diff --git a/src/components/pages/PanelAdministrator.vue b/src/components/pages/PanelAdministrator.vue
index 19984f0bb6c5d1122509b923a4ec87dd13f8f43a..2569971394e6168fb516a0b17e2a8ce7f35f39ef 100644
--- a/src/components/pages/PanelAdministrator.vue
+++ b/src/components/pages/PanelAdministrator.vue
@@ -24,128 +24,8 @@
             </b-card>
           </b-tab>
           <b-tab v-if="this.$store.state.user.role == 2" title="Pengaturan Admin">
-            <!-- Table Pagination + Filter -->
-            <b-pagination
-              v-model="currentPage"
-              :total-rows="totalRows"
-              :per-page="perPage"
-              align="center"
-            />
-            <b-form-input
-              v-model="filter"
-              placeholder="Ketik untuk menyaring urusan/admin..."
-            />
-            <div class="mb-3">
-              <small class="text-muted font-italic">
-                Menampilkan {{ totalRows }} baris urusan
-              </small>
-            </div>
-            <b-table
-              show-empty
-              striped
-              hover
-              stacked="sm"
-              :items="items"
-              :fields="fields"
-              :current-page="currentPage"
-              :per-page="perPage"
-              :filter="filter"
-              @filtered="filterTrigger"
-            >
-              <template slot="aksi" slot-scope="row">
-                <div v-if="row.item.admin === '-'">
-                  <div class="px-1 col-md-6 col-12">
-                    <b-button
-                      @click="switchToggleDetails(row)"
-                      variant="success"
-                      size="sm"
-                      class="w-100"
-                    >
-                      Pasang
-                    </b-button>
-                  </div>
-                </div>
-                <b-row class="mx-0" v-else>
-                  <div class="px-1 col-md-6 col-12">
-                    <b-button
-                      @click="switchToggleDetails(row)"
-                      variant="primary"
-                      size="sm"
-                      class="w-100"
-                    >
-                      Ubah
-                    </b-button>
-                  </div>
-                  <div class="px-1 col-md-6 col-12">
-                    <b-button
-                      @click="clearButtonHandler(row)"
-                      variant="danger"
-                      size="sm"
-                      class="w-100"
-                    >
-                      Kosongkan 
-                    </b-button>
-                  </div>
-                </b-row>
-              </template>
-              <template slot="row-details" slot-scope="row">
-                <b-card
-                  bg-variant="light"
-                >
-                  <small><b>Mohon pilih Admin dari daftar di bawah ini:</b></small>
-                  <b-form-select
-                    v-model="selected"
-                    :options="options"
-                    size="sm"
-                  />
-                  <b-button
-                    @click="assignAdmin(row)"
-                    variant="primary"
-                    size="sm"
-                    class="float-right mt-2 ml-2"
-                  >
-                    Pilih Admin
-                  </b-button>
-                  <b-button
-                    @click="switchToggleDetails(null)"
-                    size="sm"
-                    class="float-right mt-2"
-                  >
-                    Batalkan
-                  </b-button>
-                </b-card>
-              </template>
-              <template slot="empty">
-                <div align="center">Tidak ada data untuk ditampilkan</div>
-              </template>
-              <template slot="emptyfiltered">
-                <div align="center">Data tidak ditemukan</div>
-              </template>
-            </b-table>
-            <b-pagination
-              v-model="currentPage"
-              :total-rows="totalRows"
-              :per-page="perPage"
-              align="center"
-            />
-
-            <!-- Modal Component -->
-            <b-modal
-              id="confirmation-modal"
-              centered
-              title="Konfirmasi"
-              v-model="modalVisibility"
-              ok-title="Kosongkan"
-              cancel-title="Batal"
-              ok-variant="danger"
-              @ok="clearAdminHandler"
-            >
-              <p align="center" class="my-4">
-                Apakah Anda yakin ingin mengosongkan Admin?<br>
-                <b>Tindakan ini tidak dapat diurungkan.</b>
-              </p>
-            </b-modal>
-          </b-tab>
+              <table-budget :data='dataTable'/>
+          </b-tab>  
         </b-tabs>
       </b-card>
     </div>
@@ -154,11 +34,14 @@
 
 <script>
 import Comments from '@/components/partials/Comments'
+import TableBudget from '@/components/partials/TableBudget'
+
 
 export default {
   name: 'PanelAdministrator',
   components: {
     'comments' : Comments,
+    'table-budget' : TableBudget
   },
   data() {
     return {
@@ -215,8 +98,40 @@ export default {
         { value: '2', text: 'William Rukmansa' },
         { value: '3', text: 'Ricky Kennedy' }
       ],
+      dataTable : { 
+          perPage: 5,
+          currentPage: 1,
+          fields : { 
+            activity_name : {
+              label : 'Activity Name',
+              sortable : true,
+            }, 
+            admin_name : {
+              label : 'Admin Name',
+              sortable : true,
+            },
+            actions : {
+              label : 'Actions'
+            }
+          },
+          current_item: {
+            id : 99, activity_name:'current activity', admin_name : 'aaa'
+          },
+          items: [
+            { id: 1, activity_name: 'A', admin_name: 'Flintstone' },
+            { id: 2, activity_name: 'B', admin_name: 'Flintstone' },
+            { id: 3, activity_name: 'C', admin_name: 'Rubbleaskldjf klsajdfklsajdkalskjdfklsjdfalkdflksdj fljslkfjskldfj lksajlkfjsdl ksalksjdfklasjdlkjfs lkdjfklsajfklasklfmasdlkfsj oidfamslkdfmi saldkfmsialfi madlifsm' },
+            { id: 4, activity_name: 'D', admin_name: 'Rubble' },
+            { id: 5, activity_name: 'E', admin_name: 'Flintstone' },
+            { id: 6, activity_name: 'F', admin_name: 'Rubble' },
+            { id: 7, activity_name: 'G', admin_name: 'Gazzoo' },
+            { id: 8, activity_name: 'H', admin_name: 'Slate' },
+            { id: 9, activity_name: 'I', admin_name: 'Slaghoople' },
+            // { id: 10, first_name: 'Ricky', last_name: 'Kennedy' }
+          ],
+      }
     }
-  },
+  },  
   created : function() {
     if (this.$store.state.user.role <= 0) {
       this.$router.push({name: 'LandingPage'});
diff --git a/src/components/partials/TableBudget.vue b/src/components/partials/TableBudget.vue
index 480ea5f93857ecacdc8a8571f2f0529f36970068..7f7aa2f55e6084e11e0d9fea73dd368d000e6a03 100644
--- a/src/components/partials/TableBudget.vue
+++ b/src/components/partials/TableBudget.vue
@@ -5,51 +5,51 @@
         <h3>
           {{ "Activity : " + data.current_item.activity_name }}
           <br><br>
-          {{" Admin : " + data.current_item.admin_name}}
+          {{"Admin : " + data.current_item.admin_name}}
         </h3>
       </b-row>
-      <b-row align-h='end'>
-        <div v-if="data.items.admin_name === '--'">
-          <div class="px-1 col-md-4 col-12">
+      <b-row class="my-2" align-h="end">
+        <b-col 
+          v-if="data.current_item.admin_name === '--'" 
+          cols="auto"
+        >
+          <b-button
+            v-on:click="switchToggleDetails(row)"
+            variant="success"
+            size="sm"
+          >
+            Pasang Admin
+          </b-button>
+        </b-col>
+        <b-col 
+          v-else
+          cols="auto"
+        >
             <b-button
               @click="switchToggleDetails(row)"
-              variant="success"
+              variant="primary"
               size="sm"
-              class="w-100"
             >
-              Pasang
+              Ubah Admin
             </b-button>
-          </div>
-        </div>
-        <div v-else class="px-1 col-md-1 col-12">
-          <b-button
-            @click="switchToggleDetails(row)"
-            variant="primary"
-            size="sm"
-            class="w-100"
-          >
-            Ubah
-          </b-button>
-        </div>
-        <div class="px-1 col-md-1 col-12">
-          <b-button
-            @click="clearButtonHandler(row)"
-            variant="danger"
-            size="sm"
-            class="w-100"
-          >
-            Kosongkan 
-          </b-button>
-        </div>
-        <div class="px-1 col-md-2 col-12">
+            <b-button
+              @click="clearButtonHandler(row)"
+              variant="danger"
+              size="sm"
+            >
+              Hapus Admin 
+            </b-button>
+        </b-col>
+        <b-col 
+          cols="auto"
+        >
           <b-button
             v-on:click="changeSeen()"
             size="sm"
-            class="w-100"
           >
             Tampilkan Rincian 
           </b-button>
-        </div>
+        </b-col>
       </b-row>
       <b-row align-h='center' v-if="seen" class=" justify-content-center overflow-auto">
           <b-table
@@ -188,10 +188,18 @@ export default {
 
 <style lang="scss" scoped>
 @import 'src/assets/css/style.scss';
+* {
+  margin: 0%;
+  padding: 0%;
+}
 
 .b-table tbody tr td {
   cursor: pointer;
 }
 
+.col-auto {
+  padding : 0px 5px;
+}
+
 
 </style>
\ No newline at end of file