diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
index 12af5dce1..52e204a02 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
@@ -561,77 +561,96 @@ onMounted(() => {
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>
-      <div class="col-xs-12 col-sm-4 col-md-4 q-pa-lg">
-        <q-card flat bordered>
-          <q-card-section class="text-center">
-            <div class="text-weight-medium q-mt-md">
-              {{ props.row.level !== "" ? props.row.level : "-" }}
+      <div class="col-xs-12 col-sm-6 col-md-4">
+        <q-card flat bordered class="q-pa-md">
+          <div class="row q-pb-sm">
+            <div class="column">
+              <div class="text-weight-bold">
+                {{ props.row.level !== "" ? props.row.level : "-" }}
+              </div>
+              <div class="text-weight-light full-width text-left text-grey-9">
+                {{ date2Thai(props.row.date) }}
+              </div>
             </div>
-            <div class="text-weight-light full-width text-center">
-              {{ date2Thai(props.row.date) }}
+            <q-space />
+            <div class="q-gutter-x-sm">
+              <q-btn
+                color="teal-5"
+                icon="mdi-pencil-outline"
+                flat
+                round
+                @click="openDialogEdit(props.row)"
+                ><q-tooltip>แก้ไข</q-tooltip></q-btn
+              >
+              <q-btn
+                color="edit"
+                icon="mdi-history"
+                flat
+                round
+                @click="openDialogHistory(props.row.id)"
+                ><q-tooltip>ประวิติข้อมูลราชการ</q-tooltip></q-btn
+              >
             </div>
+          </div>
+          <q-separator />
+          <q-card-section class="q-pa-none">
+            <q-list>
+              <q-item class="q-pa-none">
+                <q-item-section>
+                  <q-item-label>รายละเอียด</q-item-label>
+                </q-item-section>
+                <q-item-section side>
+                  <q-item-label caption>{{
+                    props.row.detail !== "" ? props.row.detail : "-"
+                  }}</q-item-label>
+                </q-item-section>
+              </q-item>
+
+              <q-item class="q-pa-none">
+                <q-item-section>
+                  <q-item-label>ล้างมลทิน</q-item-label>
+                </q-item-section>
+                <q-item-section side>
+                  <q-item-label caption>
+                    {{
+                      props.row.unStigma !== "" ? props.row.unStigma : "-"
+                    }}</q-item-label
+                  >
+                </q-item-section>
+              </q-item>
+
+              <q-item class="q-pa-none">
+                <q-item-section>
+                  <q-item-label>เลขที่คำสั่ง</q-item-label>
+                </q-item-section>
+                <q-item-section side>
+                  <q-item-label caption>
+                    {{
+                      props.row.refCommandNo !== ""
+                        ? props.row.refCommandNo
+                        : "-"
+                    }}</q-item-label
+                  >
+                </q-item-section>
+              </q-item>
+              <q-item class="q-pa-none">
+                <q-item-section>
+                  <q-item-label
+                    >เอกสารอ้างอิง (ลงวันที่)</q-item-label
+                  ></q-item-section
+                >
+                <q-item-section side>
+                  <q-item-label caption>
+                    {{
+                      props.row.refCommandDate
+                        ? date2Thai(props.row.refCommandDate)
+                        : "-"
+                    }}</q-item-label
+                  >
+                </q-item-section>
+              </q-item>
+            </q-list>
           </q-card-section>
-
-          <q-card-section class="q-pa-lg">
-            <q-card bordered class="bg-grey-12">
-              <q-list>
-                <q-item>
-                  <q-item-section>
-                    <q-item-label caption>รายละเอียด</q-item-label>
-                    <q-item-label>{{
-                      props.row.detail !== "" ? props.row.detail : "-"
-                    }}</q-item-label>
-                  </q-item-section>
-                </q-item>
-
-                <q-item>
-                  <q-item-section>
-                    <q-item-label caption>ล้างมลทิน</q-item-label>
-                    <q-item-label>
-                      {{
-                        props.row.unStigma !== "" ? props.row.unStigma : "-"
-                      }}</q-item-label
-                    >
-                  </q-item-section>
-                </q-item>
-
-                <q-item>
-                  <q-item-section>
-                    <q-item-label caption>เลขที่คำสั่ง</q-item-label>
-                    <q-item-label>
-                      {{
-                        props.row.refCommandNo !== ""
-                          ? props.row.refCommandNo
-                          : "-"
-                      }}</q-item-label
-                    >
-                  </q-item-section>
-                </q-item>
-                <q-item>
-                  <q-item-section>
-                    <q-item-label caption
-                      >เอกสารอ้างอิง (ลงวันที่)</q-item-label
-                    >
-                    <q-item-label>
-                      {{
-                        props.row.refCommandDate
-                          ? date2Thai(props.row.refCommandDate)
-                          : "-"
-                      }}</q-item-label
-                    >
-                  </q-item-section>
-                </q-item>
-              </q-list>
-            </q-card>
-          </q-card-section>
-          <q-separator inset />
-          <q-btn
-            flat
-            color="black"
-            label="แก้ไขข้อมูล"
-            class="hover-button full-width q-pa-md"
-            @click="openDialogEdit(props.row)"
-          />
         </q-card>
       </div>
     </template>