diff --git a/src/app/content/hemat-app/master/master-category/master-category.component.html b/src/app/content/hemat-app/master/master-category/master-category.component.html
index c29693b..2decda7 100644
--- a/src/app/content/hemat-app/master/master-category/master-category.component.html
+++ b/src/app/content/hemat-app/master/master-category/master-category.component.html
@@ -23,9 +23,19 @@
                     <div class="col-md-6 text-right">
                       <button
                         class="btn btn-secondary"
+                        style="
+                          color: #000000 !important;
+                          border-color: #bef264 !important;
+                          background-color: #bef264 !important;
+                        "
                         (click)="openAddMasterModal()"
                       >
-                        <i class="feather ft-plus"></i>&nbsp; Add new master
+                        <i
+                          class="feather ft-plus"
+                          style="color: #ffffff !important"
+                        ></i
+                        >&nbsp;
+                        <span style="font-weight: 600">Add new master</span>
                       </button>
                     </div>
                   </div>
@@ -50,7 +60,7 @@
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
                         >
-                          {{ rowIndex + 1 }}
+                        <p style="color: #ffffff">{{ rowIndex + 1 }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -59,13 +69,13 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Category Name</span>
+                          <span style="color: #ffffff">Name</span>
                         </ng-template>
                         <ng-template
                           let-value="value"
                           ngx-datatable-cell-template
                         >
-                          {{ value }}
+                        <p style="color: #ffffff">{{ value }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -74,13 +84,13 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Status</span>
+                          <span style="color: #ffffff">Status</span>
                         </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-value="value"
                         >
-                          {{ value === "2" ? "Aktif" : "Tidak Aktif" }}
+                        <p style="color: #ffffff">{{ value === "2" ? "Aktif" : "Tidak Aktif" }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -88,6 +98,9 @@
                         [flexGrow]="1"
                         [minWidth]="150"
                       >
+                      <ng-template ngx-datatable-header-template>
+                        <span style="color: #ffffff">Actions</span>
+                      </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
@@ -95,12 +108,20 @@
                         >
                           <button
                             class="btn btn-sm btn-warning mr-1"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="editRow(row)"
                           >
                             <i class="ficon feather ft-edit"></i>
                           </button>
                           <button
                             class="btn btn-sm btn-danger"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="deleteRow(row)"
                           >
                             <i class="ficon feather ft-trash-2"></i>
diff --git a/src/app/content/hemat-app/master/master-duration-use/master-duration-use.component.html b/src/app/content/hemat-app/master/master-duration-use/master-duration-use.component.html
index c29693b..e041067 100644
--- a/src/app/content/hemat-app/master/master-duration-use/master-duration-use.component.html
+++ b/src/app/content/hemat-app/master/master-duration-use/master-duration-use.component.html
@@ -23,9 +23,19 @@
                     <div class="col-md-6 text-right">
                       <button
                         class="btn btn-secondary"
+                        style="
+                          color: #000000 !important;
+                          border-color: #bef264 !important;
+                          background-color: #bef264 !important;
+                        "
                         (click)="openAddMasterModal()"
                       >
-                        <i class="feather ft-plus"></i>&nbsp; Add new master
+                        <i
+                          class="feather ft-plus"
+                          style="color: #ffffff !important"
+                        ></i
+                        >&nbsp;
+                        <span style="font-weight: 600">Add new master</span>
                       </button>
                     </div>
                   </div>
@@ -50,7 +60,7 @@
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
                         >
-                          {{ rowIndex + 1 }}
+                        <p style="color: #ffffff">{{ rowIndex + 1 }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -59,13 +69,13 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Category Name</span>
+                          <span style="color: #ffffff">Name</span>
                         </ng-template>
                         <ng-template
                           let-value="value"
                           ngx-datatable-cell-template
                         >
-                          {{ value }}
+                        <p style="color: #ffffff">{{ value }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -74,13 +84,13 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Status</span>
+                          <span style="color: #ffffff">Status</span>
                         </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-value="value"
                         >
-                          {{ value === "2" ? "Aktif" : "Tidak Aktif" }}
+                        <p style="color: #ffffff">{{ value === "2" ? "Aktif" : "Tidak Aktif" }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -95,12 +105,20 @@
                         >
                           <button
                             class="btn btn-sm btn-warning mr-1"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="editRow(row)"
                           >
                             <i class="ficon feather ft-edit"></i>
                           </button>
                           <button
                             class="btn btn-sm btn-danger"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="deleteRow(row)"
                           >
                             <i class="ficon feather ft-trash-2"></i>
diff --git a/src/app/content/hemat-app/master/master-floor/master-floor.component.html b/src/app/content/hemat-app/master/master-floor/master-floor.component.html
index 935ac56..d4e694b 100644
--- a/src/app/content/hemat-app/master/master-floor/master-floor.component.html
+++ b/src/app/content/hemat-app/master/master-floor/master-floor.component.html
@@ -6,10 +6,7 @@
     <div class="content-body">
       <section id="configuration">
         <div class="row">
-          <div
-            class="col-12"
-            *blockUI="'zeroConfiguration'; message: 'Loading'"
-          >
+          <div class="col-12">
             <div class="card" style="background-color: #252525 !important">
               <div class="card-content">
                 <div class="card-body">
@@ -21,7 +18,6 @@
                         placeholder="Search..."
                         [(ngModel)]="searchTerm"
                         (input)="filterRows()"
-                        (touchstart)="onTouchStart($event)"
                       />
                     </div>
                     <div class="col-md-6 text-right">
@@ -54,7 +50,7 @@
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
                         >
-                          {{ rowIndex + 1 }}
+                          <p style="color: #ffffff">{{ rowIndex + 1 }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -63,13 +59,13 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Category Name</span>
+                          <span style="color: #ffffff">Name</span>
                         </ng-template>
                         <ng-template
                           let-value="value"
                           ngx-datatable-cell-template
                         >
-                          {{ value }}
+                          <p style="color: #ffffff">{{ value }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -78,13 +74,15 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Status</span>
+                          <span style="color: #ffffff">Status</span>
                         </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-value="value"
                         >
-                          {{ value === "2" ? "Aktif" : "Tidak Aktif" }}
+                          <p style="color: #ffffff">
+                            {{ value === "2" ? "Aktif" : "Tidak Aktif" }}
+                          </p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -92,6 +90,9 @@
                         [flexGrow]="1"
                         [minWidth]="150"
                       >
+                        <ng-template ngx-datatable-header-template>
+                          <span style="color: #ffffff">Actions</span>
+                        </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
@@ -99,12 +100,20 @@
                         >
                           <button
                             class="btn btn-sm btn-warning mr-1"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="editRow(row)"
                           >
                             <i class="ficon feather ft-edit"></i>
                           </button>
                           <button
                             class="btn btn-sm btn-danger"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="deleteRow(row)"
                           >
                             <i class="ficon feather ft-trash-2"></i>
diff --git a/src/app/content/hemat-app/master/master-role/master-role.component.html b/src/app/content/hemat-app/master/master-role/master-role.component.html
index 935ac56..f874413 100644
--- a/src/app/content/hemat-app/master/master-role/master-role.component.html
+++ b/src/app/content/hemat-app/master/master-role/master-role.component.html
@@ -27,9 +27,19 @@
                     <div class="col-md-6 text-right">
                       <button
                         class="btn btn-secondary"
+                        style="
+                          color: #000000 !important;
+                          border-color: #bef264 !important;
+                          background-color: #bef264 !important;
+                        "
                         (click)="openAddMasterModal()"
                       >
-                        <i class="feather ft-plus"></i>&nbsp; Add new master
+                        <i
+                          class="feather ft-plus"
+                          style="color: #ffffff !important"
+                        ></i
+                        >&nbsp;
+                        <span style="font-weight: 600">Add new master</span>
                       </button>
                     </div>
                   </div>
@@ -54,7 +64,7 @@
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
                         >
-                          {{ rowIndex + 1 }}
+                          <p style="color: #ffffff">{{ rowIndex + 1 }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -63,13 +73,13 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Category Name</span>
+                          <span style="color: #ffffff">Name</span>
                         </ng-template>
                         <ng-template
                           let-value="value"
                           ngx-datatable-cell-template
                         >
-                          {{ value }}
+                          <p style="color: #ffffff">{{ value }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -78,13 +88,15 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Status</span>
+                          <span style="color: #ffffff">Status</span>
                         </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-value="value"
                         >
-                          {{ value === "2" ? "Aktif" : "Tidak Aktif" }}
+                          <p style="color: #ffffff">
+                            {{ value === "2" ? "Aktif" : "Tidak Aktif" }}
+                          </p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -92,6 +104,9 @@
                         [flexGrow]="1"
                         [minWidth]="150"
                       >
+                        <ng-template ngx-datatable-header-template>
+                          <span style="color: #ffffff">Actions</span>
+                        </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
@@ -99,12 +114,20 @@
                         >
                           <button
                             class="btn btn-sm btn-warning mr-1"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="editRow(row)"
                           >
                             <i class="ficon feather ft-edit"></i>
                           </button>
                           <button
                             class="btn btn-sm btn-danger"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="deleteRow(row)"
                           >
                             <i class="ficon feather ft-trash-2"></i>
diff --git a/src/app/content/hemat-app/master/master-room/master-room.component.html b/src/app/content/hemat-app/master/master-room/master-room.component.html
index 58a3c31..2bfdb19 100644
--- a/src/app/content/hemat-app/master/master-room/master-room.component.html
+++ b/src/app/content/hemat-app/master/master-room/master-room.component.html
@@ -6,10 +6,7 @@
     <div class="content-body">
       <section id="configuration">
         <div class="row">
-          <div
-            class="col-12"
-            *blockUI="'zeroConfiguration'; message: 'Loading'"
-          >
+          <div class="col-12">
             <div class="card" style="background-color: #252525 !important">
               <div class="card-content">
                 <div class="card-body">
@@ -21,15 +18,24 @@
                         placeholder="Search..."
                         [(ngModel)]="searchTerm"
                         (input)="filterRows()"
-                        (touchstart)="onTouchStart($event)"
                       />
                     </div>
                     <div class="col-md-6 text-right">
                       <button
                         class="btn btn-secondary"
+                        style="
+                          color: #000000 !important;
+                          border-color: #bef264 !important;
+                          background-color: #bef264 !important;
+                        "
                         (click)="openAddMasterModal()"
                       >
-                        <i class="feather ft-plus"></i>&nbsp; Add new master
+                        <i
+                          class="feather ft-plus"
+                          style="color: #ffffff !important"
+                        ></i
+                        >&nbsp;
+                        <span style="font-weight: 600">Add new room</span>
                       </button>
                     </div>
                   </div>
@@ -54,7 +60,7 @@
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
                         >
-                          {{ rowIndex + 1 }}
+                        <p style="color: #ffffff">{{ rowIndex + 1 }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -63,13 +69,13 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Room Name</span>
+                          <span style="color: #ffffff">Room Name</span>
                         </ng-template>
                         <ng-template
                           let-value="value"
                           ngx-datatable-cell-template
                         >
-                          {{ value }}
+                        <p style="color: #ffffff">{{ value }}</p>
                         </ng-template>
                       </ngx-datatable-column>
 
@@ -79,13 +85,13 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Status</span>
+                          <span style="color: #ffffff">Status</span>
                         </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-value="value"
                         >
-                          {{ value === 2 ? "Aktif" : "Tidak Aktif" }}
+                        <p style="color: #ffffff">{{ value === 2 ? "Aktif" : "Tidak Aktif" }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -93,6 +99,9 @@
                         [flexGrow]="1"
                         [minWidth]="150"
                       >
+                      <ng-template ngx-datatable-header-template>
+                        <span style="color: #ffffff">Actions</span>
+                      </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
@@ -100,12 +109,20 @@
                         >
                           <button
                             class="btn btn-sm btn-warning mr-1"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="editRow(row)"
                           >
                             <i class="ficon feather ft-edit"></i>
                           </button>
                           <button
                             class="btn btn-sm btn-danger"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="deleteRow(row)"
                           >
                             <i class="ficon feather ft-trash-2"></i>
diff --git a/src/app/content/hemat-app/master/master-room/master-room.component.ts b/src/app/content/hemat-app/master/master-room/master-room.component.ts
index 0e731f6..f12b5e8 100644
--- a/src/app/content/hemat-app/master/master-room/master-room.component.ts
+++ b/src/app/content/hemat-app/master/master-room/master-room.component.ts
@@ -26,14 +26,14 @@ export class MasterRoomComponent {
 
   ngOnInit() {
     this.breadcrumb = {
-      mainlabel: "Master Building",
+      mainlabel: "Master Room",
       links: [
         {
           name: "Home",
           isLink: false,
         },
         {
-          name: "Master Building",
+          name: "Master Room",
           isLink: false,
         },
       ],
diff --git a/src/app/content/hemat-app/master/master-status/master-status.component.html b/src/app/content/hemat-app/master/master-status/master-status.component.html
index 935ac56..e586ee5 100644
--- a/src/app/content/hemat-app/master/master-status/master-status.component.html
+++ b/src/app/content/hemat-app/master/master-status/master-status.component.html
@@ -6,10 +6,7 @@
     <div class="content-body">
       <section id="configuration">
         <div class="row">
-          <div
-            class="col-12"
-            *blockUI="'zeroConfiguration'; message: 'Loading'"
-          >
+          <div class="col-12">
             <div class="card" style="background-color: #252525 !important">
               <div class="card-content">
                 <div class="card-body">
@@ -21,15 +18,24 @@
                         placeholder="Search..."
                         [(ngModel)]="searchTerm"
                         (input)="filterRows()"
-                        (touchstart)="onTouchStart($event)"
                       />
                     </div>
                     <div class="col-md-6 text-right">
                       <button
                         class="btn btn-secondary"
+                        style="
+                          color: #000000 !important;
+                          border-color: #bef264 !important;
+                          background-color: #bef264 !important;
+                        "
                         (click)="openAddMasterModal()"
                       >
-                        <i class="feather ft-plus"></i>&nbsp; Add new master
+                        <i
+                          class="feather ft-plus"
+                          style="color: #ffffff !important"
+                        ></i
+                        >&nbsp;
+                        <span style="font-weight: 600">Add new master</span>
                       </button>
                     </div>
                   </div>
@@ -54,7 +60,7 @@
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
                         >
-                          {{ rowIndex + 1 }}
+                          <p style="color: #ffffff">{{ rowIndex + 1 }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -63,13 +69,13 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Category Name</span>
+                          <span style="color: #ffffff">Name</span>
                         </ng-template>
                         <ng-template
                           let-value="value"
                           ngx-datatable-cell-template
                         >
-                          {{ value }}
+                          <p style="color: #ffffff">{{ value }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -78,13 +84,15 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Status</span>
+                          <span style="color: #ffffff">Status</span>
                         </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-value="value"
                         >
-                          {{ value === "2" ? "Aktif" : "Tidak Aktif" }}
+                          <p style="color: #ffffff">
+                            {{ value === "2" ? "Aktif" : "Tidak Aktif" }}
+                          </p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -92,6 +100,9 @@
                         [flexGrow]="1"
                         [minWidth]="150"
                       >
+                        <ng-template ngx-datatable-header-template>
+                          <span style="color: #ffffff">Actions</span>
+                        </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
@@ -99,12 +110,20 @@
                         >
                           <button
                             class="btn btn-sm btn-warning mr-1"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="editRow(row)"
                           >
                             <i class="ficon feather ft-edit"></i>
                           </button>
                           <button
                             class="btn btn-sm btn-danger"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="deleteRow(row)"
                           >
                             <i class="ficon feather ft-trash-2"></i>
diff --git a/src/app/content/hemat-app/master/master-type/master-type.component.html b/src/app/content/hemat-app/master/master-type/master-type.component.html
index 935ac56..e586ee5 100644
--- a/src/app/content/hemat-app/master/master-type/master-type.component.html
+++ b/src/app/content/hemat-app/master/master-type/master-type.component.html
@@ -6,10 +6,7 @@
     <div class="content-body">
       <section id="configuration">
         <div class="row">
-          <div
-            class="col-12"
-            *blockUI="'zeroConfiguration'; message: 'Loading'"
-          >
+          <div class="col-12">
             <div class="card" style="background-color: #252525 !important">
               <div class="card-content">
                 <div class="card-body">
@@ -21,15 +18,24 @@
                         placeholder="Search..."
                         [(ngModel)]="searchTerm"
                         (input)="filterRows()"
-                        (touchstart)="onTouchStart($event)"
                       />
                     </div>
                     <div class="col-md-6 text-right">
                       <button
                         class="btn btn-secondary"
+                        style="
+                          color: #000000 !important;
+                          border-color: #bef264 !important;
+                          background-color: #bef264 !important;
+                        "
                         (click)="openAddMasterModal()"
                       >
-                        <i class="feather ft-plus"></i>&nbsp; Add new master
+                        <i
+                          class="feather ft-plus"
+                          style="color: #ffffff !important"
+                        ></i
+                        >&nbsp;
+                        <span style="font-weight: 600">Add new master</span>
                       </button>
                     </div>
                   </div>
@@ -54,7 +60,7 @@
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
                         >
-                          {{ rowIndex + 1 }}
+                          <p style="color: #ffffff">{{ rowIndex + 1 }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -63,13 +69,13 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Category Name</span>
+                          <span style="color: #ffffff">Name</span>
                         </ng-template>
                         <ng-template
                           let-value="value"
                           ngx-datatable-cell-template
                         >
-                          {{ value }}
+                          <p style="color: #ffffff">{{ value }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -78,13 +84,15 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Status</span>
+                          <span style="color: #ffffff">Status</span>
                         </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-value="value"
                         >
-                          {{ value === "2" ? "Aktif" : "Tidak Aktif" }}
+                          <p style="color: #ffffff">
+                            {{ value === "2" ? "Aktif" : "Tidak Aktif" }}
+                          </p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -92,6 +100,9 @@
                         [flexGrow]="1"
                         [minWidth]="150"
                       >
+                        <ng-template ngx-datatable-header-template>
+                          <span style="color: #ffffff">Actions</span>
+                        </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
@@ -99,12 +110,20 @@
                         >
                           <button
                             class="btn btn-sm btn-warning mr-1"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="editRow(row)"
                           >
                             <i class="ficon feather ft-edit"></i>
                           </button>
                           <button
                             class="btn btn-sm btn-danger"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="deleteRow(row)"
                           >
                             <i class="ficon feather ft-trash-2"></i>
diff --git a/src/app/content/hemat-app/master/master-voltage/master-voltage.component.html b/src/app/content/hemat-app/master/master-voltage/master-voltage.component.html
index 935ac56..e586ee5 100644
--- a/src/app/content/hemat-app/master/master-voltage/master-voltage.component.html
+++ b/src/app/content/hemat-app/master/master-voltage/master-voltage.component.html
@@ -6,10 +6,7 @@
     <div class="content-body">
       <section id="configuration">
         <div class="row">
-          <div
-            class="col-12"
-            *blockUI="'zeroConfiguration'; message: 'Loading'"
-          >
+          <div class="col-12">
             <div class="card" style="background-color: #252525 !important">
               <div class="card-content">
                 <div class="card-body">
@@ -21,15 +18,24 @@
                         placeholder="Search..."
                         [(ngModel)]="searchTerm"
                         (input)="filterRows()"
-                        (touchstart)="onTouchStart($event)"
                       />
                     </div>
                     <div class="col-md-6 text-right">
                       <button
                         class="btn btn-secondary"
+                        style="
+                          color: #000000 !important;
+                          border-color: #bef264 !important;
+                          background-color: #bef264 !important;
+                        "
                         (click)="openAddMasterModal()"
                       >
-                        <i class="feather ft-plus"></i>&nbsp; Add new master
+                        <i
+                          class="feather ft-plus"
+                          style="color: #ffffff !important"
+                        ></i
+                        >&nbsp;
+                        <span style="font-weight: 600">Add new master</span>
                       </button>
                     </div>
                   </div>
@@ -54,7 +60,7 @@
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
                         >
-                          {{ rowIndex + 1 }}
+                          <p style="color: #ffffff">{{ rowIndex + 1 }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -63,13 +69,13 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Category Name</span>
+                          <span style="color: #ffffff">Name</span>
                         </ng-template>
                         <ng-template
                           let-value="value"
                           ngx-datatable-cell-template
                         >
-                          {{ value }}
+                          <p style="color: #ffffff">{{ value }}</p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -78,13 +84,15 @@
                         [minWidth]="90"
                       >
                         <ng-template ngx-datatable-header-template>
-                          <span>Status</span>
+                          <span style="color: #ffffff">Status</span>
                         </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-value="value"
                         >
-                          {{ value === "2" ? "Aktif" : "Tidak Aktif" }}
+                          <p style="color: #ffffff">
+                            {{ value === "2" ? "Aktif" : "Tidak Aktif" }}
+                          </p>
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
@@ -92,6 +100,9 @@
                         [flexGrow]="1"
                         [minWidth]="150"
                       >
+                        <ng-template ngx-datatable-header-template>
+                          <span style="color: #ffffff">Actions</span>
+                        </ng-template>
                         <ng-template
                           ngx-datatable-cell-template
                           let-rowIndex="rowIndex"
@@ -99,12 +110,20 @@
                         >
                           <button
                             class="btn btn-sm btn-warning mr-1"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="editRow(row)"
                           >
                             <i class="ficon feather ft-edit"></i>
                           </button>
                           <button
                             class="btn btn-sm btn-danger"
+                            style="
+                              background-color: #000000 !important;
+                              border-color: #bef264 !important;
+                            "
                             (click)="deleteRow(row)"
                           >
                             <i class="ficon feather ft-trash-2"></i>
diff --git a/src/index.html b/src/index.html
index f3f1898..dc08c80 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,7 +11,7 @@
   <meta name="keywords" content="admin template, modern admin template, dashboard template, flat admin template, responsive admin template, web app, crypto dashboard, bitcoin dashboard">
   <meta name="author" content="EvolVision & CleVision">
 
-  <title> Hemat</title> <!-- TODO - Title needs to be dynamic-->
+  <title> Smart Building Management Systems</title> <!-- TODO - Title needs to be dynamic-->
 
   <link href="https://unpkg.com/font-awesome@4.7.0/css/font-awesome.css" rel="stylesheet">
   <link href="assets/fonts/feather/style.min.css" rel="stylesheet">