diff --git a/frontend/src/components/clientSubPages/Overview.vue b/frontend/src/components/clientSubPages/Overview.vue
index eb91548..518a6ba 100644
--- a/frontend/src/components/clientSubPages/Overview.vue
+++ b/frontend/src/components/clientSubPages/Overview.vue
@@ -1,34 +1,44 @@
 <template>
 	<div class="overview-container">
-		<template v-if="isNew || editMode">
-			<ClientInformationForm
-				ref="clientInfoRef"
-				:form-data="formData"
-				@update:form-data="formData = $event"
-				:is-submitting="isSubmitting"
-				:is-edit-mode="editMode"
-				@new-client-toggle="handleNewClientToggle"
-				@customer-selected="handleCustomerSelected"
-			/>
-
-			<ContactInformationForm
-				ref="contactInfoRef"
-				:form-data="formData"
-				@update:form-data="formData = $event"
-				:is-submitting="isSubmitting"
-				:is-edit-mode="editMode"
-				:is-new-client-locked="isNewClientMode"
-				:available-contacts="availableContacts"
-				@new-contact-toggle="handleNewContactToggle"
-			/>
-
-			<AddressInformationForm
-				:form-data="formData"
-				@update:form-data="formData = $event"
-				:is-submitting="isSubmitting"
-				:is-edit-mode="editMode"
+		<template v-if="!editMode">
+			<Button
+				@click="toggleEditMode"
+				icon="pi pi-pencil"
+				label="Edit Information"
+				size="small"
+				severity="secondary"
 			/>
 		</template>
+		<div class="status-cards">
+				<template v-if="isNew || editMode">
+				<ClientInformationForm
+					ref="clientInfoRef"
+					:form-data="formData"
+					@update:form-data="formData = $event"
+				:is-submitting="isSubmitting"
+					:is-edit-mode="editMode"
+					@new-client-toggle="handleNewClientToggle"
+					@customer-selected="handleCustomerSelected"
+				/>
+
+				<ContactInformationForm
+					ref="contactInfoRef"
+					:form-data="formData"
+					@update:form-data="formData = $event"
+				:is-submitting="isSubmitting"
+					:is-edit-mode="editMode"
+					:is-new-client-locked="isNewClientMode"
+					:available-contacts="availableContacts"
+					@new-contact-toggle="handleNewContactToggle"
+				/>
+
+				<AddressInformationForm
+					:form-data="formData"
+					@update:form-data="formData = $event"
+				:is-submitting="isSubmitting"
+					:is-edit-mode="editMode"
+				/>
+			</template>
 
 			<!-- Display Mode (existing client view) -->
 			<template v-else>