diff --git a/frontend/src/components/pages/Clients.vue b/frontend/src/components/pages/Clients.vue
index a9bde8c..8435fd3 100644
--- a/frontend/src/components/pages/Clients.vue
+++ b/frontend/src/components/pages/Clients.vue
@@ -1,6 +1,101 @@
 <template>
 	<div class="page-container">
 		<H2>Client Contact List</H2>
+		<!-- Status Chart Section -->
+		<div class="widgets-grid">
+			<!-- Incomplete Bids Widget -->
+			<Card>
+				<template #header>
+					<div class="widget-header">
+						<Edit class="widget-icon" />
+						<h3>Incomplete Bids</h3>
+					</div>
+				</template>
+				<template #content>
+					<div class="widget-content">
+						<TodoChart
+								title="Incomplete Bids"
+								:todoNumber="bidsTodoNumber"
+								:completedNumber="bidsCompletedNumber"
+								>
+						</TodoChart>
+						<button class="sidebar-button"
+								@click="navigateTo('/calendar')">
+							Incomplete Bids
+						</button>
+					</div>
+				</template>
+			</Card>
+			<!-- Unapproved Estimates Widget -->
+			<Card>
+				<template #header>
+					<div class="widget-header">
+						<ChatBubbleQuestion class="widget-icon" />
+						<h3>Unapproved Estimates</h3>
+					</div>
+				</template>
+				<template #content>
+					<div class="widget-content">
+						<TodoChart
+								title="Unapproved Estimates"
+								:todoNumber="estimatesTodoNumber"
+								:completedNumber="estimatesCompletedNumber"
+								>
+						</TodoChart>
+						<button class="sidebar-button"
+								@click="navigateTo('/estimates')">
+							Unapproved Estimates
+						</button>
+					</div>
+				</template>
+			</Card>
+			<!-- Half Down Widget -->
+			<Card>
+				<template #header>
+					<div class="widget-header">
+						<CreditCard class="widget-icon" />
+						<h3>Half Down Payments</h3>
+					</div>
+				</template>
+				<template #content>
+					<div class="widget-content">
+						<TodoChart
+								title="Half Down Payments"
+								:todoNumber="halfDownTodoNumber"
+								:completedNumber="halfDownCompletedNumber"
+								>
+						</TodoChart>
+						<button class="sidebar-button"
+								@click="navigateTo('/jobs')">
+							Half Down Payments
+						</button>
+					</div>
+				</template>
+			</Card>
+			<!-- Late Balances Widget -->
+			<Card>
+				<template #header>
+					<div class="widget-header">
+						<CardNoAccess class="widget-icon" />
+						<h3>Late Balances</h3>
+					</div>
+				</template>
+				<template #content>
+					<div class="widget-content">
+						<TodoChart
+								title="Late Balances"
+								:todoNumber="balancesTodoNumber"
+								:completedNumber="balancesCompletedNumber"
+								>
+						</TodoChart>
+						<button class="sidebar-button"
+								@click="navigateTo('/jobs')">
+							Late Balances
+						</button>
+					</div>
+				</template>
+			</Card>
+		</div>
 
 		<DataTable
 			:data="tableData"
diff --git a/frontend/src/components/pages/Estimates.vue b/frontend/src/components/pages/Estimates.vue
index 3f0e758..b421eef 100644
--- a/frontend/src/components/pages/Estimates.vue
+++ b/frontend/src/components/pages/Estimates.vue
@@ -1,101 +1,6 @@
 <template>
-	<div class="page-container">
+	<div>
 		<h2>Estimates</h2>
-		<!-- Todo Chart Section -->
-		<div class="widgets-grid">
-			<!-- Incomplete Bids Widget -->
-			<Card>
-				<template #header>
-					<div class="widget-header">
-						<Edit class="widget-icon" />
-						<h3>Incomplete Bids</h3>
-					</div>
-				</template>
-				<template #content>
-					<div class="widget-content">
-						<TodoChart
-								title="Incomplete Bids"
-								:todoNumber="bidsTodoNumber"
-								:completedNumber="bidsCompletedNumber"
-								>
-						</TodoChart>
-						<button class="sidebar-button"
-								@click="navigateTo('/calendar')">
-							Incomplete Bids
-						</button>
-					</div>
-				</template>
-			</Card>
-			<!-- Unapproved Estimates Widget -->
-			<Card>
-				<template #header>
-					<div class="widget-header">
-						<ChatBubbleQuestion class="widget-icon" />
-						<h3>Unapproved Estimates</h3>
-					</div>
-				</template>
-				<template #content>
-					<div class="widget-content">
-						<TodoChart
-								title="Unapproved Estimates"
-								:todoNumber="estimatesTodoNumber"
-								:completedNumber="estimatesCompletedNumber"
-								>
-						</TodoChart>
-						<button class="sidebar-button"
-								@click="navigateTo('/estimates')">
-							Unapproved Estimates
-						</button>
-					</div>
-				</template>
-			</Card>
-			<!-- Half Down Widget -->
-			<Card>
-				<template #header>
-					<div class="widget-header">
-						<CreditCard class="widget-icon" />
-						<h3>Half Down Payments</h3>
-					</div>
-				</template>
-				<template #content>
-					<div class="widget-content">
-						<TodoChart
-								title="Half Down Payments"
-								:todoNumber="halfDownTodoNumber"
-								:completedNumber="halfDownCompletedNumber"
-								>
-						</TodoChart>
-						<button class="sidebar-button"
-								@click="navigateTo('/jobs')">
-							Half Down Payments
-						</button>
-					</div>
-				</template>
-			</Card>
-			<!-- Late Balances Widget -->
-			<Card>
-				<template #header>
-					<div class="widget-header">
-						<Hammer class="widget-icon" />
-						<h3>Jobs In Queue</h3>
-					</div>
-				</template>
-				<template #content>
-					<div class="widget-content">
-						<TodoChart
-								title="Jobs In Queue"
-								:todoNumber="jobQueueTodoNumber"
-								:completedNumber="jobQueueCompletedNumber"
-								>
-						</TodoChart>
-						<button class="sidebar-button"
-								@click="navigateTo('/jobs')">
-							View Queued Jobs
-						</button>
-					</div>
-				</template>
-			</Card>
-		</div>
 		<DataTable
 			:data="tableData"
 			:columns="columns"
@@ -128,10 +33,7 @@
 	</div>
 </template>
 <script setup>
-import Card from "../common/Card.vue";
 import DataTable from "../common/DataTable.vue";
-import TodoChart from "../common/TodoChart.vue";
-import { Edit, ChatBubbleQuestion, CreditCard, Hammer } from "@iconoir/vue";
 import { ref, onMounted } from "vue";
 import Api from "../../api";
 import { useLoadingStore } from "../../stores/loading";
@@ -286,45 +188,4 @@ onMounted(async () => {
 });
 
 </script>
-<style lang="css">
-.widgets-grid {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 20px;
-	margin-bottom: 20px;
-}
-.widget-header {
-	display: flex;
-	align-items: center;
-	gap: 10px;
-	padding: 20px 20px 0;
-}
-
-.widget-icon {
-	color: var(--theme-primary-strong);
-	width: 24px;
-	height: 24px;
-}
-
-.widget-header h3 {
-	margin: 0;
-	color: #2c3e50;
-	font-size: 1.2rem;
-}
-
-.widget-content {
-	display: flex;
-	flex-direction: column;
-	margin: 0;
-	width: 200px;
-	align-items: center;
-	padding: 20px 20px 20px;
-	/*gap: 15px;*/
-}
-.page-container {
-	height: 100%;
-	margin: 20px;
-	gap: 20px;
-	background-color: transparent;
-}
-</style>
+<style lang=""></style>
diff --git a/frontend/src/components/pages/Home.vue b/frontend/src/components/pages/Home.vue
index df3ad5e..f6af432 100644
--- a/frontend/src/components/pages/Home.vue
+++ b/frontend/src/components/pages/Home.vue
@@ -160,29 +160,6 @@
 					</div>
 				</template>
 			</Card>
-			<!-- 15 Day Follow Up Widget -->
-			<Card >
-				<template #header>
-					<div class="widget-header">
-						<Calendar class="widget-icon" />
-						<h3>15 Day Follow Ups</h3>
-					</div>
-				</template>
-				<template #content>
-					<div class="widget-content">
-						<TodoChart
-								title="15 Day Follow Ups"
-								:todoNumber="fifteenDayTodoNumber"
-								:completedNumber="fifteenDayCompletedNumber"
-								>
-						</TodoChart>
-						<button class="sidebar-button"
-								@click="navigateTo('/calendar')">
-							View Follow Ups
-						</button>
-					</div>
-				</template>
-			</Card>
 			<!-- Late Balances Widget -->
 			<Card >
 				<template #header>
@@ -200,7 +177,7 @@
 								>
 						</TodoChart>
 						<button class="sidebar-button"
-								@click="navigateTo('/invoices')">
+								@click="navigateTo('/jobs')">
 							Late Balances
 						</button>
 					</div>
diff --git a/frontend/src/components/pages/Invoices.vue b/frontend/src/components/pages/Invoices.vue
index a39457a..1e4f379 100644
--- a/frontend/src/components/pages/Invoices.vue
+++ b/frontend/src/components/pages/Invoices.vue
@@ -1,55 +1,6 @@
 <template>
-	<div class="page-container">
+	<div>
 		<h2>Invoices</h2>
-		<!-- Todo Chart Section -->
-		<div class = "widgets-grid">
-			<!-- Ready to Invoice Widget -->
-			<Card>
-				<template #header>
-					<div class="widget-header">
-						<CalendarCheck class="widget-icon" />
-						<h3>Ready To Invoice</h3>
-					</div>
-				</template>
-				<template #content>
-					<div class="widget-content">
-						<TodoChart
-								title="Ready To Invoice"
-								:todoNumber="invoiceTodoNumber"
-								:completedNumber="invoiceCompletedNumber"
-								>
-						</TodoChart>
-						<button class="sidebar-button"
-								@click="filterBy('ready')">
-							View Ready To Invoice
-						</button>
-					</div>
-				</template>
-			</Card>
-			<!-- Late Balances Widget -->
-			<Card>
-				<template #header>
-					<div class="widget-header">
-						<CardNoAccess class="widget-icon" />
-						<h3>Late Balances</h3>
-					</div>
-				</template>
-				<template #content>
-					<div class="widget-content">
-						<TodoChart
-								title="Late Balances"
-								:todoNumber="balancesTodoNumber"
-								:completedNumber="balancesCompletedNumber"
-								>
-						</TodoChart>
-						<button class="sidebar-button"
-								@click="filterBy('late')">
-							View Late Balances
-						</button>
-					</div>
-				</template>
-			</Card>
-		</div>
 		<DataTable
 			:data="tableData"
 			:columns="columns"
@@ -62,15 +13,12 @@
 	</div>
 </template>
 <script setup>
-import Card from "../common/Card.vue";
 import DataTable from "../common/DataTable.vue";
-import TodoChart from "../common/TodoChart.vue";
 import { ref, onMounted } from "vue";
 import Api from "../../api";
 import { useLoadingStore } from "../../stores/loading";
 import { usePaginationStore } from "../../stores/pagination";
 import { useFiltersStore } from "../../stores/filters";
-import { CardNoAccess, CalendarCheck } from "@iconoir/vue";
 
 const loadingStore = useLoadingStore();
 const paginationStore = usePaginationStore();
@@ -96,10 +44,6 @@ const columns = [
 	{ label: "Grand Total", fieldName: "grandTotal", type: "text", sortable: true },
 ];
 
-const filterBy = () => {
-	console.log("DEBUG: Invoices filterBy not implemented yet.");
-}
-
 const handleInvoiceClick = () => {
 }
 
@@ -191,45 +135,4 @@ onMounted(async () => {
 });
 
 </script>
-<style lang="css">
-.widgets-grid {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 20px;
-	margin-bottom: 20px;
-}
-.widget-header {
-	display: flex;
-	align-items: center;
-	gap: 10px;
-	padding: 20px 20px 0;
-}
-
-.widget-icon {
-	color: var(--theme-primary-strong);
-	width: 24px;
-	height: 24px;
-}
-
-.widget-header h3 {
-	margin: 0;
-	color: #2c3e50;
-	font-size: 1.2rem;
-}
-
-.widget-content {
-	display: flex;
-	flex-direction: column;
-	margin: 0;
-	width: 200px;
-	align-items: center;
-	padding: 20px 20px 20px;
-	/*gap: 15px;*/
-}
-.page-container {
-	height: 100%;
-	margin: 20px;
-	gap: 20px;
-	background-color: transparent;
-}
-</style>
+<style lang=""></style>
diff --git a/frontend/src/components/pages/Jobs.vue b/frontend/src/components/pages/Jobs.vue
index 70868e9..d5dfb7c 100644
--- a/frontend/src/components/pages/Jobs.vue
+++ b/frontend/src/components/pages/Jobs.vue
@@ -1,101 +1,6 @@
 <template>
-	<div class="page-container">
+	<div>
 		<h2>Jobs</h2>
-		<!-- Todo Chart Section -->
-		<div class = "widgets-grid">
-			<!-- Jobs in Queue Widget -->
-			<Card>
-				<template #header>
-					<div class="widget-header">
-						<Hammer class="widget-icon" />
-						<h3>Jobs In Queue</h3>
-					</div>
-				</template>
-				<template #content>
-					<div class="widget-content">
-						<TodoChart
-								title="Jobs In Queue"
-								:todoNumber="jobQueueTodoNumber"
-								:completedNumber="jobQueueCompletedNumber"
-								>
-						</TodoChart>
-						<button class="sidebar-button"
-								@click="filterBy('in queue')">
-							View Queued Jobs
-						</button>
-					</div>
-				</template>
-			</Card>
-			<!-- Jobs In Progress Widget -->
-			<Card>
-				<template #header>
-					<div class="widget-header">
-						<Hammer class="widget-icon" />
-						<h3>Jobs In Progress</h3>
-					</div>
-				</template>
-				<template #content>
-					<div class="widget-content">
-						<TodoChart
-								title="Jobs in Progress"
-								:todoNumber="progressTodoNumber"
-								:completedNumber="progressCompletedNumber"
-								>
-						</TodoChart>
-						<button class="sidebar-button"
-								@click="filterBy('in progress')">
-							View Jobs In Progress
-						</button>
-					</div>
-				</template>
-			</Card>
-			<!-- Late Jobs Widget -->
-			<Card>
-				<template #header>
-					<div class="widget-header">
-						<Alarm class="widget-icon" />
-						<h3>Late Jobs</h3>
-					</div>
-				</template>
-				<template #content>
-					<div class="widget-content">
-						<TodoChart
-								title="Late Jobs"
-								:todoNumber="lateTodoNumber"
-								:completedNumber="lateCompletedNumber"
-								>
-						</TodoChart>
-						<button class="sidebar-button"
-								@click="filterBy('late')">
-							View Late Jobs
-						</button>
-					</div>
-				</template>
-			</Card>
-			<!-- Ready to Invoice Widget -->
-			<Card>
-				<template #header>
-					<div class="widget-header">
-						<CalendarCheck class="widget-icon" />
-						<h3>Ready To Invoice</h3>
-					</div>
-				</template>
-				<template #content>
-					<div class="widget-content">
-						<TodoChart
-								title="Ready To Invoice"
-								:todoNumber="invoiceTodoNumber"
-								:completedNumber="invoiceCompletedNumber"
-								>
-						</TodoChart>
-						<button class="sidebar-button"
-								@click="navigateTo('/invoices')">
-							View Ready To Invoice
-						</button>
-					</div>
-				</template>
-			</Card>
-		</div>
 		<DataTable
 			:data="tableData"
 			:columns="columns"
@@ -108,17 +13,13 @@
 	</div>
 </template>
 <script setup>
-import Card from "../common/Card.vue";
 import DataTable from "../common/DataTable.vue";
-import TodoChart from "../common/TodoChart.vue";
 import { ref, onMounted } from "vue";
-import { useRouter } from "vue-router";
 import Api from "../../api";
 import { useLoadingStore } from "../../stores/loading";
 import { usePaginationStore } from "../../stores/pagination";
 import { useFiltersStore } from "../../stores/filters";
 import { useNotificationStore } from "../../stores/notifications-primevue";
-import { Alarm, CalendarCheck, Hammer } from "@iconoir/vue";
 
 const loadingStore = useLoadingStore();
 const paginationStore = usePaginationStore();
@@ -137,15 +38,6 @@ const columns = [
 	{ label: "Progress", fieldName: "percentComplete", type: "text", sortable: true },
 ];
 
-const router = useRouter();
-const navigateTo = (path) => {
-	router.push(path);
-};
-
-const filterBy = (filter) => {
-	console.log("DEBUG: Jobs filterBy not implemented yet.");
-};
-
 // Handle lazy loading events from DataTable
 const handleLazyLoad = async (event) => {
 	console.log("Jobs page - handling lazy load:", event);
@@ -277,45 +169,4 @@ onMounted(async () => {
 	// });
 });
 </script>
-<style lang="css">
-.widgets-grid {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 20px;
-	margin-bottom: 20px;
-}
-.widget-header {
-	display: flex;
-	align-items: center;
-	gap: 10px;
-	padding: 20px 20px 0;
-}
-
-.widget-icon {
-	color: var(--theme-primary-strong);
-	width: 24px;
-	height: 24px;
-}
-
-.widget-header h3 {
-	margin: 0;
-	color: #2c3e50;
-	font-size: 1.2rem;
-}
-
-.widget-content {
-	display: flex;
-	flex-direction: column;
-	margin: 0;
-	width: 200px;
-	align-items: center;
-	padding: 20px 20px 20px;
-	/*gap: 15px;*/
-}
-.page-container {
-	height: 100%;
-	margin: 20px;
-	gap: 20px;
-	background-color: transparent;
-}
-</style>
+<style lang=""></style>