diff --git a/src/components/cards/UserCard.tsx b/src/components/cards/UserCard.tsx
index 920ead8..0baf8ac 100644
--- a/src/components/cards/UserCard.tsx
+++ b/src/components/cards/UserCard.tsx
@@ -15,7 +15,7 @@ export function UserCard({ row, onEdit }: { row: any; onEdit?: (row: any) => voi
 
   return (
     <div
-      className="bg-app p-4 mb-3 flex items-center justify-between hover:bg-slate-50 transition-colors cursor-pointer border border-border-subtle rounded-xl shadow-[0_2px_8px_rgba(11,27,59,0.04)]"
+      className="bg-card p-4 flex items-center justify-between hover:bg-slate-50 transition-colors cursor-pointer border border-border-subtle rounded-xl shadow-[0_2px_8px_rgba(11,27,59,0.04)]"
       onClick={() => onEdit?.(row)}
     >
       <div className="flex items-center gap-4 min-w-0">
@@ -38,9 +38,9 @@ export function UserCard({ row, onEdit }: { row: any; onEdit?: (row: any) => voi
             e.stopPropagation();
             onEdit(row);
           }}
-          className="p-2 text-faint hover:text-primary hover:bg-primary/10 rounded-full transition-colors shrink-0"
+          className="w-[34px] h-[34px] flex items-center justify-center border border-border-default bg-card shadow-xs text-faint hover:text-primary hover:border-primary hover:bg-primary/5 rounded-md transition-colors shrink-0"
         >
-          <Edit2 size={18} />
+          <Edit2 size={16} />
         </button>
       )}
     </div>
diff --git a/src/components/reusable/Pagination.tsx b/src/components/reusable/Pagination.tsx
index 3732c73..8a07f17 100644
--- a/src/components/reusable/Pagination.tsx
+++ b/src/components/reusable/Pagination.tsx
@@ -32,7 +32,7 @@ export function Pagination({ page, pageSize, total, onPage, onPageSizeChange }:
   };
 
   return (
-    <div className="flex flex-col items-center justify-center gap-4 pt-5 pb-24 border-t border-gray-100 mt-2">
+    <div className="flex flex-col items-center justify-center gap-4 pt-5 pb-6 border-t border-gray-100 mt-2">
       <div className="flex items-center bg-white shadow-sm border border-gray-200 rounded-full p-1.5 gap-1 overflow-x-auto max-w-full no-scrollbar">
         <button
           disabled={safePage <= 1}
diff --git a/src/screens/DailyLogsPage.tsx b/src/screens/DailyLogsPage.tsx
index 0c485ca..3a9e38b 100644
--- a/src/screens/DailyLogsPage.tsx
+++ b/src/screens/DailyLogsPage.tsx
@@ -31,11 +31,8 @@ export function DailyLogsPage() {
   }
 
   return (
-    <div className="flex flex-col h-full bg-transparent w-full relative">
-      <div className="flex-1 overflow-y-auto pb-24">
-
-        
-        <DailyLogsView 
+    <>
+      <DailyLogsView 
         hideTiles
         refreshKey={refreshKey}
         onRowClick={(row) => {
@@ -47,7 +44,6 @@ export function DailyLogsPage() {
           setPunchOutTitle("Punch Out");
         }}
       />
-      </div>
 
       {/* Global Floating Action Button for Punch In */}
       <button
@@ -95,6 +91,6 @@ export function DailyLogsPage() {
           />
         )}
       </Modal>
-    </div>
+    </>
   );
 }
diff --git a/src/screens/DailySalesReportPage.tsx b/src/screens/DailySalesReportPage.tsx
index 5816199..57773ad 100644
--- a/src/screens/DailySalesReportPage.tsx
+++ b/src/screens/DailySalesReportPage.tsx
@@ -191,7 +191,7 @@ export function DailySalesReportPage() {
     <div className="flex flex-col gap-5">
       <h1 className="m-0 text-xl font-extrabold text-strong tracking-[-0.01em] print:hidden">Daily Sales Report</h1>
 
-      <Card className="print:hidden">
+      <Card className="print:hidden overflow-visible">
         <form onSubmit={submit} className="flex flex-col gap-4">
           <Input
             label="Date"
diff --git a/src/screens/StoresPage.tsx b/src/screens/StoresPage.tsx
index 66d4018..5bf954a 100644
--- a/src/screens/StoresPage.tsx
+++ b/src/screens/StoresPage.tsx
@@ -52,20 +52,18 @@ export function StoresPage() {
   }
 
   return (
-    <div className="flex flex-col h-full bg-transparent w-full relative">
-      <div className="flex-1 overflow-y-auto pb-24">
-        <StoresView 
-          refreshKey={refreshKey}
-          onRowClick={(row) => {
-            const id = row.instance_id as number | string | undefined;
-            if (id != null) navigate(`/stores/${id}`);
-          }} 
-          onEditRow={(row) => {
-            setEditingInstanceId(row.instance_id as string | number);
-            setEditTitle("Edit Store");
-          }}
-        />
-      </div>
+    <>
+      <StoresView 
+        refreshKey={refreshKey}
+        onRowClick={(row) => {
+          const id = row.instance_id as number | string | undefined;
+          if (id != null) navigate(`/stores/${id}`);
+        }} 
+        onEditRow={(row) => {
+          setEditingInstanceId(row.instance_id as string | number);
+          setEditTitle("Edit Store");
+        }}
+      />
 
       {/* Global Floating Action Button for Create Store */}
       <button
@@ -113,6 +111,6 @@ export function StoresPage() {
           />
         )}
       </Modal>
-    </div>
+    </>
   );
 }