diff --git a/src/modules/09_leave/components/1_Work/TableList.vue b/src/modules/09_leave/components/1_Work/TableList.vue
index 301f32a22..ab5c98f38 100644
--- a/src/modules/09_leave/components/1_Work/TableList.vue
+++ b/src/modules/09_leave/components/1_Work/TableList.vue
@@ -116,7 +116,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
 </script>
 
 <template>
-  <q-toolbar style="padding: 0" class="q-gutter-sm q-mb-md">
+  <q-toolbar style="padding: 0" class="q-gutter-sm q-mb-sm">
     <div class="col-2">
       <datepicker
         menu-class-name="modalfix"
diff --git a/src/modules/09_leave/components/2_Leave/TableList.vue b/src/modules/09_leave/components/2_Leave/TableList.vue
index 5cc33d2e7..b95bd6271 100644
--- a/src/modules/09_leave/components/2_Leave/TableList.vue
+++ b/src/modules/09_leave/components/2_Leave/TableList.vue
@@ -85,7 +85,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
 </script>
 
 <template>
-  <q-toolbar style="padding: 0" class="q-gutter-sm q-mb-md">
+  <q-toolbar style="padding: 0" class="q-gutter-sm q-mb-sm">
     <div class="col-2">
       <q-select
         emit-value
diff --git a/src/modules/11_discipline/components/1_Complaint/MainPage.vue b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
index 5c3118b49..ef5f5b7ff 100644
--- a/src/modules/11_discipline/components/1_Complaint/MainPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
@@ -62,53 +62,55 @@ function redirectToPageadd() {
 
 <template>
   <div class="toptitle text-dark col-12 row items-center">เรื่องร้องเรียน</div>
-  <div class="col-12 q-mt-sm">
-    <q-card flat bordered>
-      <div class="q-pa-md">
-        <q-toolbar style="padding: 0" class="q-gutter-sm q-mb-md">
-          <q-btn
-            id="addComplaints"
-            flat
-            dense
-            round
-            color="primary"
-            icon="mdi-plus"
-            @click="redirectToPageadd()"
-            ><q-tooltip>เพิ่มเรื่องร้องเรียน </q-tooltip></q-btn
-          >
+  <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
+      <div class="row col-12 q-col-gutter-sm q-mb-sm">
+          <div>
+            <q-btn
+              id="addComplaints"
+              size="12px"
+              flat
+              round
+              color="primary"
+              icon="mdi-plus"
+              @click="redirectToPageadd()"
+              ><q-tooltip>เพิ่มเรื่องร้องเรียน </q-tooltip></q-btn
+            >
+          </div>
           <q-space />
-          <div class="col-2">
-            <q-input
-              id="filterTable"
-              for="filterTable"
-              dense
-              outlined
-              v-model="filterTable"
-              label="ค้นหา"
-            />
-          </div>
-          <div class="col-2">
-            <q-select
-              id="visibleColumns"
-              for="visibleColumns"
-              v-model="complainstStore.visibleColumns"
-              multiple
-              outlined
-              dense
-              options-dense
-              :display-value="$q.lang.table.columns"
-              emit-value
-              map-options
-              :options="complainstStore.columns"
-              option-value="name"
-              options-cover
-            />
-          </div>
-        </q-toolbar>
+          <q-input
+            class="col-xs-12 col-sm-3 col-md-2"
+            id="filterTable"
+            for="filterTable"
+            dense
+            outlined
+            v-model="filterTable"
+            label="ค้นหา"
+          >
+          <template v-slot:append>
+            <q-icon name="search" />
+          </template>
+          </q-input>
+          <q-select
+            id="visibleColumns"
+            for="visibleColumns"
+            v-model="complainstStore.visibleColumns"
+            multiple
+            outlined
+            dense
+            options-dense
+            :display-value="$q.lang.table.columns"
+            emit-value
+            map-options
+            :options="complainstStore.columns"
+            option-value="name"
+            options-cover
+            class="col-xs-12 col-sm-3 col-md-2"
+          />
+      </div>
+      <div class="col-12">
         <TableComplaint :filterTable="filterTable" />
       </div>
-    </q-card>
-  </div>
+  </q-card>
 </template>
 
 <style scoped></style>
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
index 8635c2d3c..e90d2c8a6 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
@@ -87,115 +87,117 @@ onMounted(() => {
     รายการสืบสวนข้อเท็จจริง
   </div>
   <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
-    <div class="row q-col-gutter-sm">
-      <div class="row col-12 q-col-gutter-sm">
-        <div>
-          <q-btn
-            @click="clickAdd()"
-            size="12px"
-            flat
-            round
-            color="add"
-            icon="mdi-plus"
-          >
-            <q-tooltip>เพิ่มรายการสืบสวนข้อเท็จจริง</q-tooltip>
-          </q-btn>
-        </div>
-        <q-space />
-
-        <q-input
-          class="col-xs-12 col-sm-3 col-md-2"
-          standout
-          dense
-          v-model="filterKeyword"
-          ref="filterRef"
-          outlined
-          debounce="300"
-          placeholder="ค้นหา"
-        >
-          <template v-slot:append>
-            <q-icon v-if="filterKeyword == ''" name="search" />
-            <q-icon
-              v-if="filterKeyword !== ''"
-              name="clear"
-              class="cursor-pointer"
-              @click="resetFilter"
-            />
-          </template>
-        </q-input>
-
-        <q-select
-          v-model="dataInvestigate.visibleColumns"
-          multiple
-          outlined
-          dense
-          options-dense
-          :display-value="$q.lang.table.columns"
-          emit-value
-          map-options
-          :options="dataInvestigate.columns"
-          option-value="name"
-          options-cover
-          style="min-width: 150px"
-          class="col-xs-12 col-sm-3 col-md-2"
-        />
-      </div>
-      <div class="col-12">
-        <d-table
-          ref="table"
-          :columns="dataInvestigate.columns"
-          :rows="dataInvestigate.rows"
-          :filter="filterKeyword"
-          row-key="interrogated"
+    <div class="row col-12 q-col-gutter-sm q-mb-sm">
+      <div>
+        <q-btn
+          @click="clickAdd()"
+          size="12px"
           flat
-          bordered
-          :paging="true"
-          dense
-          class="custom-header-table"
-          v-bind="attrs"
-          :visible-columns="dataInvestigate.visibleColumns"
-          :pagination-label="paginationLabel"
-          v-model:pagination="pagination"
+          round
+          color="add"
+          icon="mdi-plus"
         >
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <q-th
-                v-for="col in props.cols"
-                :key="col.name"
-                :props="props"
-                style="padding: 10px; color: #35373c; font-weight: 500"
-              >
-                <span class="text-weight-medium">{{ col.label }}</span>
-              </q-th>
-              <q-th auto-width />
-              <q-th auto-width />
-            </q-tr>
-          </template>
-          <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer">
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                <q-td v-if="col.name == 'no'">
-                  {{ props.rowIndex + 1 }}
-                </q-td>
-                <div>
-                  {{ col.value }}
-                </div>
+          <q-tooltip>เพิ่มรายการสืบสวนข้อเท็จจริง</q-tooltip>
+        </q-btn>
+      </div>
+      <q-space />
+
+      <q-input
+        class="col-xs-12 col-sm-3 col-md-2"
+        standout
+        dense
+        v-model="filterKeyword"
+        ref="filterRef"
+        outlined
+        debounce="300"
+        placeholder="ค้นหา"
+      >
+        <template v-slot:append>
+          <q-icon v-if="filterKeyword == ''" name="search" />
+          <q-icon
+            v-if="filterKeyword !== ''"
+            name="clear"
+            class="cursor-pointer"
+            @click="resetFilter"
+          />
+        </template>
+      </q-input>
+
+      <q-select
+        v-model="dataInvestigate.visibleColumns"
+        multiple
+        outlined
+        dense
+        options-dense
+        :display-value="$q.lang.table.columns"
+        emit-value
+        map-options
+        :options="dataInvestigate.columns"
+        option-value="name"
+        options-cover
+        style="min-width: 150px"
+        class="col-xs-12 col-sm-3 col-md-2"
+      />
+    </div>
+    <div class="col-12">
+      <d-table
+        ref="table"
+        :columns="dataInvestigate.columns"
+        :rows="dataInvestigate.rows"
+        :filter="filterKeyword"
+        row-key="interrogated"
+        flat
+        bordered
+        :paging="true"
+        dense
+        class="custom-header-table"
+        v-bind="attrs"
+        :visible-columns="dataInvestigate.visibleColumns"
+        :pagination-label="paginationLabel"
+        v-model:pagination="pagination"
+      >
+        <template v-slot:header="props">
+          <q-tr :props="props">
+            <q-th
+              v-for="col in props.cols"
+              :key="col.name"
+              :props="props"
+              style="color: #000000; font-weight: 500"
+            >
+              <span class="text-weight-medium">{{ col.label }}</span>
+            </q-th>
+            <q-th auto-width />
+            <q-th auto-width />
+          </q-tr>
+        </template>
+        <template v-slot:body="props">
+          <q-tr :props="props" class="cursor-pointer">
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">
+              <q-td v-if="col.name == 'no'">
+                {{ props.rowIndex + 1 }}
               </q-td>
-              <q-td auto-width style="font-size: 14px; width: 10rem">
-                {{ props.row.active }}
-              </q-td>
-              <q-td auto-width>
+              <div>
+                {{ col.value }}
+              </div>
+            </q-td>
+            <q-td auto-width style="font-size: 14px; width: 10%;">
+              {{ props.row.active }}
+            </q-td>
+            <q-td auto-width>
+              <div>
                 <q-btn
                   v-if="props.row.status === 'ยุติเรื่อง'"
-                  class="q-px-xl q-py-xs text-white no-shadow"
-                  style="background-color: #00aa86; border-radius: 6px"
+                  dense
+                  outline
+                  color="deep-orange-7"
+                  class="q-px-sm"
                   >ยกเลิกยุติเรื่อง</q-btn
                 >
-              </q-td>
-            </q-tr>
-          </template>
-        </d-table>
-      </div>
+              </div>
+            </q-td>
+          </q-tr>
+        </template>
+      </d-table>
     </div>
   </q-card>
 </template>
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
index fe7c5077c..8c7415201 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
@@ -103,7 +103,9 @@ const clickAdd = () => {
               <q-btn
                 v-if="props.row.active === 'ยืนยันผล'"
                 color="primary"
-                class="q-px-md q-py-xs"
+                class="q-px-md"
+                dense
+                unelevated
                 >ยืนยันผล</q-btn
               >
               <span v-else>{{ props.row.active }}</span>
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
index 29aedd860..06a30b961 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
@@ -14,7 +14,6 @@
       </q-btn>
     </div>
     <q-space />
-    <div class="items-center q-gutter-sm" style="display: flex">
       <!-- ค้นหาข้อความใน table -->
       <q-input
         standout
@@ -26,6 +25,7 @@
         debounce="300"
         placeholder="ค้นหา"
         style="max-width: 200px"
+        class="col-xs-12 col-sm-3 col-md-2"
       >
         <template v-slot:append>
           <q-icon v-if="inputfilter == ''" name="search" />
@@ -50,12 +50,10 @@
         option-value="name"
         map-options
         emit-value
-        style="min-width: 150px"
-        class="gt-xs"
+        class="col-xs-12 col-sm-3 col-md-2 gt-xs"
       >
         <template> </template>
       </q-select>
-    </div>
   </div>
   <d-table
     ref="table"
diff --git a/src/modules/11_discipline/components/4_Order/MainPage.vue b/src/modules/11_discipline/components/4_Order/MainPage.vue
index cbefe6d47..3a4b330d2 100644
--- a/src/modules/11_discipline/components/4_Order/MainPage.vue
+++ b/src/modules/11_discipline/components/4_Order/MainPage.vue
@@ -60,51 +60,53 @@ function redirectToPageadd() {
   <div class="toptitle text-dark col-12 row items-center">
     รายการออกคำสั่งลงโทษทางวินัย
   </div>
-  <div class="col-12 q-mt-sm">
-    <q-card flat bordered>
-      <div class="q-pa-md">
-        <q-toolbar style="padding: 0" class="q-gutter-sm q-mb-md">
-          <q-btn
-            id="addDisciplineOrder"
-            flat
-            dense
-            round
-            color="primary"
-            icon="mdi-plus"
-            @click="redirectToPageadd()"
-            ><q-tooltip>เพิ่มรายการออกคำสั่งลงโทษทางวินัย </q-tooltip></q-btn
-          >
+  <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
+      <div class="row col-12 q-col-gutter-sm q-mb-sm">
+          <div>
+            <q-btn
+              id="addDisciplineOrder"
+              flat
+              size="12px"
+              round
+              color="primary"
+              icon="mdi-plus"
+              @click="redirectToPageadd()"
+              ><q-tooltip>เพิ่มรายการออกคำสั่งลงโทษทางวินัย </q-tooltip></q-btn
+            >
+          </div>
           <q-space />
-          <div class="col-2">
-            <q-input
-              for="filterTable"
-              dense
-              outlined
-              v-model="filterTable"
-              label="ค้นหา"
-            />
-          </div>
-          <div class="col-2">
-            <q-select
-              for="visibleColumns"
-              v-model="OrderStore.visibleColumns"
-              multiple
-              outlined
-              dense
-              options-dense
-              :display-value="$q.lang.table.columns"
-              emit-value
-              map-options
-              :options="OrderStore.columns"
-              option-value="name"
-              options-cover
-            />
-          </div>
-        </q-toolbar>
+          <q-input
+            class="col-xs-12 col-sm-3 col-md-2"
+            for="filterTable"
+            dense
+            outlined
+            v-model="filterTable"
+            label="ค้นหา"
+          >
+            <template v-slot:append>
+              <q-icon name="search" />
+            </template>
+          </q-input>
+          <q-select
+            for="visibleColumns"
+            class="col-xs-12 col-sm-3 col-md-2"
+            v-model="OrderStore.visibleColumns"
+            multiple
+            outlined
+            dense
+            options-dense
+            :display-value="$q.lang.table.columns"
+            emit-value
+            map-options
+            :options="OrderStore.columns"
+            option-value="name"
+            options-cover
+          />
+      </div>
+      <div class="col-12">
         <tableOrder :filterTable="filterTable" />
       </div>
     </q-card>
-  </div>
 </template>
 
 <style scoped></style>
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
index c875d725c..d801be5f7 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
@@ -111,114 +111,112 @@ onMounted(() => {});
     รายการช่องทางการร้องเรียน
   </div>
   <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
-    <div class="row q-col-gutter-sm">
-      <div class="row col-12 q-col-gutter-sm">
-        <div>
-          <q-btn
-            @click="clickAdd()"
-            size="12px"
-            flat
-            round
-            color="add"
-            icon="mdi-plus"
-          >
-            <q-tooltip>เพิ่มช่องทางการร้องเรียน</q-tooltip>
-          </q-btn>
-        </div>
-        <q-space />
-
-        <q-input
-          class="col-xs-12 col-sm-3 col-md-2"
-          standout
-          dense
-          v-model="filterKeyword"
-          ref="filterRef"
-          outlined
-          debounce="300"
-          placeholder="ค้นหา"
+    <div class="row col-12 q-col-gutter-sm q-mb-sm">
+      <div>
+        <q-btn
+          @click="clickAdd()"
+          size="12px"
+          flat
+          round
+          color="add"
+          icon="mdi-plus"
         >
-          <template v-slot:append>
-            <q-icon v-if="filterKeyword == ''" name="search" />
-            <q-icon
-              v-if="filterKeyword !== ''"
-              name="clear"
-              class="cursor-pointer"
-              @click="resetFilter"
-            />
-          </template>
-        </q-input>
+          <q-tooltip>เพิ่มช่องทางการร้องเรียน</q-tooltip>
+        </q-btn>
+      </div>
+      <q-space />
 
-        <q-select
-          v-model="visibleColumns"
-          multiple
-          outlined
-          dense
-          options-dense
-          :display-value="$q.lang.table.columns"
-          emit-value
-          map-options
-          :options="columns"
-          option-value="name"
-          options-cover
-          style="min-width: 150px"
-          class="col-xs-12 col-sm-3 col-md-2"
-        />
-      </div>
-      <div class="col-12">
-        <d-table
-          :columns="columns"
-          :rows="rows"
-          row-key="id"
-          :filter="filterKeyword"
-          :visible-columns="visibleColumns"
-          :pagination-label="paginationLabel"
-          v-model:pagination="pagination"
-        >
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                <span class="text-weight-medium">{{ col.label }}</span>
-              </q-th>
-              <q-th auto-width />
-            </q-tr>
-          </template>
-          <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer">
-              <q-td key="no" :props="props">
-                {{ props.rowIndex + 1 }}
-              </q-td>
-              <q-td key="subject" :props="props">
-                {{ props.row.subject }}
-              </q-td>
-              <q-td>
-                <q-btn
-                  dense
-                  size="12px"
-                  flat
-                  round
-                  color="red"
-                  @click="clickDelete(props.row.id)"
-                  icon="mdi-delete"
-                >
-                  <q-tooltip>ลบข้อมูล</q-tooltip>
-                </q-btn>
-              </q-td>
-            </q-tr>
-          </template>
-          <!-- <template v-slot:pagination="scope">
-            <q-pagination
-              v-model="pagination.page"
-              active-color="primary"
-              color="dark"
-              :max="scope.pagesNumber"
-              :max-pages="5"
-              size="sm"
-              boundary-links
-              direction-links
-            ></q-pagination>
-          </template> -->
-        </d-table>
-      </div>
+      <q-input
+        class="col-xs-12 col-sm-3 col-md-2"
+        standout
+        dense
+        v-model="filterKeyword"
+        ref="filterRef"
+        outlined
+        debounce="300"
+        placeholder="ค้นหา"
+      >
+        <template v-slot:append>
+          <q-icon v-if="filterKeyword == ''" name="search" />
+          <q-icon
+            v-if="filterKeyword !== ''"
+            name="clear"
+            class="cursor-pointer"
+            @click="resetFilter"
+          />
+        </template>
+      </q-input>
+
+      <q-select
+        v-model="visibleColumns"
+        multiple
+        outlined
+        dense
+        options-dense
+        :display-value="$q.lang.table.columns"
+        emit-value
+        map-options
+        :options="columns"
+        option-value="name"
+        options-cover
+        style="min-width: 150px"
+        class="col-xs-12 col-sm-3 col-md-2"
+      />
+    </div>
+    <div class="col-12">
+      <d-table
+        :columns="columns"
+        :rows="rows"
+        row-key="id"
+        :filter="filterKeyword"
+        :visible-columns="visibleColumns"
+        :pagination-label="paginationLabel"
+        v-model:pagination="pagination"
+      >
+        <template v-slot:header="props">
+          <q-tr :props="props">
+            <q-th v-for="col in props.cols" :key="col.name" :props="props">
+              <span class="text-weight-medium">{{ col.label }}</span>
+            </q-th>
+            <q-th auto-width />
+          </q-tr>
+        </template>
+        <template v-slot:body="props">
+          <q-tr :props="props" class="cursor-pointer">
+            <q-td key="no" :props="props">
+              {{ props.rowIndex + 1 }}
+            </q-td>
+            <q-td key="subject" :props="props">
+              {{ props.row.subject }}
+            </q-td>
+            <q-td>
+              <q-btn
+                dense
+                size="12px"
+                flat
+                round
+                color="red"
+                @click="clickDelete(props.row.id)"
+                icon="mdi-delete"
+              >
+                <q-tooltip>ลบข้อมูล</q-tooltip>
+              </q-btn>
+            </q-td>
+          </q-tr>
+        </template>
+        <!-- <template v-slot:pagination="scope">
+          <q-pagination
+            v-model="pagination.page"
+            active-color="primary"
+            color="dark"
+            :max="scope.pagesNumber"
+            :max-pages="5"
+            size="sm"
+            boundary-links
+            direction-links
+          ></q-pagination>
+        </template> -->
+      </d-table>
     </div>
   </q-card>
 </template>
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
index 670372a62..47d8318eb 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
@@ -84,8 +84,7 @@ function clickDelete(id: string) {
     รายการชื่อกรรมการ
   </div>
   <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
-    <div class="row q-col-gutter-sm">
-      <div class="row col-12 q-col-gutter-sm">
+      <div class="row col-12 q-col-gutter-sm  q-mb-sm">
         <div>
           <q-btn @click="$router.push(`/discipline/director/add`)" size="12px" flat round color="add" icon="mdi-plus">
             <q-tooltip>เพิ่มรายชื่อกรรมการ</q-tooltip>
@@ -138,6 +137,5 @@ function clickDelete(id: string) {
         </d-table>
 
       </div>
-    </div>
   </q-card>
 </template>
\ No newline at end of file