diff --git a/components/TabelData.vue b/components/TabelData.vue
index b633f96..bebda64 100644
--- a/components/TabelData.vue
+++ b/components/TabelData.vue
@@ -70,7 +70,7 @@
 
       <!-- Custom slot untuk keterangan -->
       <template v-slot:item.keterangan="{ item }">
-        <span v-if="item.keterangan" class="text-red font-weight-bold">
+        <span v-if="item.keterangan" class="text-green font-weight-medium">
           {{ item.keterangan }}
         </span>
         <span v-else>-</span>
@@ -192,6 +192,6 @@ watch(search, () => {
 
 <style scoped>
 .text-red {
-  color: #d32f2f;
+  color: #383838;
 }
 </style>
\ No newline at end of file
diff --git a/components/TabelListPasien.vue b/components/TabelListPasien.vue
index 3b59911..034bdf7 100644
--- a/components/TabelListPasien.vue
+++ b/components/TabelListPasien.vue
@@ -2,31 +2,31 @@
   <div>
     <!-- Filter Section -->
     <v-row class="mb-4">
-      <v-col cols="12" md="3">
-        <v-text-field
-          v-model="filterDate"
-          type="date"
-          label="Tanggal"
-          density="compact"
-          hide-details
-          variant="outlined"
-        />
-      </v-col>
-      <v-col cols="12" md="3">
-        <v-select
-          v-model="filterStatus"
-          :items="statusOptions"
-          label="Status"
-          density="compact"
-          hide-details
-          variant="outlined"
-        />
-      </v-col>
-      <v-col cols="12" md="6" class="d-flex align-center gap-2">
-        <v-btn color="primary" @click="searchData">
-          Search
+      <v-col cols="12" class="d-flex align-center flex-wrap">
+        <div style="width: 200px;" class="mr-4">
+          <v-text-field
+            v-model="filterDate"
+            type="date"
+            label="Tanggal"
+            density="compact"
+            hide-details
+            variant="outlined"
+          />
+        </div>
+        <div style="width: 150px;" class="mr-4">
+          <v-select
+            v-model="filterStatus"
+            :items="statusOptions"
+            label="Status"
+            density="compact"
+            hide-details
+            variant="outlined"
+          />
+        </div>
+        <v-btn color="primary" @click="searchData" class="mr-3">
+          SEARCH
         </v-btn>
-        <v-btn color="success" variant="outlined" @click="exportLaporan">
+        <v-btn color="success" variant="outlined" @click="exportLaporan" class="mr-3">
           Laporan Pasien
         </v-btn>
         <v-btn color="info" variant="outlined" @click="exportLaporanPerKlinik">
@@ -39,14 +39,15 @@
     <v-row class="mb-3">
       <v-col cols="12" md="6" class="d-flex align-center">
         <span class="mr-2">Show</span>
-        <v-select
-          v-model="itemsPerPage"
-          :items="[10, 25, 50, 100]"
-          density="compact"
-          hide-details
-          style="width: 80px"
-          variant="outlined"
-        />
+        <div style="width: 100px;">
+          <v-select
+            v-model="itemsPerPage"
+            :items="[10, 25, 50, 100]"
+            density="compact"
+            hide-details
+            variant="outlined"
+          />
+        </div>
         <span class="ml-2">entries</span>
       </v-col>
       <v-col cols="12" md="6" class="d-flex justify-end">
@@ -268,7 +269,8 @@ const exportLaporan = () => {
 }
 
 const exportLaporanPerKlinik = () => {
-  emit('export-laporan-per-klinik')
+  // Navigate to laporan pasien per klinik page
+  navigateTo('/laporan-pasien-per-klinik')
 }
 
 const getStatusColor = (status) => {
diff --git a/layouts/default.vue b/layouts/default.vue
index e4baaf2..d019483 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -4,12 +4,12 @@
     <!-- App bar di bagian atas layout -->
      <v-app-bar app color=#ff9248 dark>
         <v-app-bar-nav-icon @click="rail = !rail"></v-app-bar-nav-icon>
-        <v-toolbar-title class="ml-2">Antrean RSSA</v-toolbar-title>
-        <v-spacer></v-spacer>++++++++++++++
+        <v-toolbar-title class="ml-2" style="color: white;">Antrean RSSA</v-toolbar-title>
+        <v-spacer></v-spacer>
         <v-btn icon>
-          <v-icon>mdi-account-circle</v-icon>
+          <v-icon color="white">mdi-account-circle</v-icon>
         </v-btn>
-        <span class="mr-2">Ragil Bayu Nogroho</span>
+        <span class="mr-2" style="color:white">Adam Sulfat</span>
       </v-app-bar>
 
     <!-- Komponen sidebar (v-navigation-drawer) yang Anda berikan -->
diff --git a/pages/Setting/Master-Loket.vue b/pages/Setting/Master-Loket.vue
index bd2d4ba..bceaefd 100644
--- a/pages/Setting/Master-Loket.vue
+++ b/pages/Setting/Master-Loket.vue
@@ -3,7 +3,7 @@
     <v-card>
       <v-card-title class="d-flex justify-space-between align-center">
         <span>Master Loket</span>
-        <v-btn color="primary" @click="tambahLoket">Tambah Baru</v-btn>
+        <v-btn color=#ff9248 @click="tambahLoket" style="color:white;">Tambah Baru</v-btn>
       </v-card-title>
       <TabelData
         :headers="loketHeaders"
@@ -11,8 +11,8 @@
         title="Master Loket"
       >
         <template #actions="{ item }">
-          <v-btn small color="info" @click="editLoket(item)" class="mr-2">Edit</v-btn>
-          <v-btn small color="error" @click="deleteLoket(item)">Delete</v-btn>
+          <v-btn small color=#ff9248 @click="editLoket(item)" class="mr-2" style="color:white;">Edit</v-btn>
+          <v-btn small color="grey-lighten-4" @click="deleteLoket(item)">Delete</v-btn>
         </template>
       </TabelData>
     </v-card>
diff --git a/pages/Setting/Screen/index.vue b/pages/Setting/Screen/index.vue
index 6be789b..9ae244b 100644
--- a/pages/Setting/Screen/index.vue
+++ b/pages/Setting/Screen/index.vue
@@ -70,8 +70,9 @@
         <v-btn
           icon="mdi-pencil"
           size="small"
-          color="primary"
+          color=#ff9248
           @click="editScreen(item)"
+          style="color:white;"
         ></v-btn>
       </template>
     </v-data-table>
diff --git a/pages/data-pasien/index.vue b/pages/data-pasien/index.vue
index f9bf040..8180bcb 100644
--- a/pages/data-pasien/index.vue
+++ b/pages/data-pasien/index.vue
@@ -5,8 +5,8 @@
     <div class="d-flex justify-space-between align-center mb-4">
       <h2>Data Pasien</h2>
       <div class="d-flex gap-2">
-        <v-btn color="primary" prepend-icon="mdi-plus" @click="addPatient">
-          Add Patient
+        <v-btn color=#ff9248 prepend-icon="mdi-plus" @click="addPatient" style="color:white">
+         Tambah Pasien
         </v-btn>
       </div>
     </div>
@@ -23,14 +23,15 @@
           <v-btn
     
             size="small"
-            color="primary"
+            color=#ff9248
             variant="flat"
             @click="viewPasien(item)"
+            style="color:white;"
           >VIEW</v-btn>
           <v-btn
      
             size="small"
-            color="warning"
+            color="grey-lighten-4"
             variant="flat"
             @click="editPasien(item)"
           >EDIT</v-btn>