diff --git a/frontend/src/features/common/table-layout/index.jsx b/frontend/src/features/common/table-layout/index.jsx
index dc6bd0d..58e3656 100644
--- a/frontend/src/features/common/table-layout/index.jsx
+++ b/frontend/src/features/common/table-layout/index.jsx
@@ -38,7 +38,7 @@ function TableLayoutMemoized({
   });
   const navigate = useNavigate();
   return (
-    <Stack spacing={4} marginTop={4}>
+    <Stack spacing={4}>
       <Flex justifyContent={"space-between"} alignItems={"center"}>
         <Flex justifyContent={"space-between"} gap={4} alignItems={"center"}>
           <Icon
diff --git a/frontend/src/features/estimates/list/index.jsx b/frontend/src/features/estimates/list/index.jsx
index 19b3ea5..5bc49e7 100644
--- a/frontend/src/features/estimates/list/index.jsx
+++ b/frontend/src/features/estimates/list/index.jsx
@@ -85,7 +85,7 @@ export default function EstimatesPage() {
   const deleting = estimateStatus === "deleting";
   return (
     <MainLayout>
-      <Box p={5}>
+      <Box p={4}>
         {loading ? (
           <Flex justifyContent={"center"} alignItems={"center"}>
             <Spinner size={"md"} />
diff --git a/frontend/src/features/expenses/index.jsx b/frontend/src/features/expenses/index.jsx
index 6f1321c..e60c6a4 100644
--- a/frontend/src/features/expenses/index.jsx
+++ b/frontend/src/features/expenses/index.jsx
@@ -95,7 +95,7 @@ export default function ExpensesPage() {
   const { symbol } = useCurrentOrgCurrency();
   return (
     <MainLayout>
-      <Box p={5}>
+      <Box p={4}>
         {loading ? (
           <Flex justifyContent={"center"} alignItems={"center"}>
             <Spinner size={"md"} />
diff --git a/frontend/src/features/invoices/list/index.jsx b/frontend/src/features/invoices/list/index.jsx
index 27ae0dd..5d9c536 100644
--- a/frontend/src/features/invoices/list/index.jsx
+++ b/frontend/src/features/invoices/list/index.jsx
@@ -84,7 +84,7 @@ export default function InvoicesPage() {
   const downloading = invoiceStatus === "downloading";
   return (
     <MainLayout>
-      <Box p={5}>
+      <Box p={4}>
         {loading ? (
           <Flex justifyContent={"center"} alignItems={"center"}>
             <Spinner size={"md"} />
diff --git a/frontend/src/features/parties/index.jsx b/frontend/src/features/parties/index.jsx
index 34da785..629cff7 100644
--- a/frontend/src/features/parties/index.jsx
+++ b/frontend/src/features/parties/index.jsx
@@ -96,7 +96,7 @@ export default function PartysPage() {
   const navigate = useNavigate();
   return (
     <MainLayout>
-      <Box p={5}>
+      <Box p={4}>
         {loading ? (
           <Flex justifyContent={"center"} alignItems={"center"}>
             <Spinner size={"md"} />
diff --git a/frontend/src/features/purchase/list/index.jsx b/frontend/src/features/purchase/list/index.jsx
index 739caf8..63c02d1 100644
--- a/frontend/src/features/purchase/list/index.jsx
+++ b/frontend/src/features/purchase/list/index.jsx
@@ -37,7 +37,7 @@ export default function PurchasePage() {
   const navigate = useNavigate();
   const purchaseTableMapper = (purchase) => ({
     partyName: purchase.party ? purchase.party.name : "",
-    billingAddress: purchase.party.billingAddress,
+    billingAddress: purchase?.billingAddress,
     ...purchase,
     purchaseNo: transactionPrefixInvoice + purchase.purchaseNo,
     date: new Date(purchase.date).toISOString().split("T")[0],
@@ -90,7 +90,7 @@ export default function PurchasePage() {
 
   return (
     <MainLayout>
-      <Box p={5}>
+      <Box p={4}>
         {loading ? (
           <Flex justifyContent={"center"} alignItems={"center"}>
             <Spinner size={"md"} />