Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/proxy.conf.json
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/proxy.conf.json	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/proxy.conf.json	(working copy)
@@ -1,9 +1,20 @@
 {
+  "/api/v2/proxy_req_dev/api": {
+    "target": "http://192.168.85.41:8000",
+    "secure": false,
+    "changeOrigin": true,
+    "pathRewrite": {
+      "^/api/v2": ""
+    },
+    "logLevel": "debug"
+  },
   "/api/v2": {
     "target": "http://192.168.85.41:8000",
     "secure": false,
     "changeOrigin": true,
-    "pathRewrite": { "^/api/v2": "" },
+    "pathRewrite": {
+      "^/api/v2": ""
+    },
     "logLevel": "debug"
   }
-}
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/apv-ssl-management/apv-ssl-management.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/apv-ssl-management/apv-ssl-management.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/apv-ssl-management/apv-ssl-management.html	(working copy)
@@ -81,13 +81,12 @@
         <tr mat-header-row *matHeaderRowDef="tableColumns; sticky: true"></tr>
         <tr mat-row *matRowDef="let row; columns: tableColumns;"></tr>
 
-        <tr class="mat-row table-no-data" *matNoDataRow>
-          <td class="mat-cell" colspan="10">
-            @if (input.value) {
-            No results found for "{{input.value}}"
-            } @else {
-            No results found.
-            }
+        <tr class="mat-row" *matNoDataRow>
+          <td class="mat-cell no-data-cell" colspan="10">
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
           </td>
         </tr>
       </table>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/apv-ssl-management/check-apv-vs-certificate-expiry.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/apv-ssl-management/check-apv-vs-certificate-expiry.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/apv-ssl-management/check-apv-vs-certificate-expiry.html	(working copy)
@@ -29,8 +29,13 @@
       </ng-container>
       <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
       <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-      <tr class="mat-row table-no-data" *matNoDataRow>
-        <td class="mat-cell" colspan="9">No results found.</td>
+      <tr class="mat-row" *matNoDataRow>
+        <td class="mat-cell no-data-cell" colspan="9">
+          <div class="no-data-content">
+            <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+            <span>No data available</span>
+          </div>
+        </td>
       </tr>
     </table>
   </div>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/app-notification/app-notification.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/app-notification/app-notification.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/app-notification/app-notification.html	(working copy)
@@ -1,32 +1,28 @@
 <div class="notification {{data.type}}" role="alert">
-  <div
-    class="message-container"
-    [matTooltip]="data.message" matTooltipPosition="below"
-    matTooltipClass="error-tooltip"
-  >
+  <div class="message-container" [matTooltip]="data.message" matTooltipPosition="below" matTooltipClass="error-tooltip">
     <div class="icon-container">
       @if (data.type === 'success') {
-        <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
-             stroke-linecap="round" stroke-linejoin="round">
-          <path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"></path>
-          <polyline points="22 4 12 14.01 9 11.01"></polyline>
-        </svg>
+      <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
+        stroke-linecap="round" stroke-linejoin="round">
+        <path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"></path>
+        <polyline points="22 4 12 14.01 9 11.01"></polyline>
+      </svg>
       } @else {
-        <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-          <circle cx="12" cy="12" r="10"/>
-          <line x1="12" y1="8" x2="12" y2="12"/>
-          <line x1="12" y1="16" x2="12.01" y2="16"/>
-        </svg>
+      <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+        <circle cx="12" cy="12" r="10" />
+        <line x1="12" y1="8" x2="12" y2="12" />
+        <line x1="12" y1="16" x2="12.01" y2="16" />
+      </svg>
       }
     </div>
     <span class="message">
-      {{ data.message.length > 50 ? (data.message | slice:0:50) + '...' : data.message }}
+      {{ data.message }}
     </span>
   </div>
   <button class="dismiss-btn" (click)="dismiss()" aria-label="Dismiss notification">
     <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"
-         stroke-linecap="round" stroke-linejoin="round">
-      <path d="M18 6L6 18M6 6l12 12"/>
+      stroke-linecap="round" stroke-linejoin="round">
+      <path d="M18 6L6 18M6 6l12 12" />
     </svg>
   </button>
-</div>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/app-notification/app-notification.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/app-notification/app-notification.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/app-notification/app-notification.scss	(working copy)
@@ -59,10 +59,14 @@
   }
 
   .message {
-    white-space: nowrap;
+    white-space: normal;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    line-clamp: 2;
+    -webkit-box-orient: vertical;
     overflow: hidden;
-    text-overflow: ellipsis;
     line-height: 1.4;
+    word-break: break-word;
     max-width: 100%;
   }
 
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.html	(working copy)
@@ -20,17 +20,22 @@
           <td mat-cell *matCellDef="let element">
             <div class="row-action a-link">
               @if (element?.state === 'done') {
-                <fa-icon [icon]="['far', 'check-circle']" class="success-icon"></fa-icon> Done
+              <fa-icon [icon]="['far', 'check-circle']" class="success-icon"></fa-icon> Done
               } @else {
-                <fa-icon [icon]="['fas', 'spinner']" class="warning-icon"></fa-icon> {{element?.state}}
+              <fa-icon [icon]="['fas', 'spinner']" class="warning-icon"></fa-icon> {{element?.state}}
               }
             </div>
           </td>
         </ng-container>
         <tr mat-header-row *matHeaderRowDef="tasksColumns"></tr>
         <tr mat-row *matRowDef="let row; columns: tasksColumns;"></tr>
-        <tr class="mat-row table-no-data" *matNoDataRow>
-          <td class="mat-cell" colspan="4">No results found.</td>
+        <tr class="mat-row" *matNoDataRow>
+          <td class="mat-cell no-data-cell" colspan="4">
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
+          </td>
         </tr>
       </table>
     </div>
@@ -41,11 +46,8 @@
 </mat-dialog-content>
 <mat-dialog-actions>
   <div class="align-center">
-    <button
-      mat-button
-      color="basic"
-      (click)="onCancel()">
+    <button mat-button color="basic" (click)="onCancel()">
       close
     </button>
   </div>
-</mat-dialog-actions>
+</mat-dialog-actions>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/control-panel/control-panel.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/control-panel/control-panel.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/control-panel/control-panel.scss	(working copy)
@@ -279,33 +279,7 @@
     letter-spacing: 0.05em;
     color: var(--text-secondary);
     margin: 0 0 10px 0;
-  }
-}
-
-.no-data-cell {
-  padding: 0 !important;
-  border-bottom: none !important;
-}
-
-.no-data-content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 32px 0;
-  color: var(--text-secondary);
-  gap: 10px;
-  opacity: 0.7;
-
-  fa-icon {
-    font-size: 24px;
-    margin-bottom: 4px;
   }
-
-  span {
-    font-size: 13px;
-    font-weight: 500;
-  }
 }
 
 .dashboard-table {
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/device-ha/device-ha.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/device-ha/device-ha.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/device-ha/device-ha.html	(working copy)
@@ -80,13 +80,12 @@
         </ng-container>
         <tr mat-header-row *matHeaderRowDef="tableColumns; sticky: true"></tr>
         <tr mat-row *matRowDef="let row; columns: tableColumns;"></tr>
-        <tr class="mat-row table-no-data" *matNoDataRow>
+        <tr class="mat-row" *matNoDataRow>
           <td class="mat-cell no-data-cell" colspan="10">
-            @if (input.value) {
-            No results found for "{{input.value}}"
-            } @else {
-            No results found.
-            }
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
           </td>
         </tr>
       </table>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/observability/observability.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/observability/observability.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/observability/observability.html	(working copy)
@@ -52,8 +52,13 @@
                 </ng-container>
                 <tr mat-header-row *matHeaderRowDef="dataColumns"></tr>
                 <tr mat-row *matRowDef="let row; columns: dataColumns;"></tr>
-                <tr class="mat-row table-no-data" *matNoDataRow>
-                    <td class="mat-cell" colspan="3">No results found.</td>
+                <tr class="mat-row" *matNoDataRow>
+                    <td class="mat-cell no-data-cell" colspan="3">
+                        <div class="no-data-content">
+                            <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                            <span>No data available</span>
+                        </div>
+                    </td>
                 </tr>
             </table>
         </div>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/apv-ssl-certificates/apv-ssl-certificates.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/apv-ssl-certificates/apv-ssl-certificates.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/apv-ssl-certificates/apv-ssl-certificates.html	(working copy)
@@ -88,13 +88,12 @@
         <tr mat-header-row *matHeaderRowDef="tableColumns; sticky: true"></tr>
         <tr mat-row *matRowDef="let row; columns: tableColumns;"></tr>
 
-        <tr class="mat-row table-no-data" *matNoDataRow>
+        <tr class="mat-row" *matNoDataRow>
           <td class="mat-cell no-data-cell" colspan="10">
-            @if (input.value) {
-            No results found for "{{input.value}}"
-            } @else {
-            No results found.
-            }
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
           </td>
         </tr>
       </table>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/apv-ssl-inter-ca-certificates/apv-ssl-inter-ca-certificates.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/apv-ssl-inter-ca-certificates/apv-ssl-inter-ca-certificates.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/apv-ssl-inter-ca-certificates/apv-ssl-inter-ca-certificates.html	(working copy)
@@ -53,13 +53,12 @@
         <tr mat-header-row *matHeaderRowDef="tableColumns; sticky: true"></tr>
         <tr mat-row *matRowDef="let row; columns: tableColumns;"></tr>
 
-        <tr class="mat-row table-no-data" *matNoDataRow>
+        <tr class="mat-row" *matNoDataRow>
           <td class="mat-cell no-data-cell" colspan="10">
-            @if (input.value) {
-            No results found for "{{input.value}}"
-            } @else {
-            No results found.
-            }
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
           </td>
         </tr>
       </table>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-configuration/avx-device-detail-configuration.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-configuration/avx-device-detail-configuration.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-configuration/avx-device-detail-configuration.html	(working copy)
@@ -1,31 +1,41 @@
-<div class="tab-container">
-  <mat-tab-group mat-stretch-tabs="false" animationDuration="0ms" [selectedIndex]="selectedTabIndex" (selectedTabChange)="onTabChange($event)">
+<div class="avx-tab-content-container">
+  <mat-tab-group mat-stretch-tabs="false" animationDuration="0ms" [selectedIndex]="selectedTabIndex"
+    (selectedTabChange)="onTabChange($event)" class="modern-tabs">
     <mat-tab label="Running Configuration">
       <ng-template matTabContent>
-        <div class="tab-content">
-          <div class="device-config">
-            <pre class="wrapped-pre">{{ deviceConfig }}</pre>
+        <div class="config-view-container">
+          <div class="config-toolbar">
+            <span class="toolbar-title">Running Config</span>
           </div>
+          <div class="config-code-block">
+            <pre><code>{{ deviceConfig }}</code></pre>
+          </div>
         </div>
       </ng-template>
     </mat-tab>
     <mat-tab label="Startup Configuration">
       <ng-template matTabContent>
-        <div class="tab-content">
-          <div class="device-config">
-            <pre class="wrapped-pre">{{ deviceConfig }}</pre>
+        <div class="config-view-container">
+          <div class="config-toolbar">
+            <span class="toolbar-title">Startup Config</span>
           </div>
+          <div class="config-code-block">
+            <pre><code>{{ deviceConfig }}</code></pre>
+          </div>
         </div>
       </ng-template>
     </mat-tab>
     <mat-tab label="Technical Statistics">
       <ng-template matTabContent>
-        <div class="tab-content">
-          <div class="device-config">
-            <pre class="wrapped-pre">{{ deviceConfig }}</pre>
+        <div class="config-view-container">
+          <div class="config-toolbar">
+            <span class="toolbar-title">Tech Stats</span>
           </div>
+          <div class="config-code-block">
+            <pre><code>{{ deviceConfig }}</code></pre>
+          </div>
         </div>
       </ng-template>
     </mat-tab>
   </mat-tab-group>
-</div>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-configuration/avx-device-detail-configuration.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-configuration/avx-device-detail-configuration.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-configuration/avx-device-detail-configuration.scss	(working copy)
@@ -1,18 +1,58 @@
-.wrapped-pre {
-  padding: 15px;
-  border: 1px solid #ccc;
-  overflow-x: auto;
-  white-space: pre-wrap;
-  word-break: break-word;
-  font-family: monospace;
-  height: 60vh;
-  max-height: 80vh;
-  overflow-y: auto;
+.avx-tab-content-container {
+  padding: 16px;
+  background-color: transparent;
 }
 
-.device-config {
-  padding: 4px;
+.modern-tabs {
+  background-color: white;
   border-radius: 8px;
-  max-width: 90vw;
-  margin: 20px auto;
+  overflow: hidden;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+
+  ::ng-deep .mat-mdc-tab-header {
+    background-color: #fafafa;
+    border-bottom: 1px solid #eee;
+  }
 }
+
+.config-view-container {
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+}
+
+.config-toolbar {
+  padding: 8px 16px;
+  background-color: #fff;
+  border-bottom: 1px solid #eee;
+  display: flex;
+  align-items: center;
+
+  .toolbar-title {
+    font-size: 13px;
+    font-weight: 500;
+    color: #666;
+  }
+}
+
+.config-code-block {
+  background-color: #f8f9fa;
+  padding: 16px;
+  margin: 0;
+
+  pre {
+    margin: 0;
+    font-family: 'JetBrains Mono', 'Fira Code', monospace;
+    font-size: 13px;
+    line-height: 1.5;
+    white-space: pre-wrap;
+    word-break: break-all;
+    color: #333;
+    background-color: white;
+    padding: 12px;
+    border: 1px solid #eee;
+    border-radius: 4px;
+    max-height: 70vh;
+    overflow-y: auto;
+  }
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-deployments/avx-device-detail-deployments.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-deployments/avx-device-detail-deployments.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-deployments/avx-device-detail-deployments.html	(working copy)
@@ -1,26 +1,90 @@
-@for (_domain of vaData; track _domain) {
-  <mat-card class="page-card-1">
-    <mat-card-header>
-      <mat-card-title>Domain ID: {{ _domain?.domain_id }}</mat-card-title>
-    </mat-card-header>
-    <mat-card-content>
-      <p>CPU Threads ({{ _domain?.domain_cpu_reserved }} reserved + {{ _domain?.domain_cpu_used }} used
-        + {{ _domain?.domain_cpu_left }} available = {{ _domain?.domain_cpu_all }} in
-        total): {{ _domain?.domain_cpu_used_rate }}% used</p>
-      <p>Memory ({{ _domain?.domain_memory_reserved }} GB reserved + {{ _domain?.domain_memory_used }} GB used
-        + {{ _domain?.domain_memory_left }} GB available = {{ _domain?.domain_memory_all }} GB in
-        total): {{ _domain?.domain_memory_used_rate }}% used</p>
-      <p>Disk Space ({{ deviceInfo?.disk?.disk_used }} GB used + {{ deviceInfo?.disk?.disk_left }} GB available
-        = {{ deviceInfo?.disk?.disk_total }} GB in total): {{ deviceInfo?.disk?.disk_used_rate }}% used</p>
-      <p>Traffic Interface VF ({{ _domain?.domain_portvf_used }} used + {{ _domain?.domain_portvf_left }} available
-        = {{ _domain?.domain_portvf_all }} in total): {{ _domain?.domain_portvf_used_rate }}% used</p>
-      <p>SSL Card VF ({{ _domain?.domain_sslvf_used }} used + {{ _domain?.domain_sslvf_left }} available
-        = {{ _domain?.domain_sslvf_all }} in total): {{ _domain?.domain_sslvf_used_rate }}% used</p>
-    </mat-card-content>
-  </mat-card>
-}
-<br>
-<p>
-  &nbsp;&nbsp;&nbsp;&nbsp;<b>Note: </b>The width of the block for a VA instance represents the amount of its CPU
-  threads.
-</p>
+<div class="avx-tab-content-container">
+  <div class="table-container">
+    <table mat-table [dataSource]="vaData" class="modern-table">
+
+      <!-- Domain ID Column -->
+      <ng-container matColumnDef="domainId">
+        <th mat-header-cell *matHeaderCellDef>Domain ID</th>
+        <td mat-cell *matCellDef="let element">{{ element?.domain_id }}</td>
+      </ng-container>
+
+      <!-- CPU Column -->
+      <ng-container matColumnDef="cpu">
+        <th mat-header-cell *matHeaderCellDef>CPU Threads</th>
+        <td mat-cell *matCellDef="let element">
+          <div class="usage-cell">
+            <div class="usage-text">
+              {{ element?.domain_cpu_used_rate }}% used
+              <small>({{ element?.domain_cpu_used }} / {{ element?.domain_cpu_all }})</small>
+            </div>
+            <!-- Mini bar could go here -->
+          </div>
+        </td>
+      </ng-container>
+
+      <!-- Memory Column -->
+      <ng-container matColumnDef="memory">
+        <th mat-header-cell *matHeaderCellDef>Memory (GB)</th>
+        <td mat-cell *matCellDef="let element">
+          <div class="usage-cell">
+            <div class="usage-text">
+              {{ element?.domain_memory_used_rate }}% used
+              <small>({{ element?.domain_memory_used }} / {{ element?.domain_memory_all }})</small>
+            </div>
+          </div>
+        </td>
+      </ng-container>
+
+      <!-- Disk Column -->
+      <ng-container matColumnDef="disk">
+        <th mat-header-cell *matHeaderCellDef>Disk Space (GB)</th>
+        <td mat-cell *matCellDef="let element">
+          <div class="usage-cell">
+            <div class="usage-text">
+              {{ deviceInfo?.disk?.disk_used_rate }}% used
+              <small>({{ deviceInfo?.disk?.disk_used }} / {{ deviceInfo?.disk?.disk_total }})</small>
+            </div>
+          </div>
+        </td>
+      </ng-container>
+
+      <!-- Interface VF Column -->
+      <ng-container matColumnDef="interfaceVf">
+        <th mat-header-cell *matHeaderCellDef>Traffic Interface VF</th>
+        <td mat-cell *matCellDef="let element">
+          <div class="usage-cell">
+            <div class="usage-text">
+              {{ element?.domain_portvf_used_rate }}% used
+              <small>({{ element?.domain_portvf_used }} / {{ element?.domain_portvf_all }})</small>
+            </div>
+          </div>
+        </td>
+      </ng-container>
+
+      <!-- SSL VF Column -->
+      <ng-container matColumnDef="sslVf">
+        <th mat-header-cell *matHeaderCellDef>SSL Card VF</th>
+        <td mat-cell *matCellDef="let element">
+          <div class="usage-cell">
+            <div class="usage-text">
+              {{ element?.domain_sslvf_used_rate }}% used
+              <small>({{ element?.domain_sslvf_used }} / {{ element?.domain_sslvf_all }})</small>
+            </div>
+          </div>
+        </td>
+      </ng-container>
+
+      <tr mat-header-row *matHeaderRowDef="['domainId', 'cpu', 'memory', 'disk', 'interfaceVf', 'sslVf']"></tr>
+      <tr mat-row *matRowDef="let row; columns: ['domainId', 'cpu', 'memory', 'disk', 'interfaceVf', 'sslVf'];"></tr>
+
+      <tr class="mat-row" *matNoDataRow>
+        <td class="mat-cell no-data-cell" colspan="6">
+          <div class="no-data-content">
+            <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+            <span>No deployments found.</span>
+          </div>
+        </td>
+      </tr>
+    </table>
+  </div>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-deployments/avx-device-detail-deployments.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-deployments/avx-device-detail-deployments.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-deployments/avx-device-detail-deployments.scss	(working copy)
@@ -0,0 +1,70 @@
+.avx-tab-content-container {
+    padding: 16px;
+    background-color: transparent;
+}
+
+.table-container {
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+    border-radius: 8px;
+    overflow: hidden;
+    background-color: white;
+}
+
+.modern-table {
+    width: 100%;
+
+    th.mat-header-cell {
+        font-size: 13px;
+        font-weight: 600;
+        color: #444;
+        background-color: #fafafa;
+        border-bottom: 1px solid #eee;
+        padding: 16px;
+    }
+
+    td.mat-cell {
+        font-size: 13px;
+        color: #333;
+        padding: 12px 16px;
+        border-bottom: 1px solid #f0f0f0;
+    }
+
+    tr.mat-row:hover {
+        background-color: #f9f9f9;
+    }
+
+    .usage-cell {
+        display: flex;
+        flex-direction: column;
+
+        .usage-text {
+            font-size: 13px;
+            color: #333;
+
+            small {
+                color: #777;
+                margin-left: 4px;
+            }
+        }
+    }
+}
+
+.note-container {
+    margin-top: 16px;
+    padding: 12px;
+    background-color: #e3f2fd;
+    border-radius: 6px;
+    color: #0d47a1;
+    font-size: 13px;
+
+    p {
+        margin: 0;
+    }
+}
+
+.table-no-data {
+    text-align: center;
+    font-style: italic;
+    color: #999;
+    height: 48px;
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-deployments/avx-device-detail-deployments.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-deployments/avx-device-detail-deployments.ts	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-deployments/avx-device-detail-deployments.ts	(working copy)
@@ -1,9 +1,10 @@
-import {Component, OnInit} from '@angular/core';
-import {SharedModule} from '../../../shared/shared-module';
-import {AvxService} from '../../../services/avx-service';
-import {NotificationService} from '../../../services/notification';
-import {ActivatedRoute} from '@angular/router';
-import {take} from 'rxjs/operators';
+import { Component, OnInit } from '@angular/core';
+import { SharedModule } from '../../../shared/shared-module';
+import { AvxService } from '../../../services/avx-service';
+import { NotificationService } from '../../../services/notification';
+import { ActivatedRoute } from '@angular/router';
+import { take } from 'rxjs/operators';
+import { MatTableDataSource } from '@angular/material/table';
 
 @Component({
   selector: 'app-avx-device-detail-deployments',
@@ -16,7 +17,7 @@
   deviceName: any = '';
   deviceId: any = '';
   deviceInfo: any = {};
-  vaData: any = [];
+  vaData = new MatTableDataSource<any>([]);
 
   constructor(
     private _avx: AvxService,
@@ -39,6 +40,7 @@
         if (result && result?.data) {
           this.deviceInfo = result?.data;
           this.deviceInfo.disk.disk_used_rate = (parseInt(this.deviceInfo.disk.disk_used) / parseInt(this.deviceInfo.disk.disk_total) * 100).toFixed(2);
+          const tempVaData: any[] = [];
           for (let i = 0; i < this.deviceInfo.domain_num; i++) {
             let va_addable = false;
             let domain_cpu_all = 0;
@@ -94,7 +96,7 @@
             if (domain_portvf_all !== 0) {
               domain_memory_used_rate = ((domain_memory_used + domain_memory_reserved) / domain_memory_all * 100).toFixed(2)
             }
-            this.vaData.push({
+            tempVaData.push({
               'domain_id': i + 1,
               'domain_cpu_all': domain_cpu_all,
               'domain_cpu_left': domain_cpu_left,
@@ -120,6 +122,7 @@
               'va_addable': va_addable
             });
           }
+          this.vaData.data = tempVaData;
         }
       },
       error: error => {
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-logs/avx-device-detail-logs.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-logs/avx-device-detail-logs.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-logs/avx-device-detail-logs.html	(working copy)
@@ -1,49 +1,56 @@
-<mat-card class="page-card-1" appearance="filled">
-  <mat-card-content>
-    <div class="button-container">
-      <div class="form-field-wrapper">
-        <label for="deviceType" class="form-label">Log Level</label>
-        <mat-form-field appearance="outline" subscriptSizing="dynamic">
-          <mat-select (selectionChange)="filterLogs($event.value)" [(ngModel)]="selectedLogLevel">
-            @for (_level of logLevel; track _level) {
+<div class="avx-tab-content-container">
+  <mat-card class="page-card-1" appearance="outlined">
+    <mat-card-content>
+      <div class="logs-toolbar">
+        <div class="filter-group">
+          <label for="deviceType" class="filter-label">Log Level</label>
+          <mat-form-field appearance="outline" subscriptSizing="dynamic" class="dense-select">
+            <mat-select (selectionChange)="filterLogs($event.value)" [(ngModel)]="selectedLogLevel">
+              @for (_level of logLevel; track _level) {
               <mat-option [value]="_level?.value">{{ _level?.label }}</mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
+              }
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <!-- Could add a Refresh button here later if needed -->
       </div>
-    </div>
-    <div class="table-container">
-      <div class="mat-elevation-z0">
-        <table mat-table [dataSource]="dataSource">
-          <ng-container matColumnDef="serial">
-            <th mat-header-cell *matHeaderCellDef>ID</th>
-            <td mat-cell *matCellDef="let element; let i = index;"> {{ i | globalSerial }}</td>
-          </ng-container>
-          <ng-container matColumnDef="logLevel">
-            <th mat-header-cell *matHeaderCellDef>Log Level</th>
-            <td mat-cell *matCellDef="let element">{{ element?.logLevel }}</td>
-          </ng-container>
-          <ng-container matColumnDef="timestamp">
-            <th mat-header-cell *matHeaderCellDef>Timestamp</th>
-            <td mat-cell *matCellDef="let element">{{ element?.timestamp }}</td>
-          </ng-container>
-          <ng-container matColumnDef="message">
-            <th mat-header-cell *matHeaderCellDef>Message</th>
-            <td mat-cell *matCellDef="let element">{{ element?.message }}</td>
-          </ng-container>
-          <tr mat-header-row *matHeaderRowDef="dataColumns"></tr>
-          <tr mat-row *matRowDef="let row; columns: dataColumns;"></tr>
-          <tr class="mat-row table-no-data" *matNoDataRow>
-            <td class="mat-cell" colspan="11">No results found.</td>
-          </tr>
-        </table>
-        <mat-paginator
-          [length]="totalRecords"
-          [pageSize]="10"
-          [pageSizeOptions]="[10, 20, 50]"
-        >
-        </mat-paginator>
+
+      <div class="table-container">
+        <div class="mat-elevation-z0">
+          <table mat-table [dataSource]="dataSource" class="modern-table">
+            <ng-container matColumnDef="serial">
+              <th mat-header-cell *matHeaderCellDef>ID</th>
+              <td mat-cell *matCellDef="let element; let i = index;"> {{ i | globalSerial }}</td>
+            </ng-container>
+            <ng-container matColumnDef="logLevel">
+              <th mat-header-cell *matHeaderCellDef>Log Level</th>
+              <td mat-cell *matCellDef="let element">
+                <span class="log-badge" [ngClass]="element?.logLevel">{{ element?.logLevel }}</span>
+              </td>
+            </ng-container>
+            <ng-container matColumnDef="timestamp">
+              <th mat-header-cell *matHeaderCellDef>Timestamp</th>
+              <td mat-cell *matCellDef="let element" class="timestamp-cell">{{ element?.timestamp }}</td>
+            </ng-container>
+            <ng-container matColumnDef="message">
+              <th mat-header-cell *matHeaderCellDef>Message</th>
+              <td mat-cell *matCellDef="let element" class="message-cell">{{ element?.message }}</td>
+            </ng-container>
+            <tr mat-header-row *matHeaderRowDef="dataColumns"></tr>
+            <tr mat-row *matRowDef="let row; columns: dataColumns;"></tr>
+            <tr class="mat-row" *matNoDataRow>
+              <td class="mat-cell no-data-cell" colspan="4">
+                <div class="no-data-content">
+                  <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                  <span>No logs found.</span>
+                </div>
+              </td>
+            </tr>
+          </table>
+          <mat-paginator [length]="totalRecords" [pageSize]="10" [pageSizeOptions]="[10, 20, 50]">
+          </mat-paginator>
+        </div>
       </div>
-    </div>
-  </mat-card-content>
-</mat-card>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-logs/avx-device-detail-logs.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-logs/avx-device-detail-logs.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-logs/avx-device-detail-logs.scss	(working copy)
@@ -0,0 +1,133 @@
+.avx-tab-content-container {
+    padding: 16px;
+    background-color: transparent;
+}
+
+.page-card-1 {
+    width: 100%;
+    border-radius: 8px;
+    background-color: white;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+
+    mat-card-header {
+        background-color: rgba(0, 0, 0, 0.01);
+        border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+        padding: 16px;
+
+        mat-card-title {
+            font-size: 16px;
+            font-weight: 600;
+            color: #1170cf;
+        }
+    }
+
+    mat-card-content {
+        padding: 0;
+    }
+}
+
+.logs-toolbar {
+    padding: 16px;
+    border-bottom: 1px solid #f0f0f0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.filter-group {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+}
+
+.filter-label {
+    font-size: 13px;
+    font-weight: 500;
+    color: #555;
+}
+
+.dense-select {
+    width: 200px;
+
+    ::ng-deep .mat-mdc-form-field-wrapper {
+        padding-bottom: 0;
+    }
+}
+
+
+.modern-table {
+    width: 100%;
+
+    th.mat-header-cell {
+        font-size: 13px;
+        font-weight: 600;
+        color: #444;
+        background-color: #fafafa;
+        border-bottom: 1px solid #eee;
+        padding: 16px;
+    }
+
+    td.mat-cell {
+        font-size: 13px;
+        color: #333;
+        padding: 12px 16px;
+        border-bottom: 1px solid #f0f0f0;
+    }
+
+    tr.mat-row:hover {
+        background-color: #f9f9f9;
+    }
+
+    .message-cell {
+        white-space: pre-wrap; // or nowrap depending on preference
+        max-width: 500px;
+    }
+
+    .timestamp-cell {
+        white-space: nowrap;
+        color: #666;
+    }
+}
+
+.log-badge {
+    padding: 2px 8px;
+    border-radius: 4px;
+    font-size: 11px;
+    font-weight: 600;
+    text-transform: uppercase;
+
+    &.info,
+    &.INFO {
+        background-color: #e3f2fd;
+        color: #1976d2;
+    }
+
+    &.warn,
+    &.WARN,
+    &.WARNING {
+        background-color: #fff8e1;
+        color: #ffa000;
+    }
+
+    &.error,
+    &.ERROR,
+    &.biritical,
+    &.CRITICAL {
+        // "biritical" might be a typo in log levels? Assuming typo or safe fallback
+        background-color: #ffebee;
+        color: #d32f2f;
+    }
+
+    &.debug,
+    &.DEBUG {
+        background-color: #f5f5f5;
+        color: #757575;
+    }
+}
+
+.table-no-data {
+    text-align: center;
+    font-style: italic;
+    color: #999;
+    height: 48px;
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-overview/avx-device-detail-overview.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-overview/avx-device-detail-overview.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-overview/avx-device-detail-overview.html	(working copy)
@@ -1,152 +1,166 @@
-<div class="button-container">
-  <button mat-raised-button (click)="showWebInterface()">
-    <fa-icon [icon]="['fas', 'tv']"></fa-icon>
-    Show Web Interface
-  </button>&nbsp;&nbsp;
-  <button mat-raised-button (click)="showWebConsole()">
-    <fa-icon [icon]="['fas', 'terminal']"></fa-icon>
-    Show Web Console
-  </button>
-</div>
-<mat-grid-list cols="3" rowHeight="100px">
-  <mat-grid-tile colspan="1" rowspan="3">
+<div class="avx-overview-container">
+  <!-- Action Buttons -->
+  <div class="action-bar">
+    <button mat-flat-button color="primary" (click)="showWebInterface()">
+      <fa-icon [icon]="['fas', 'tv']"></fa-icon>
+      Show Web Interface
+    </button>
+    <button mat-stroked-button color="primary" (click)="showWebConsole()">
+      <fa-icon [icon]="['fas', 'terminal']"></fa-icon>
+      Show Web Console
+    </button>
+  </div>
+
+  <!-- Primary Metrics (Top 3 Large Charts) -->
+  <div class="primary-metrics-grid">
+    <!-- Network Throughput -->
     <mat-card class="dashboard-card" appearance="outlined">
+      <mat-card-header>
+        <mat-card-title>Network Throughput (bps)</mat-card-title>
+      </mat-card-header>
       <mat-card-content class="card-content-wrapper">
-        <div class="card-header-row">
-          <mat-card-title class="card-title">
-            <span class="card-title-text">Network Throughput (bps)</span>
-          </mat-card-title>
-        </div>
         <div class="chart-flex-container">
           <div echarts [options]="chartOption1" class="chart-container"></div>
         </div>
       </mat-card-content>
     </mat-card>
-  </mat-grid-tile>
-  <mat-grid-tile colspan="1" rowspan="3">
+
+    <!-- CPU Usage -->
     <mat-card class="dashboard-card" appearance="outlined">
+      <mat-card-header>
+        <mat-card-title>CPU Usage (%)</mat-card-title>
+      </mat-card-header>
       <mat-card-content class="card-content-wrapper">
-        <div class="card-header-row">
-          <mat-card-title class="card-title">
-            <span class="card-title-text">CPU Usage (%)</span>
-          </mat-card-title>
-        </div>
         <div class="chart-flex-container">
           <div echarts [options]="chartOption2" class="chart-container"></div>
         </div>
       </mat-card-content>
     </mat-card>
-  </mat-grid-tile>
-  <mat-grid-tile colspan="1" rowspan="3">
+
+    <!-- Memory Usage -->
     <mat-card class="dashboard-card" appearance="outlined">
+      <mat-card-header>
+        <mat-card-title>Memory Usage (%)</mat-card-title>
+      </mat-card-header>
       <mat-card-content class="card-content-wrapper">
-        <div class="card-header-row">
-          <mat-card-title class="card-title">
-            <span class="card-title-text">Memory Usage (%)</span>
-          </mat-card-title>
-        </div>
         <div class="chart-flex-container">
           <div echarts [options]="chartOption3" class="chart-container"></div>
         </div>
       </mat-card-content>
     </mat-card>
-  </mat-grid-tile>
-</mat-grid-list>
-<mat-grid-list cols="5" rowHeight="120px">
-  <mat-grid-tile colspan="1" rowspan="1">
-    <mat-card class="dashboard-card" appearance="outlined">
+  </div>
+
+  <!-- Secondary Metrics (Bottom 5 Small Charts) -->
+  <div class="secondary-metrics-grid">
+    <!-- CPU Threads -->
+    <mat-card class="dashboard-card small-card" appearance="outlined">
+      <mat-card-header class="small-header">
+        <mat-card-title>
+          <span>CPU Threads <small>({{ chartMeta?.cpu }})</small></span>
+          <button mat-icon-button (click)="enlargeSystemLoad('cpu')" matTooltip="Expand">
+            <fa-icon [icon]="['fas', 'expand']"></fa-icon>
+          </button>
+        </mat-card-title>
+      </mat-card-header>
       <mat-card-content class="card-content-wrapper">
-        <div class="card-header-row-1">
-          <mat-card-title class="card-title-1">
-            <span class="card-title-text">CPU Threads ({{ chartMeta?.cpu }})</span>
-            <fa-icon [icon]="['fas', 'expand']" class="fa-1x a-link" matTooltip="Expand"
-                     (click)="enlargeSystemLoad('cpu')"></fa-icon>
-          </mat-card-title>
-        </div>
         <div class="chart-flex-container">
           <div echarts [options]="chartOption4" class="chart-container"></div>
         </div>
       </mat-card-content>
     </mat-card>
-  </mat-grid-tile>
-  <mat-grid-tile colspan="1" rowspan="1">
-    <mat-card class="dashboard-card" appearance="outlined">
+
+    <!-- Memory -->
+    <mat-card class="dashboard-card small-card" appearance="outlined">
+      <mat-card-header class="small-header">
+        <mat-card-title>
+          <span>Memory <small>({{ chartMeta?.memory }})</small></span>
+          <button mat-icon-button (click)="enlargeSystemLoad('memory')" matTooltip="Expand">
+            <fa-icon [icon]="['fas', 'expand']"></fa-icon>
+          </button>
+        </mat-card-title>
+      </mat-card-header>
       <mat-card-content class="card-content-wrapper">
-        <div class="card-header-row-1">
-          <mat-card-title class="card-title-1">
-            <span class="card-title-text">Memory ({{ chartMeta?.memory }})</span>
-            <fa-icon [icon]="['fas', 'expand']" class="fa-1x a-link" matTooltip="Expand"
-                     (click)="enlargeSystemLoad('memory')"></fa-icon>
-          </mat-card-title>
-        </div>
         <div class="chart-flex-container">
           <div echarts [options]="chartOption5" class="chart-container"></div>
         </div>
       </mat-card-content>
     </mat-card>
-  </mat-grid-tile>
-  <mat-grid-tile colspan="1" rowspan="1">
-    <mat-card class="dashboard-card" appearance="outlined">
+
+    <!-- Traffic Interface -->
+    <mat-card class="dashboard-card small-card" appearance="outlined">
+      <mat-card-header class="small-header">
+        <mat-card-title>
+          <span>Traffic Interface VF <small>({{ chartMeta?.port }})</small></span>
+          <button mat-icon-button (click)="enlargeSystemLoad('ports')" matTooltip="Expand">
+            <fa-icon [icon]="['fas', 'expand']"></fa-icon>
+          </button>
+        </mat-card-title>
+      </mat-card-header>
       <mat-card-content class="card-content-wrapper">
-        <div class="card-header-row-1">
-          <mat-card-title class="card-title-1">
-            <span class="card-title-text">Traffic Interface VF ({{ chartMeta?.port }})</span>
-            <fa-icon [icon]="['fas', 'expand']" class="fa-1x a-link" matTooltip="Expand"
-                     (click)="enlargeSystemLoad('ports')"></fa-icon>
-          </mat-card-title>
-        </div>
         <div class="chart-flex-container">
           <div echarts [options]="chartOption6" class="chart-container"></div>
         </div>
       </mat-card-content>
     </mat-card>
-  </mat-grid-tile>
-  <mat-grid-tile colspan="1" rowspan="1">
-    <mat-card class="dashboard-card" appearance="outlined">
+
+    <!-- SSL Card -->
+    <mat-card class="dashboard-card small-card" appearance="outlined">
+      <mat-card-header class="small-header">
+        <mat-card-title>
+          <span>SSL Card VF <small>({{ chartMeta?.ssl }})</small></span>
+          <button mat-icon-button (click)="enlargeSystemLoad('ssl')" matTooltip="Expand">
+            <fa-icon [icon]="['fas', 'expand']"></fa-icon>
+          </button>
+        </mat-card-title>
+      </mat-card-header>
       <mat-card-content class="card-content-wrapper">
-        <div class="card-header-row-1">
-          <mat-card-title class="card-title-1">
-            <span class="card-title-text">SSL Card VF ({{ chartMeta?.ssl }})</span>
-            <fa-icon [icon]="['fas', 'expand']" class="fa-1x a-link" matTooltip="Expand"
-                     (click)="enlargeSystemLoad('ssl')"></fa-icon>
-          </mat-card-title>
-        </div>
         <div class="chart-flex-container">
           <div echarts [options]="chartOption7" class="chart-container"></div>
         </div>
       </mat-card-content>
     </mat-card>
-  </mat-grid-tile>
-  <mat-grid-tile colspan="1" rowspan="1">
-    <mat-card class="dashboard-card" appearance="outlined">
+
+    <!-- Disk Usage -->
+    <mat-card class="dashboard-card small-card" appearance="outlined">
+      <mat-card-header class="small-header">
+        <mat-card-title>
+          <span>Disk Usage <small>({{ chartMeta?.disk }})</small></span>
+          <button mat-icon-button (click)="enlargeSystemLoad('disk')" matTooltip="Expand">
+            <fa-icon [icon]="['fas', 'expand']"></fa-icon>
+          </button>
+        </mat-card-title>
+      </mat-card-header>
       <mat-card-content class="card-content-wrapper">
-        <div class="card-header-row-1">
-          <mat-card-title class="card-title-1">
-            <span class="card-title-text">Disk Usage ({{ chartMeta?.disk }})</span>
-            <fa-icon [icon]="['fas', 'expand']" class="fa-1x a-link" matTooltip="Expand"
-                     (click)="enlargeSystemLoad('disk')"></fa-icon>
-          </mat-card-title>
-        </div>
         <div class="chart-flex-container">
           <div echarts [options]="chartOption8" class="chart-container"></div>
         </div>
       </mat-card-content>
     </mat-card>
-  </mat-grid-tile>
-</mat-grid-list>
-<mat-card class="page-card-1">
-  <mat-card-header>
-    <mat-card-title>System Information</mat-card-title>
-  </mat-card-header>
-  <mat-card-content>
-    <table mat-table [dataSource]="dataSource" class="mat-elevation-z1">
-      <ng-container matColumnDef="key">
-        <td mat-cell *matCellDef="let element"> {{ element.key }}</td>
-      </ng-container>
-      <ng-container matColumnDef="value">
-        <td mat-cell *matCellDef="let element"> {{ element.value }}</td>
-      </ng-container>
-      <tr mat-row *matRowDef="let row; columns: dataColumns;"></tr>
-    </table>
-  </mat-card-content>
-</mat-card>
+  </div>
+
+  <!-- System Information Table -->
+  <mat-card class="page-card-1 system-info-card" appearance="outlined">
+    <mat-card-header>
+      <mat-card-title>System Information</mat-card-title>
+    </mat-card-header>
+    <mat-card-content>
+      <table mat-table [dataSource]="dataSource" class="mat-elevation-z0 modern-table">
+        <ng-container matColumnDef="key">
+          <td mat-cell *matCellDef="let element" class="key-cell"> {{ element.key }}</td>
+        </ng-container>
+        <ng-container matColumnDef="value">
+          <td mat-cell *matCellDef="let element" class="value-cell"> {{ element.value }}</td>
+        </ng-container>
+        <tr mat-row *matRowDef="let row; columns: dataColumns;"></tr>
+        <tr class="mat-row" *matNoDataRow>
+          <td class="mat-cell no-data-cell" colspan="2">
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
+          </td>
+        </tr>
+      </table>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-overview/avx-device-detail-overview.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-overview/avx-device-detail-overview.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-overview/avx-device-detail-overview.scss	(working copy)
@@ -1,184 +1,193 @@
-.page-card-1 {
-  width: 100%;
-  border-radius: 0;
-  background-color: inherit;
-  font-size: 14px !important;
+// General Container
+.avx-overview-container {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  padding: 16px;
+  background-color: transparent; // Let page background show through
+}
 
-  mat-card-header {
-    color: #1170cf;
+// Action Bar
+.action-bar {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  margin-bottom: 8px;
+
+  button {
+    border-radius: 6px;
+    font-weight: 500;
   }
 }
 
-mat-card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 4px 10px;
+// Primary Metrics (Top 3 Charts)
+.primary-metrics-grid {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 16px;
+  grid-auto-rows: 300px; // Enforce fixed row height
+
+  @media (max-width: 1200px) {
+    grid-template-columns: repeat(2, 1fr);
+  }
+
+  @media (max-width: 800px) {
+    grid-template-columns: 1fr;
+  }
 }
 
-mat-card-title {
-  font-size: medium;
+// Secondary Metrics (Bottom 5 Small Charts)
+.secondary-metrics-grid {
+  display: grid;
+  grid-template-columns: repeat(5, 1fr);
+  gap: 12px;
+  grid-auto-rows: 160px; // Enforce fixed row height
+
+  @media (max-width: 1400px) {
+    grid-template-columns: repeat(3, 1fr);
+  }
+
+  @media (max-width: 900px) {
+    grid-template-columns: repeat(2, 1fr);
+  }
+
+  @media (max-width: 600px) {
+    grid-template-columns: 1fr;
+  }
 }
 
+// Card Styles
 .dashboard-card {
-  width: 100%;
   height: 100%;
-  border-radius: 8px;
-  background-color: inherit;
-}
-
-.card-content-wrapper {
-  margin-top: 2px;
-  padding: 0 !important;
   display: flex;
   flex-direction: column;
-  height: 100%;
-  width: 100%;
-}
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05); // Subtle shadow
+  background: white; // Assuming light theme base
 
-.card-header-row {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  margin-bottom: 8px;
-  padding: 0 8px;
-}
+  mat-card-header {
+    padding: 12px 16px;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+    background-color: rgba(0, 0, 0, 0.01);
 
-.card-header-row-1 {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  margin-bottom: 0;
-  padding: 0 4px;
-}
+    mat-card-title {
+      font-size: 15px;
+      font-weight: 600;
+      color: #333;
+      margin: 0;
+    }
+  }
 
-.metric-icon {
-  color: #3f51b5;
-}
+  &.small-card {
+    mat-card-header.small-header {
+      padding: 8px 12px;
 
-.card-title {
-  font-size: 14px;
-  font-weight: 500;
-  color: #555;
-  margin: 0;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  width: 100%;
-}
+      // START FIX: Ensure internal wrapper takes full width
+      ::ng-deep .mat-mdc-card-header-text {
+        width: 100%;
+        margin: 0; // Remove default margins
+      }
 
-.card-title-1 {
-  font-size: 12px;
-  font-weight: 400;
-  color: #555;
-  margin: 0;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  width: 100%;
-}
+      // END FIX
 
-.metric-value {
-  display: flex;
-  justify-content: center;
-  align-items: flex-end;
-  line-height: 1;
-}
+      mat-card-title {
+        font-size: 13px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        width: 100%;
+        margin: 0; // Ensure no bottom margin
 
-.metric-label {
-  display: flex;
-  justify-content: center;
-  align-items: flex-end;
-  font-size: 0.9rem;
-  color: #777;
-  margin-top: 5px;
-}
+        small {
+          color: #777;
+          font-weight: 400;
+          margin-left: 4px;
+        }
 
-.online-count {
-  font-size: 36px;
-  font-weight: 600;
-  color: #333;
-}
+        button {
+          width: 24px;
+          height: 24px;
+          line-height: 24px;
+          padding: 0;
 
-.total-count {
-  font-size: 18px;
-  font-weight: 500;
-  color: #888;
-  margin-left: 4px;
-}
+          fa-icon {
+            font-size: 12px;
+            color: #1170cf;
+          }
+        }
+      }
+    }
+  }
 
-.status-details {
-  font-size: 14px;
-  color: #d32f2f;
-  margin: 0;
-  font-weight: 500;
-  text-align: center;
+  .card-content-wrapper {
+    flex: 1;
+    padding: 0; // Charts usually handle their own padding
+    position: relative;
+    min-height: 0; // Fixes flex overflow issues
+  }
 }
 
-.active,
-.matrics-icon {
-  color: darkgreen;
-}
-
+// Charts
 .chart-flex-container {
+  width: 100%;
+  height: 100%;
   display: flex;
-  justify-content: space-around;
+  justify-content: center;
   align-items: center;
-  height: 100%;
-  width: 100%;
-  flex-grow: 1;
+  padding: 8px;
 }
 
 .chart-container {
   width: 100%;
   height: 100%;
-  max-width: none;
-  max-height: none;
 }
 
-.chart-flex-container .chart-container {
-  width: 100%;
-  height: 100%;
-}
 
-mat-grid-list {
-  height: 100%;
-  width: 100%;
-}
+// System Information Table
+.system-info-card {
+  border-radius: 8px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
 
-.metrics-container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 20px;
-}
+  mat-card-header {
+    background-color: rgba(0, 0, 0, 0.01);
+    border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+    padding: 12px 16px;
 
-.card-body-content {
-  flex-grow: 1;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+    mat-card-title {
+      font-size: 16px;
+      font-weight: 600;
+      color: #1170cf;
+    }
+  }
+
+  mat-card-content {
+    padding: 0;
+  }
 }
 
-.metrics-horizontal-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  gap: 20px;
+.modern-table {
   width: 100%;
-}
 
-.metric-item {
-  text-align: center;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
+  tr.mat-row,
+  tr.mat-header-row {
+    height: 40px;
+  }
 
-.metric-value {
-  font-size: 1rem;
-  font-weight: 500;
-  color: #333;
-}
+  .key-cell {
+    font-weight: 500;
+    color: #555;
+    width: 30%;
+    padding-left: 16px;
+  }
+
+  .value-cell {
+    color: #333;
+    padding-right: 16px;
+  }
+
+  // Striped rows
+  tr.mat-row:nth-child(odd) {
+    background-color: rgba(0, 0, 0, 0.02);
+  }
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-overview/avx-device-detail-overview.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-overview/avx-device-detail-overview.ts	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-detail-overview/avx-device-detail-overview.ts	(working copy)
@@ -1,14 +1,14 @@
-import {Component, inject, OnInit} from '@angular/core';
-import {AvxService} from '../../../services/avx-service';
-import {NotificationService} from '../../../services/notification';
-import {ActivatedRoute, Router} from '@angular/router';
-import {take} from 'rxjs/operators';
-import {SharedModule} from '../../../shared/shared-module';
-import {MatTableDataSource} from '@angular/material/table';
-import {UtilsService} from '../../../services/utils-service';
-import {EChartsOption} from 'echarts';
-import {ChartOptions} from '../../../services/chart-options';
-import {MAT_DIALOG_DATA, MatDialog, MatDialogConfig, MatDialogRef} from '@angular/material/dialog';
+import { Component, inject, OnInit } from '@angular/core';
+import { AvxService } from '../../../services/avx-service';
+import { NotificationService } from '../../../services/notification';
+import { ActivatedRoute, Router } from '@angular/router';
+import { take } from 'rxjs/operators';
+import { SharedModule } from '../../../shared/shared-module';
+import { MatTableDataSource } from '@angular/material/table';
+import { UtilsService } from '../../../services/utils-service';
+import { EChartsOption } from 'echarts';
+import { ChartOptions } from '../../../services/chart-options';
+import { MAT_DIALOG_DATA, MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dialog';
 
 @Component({
   selector: 'app-avx-device-detail-overview',
@@ -46,6 +46,11 @@
     this.deviceName = this._route.snapshot.paramMap.get('deviceName');
     this.deviceIp = this._route.snapshot.paramMap.get('deviceIp');
     this.deviceId = this._route.snapshot.paramMap.get('deviceId');
+    this.chartOption4 = this._chartOptions.getNoDataChartOptions();
+    this.chartOption5 = this._chartOptions.getNoDataChartOptions();
+    this.chartOption6 = this._chartOptions.getNoDataChartOptions();
+    this.chartOption7 = this._chartOptions.getNoDataChartOptions();
+    this.chartOption8 = this._chartOptions.getNoDataChartOptions();
     setTimeout(() => {
       this.getAVXDeviceSystemInfoOverview();
       this.getAVXDeviceResourceOccupation();
@@ -88,7 +93,7 @@
     return apiResponse.map((item: any) => {
       const name = item[0];
       const value = item[1];
-      return {name, value};
+      return { name, value };
     });
   }
 
@@ -97,141 +102,179 @@
 
   updateChartOption(_data: any) {
 
-    _data?.cpu_thread.push(["Reserved", _data?.cpu_left_dedicated])
-    this.deviceMeta.cpu = this.convertApiResponseToChartData(_data?.cpu_thread).map((item: any) => {
-      if (item.name === 'Reserved') {
-        return {
-          ...item,
-          itemStyle: {
-            color: 'orange'
-          }
-        };
-      } else if (item.name === 'Available') {
-        return {
-          ...item,
-          itemStyle: {
-            color: 'green'
-          }
-        };
-      } else {
-        return {
-          ...item,
-          itemStyle: {
-            color: '#5470c6'
-          }
-        };
-      }
-    })
-    this.chartMeta.cpu = `${_data.cpu_used} / ${_data?.cpu_all}`;
-    this.chartOption4 = this._chartOptions.customDoughnutChartOptions('CPU', this.deviceMeta.cpu);
+    if (_data?.cpu_thread) {
+      _data?.cpu_thread.push(["Reserved", _data?.cpu_left_dedicated])
+      this.deviceMeta.cpu = this.convertApiResponseToChartData(_data?.cpu_thread).map((item: any) => {
+        if (item.name === 'Reserved') {
+          return {
+            ...item,
+            itemStyle: {
+              color: 'orange'
+            }
+          };
+        } else if (item.name === 'Available') {
+          return {
+            ...item,
+            itemStyle: {
+              color: 'green'
+            }
+          };
+        } else {
+          return {
+            ...item,
+            itemStyle: {
+              color: '#5470c6'
+            }
+          };
+        }
+      })
+      this.chartMeta.cpu = `${_data.cpu_used} / ${_data?.cpu_all}`;
+      this.chartOption4 = this._chartOptions.customDoughnutChartOptions('CPU', this.deviceMeta.cpu);
+    } else {
+      this.chartOption4 = this._chartOptions.getNoDataChartOptions();
+    }
 
-    _data?.memory.push(["Reserved", _data?.memory_reserved])
-    _data?.memory.push(["Available", _data?.memory_left])
+    if (_data?.memory) {
+      _data?.memory.push(["Reserved", _data?.memory_reserved])
+      _data?.memory.push(["Available", _data?.memory_left])
 
-    this.deviceMeta.memory = this.convertApiResponseToChartData(_data?.memory).map((item: any) => {
-      if (item.name === 'Reserved') {
-        return {
-          ...item,
-          itemStyle: {
-            color: 'orange'
-          }
-        };
-      } else if (item.name === 'Available') {
-        return {
-          ...item,
-          itemStyle: {
-            color: 'green'
-          }
-        };
-      } else {
-        return {
-          ...item,
-          itemStyle: {
-            color: '#5470c6'
-          }
-        };
-      }
-    })
-    this.chartMeta.memory = `${_data.memory_used + _data?.memory_reserved} / ${_data?.memory_all}`;
-    this.chartOption5 = this._chartOptions.customDoughnutChartOptions('Memory', this.deviceMeta.memory);
+      this.deviceMeta.memory = this.convertApiResponseToChartData(_data?.memory).map((item: any) => {
+        if (item.name === 'Reserved') {
+          return {
+            ...item,
+            itemStyle: {
+              color: 'orange'
+            }
+          };
+        } else if (item.name === 'Available') {
+          return {
+            ...item,
+            itemStyle: {
+              color: 'green'
+            }
+          };
+        } else {
+          return {
+            ...item,
+            itemStyle: {
+              color: '#5470c6'
+            }
+          };
+        }
+      })
+      this.chartMeta.memory = `${_data.memory_used + _data?.memory_reserved} / ${_data?.memory_all}`;
+      this.chartOption5 = this._chartOptions.customDoughnutChartOptions('Memory', this.deviceMeta.memory);
+    } else {
+      this.chartOption5 = this._chartOptions.getNoDataChartOptions();
+    }
 
-    _data?.port_vf.push(["Available", _data?.port_vf_left])
+    if (_data?.port_vf) {
+      _data?.port_vf.push(["Available", _data?.port_vf_left])
 
-    this.deviceMeta.ports = this.convertApiResponseToChartData(_data?.port_vf).map((item: any) => {
-      if (item.name === 'Reserved') {
-        return {
-          ...item,
-          itemStyle: {
-            color: 'orange'
-          }
-        };
-      } else if (item.name === 'Available') {
-        return {
-          ...item,
-          itemStyle: {
-            color: 'green'
-          }
-        };
-      } else {
-        return {
-          ...item,
-          itemStyle: {
-            color: '#5470c6'
-          }
-        };
-      }
-    })
-    this.chartMeta.port = `${_data.port_vf_used} / ${_data?.port_vf_all}`;
-    this.chartOption6 = this._chartOptions.customDoughnutChartOptions('Ports', this.deviceMeta.ports);
+      this.deviceMeta.ports = this.convertApiResponseToChartData(_data?.port_vf).map((item: any) => {
+        if (item.name === 'Reserved') {
+          return {
+            ...item,
+            itemStyle: {
+              color: 'orange'
+            }
+          };
+        } else if (item.name === 'Available') {
+          return {
+            ...item,
+            itemStyle: {
+              color: 'green'
+            }
+          };
+        } else {
+          return {
+            ...item,
+            itemStyle: {
+              color: '#5470c6'
+            }
+          };
+        }
+      })
+      this.chartMeta.port = `${_data.port_vf_used} / ${_data?.port_vf_all}`;
+      this.chartOption6 = this._chartOptions.customDoughnutChartOptions('Ports', this.deviceMeta.ports);
+    } else {
+      this.chartOption6 = this._chartOptions.getNoDataChartOptions();
+    }
 
-    _data?.ssl_vf.push(["Available", _data?.ssl_vf_left])
+    if (_data?.ssl_vf) {
+      _data?.ssl_vf.push(["Available", _data?.ssl_vf_left])
 
-    this.deviceMeta.ssl = this.convertApiResponseToChartData(_data?.ssl_vf).map((item: any) => {
-      if (item.name === 'Reserved') {
-        return {
-          ...item,
-          itemStyle: {
-            color: 'orange'
-          }
-        };
-      } else if (item.name === 'Available') {
-        return {
-          ...item,
-          itemStyle: {
-            color: 'green'
-          }
-        };
-      } else {
-        return {
-          ...item,
-          itemStyle: {
-            color: '#5470c6'
-          }
-        };
-      }
-    })
-    this.chartMeta.ssl = `${_data.ssl_vf_used} / ${_data?.ssl_vf_all}`;
-    this.chartOption7 = this._chartOptions.customDoughnutChartOptions('SSL', this.deviceMeta.ssl);
+      this.deviceMeta.ssl = this.convertApiResponseToChartData(_data?.ssl_vf).map((item: any) => {
+        if (item.name === 'Reserved') {
+          return {
+            ...item,
+            itemStyle: {
+              color: 'orange'
+            }
+          };
+        } else if (item.name === 'Available') {
+          return {
+            ...item,
+            itemStyle: {
+              color: 'green'
+            }
+          };
+        } else {
+          return {
+            ...item,
+            itemStyle: {
+              color: '#5470c6'
+            }
+          };
+        }
+      })
+      this.chartMeta.ssl = `${_data.ssl_vf_used} / ${_data?.ssl_vf_all}`;
+      this.chartOption7 = this._chartOptions.customDoughnutChartOptions('SSL', this.deviceMeta.ssl);
+    } else {
+      this.chartOption7 = this._chartOptions.getNoDataChartOptions();
+    }
 
-    this.deviceMeta.disk = [
-      {name: 'Available', value: _data?.disk_left},
-      {name: 'Used', value: _data?.disk_used},
-    ]
-    this.chartMeta.disk = `${_data.disk_used} / ${_data?.disk_total}`;
-    this.chartOption8 = this._chartOptions.customDoughnutChartOptions('Disk Usage', this.deviceMeta.disk);
+    if (_data?.disk_used !== undefined && _data?.disk_total !== undefined) {
+      this.deviceMeta.disk = [
+        { name: 'Available', value: _data?.disk_left },
+        { name: 'Used', value: _data?.disk_used },
+      ]
+      this.chartMeta.disk = `${_data.disk_used} / ${_data?.disk_total}`;
+      this.chartOption8 = this._chartOptions.customDoughnutChartOptions('Disk Usage', this.deviceMeta.disk);
+    } else {
+      this.chartOption8 = this._chartOptions.getNoDataChartOptions();
+    }
   }
 
   updateStatisticsCharts(_data: any) {
-    _data.throughput = {
-      sent: [],
-      received: []
+    if (!_data || Object.keys(_data).length === 0) {
+      this.chartOption1 = this._chartOptions.getNoDataChartOptions();
+      this.chartOption2 = this._chartOptions.getNoDataChartOptions();
+      this.chartOption3 = this._chartOptions.getNoDataChartOptions();
+      return;
     }
-    _data.cpu = [];
-    _data.memory = []
 
-    this.chartOption1 = this._chartOptions.historicalThroughputChartOptions(_data.throughput.received, _data.throughput.sent)
-    this.chartOption2 = this._chartOptions.plotSingleLineChartOptions({label: 'CPU'}, _data?.cpu)
-    this.chartOption3 = this._chartOptions.plotSingleLineChartOptions({label: 'Memory'}, _data?.memory)
+    _data.throughput = _data.throughput || { sent: [], received: [] };
+    _data.cpu = _data.cpu || [];
+    _data.memory = _data.memory || [];
+
+    if (_data.throughput.sent.length === 0 && _data.throughput.received.length === 0) {
+      this.chartOption1 = this._chartOptions.getNoDataChartOptions();
+    } else {
+      this.chartOption1 = this._chartOptions.historicalThroughputChartOptions(_data.throughput.received, _data.throughput.sent);
+    }
+
+    if (_data.cpu.length === 0) {
+      this.chartOption2 = this._chartOptions.getNoDataChartOptions();
+    } else {
+      this.chartOption2 = this._chartOptions.plotSingleLineChartOptions({ label: 'CPU', unit: '%' }, _data.cpu);
+    }
+
+    if (_data.memory.length === 0) {
+      this.chartOption3 = this._chartOptions.getNoDataChartOptions();
+    } else {
+      this.chartOption3 = this._chartOptions.plotSingleLineChartOptions({ label: 'Memory', unit: '%' }, _data.memory);
+    }
   }
 
   dialog = inject(MatDialog);
@@ -240,13 +283,13 @@
   enlargeSystemLoad(type: string = 'cpu') {
     if (type === 'cpu') {
       this.dialogConfig.data = {
-        title: `CPU Threads (${this.chartMeta?.cpu})`,
+        title: `CPU Threads (${this.chartMeta?.cpu || '0 / 0'})`,
         chartData: this.deviceMeta.cpu,
         chartLabel: 'CPU Threads',
       };
     } else if (type === 'memory') {
       this.dialogConfig.data = {
-        title: `Memory (${this.chartMeta?.memory})`,
+        title: `Memory (${this.chartMeta?.memory} GB)`,
         chartData: this.deviceMeta.memory,
         chartLabel: 'Memory',
       };
@@ -264,7 +307,7 @@
       };
     } else if (type === 'disk') {
       this.dialogConfig.data = {
-        title: `Disk Usage (${this.chartMeta?.disk})`,
+        title: `Disk Usage (${this.chartMeta?.disk} GB)`,
         chartData: this.deviceMeta.disk,
         chartLabel: 'Disk Usage',
       };
@@ -292,7 +335,7 @@
   showWebConsole() {
     const url = this._router.serializeUrl(
       this._router.createUrlTree(['/inventory/web-console'], {
-        queryParams: {device_id: this.deviceId, device_name: this.deviceName}
+        queryParams: { device_id: this.deviceId, device_name: this.deviceName }
       })
     );
     window.open(url, '_blank');
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-details/avx-device-details.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-details/avx-device-details.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-device-details/avx-device-details.scss	(working copy)
@@ -0,0 +1,36 @@
+.page-card-1 {
+    width: 100%;
+    border-radius: 0;
+    background-color: transparent;
+    box-shadow: none;
+    font-size: 14px !important;
+
+    mat-card-header {
+        padding: 16px;
+        background-color: white;
+        border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+
+        mat-card-title {
+            font-size: 18px;
+            font-weight: 500;
+            color: #333;
+
+            a.back-to-main-page {
+                text-decoration: none;
+                color: #1170cf;
+                cursor: pointer;
+                display: flex;
+                align-items: center;
+                gap: 8px;
+
+                &:hover {
+                    text-decoration: underline;
+                }
+
+                fa-icon {
+                    font-size: 16px;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/avx-device-license-dialog.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/avx-device-license-dialog.scss	(nonexistent)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/avx-device-license-dialog.scss	(working copy)
@@ -0,0 +1,53 @@
+.license-dialog-container {
+    display: flex;
+    flex-direction: column;
+    max-width: 500px;
+}
+
+h2[mat-dialog-title] {
+    margin: 0;
+    padding: 16px 24px;
+    background-color: transparent; // Let standard dialog background show
+    // Border and Color removed to inherit standard dialog styles
+    font-size: 18px;
+    font-weight: 600;
+    display: flex;
+    align-items: center;
+}
+
+mat-dialog-content {
+    padding: 0 !important;
+    margin: 0 !important;
+    max-height: 400px;
+
+    .license-table {
+        width: 100%;
+
+        td.mat-cell {
+            padding: 12px 24px;
+            font-size: 13px;
+            border-bottom: 1px solid var(--border-color);
+            color: var(--text-primary);
+
+            &:first-child {
+                font-weight: 500;
+                color: var(--text-secondary);
+                width: 140px;
+                background-color: var(--table-header-bg); // Use subtle background for keys
+                border-right: 1px solid var(--border-color);
+            }
+        }
+
+        tr:last-child td {
+            border-bottom: none;
+        }
+    }
+}
+
+mat-dialog-actions {
+    padding: 16px;
+    border-top: none; // Remove border
+    background-color: transparent;
+    justify-content: flex-end;
+    margin-bottom: 0;
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/avx-devices.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/avx-devices.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/avx-devices.html	(working copy)
@@ -1,14 +1,18 @@
-<mat-card class="page-card-1" appearance="filled">
+<div class="avx-page-container">
+  <!-- Action Bar -->
+  <div class="action-bar">
+    <button mat-raised-button color="primary" (click)="addAVXDevice()" matTooltip="Add AVX Device">
+      <fa-icon [icon]="['fas', 'plus']"></fa-icon> Add Device
+    </button>
+  </div>
+
+  <mat-card class="page-card-1" appearance="outlined">
     <mat-card-header>
       <mat-card-title>AVX Devices</mat-card-title>
     </mat-card-header>
-  <mat-card-content>
-    <div class="button-container">
-      <button mat-raised-button (click)="addAVXDevice()" matTooltip="Add AVX Device">Add</button>
-    </div>
-    <div class="table-container">
-      <div class="mat-elevation-z0">
-        <table mat-table [dataSource]="dataSource">
+    <mat-card-content>
+      <div class="table-container">
+        <table mat-table [dataSource]="dataSource" class="modern-table">
           <ng-container matColumnDef="serial">
             <th mat-header-cell *matHeaderCellDef>ID</th>
             <td mat-cell *matCellDef="let element; let i = index;"> {{ i | globalSerial }}</td>
@@ -29,26 +33,28 @@
           </ng-container>
           <ng-container matColumnDef="va">
             <th mat-header-cell *matHeaderCellDef>VA Instances</th>
-            <td mat-cell *matCellDef="let element">{{ element?.vm_number }}</td>
+            <td mat-cell *matCellDef="let element">
+              <span class="badge">{{ element?.vm_number }}</span>
+            </td>
           </ng-container>
           <ng-container matColumnDef="stats">
             <th mat-header-cell *matHeaderCellDef> Stats</th>
             <td mat-cell *matCellDef="let element">
               <div class="stats-container">
                 <div class="stat-item">
-                  <span>CPU:</span>
+                  <span class="stat-label">CPU</span>
                   <div echarts [options]="getMiniBarOptions(element.cpu_usage)" class="mini-chart"></div>
                   <span class="progress-number">{{ element.cpu_usage }}%</span>
                 </div>
 
                 <div class="stat-item">
-                  <span>Memory:</span>
+                  <span class="stat-label">Mem</span>
                   <div echarts [options]="getMiniBarOptions(element.memory_usage)" class="mini-chart"></div>
                   <span class="progress-number">{{ element.memory_usage }}%</span>
                 </div>
 
                 <div class="stat-item">
-                  <span>Disk:</span>
+                  <span class="stat-label">Disk</span>
                   <div echarts [options]="getMiniBarOptions(element.disk_usage)" class="mini-chart"></div>
                   <span class="progress-number">{{ element.disk_usage }}%</span>
                 </div>
@@ -58,11 +64,15 @@
           <ng-container matColumnDef="status">
             <th mat-header-cell *matHeaderCellDef>Status</th>
             <td mat-cell *matCellDef="let element">
-              <div class="row-action a-link">
+              <div class="status-cell">
                 @if (element?.connection?.toLowerCase() === 'connected') {
-                  <fa-icon [icon]="['far', 'check-circle']" matTooltip="Connected" class="success-icon"></fa-icon>
+                <span class="status-badge success">
+                  <fa-icon [icon]="['fas', 'check']"></fa-icon> Connected
+                </span>
                 } @else {
-                  <fa-icon [icon]="['far', 'xmark-circle']" matTooltip="Disconnected" class="delete-icon"></fa-icon>
+                <span class="status-badge error">
+                  <fa-icon [icon]="['fas', 'xmark']"></fa-icon> Disconnected
+                </span>
                 }
               </div>
             </td>
@@ -74,34 +84,37 @@
           <ng-container matColumnDef="action">
             <th mat-header-cell *matHeaderCellDef>Action</th>
             <td mat-cell *matCellDef="let element">
-              <div class="row-action a-link">
-                <fa-icon [icon]="['fas', 'id-badge']" size="lg" matTooltip="Show License"
-                         (click)="showLicense(element)"></fa-icon>
-                <a target="_blank"
-                   rel="noopener noreferrer"
-                   [href]="element?.ip ? 'https://' + element.ip + ':' + 8888 : '#'">
-                  <fa-icon [icon]="['fas', 'tv']" size="lg" matTooltip="WebUI"></fa-icon>
+              <div class="row-action">
+                <button mat-icon-button (click)="showLicense(element)" matTooltip="Show License">
+                  <fa-icon [icon]="['fas', 'id-badge']" class="license-icon" size="lg"></fa-icon>
+                </button>
+                <a mat-icon-button target="_blank" rel="noopener noreferrer"
+                  [href]="element?.ip ? 'https://' + element.ip + ':' + 8888 : '#'" matTooltip="WebUI">
+                  <fa-icon [icon]="['fas', 'tv']" class="webui-icon" size="lg"></fa-icon>
                 </a>
-                <fa-icon [icon]="['fas', 'terminal']" size="lg" matTooltip="Show Web Console"
-                         (click)="showWebConsole(element)"></fa-icon>
-                <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon" matTooltip="Remove AVX Device"
-                         (click)="deleteAVXDevice(element)"></fa-icon>
+                <button mat-icon-button (click)="showWebConsole(element)" matTooltip="Show Web Console">
+                  <fa-icon [icon]="['fas', 'terminal']" class="cli-icon" size="lg"></fa-icon>
+                </button>
+                <button mat-icon-button (click)="deleteAVXDevice(element)" matTooltip="Remove AVX Device">
+                  <fa-icon [icon]="['far', 'trash-can']" class="delete-icon" size="lg"></fa-icon>
+                </button>
               </div>
             </td>
           </ng-container>
           <tr mat-header-row *matHeaderRowDef="dataColumns"></tr>
           <tr mat-row *matRowDef="let row; columns: dataColumns;"></tr>
-          <tr class="mat-row table-no-data" *matNoDataRow>
-            <td class="mat-cell" colspan="11">No results found.</td>
+          <tr class="mat-row" *matNoDataRow>
+            <td class="mat-cell no-data-cell" colspan="11">
+              <div class="no-data-content">
+                <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                <span>No data available</span>
+              </div>
+            </td>
           </tr>
         </table>
-        <mat-paginator
-          [length]="totalRecords"
-          [pageSize]="10"
-          [pageSizeOptions]="[10, 20, 50]"
-        >
+        <mat-paginator [length]="totalRecords" [pageSize]="10" [pageSizeOptions]="[10, 20, 50]">
         </mat-paginator>
       </div>
-    </div>
-  </mat-card-content>
-</mat-card>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/avx-devices.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/avx-devices.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/avx-devices.scss	(working copy)
@@ -1,47 +1,205 @@
+// Page Container
+.avx-page-container {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  padding: 16px;
+  background-color: transparent;
+}
+
+// Action Bar
+.action-bar {
+  display: flex;
+  justify-content: flex-end;
+
+  button {
+    font-weight: 500;
+  }
+}
+
+// Card Styles
 .page-card-1 {
   width: 100%;
-  border-radius: 0;
-  background-color: inherit;
-  font-size: 14px !important;
+  border-radius: 8px;
+  background-color: white;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
 
   mat-card-header {
-    color: #1170cf;
+    background-color: rgba(0, 0, 0, 0.01);
+    border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+    padding: 16px;
+
+    mat-card-title {
+      font-size: 16px;
+      font-weight: 600;
+      color: #1170cf;
+    }
   }
+
+  mat-card-content {
+    padding: 0;
+  }
 }
 
-mat-card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 4px 10px;
+// Modern Table Styles
+.modern-table {
+  width: 100%;
+
+  th.mat-header-cell {
+    font-size: 13px;
+    font-weight: 600;
+    color: #444;
+    background-color: #fafafa;
+    border-bottom: 1px solid #eee;
+    padding: 16px;
+  }
+
+  td.mat-cell {
+    font-size: 13px;
+    color: #333;
+    padding: 12px 16px;
+    border-bottom: 1px solid #f0f0f0;
+  }
+
+  tr.mat-row:hover {
+    background-color: #f9f9f9;
+  }
+
+  // Link styling
+  .details-page-link {
+    color: #1170cf;
+    font-weight: 500;
+    cursor: pointer;
+    text-decoration: none;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
 }
 
-mat-card-title {
-  font-size: medium;
+// Badge Styles
+.badge {
+  display: inline-block;
+  padding: 2px 8px;
+  border-radius: 12px;
+  background-color: #e3f2fd;
+  color: #1565c0;
+  font-size: 12px;
+  font-weight: 500;
 }
 
+// Stats Column
 .stats-container {
   display: flex;
   flex-direction: column;
-  gap: 4px;
+  gap: 6px;
+  min-width: 160px;
 }
 
 .stat-item {
   display: flex;
   align-items: center;
-  gap: 6px;
+  gap: 8px;
+  font-size: 12px;
+
+  .stat-label {
+    width: 30px;
+    color: #666;
+  }
 }
 
 .mini-chart {
   width: 80px;
-  height: 14px;
-  line-height: 0;
+  height: 6px; // Thinner
+  background-color: #eee; // Track background
+  border-radius: 3px;
+  overflow: hidden;
+}
+
+.progress-number {
+  font-size: 11px;
+  width: 30px;
+  text-align: right;
+  color: #555;
+}
+
+// Status Badges
+.status-cell {
   display: flex;
   align-items: center;
 }
 
-.progress-number {
+.status-badge {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 4px 10px;
+  border-radius: 16px;
   font-size: 12px;
-  min-width: 30px;
-  text-align: right;
+  font-weight: 500;
+
+  &.success {
+    background-color: #e8f5e9;
+    color: #2e7d32;
+  }
+
+  &.error {
+    background-color: #ffebee;
+    color: #c62828;
+  }
 }
+
+// Action Buttons
+.row-action {
+  display: flex;
+  gap: 12px; // Increased gap to match Inventory
+  align-items: center;
+
+  button,
+  a {
+    // Reset defaults if needed, or rely on icon classes
+    background-color: transparent; // Clean background
+
+    &:hover {
+      background-color: transparent; // Remove hover bg if using icon color change only, or keep generic? 
+      // Inventory doesn't have button background hover, just icon scale/brightness usually? 
+      // Actually devices.scss has no button hover bg in the provided snippet, just cursor pointer.
+    }
+  }
+}
+
+// Semantic Icon Classes (Match Devices Component)
+.delete-icon {
+  color: var(--warn-color);
+  font-size: 16px;
+}
+
+.success-icon {
+  color: var(--success-color);
+  font-size: 16px;
+}
+
+.license-icon {
+  color: var(--text-secondary);
+}
+
+.webui-icon {
+  color: var(--primary-color);
+}
+
+.cli-icon {
+  color: var(--text-secondary);
+}
+
+.save-icon {
+  color: var(--success-color);
+}
+
+// No data row
+.table-no-data {
+  text-align: center;
+  font-style: italic;
+  color: #999;
+  height: 48px;
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/avx-devices.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/avx-devices.ts	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/avx-devices.ts	(working copy)
@@ -1,17 +1,17 @@
-import {Component, inject, OnInit, ViewChild} from '@angular/core';
-import {SharedModule} from '../../../shared/shared-module';
-import {AvxService} from '../../../services/avx-service';
-import {take} from 'rxjs/operators';
-import {MatTableDataSource} from '@angular/material/table';
-import {MatPaginator} from '@angular/material/paginator';
-import {NotificationService} from '../../../services/notification';
-import {GlobalSerialPipe} from '../../../pipes/global-serial-pipe';
-import {MAT_DIALOG_DATA, MatDialog, MatDialogConfig, MatDialogRef} from '@angular/material/dialog';
-import {UtilsService} from '../../../services/utils-service';
-import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {CustomValidators} from '../../../utils/custom-validators';
-import {Confirmation} from '../../../services/confirmation';
-import {Router} from '@angular/router';
+import { Component, inject, OnInit, ViewChild } from '@angular/core';
+import { SharedModule } from '../../../shared/shared-module';
+import { AvxService } from '../../../services/avx-service';
+import { take } from 'rxjs/operators';
+import { MatTableDataSource } from '@angular/material/table';
+import { MatPaginator } from '@angular/material/paginator';
+import { NotificationService } from '../../../services/notification';
+import { GlobalSerialPipe } from '../../../pipes/global-serial-pipe';
+import { MAT_DIALOG_DATA, MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dialog';
+import { UtilsService } from '../../../services/utils-service';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { CustomValidators } from '../../../utils/custom-validators';
+import { Confirmation } from '../../../services/confirmation';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-avx-devices',
@@ -91,7 +91,7 @@
   showWebConsole(device: any) {
     const url = this._router.serializeUrl(
       this._router.createUrlTree(['/inventory/web-console'], {
-        queryParams: {device_id: device?.id, device_name: device?.name}
+        queryParams: { device_id: device?.id, device_name: device?.name }
       })
     );
     window.open(url, '_blank');
@@ -134,12 +134,12 @@
 
   deleteAVXDevice(_device: any) {
     let deviceName = _device?.name;
-    let confirmMsg = `Are you sure you want to permanently delete "${deviceName}"?`
+    let confirmMsg = `Are you sure you want to remove the device "${deviceName}"?`
     this._confirmation.openConfirmDialog({
       title: `Delete ${deviceName}?`,
       message: confirmMsg,
-      confirmButtonText: 'Yes, Delete It',
-      cancelButtonText: 'No, Keep It',
+      confirmButtonText: 'Delete',
+      cancelButtonText: 'Cancel',
       confirmButtonColor: 'warn',
       cancelButtonColor: 'primary'
     }).subscribe(result => {
@@ -157,7 +157,7 @@
                 if (!result[0]) {
                   this._notification.showError(`${result[1]}`);
                 } else {
-                  this._notification.showSuccess(`${deviceName} deleted successfully!`);
+                  this._notification.showSuccess(`${deviceName} removed successfully!`);
                   this.getAVXDevices();
                 }
               }
@@ -165,15 +165,13 @@
             error: (err: any) => {
               if (err.status === 200) {
                 // ToDo: Backend fix required.
-                this._notification.showSuccess(`${deviceName} deleted successfully!`);
+                this._notification.showSuccess(`${deviceName} removed successfully!`);
                 this.getAVXDevices();
               } else {
-                this._notification.showError('Deletion Failed.');
+                this._notification.showError('Removal Failed.');
               }
             }
           })
-      } else {
-        this._notification.showSuccess('Deletion cancelled.');
       }
     });
   }
@@ -182,8 +180,10 @@
 @Component({
   selector: 'show-avx-device-license',
   templateUrl: './show-avx-device-license.html',
+  styleUrl: './avx-device-license-dialog.scss',
   imports: [SharedModule],
 })
+
 export class ShowAVXDeviceLicenseDialog implements OnInit {
   readonly dialogRef = inject(MatDialogRef<ShowAVXDeviceLicenseDialog>);
   readonly data = inject(MAT_DIALOG_DATA);
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/show-avx-device-license.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/show-avx-device-license.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-devices/show-avx-device-license.html	(working copy)
@@ -1,22 +1,21 @@
-<h2 mat-dialog-title>AVX Device License Info</h2>
+<div class="license-dialog-container">
+  <h2 mat-dialog-title>AVX Device License Info</h2>
 
-<mat-dialog-content>
-  <table mat-table [dataSource]="dataSource" class="mat-elevation-z1">
-    <ng-container matColumnDef="key">
-      <td mat-cell *matCellDef="let element"> {{ element.key }}</td>
-    </ng-container>
-    <ng-container matColumnDef="value">
-      <td mat-cell *matCellDef="let element"> {{ element.value }}</td>
-    </ng-container>
-    <tr mat-row *matRowDef="let row; columns: dataColumns;"></tr>
-  </table>
-</mat-dialog-content>
+  <mat-dialog-content>
+    <table mat-table [dataSource]="dataSource" class="license-table">
+      <ng-container matColumnDef="key">
+        <td mat-cell *matCellDef="let element"> {{ element.key }}</td>
+      </ng-container>
+      <ng-container matColumnDef="value">
+        <td mat-cell *matCellDef="let element"> {{ element.value }}</td>
+      </ng-container>
+      <tr mat-row *matRowDef="let row; columns: dataColumns;"></tr>
+    </table>
+  </mat-dialog-content>
 
-<mat-dialog-actions align="center">
-  <button
-    mat-button
-    color="basic"
-    (click)="onCancel()">
-    Close
-  </button>
-</mat-dialog-actions>
+  <mat-dialog-actions>
+    <button mat-button color="basic" (click)="onCancel()">
+      Close
+    </button>
+  </mat-dialog-actions>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-backup/avx-va-backup.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-backup/avx-va-backup.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-backup/avx-va-backup.html	(working copy)
@@ -1,54 +1,69 @@
-<mat-card class="page-card-1" appearance="filled">
-  <mat-card-content>
-    <div class="button-container">
-      <button mat-raised-button (click)="createVABackup()" matTooltip="Create VA Backup">Create</button> &nbsp;&nbsp;
-      <button mat-raised-button (click)="importVABackup()" matTooltip="Import VA Backup">Import</button>
-    </div>
-    <div class="table-container">
-      <div class="mat-elevation-z0">
-        <table mat-table [dataSource]="dataSource">
-          <ng-container matColumnDef="serial">
-            <th mat-header-cell *matHeaderCellDef>ID</th>
-            <td mat-cell *matCellDef="let element; let i = index;"> {{ i | globalSerial }}</td>
-          </ng-container>
-          <ng-container matColumnDef="backupName">
-            <th mat-header-cell *matHeaderCellDef>Device Name</th>
-            <td mat-cell *matCellDef="let element">{{ element?.backup_name }}</td>
-          </ng-container>
-          <ng-container matColumnDef="avxName">
-            <th mat-header-cell *matHeaderCellDef>AVX Name</th>
-            <td mat-cell *matCellDef="let element">{{ element?.avx_name }}</td>
-          </ng-container>
-          <ng-container matColumnDef="vaName">
-            <th mat-header-cell *matHeaderCellDef>VA Name</th>
-            <td mat-cell *matCellDef="let element">{{ element?.va_name }}</td>
-          </ng-container>
-          <ng-container matColumnDef="action">
-            <th mat-header-cell *matHeaderCellDef>Action</th>
-            <td mat-cell *matCellDef="let element">
-              <div class="row-action a-link">
-                <fa-icon [icon]="['fas', 'file-export']" size="lg" matTooltip="Export VA Backup"
-                         (click)="exportBackup(element)"></fa-icon>
-                <fa-icon [icon]="['fas', 'clock-rotate-left']" size="lg" matTooltip="Restore a Backup VA Instance"
-                         (click)="restoreBackup(element)"></fa-icon>
-                <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon" matTooltip="Remove AVX Device"
-                         (click)="deleteBackup(element)"></fa-icon>
-              </div>
-            </td>
-          </ng-container>
-          <tr mat-header-row *matHeaderRowDef="dataColumns"></tr>
-          <tr mat-row *matRowDef="let row; columns: dataColumns;"></tr>
-          <tr class="mat-row table-no-data" *matNoDataRow>
-            <td class="mat-cell" colspan="11">No results found.</td>
-          </tr>
-        </table>
-        <mat-paginator
-          [length]="totalRecords"
-          [pageSize]="10"
-          [pageSizeOptions]="[10, 20, 50]"
-        >
-        </mat-paginator>
+<div class="avx-page-container">
+  <!-- Action Bar -->
+  <div class="action-bar">
+    <button mat-raised-button color="primary" (click)="createVABackup()" matTooltip="Create VA Backup">
+      <fa-icon [icon]="['fas', 'plus']"></fa-icon> Create
+    </button>&nbsp;&nbsp;
+    <button mat-stroked-button color="primary" (click)="importVABackup()" matTooltip="Import VA Backup">
+      <fa-icon [icon]="['fas', 'file-import']"></fa-icon> Import
+    </button>
+  </div>
+
+  <mat-card class="page-card-1" appearance="outlined">
+    <mat-card-header>
+      <mat-card-title>VA Backups</mat-card-title>
+    </mat-card-header>
+    <mat-card-content>
+      <div class="table-container">
+        <div class="mat-elevation-z0">
+          <table mat-table [dataSource]="dataSource" class="modern-table">
+            <ng-container matColumnDef="serial">
+              <th mat-header-cell *matHeaderCellDef>ID</th>
+              <td mat-cell *matCellDef="let element; let i = index;"> {{ i | globalSerial }}</td>
+            </ng-container>
+            <ng-container matColumnDef="backupName">
+              <th mat-header-cell *matHeaderCellDef>Backup Name</th>
+              <td mat-cell *matCellDef="let element" class="primary-text">{{ element?.backup_name }}</td>
+            </ng-container>
+            <ng-container matColumnDef="avxName">
+              <th mat-header-cell *matHeaderCellDef>AVX Name</th>
+              <td mat-cell *matCellDef="let element">{{ element?.avx_name }}</td>
+            </ng-container>
+            <ng-container matColumnDef="vaName">
+              <th mat-header-cell *matHeaderCellDef>VA Name</th>
+              <td mat-cell *matCellDef="let element">{{ element?.va_name }}</td>
+            </ng-container>
+            <ng-container matColumnDef="action">
+              <th mat-header-cell *matHeaderCellDef>Action</th>
+              <td mat-cell *matCellDef="let element">
+                <div class="row-action">
+                  <button mat-icon-button (click)="exportBackup(element)" matTooltip="Export VA Backup">
+                    <fa-icon [icon]="['fas', 'file-export']" class="primary-icon" size="lg"></fa-icon>
+                  </button>
+                  <button mat-icon-button (click)="restoreBackup(element)" matTooltip="Restore Backup">
+                    <fa-icon [icon]="['fas', 'clock-rotate-left']" class="primary-icon" size="lg"></fa-icon>
+                  </button>
+                  <button mat-icon-button (click)="deleteBackup(element)" matTooltip="Delete Backup">
+                    <fa-icon [icon]="['far', 'trash-can']" class="delete-icon" size="lg"></fa-icon>
+                  </button>
+                </div>
+              </td>
+            </ng-container>
+            <tr mat-header-row *matHeaderRowDef="dataColumns"></tr>
+            <tr mat-row *matRowDef="let row; columns: dataColumns;"></tr>
+            <tr class="mat-row" *matNoDataRow>
+              <td class="mat-cell no-data-cell" colspan="11">
+                <div class="no-data-content">
+                  <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                  <span>No data available</span>
+                </div>
+              </td>
+            </tr>
+          </table>
+          <mat-paginator [length]="totalRecords" [pageSize]="10" [pageSizeOptions]="[10, 20, 50]">
+          </mat-paginator>
+        </div>
       </div>
-    </div>
-  </mat-card-content>
-</mat-card>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-backup/avx-va-backup.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-backup/avx-va-backup.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-backup/avx-va-backup.scss	(working copy)
@@ -0,0 +1,105 @@
+// Page Container
+.avx-page-container {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    padding: 16px;
+    background-color: transparent;
+}
+
+// Action Bar
+.action-bar {
+    display: flex;
+    justify-content: flex-end;
+
+    button {
+        font-weight: 500;
+    }
+}
+
+// Card Styles
+.page-card-1 {
+    width: 100%;
+    border-radius: 8px;
+    background-color: var(--surface-bg); // Theme-aware
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+
+    mat-card-header {
+        background-color: transparent;
+        border-bottom: 1px solid var(--border-color);
+        padding: 16px;
+
+        mat-card-title {
+            font-size: 16px;
+            font-weight: 600;
+            color: var(--primary-color);
+        }
+    }
+
+    mat-card-content {
+        padding: 0;
+    }
+}
+
+// Modern Table Styles
+.modern-table {
+    width: 100%;
+
+    th.mat-header-cell {
+        font-size: 13px;
+        font-weight: 600;
+        color: var(--text-secondary);
+        background-color: var(--table-header-bg);
+        border-bottom: 1px solid var(--border-color);
+        padding: 16px;
+    }
+
+    td.mat-cell {
+        font-size: 13px;
+        color: var(--text-primary);
+        padding: 12px 16px;
+        border-bottom: 1px solid var(--border-color);
+    }
+
+    tr.mat-row:hover {
+        background-color: var(--table-hover);
+    }
+
+    // Primary text column styling
+    .primary-text {
+        font-weight: 500;
+        color: var(--primary-color);
+    }
+}
+
+// Action Buttons
+// Action Buttons
+.row-action {
+    display: flex;
+    gap: 12px;
+    align-items: center;
+
+    button,
+    a {
+        background-color: transparent;
+    }
+}
+
+// Semantic Icon Classes
+.delete-icon {
+    color: var(--warn-color);
+    font-size: 16px;
+}
+
+.primary-icon {
+    color: var(--primary-color);
+    font-size: 16px;
+}
+
+// No data row
+.table-no-data {
+    text-align: center;
+    font-style: italic;
+    color: var(--text-secondary);
+    height: 48px;
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-backup/avx-va-backup.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-backup/avx-va-backup.ts	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-backup/avx-va-backup.ts	(working copy)
@@ -1,15 +1,15 @@
-import {Component, inject, OnInit, ViewChild} from '@angular/core';
-import {SharedModule} from '../../../shared/shared-module';
-import {MatTableDataSource} from '@angular/material/table';
-import {MatPaginator} from '@angular/material/paginator';
-import {MAT_DIALOG_DATA, MatDialog, MatDialogConfig, MatDialogRef} from '@angular/material/dialog';
-import {AvxService} from '../../../services/avx-service';
-import {NotificationService} from '../../../services/notification';
-import {Confirmation} from '../../../services/confirmation';
-import {take} from 'rxjs/operators';
-import {GlobalSerialPipe} from '../../../pipes/global-serial-pipe';
-import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {HttpParams} from '@angular/common/http';
+import { Component, inject, OnInit, ViewChild } from '@angular/core';
+import { SharedModule } from '../../../shared/shared-module';
+import { MatTableDataSource } from '@angular/material/table';
+import { MatPaginator } from '@angular/material/paginator';
+import { MAT_DIALOG_DATA, MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dialog';
+import { AvxService } from '../../../services/avx-service';
+import { NotificationService } from '../../../services/notification';
+import { Confirmation } from '../../../services/confirmation';
+import { take } from 'rxjs/operators';
+import { GlobalSerialPipe } from '../../../pipes/global-serial-pipe';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { HttpParams } from '@angular/common/http';
 
 @Component({
   selector: 'app-avx-va-backup',
@@ -65,7 +65,6 @@
   getAVXDeviceBackups(device: any) {
     this._avx.getAVXVABackups(device?.id).pipe(take(1)).subscribe({
       next: (result: any) => {
-        console.log(result);
         if (result && result.length > 0) {
           result.forEach((backup: any) => {
             backup.avx_name = device.name;
@@ -140,8 +139,8 @@
     this._confirmation.openConfirmDialog({
       title: `Delete ${backupName}?`,
       message: confirmMsg,
-      confirmButtonText: 'Yes, Delete It',
-      cancelButtonText: 'No, Keep It',
+      confirmButtonText: 'Delete',
+      cancelButtonText: 'Cancel',
       confirmButtonColor: 'warn',
       cancelButtonColor: 'primary'
     }).subscribe(result => {
@@ -169,8 +168,6 @@
               }
             }
           })
-      } else {
-        this._notification.showSuccess('Deletion cancelled.');
       }
     });
   }
@@ -293,6 +290,7 @@
       "action": "Import",
       "options": {
         "url": this.configForm.value?.url,
+        "type": "url",
         "user_name": this.configForm.value?.username,
         "password": this.configForm.value?.password,
       }
@@ -344,7 +342,7 @@
 
   ngOnInit() {
     this.configForm = this._fb.group({
-      backup_name: [{value: this.data?.backup?.backup_name, disabled: true}, [Validators.required]],
+      backup_name: [{ value: this.data?.backup?.backup_name, disabled: true }, [Validators.required]],
       url: [null, [Validators.required]],
       username: [null, [Validators.required]],
       password: [null, [Validators.required]],
@@ -361,10 +359,13 @@
       "action": "Export",
       "options": {
         "__pk_list": [
-          {
-            "backup_name": this.data?.backup?.backup_name,
-          }
+          JSON.stringify(
+            {
+              "backup_name": this.data?.backup?.backup_name,
+            }
+          )
         ],
+        "type": "url",
         "url": this.configForm?.value?.url,
         "user_name": this.configForm?.value?.username,
         "password": this.configForm?.value?.password,
@@ -419,7 +420,7 @@
 
   ngOnInit() {
     this.configForm = this._fb.group({
-      backup_name: [{value: this.data.backup?.backup_name, disabled: true}, [Validators.required]],
+      backup_name: [{ value: this.data.backup?.backup_name, disabled: true }, [Validators.required]],
       domain: [0, [Validators.required]],
     })
     setTimeout(() => {
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-configuration/avx-va-instance-configuration.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-configuration/avx-va-instance-configuration.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-configuration/avx-va-instance-configuration.html	(working copy)
@@ -1,5 +1,10 @@
-<div class="tab-content">
-  <div class="device-config">
-    <pre class="wrapped-pre">{{ runningConfig }}</pre>
+<div class="avx-tab-content-container">
+  <div class="config-view-container">
+    <div class="config-toolbar">
+      <span class="toolbar-title">Running Configuration</span>
+    </div>
+    <div class="config-code-block">
+      <pre><code>{{ runningConfig }}</code></pre>
+    </div>
   </div>
-</div>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-configuration/avx-va-instance-configuration.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-configuration/avx-va-instance-configuration.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-configuration/avx-va-instance-configuration.scss	(working copy)
@@ -1,18 +1,47 @@
-.wrapped-pre {
-  padding: 15px;
-  border: 1px solid #ccc;
-  overflow-x: auto;
-  white-space: pre-wrap;
-  word-break: break-word;
-  font-family: monospace;
-  height: 60vh;
-  max-height: 80vh;
-  overflow-y: auto;
+.avx-tab-content-container {
+  padding: 16px;
+  background-color: transparent;
 }
 
-.device-config {
-  padding: 4px;
+.config-view-container {
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+  background-color: white;
   border-radius: 8px;
-  max-width: 90vw;
-  margin: 20px auto;
+  overflow: hidden;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
 }
+
+.config-toolbar {
+  padding: 12px 16px;
+  background-color: #fafafa;
+  border-bottom: 1px solid #eee;
+  display: flex;
+  align-items: center;
+
+  .toolbar-title {
+    font-size: 14px;
+    font-weight: 500;
+    color: #444;
+  }
+}
+
+.config-code-block {
+  background-color: white;
+  padding: 0;
+
+  pre {
+    margin: 0;
+    font-family: 'JetBrains Mono', 'Fira Code', monospace;
+    font-size: 13px;
+    line-height: 1.5;
+    white-space: pre-wrap;
+    word-break: break-all;
+    color: #333;
+    padding: 16px;
+    border: none;
+    max-height: 70vh;
+    overflow-y: auto;
+  }
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-details/avx-va-instance-details.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-details/avx-va-instance-details.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-details/avx-va-instance-details.scss	(working copy)
@@ -0,0 +1,42 @@
+.page-card-1 {
+    width: 100%;
+    border-radius: 0;
+    background-color: transparent;
+    box-shadow: none;
+    font-size: 14px !important;
+
+    mat-card-header {
+        padding: 16px;
+        background-color: var(--surface-bg);
+        border-bottom: 1px solid var(--border-color);
+
+        mat-card-title {
+            font-size: 18px;
+            font-weight: 500;
+            color: var(--text-primary);
+
+            a.back-to-main-page {
+                text-decoration: none;
+                color: var(--primary-color);
+                cursor: pointer;
+                display: flex;
+                align-items: center;
+                gap: 8px;
+
+                &:hover {
+                    text-decoration: underline;
+                }
+
+                fa-icon {
+                    font-size: 16px;
+                }
+            }
+        }
+
+        mat-card-subtitle {
+            margin-top: 8px;
+            font-size: 13px;
+            color: var(--text-secondary);
+        }
+    }
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-overview/avx-va-instance-overview.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-overview/avx-va-instance-overview.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-overview/avx-va-instance-overview.html	(working copy)
@@ -1,9 +1,11 @@
 @if (loader2 && !isSNMPEnabled) {
-  <br><p class="blue-icon center"><b>Note:</b> To view graph data, please enable the SNMP service first.</p>
+<br>
+<p class="blue-icon center"><b>Note:</b> To view graph data, please enable the SNMP service first.</p>
 }
 @if (loader1 && !isInstanceActive) {
-  <br><p class="blue-icon center"><b>Note:</b> Note: Lookslike the VA instance ({{ instanceName }}) is not running.
-    Please start it first.</p>
+<br>
+<p class="blue-icon center"><b>Note:</b> Note: Lookslike the VA instance ({{ instanceName }}) is not running.
+  Please start it first.</p>
 }
 <mat-grid-list cols="3" rowHeight="100px">
   <mat-grid-tile colspan="2" rowspan="3">
@@ -15,7 +17,14 @@
           </mat-card-title>
         </div>
         <div class="chart-flex-container">
+          @if (hasData1) {
           <div echarts [options]="chartOption1" class="chart-container"></div>
+          } @else {
+          <div class="no-data-content">
+            <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+            <span>No data available</span>
+          </div>
+          }
         </div>
       </mat-card-content>
     </mat-card>
@@ -29,7 +38,14 @@
           </mat-card-title>
         </div>
         <div class="chart-flex-container">
+          @if (hasData2) {
           <div echarts [options]="chartOption2" class="chart-container"></div>
+          } @else {
+          <div class="no-data-content">
+            <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+            <span>No data available</span>
+          </div>
+          }
         </div>
       </mat-card-content>
     </mat-card>
@@ -42,8 +58,8 @@
             <span class="card-title-text">Management IP</span>
             <div class="row-action a-link">
               <fa-icon [icon]="['fas', 'circle-info']"
-                       matTooltip="It is recommended to enable DHCP for both AVX and the VA instance. In this case, AVX dynamically assigns an IP address to the management port of the VA instance and therefore is aware of the management IP of the VA instance. AVX then can provide advanced management functions for the VA instance based on the management IP."
-                       class="fa-1x blue-icon"></fa-icon>
+                matTooltip="It is recommended to enable DHCP for both AVX and the VA instance. In this case, AVX dynamically assigns an IP address to the management port of the VA instance and therefore is aware of the management IP of the VA instance. AVX then can provide advanced management functions for the VA instance based on the management IP."
+                class="fa-1x blue-icon"></fa-icon>
             </div>
           </mat-card-title>
         </div>
@@ -56,6 +72,14 @@
               <td mat-cell *matCellDef="let element"> {{ element.value }}</td>
             </ng-container>
             <tr mat-row *matRowDef="let row; columns: platformDataColumns;"></tr>
+            <tr class="mat-row" *matNoDataRow>
+              <td class="mat-cell no-data-cell" colspan="2">
+                <div class="no-data-content">
+                  <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                  <span>No data available</span>
+                </div>
+              </td>
+            </tr>
           </table>
         </div>
       </mat-card-content>
@@ -78,6 +102,14 @@
               <td mat-cell *matCellDef="let element"> {{ element.value }}</td>
             </ng-container>
             <tr mat-row *matRowDef="let row; columns: platformDataColumns;"></tr>
+            <tr class="mat-row" *matNoDataRow>
+              <td class="mat-cell no-data-cell" colspan="2">
+                <div class="no-data-content">
+                  <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                  <span>No data available</span>
+                </div>
+              </td>
+            </tr>
           </table>
         </div>
       </mat-card-content>
@@ -92,7 +124,14 @@
           </mat-card-title>
         </div>
         <div class="chart-flex-container">
+          @if (hasData3) {
           <div echarts [options]="chartOption3" class="chart-container"></div>
+          } @else {
+          <div class="no-data-content">
+            <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+            <span>No data available</span>
+          </div>
+          }
         </div>
       </mat-card-content>
     </mat-card>
@@ -114,6 +153,14 @@
               <td mat-cell *matCellDef="let element"> {{ element.value }}</td>
             </ng-container>
             <tr mat-row *matRowDef="let row; columns: configDataColumns;"></tr>
+            <tr class="mat-row" *matNoDataRow>
+              <td class="mat-cell no-data-cell" colspan="2">
+                <div class="no-data-content">
+                  <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                  <span>No data available</span>
+                </div>
+              </td>
+            </tr>
           </table>
         </div>
       </mat-card-content>
@@ -128,8 +175,16 @@
           </mat-card-title>
         </div>
         <div class="chart-flex-container">
+          @if (hasData4) {
           <div echarts [options]="chartOption4" class="chart-container"></div>
+          } @else {
+          <div class="no-data-content">
+            <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+            <span>No data available</span>
+          </div>
+          }
         </div>
+
       </mat-card-content>
     </mat-card>
   </mat-grid-tile>
@@ -153,9 +208,9 @@
                   <th mat-header-cell *matHeaderCellDef>Resource</th>
                   <td mat-cell *matCellDef="let element">
                     @if (element.resource !== 'mgmt') {
-                      {{ element?.resource }}
+                    {{ element?.resource }}
                     } @else {
-                      <a class="details-page-link" (click)="updateManagementVLAN(element)">{{ element?.resource }}</a>
+                    <a class="details-page-link" (click)="updateManagementVLAN(element)">{{ element?.resource }}</a>
                     }
                   </td>
                 </ng-container>
@@ -171,14 +226,19 @@
                   <th mat-header-cell *matHeaderCellDef>VLAN Tag</th>
                   <td mat-cell *matCellDef="let element">
                     @if (element.resource !== 'mgmt') {
-                      {{ element?.vlan_tag }}
+                    {{ element?.vlan_tag }}
                     }
                   </td>
                 </ng-container>
                 <tr mat-header-row *matHeaderRowDef="portDataColumns"></tr>
                 <tr mat-row *matRowDef="let row; columns: portDataColumns;"></tr>
-                <tr class="mat-row table-no-data" *matNoDataRow>
-                  <td class="mat-cell" colspan="11">No results found.</td>
+                <tr class="mat-row" *matNoDataRow>
+                  <td class="mat-cell no-data-cell" colspan="5">
+                    <div class="no-data-content">
+                      <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                      <span>No data available</span>
+                    </div>
+                  </td>
                 </tr>
               </table>
             </div>
@@ -187,4 +247,4 @@
       </mat-card-content>
     </mat-card>
   </mat-grid-tile>
-</mat-grid-list>
+</mat-grid-list>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-overview/avx-va-instance-overview.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-overview/avx-va-instance-overview.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-overview/avx-va-instance-overview.scss	(working copy)
@@ -129,14 +129,13 @@
   flex-grow: 1;
 }
 
-.chart-flex-container-2 {
 
-}
 
-.small-table{
+.small-table {
   .mat-mdc-table {
     background-color: transparent;
   }
+
   .mat-mdc-row {
     height: 30px;
   }
@@ -195,3 +194,31 @@
   font-weight: 500;
   color: #333;
 }
+
+.no-data-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 32px 0;
+  color: var(--text-secondary);
+  gap: 10px;
+  opacity: 0.7;
+  height: 100%;
+  width: 100%;
+
+  fa-icon {
+    font-size: 24px;
+    margin-bottom: 4px;
+  }
+
+  span {
+    font-size: 13px;
+    font-weight: 500;
+  }
+}
+
+.no-data-cell {
+  padding: 0 !important;
+  border-bottom: none !important;
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-overview/avx-va-instance-overview.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-overview/avx-va-instance-overview.ts	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instance-overview/avx-va-instance-overview.ts	(working copy)
@@ -1,15 +1,15 @@
-import {Component, OnInit, ViewChild} from '@angular/core';
-import {SharedModule} from '../../../shared/shared-module';
-import {ActivatedRoute} from '@angular/router';
-import {AvxService} from '../../../services/avx-service';
-import {NotificationService} from '../../../services/notification';
-import {take} from 'rxjs/operators';
-import {MatTableDataSource} from '@angular/material/table';
-import {MatPaginator} from '@angular/material/paginator';
-import {GlobalSerialPipe} from '../../../pipes/global-serial-pipe';
-import {EChartsOption} from 'echarts';
-import {UtilsService} from '../../../services/utils-service';
-import {ChartOptions} from '../../../services/chart-options';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { SharedModule } from '../../../shared/shared-module';
+import { ActivatedRoute } from '@angular/router';
+import { AvxService } from '../../../services/avx-service';
+import { NotificationService } from '../../../services/notification';
+import { take } from 'rxjs/operators';
+import { MatTableDataSource } from '@angular/material/table';
+import { MatPaginator } from '@angular/material/paginator';
+import { GlobalSerialPipe } from '../../../pipes/global-serial-pipe';
+import { EChartsOption } from 'echarts';
+import { UtilsService } from '../../../services/utils-service';
+import { ChartOptions } from '../../../services/chart-options';
 
 @Component({
   selector: 'app-avx-va-instance-overview',
@@ -166,6 +166,11 @@
   chartOption3: EChartsOption = {};
   chartOption4: EChartsOption = {};
 
+  hasData1: boolean = false;
+  hasData2: boolean = false;
+  hasData3: boolean = false;
+  hasData4: boolean = false;
+
   getDeviceStatistics() {
     // ToDo: Integrate with APIs once ready.
     this.updateStatisticsCharts({});
@@ -178,10 +183,17 @@
     let cpu: any = [];
     let memory: any = [];
     let disk: any = [];
+    this.hasData1 = inbound_traffic.length > 0 || outbound_traffic.length > 0;
     this.chartOption1 = this._chartOptions.historicalThroughputChartOptions(inbound_traffic, outbound_traffic);
-    this.chartOption2 = this._chartOptions.plotSingleLineChartOptions({label: 'CPU', unit: 'Percentage'}, cpu)
-    this.chartOption3 = this._chartOptions.plotSingleLineChartOptions({label: 'Memory', unit: 'Percentage'}, memory)
-    this.chartOption4 = this._chartOptions.plotSingleLineChartOptions({label: 'Disk', unit: 'Percentage'}, disk)
+
+    this.hasData2 = cpu.length > 0;
+    this.chartOption2 = this._chartOptions.plotSingleLineChartOptions({ label: 'CPU', unit: 'Percentage' }, cpu)
+
+    this.hasData3 = memory.length > 0;
+    this.chartOption3 = this._chartOptions.plotSingleLineChartOptions({ label: 'Memory', unit: 'Percentage' }, memory)
+
+    this.hasData4 = disk.length > 0;
+    this.chartOption4 = this._chartOptions.plotSingleLineChartOptions({ label: 'Disk', unit: 'Percentage' }, disk)
   }
 
 }
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instances/avx-va-instances.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instances/avx-va-instances.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instances/avx-va-instances.html	(working copy)
@@ -1,12 +1,18 @@
-<mat-card class="page-card-1" appearance="filled">
-  <mat-card-content>
-    <!--  ToDo: implement later with ease of use.  -->
-    <!--    <div class="button-container">-->
-    <!--      <button mat-raised-button (click)="createVAInstance()" matTooltip="Create VA Instance">Create</button>-->
-    <!--    </div>-->
-    <div class="table-container">
-      <div class="mat-elevation-z0">
-        <table mat-table [dataSource]="dataSource">
+<div class="avx-page-container">
+  <!--  Action Bar (Placeholder for future use or if Create button is re-enabled) -->
+  <!-- <div class="action-bar">
+       <button mat-raised-button color="primary" (click)="createVAInstance()" matTooltip="Create VA Instance">
+         <fa-icon [icon]="['fas', 'plus']"></fa-icon> Create
+       </button>
+  </div> -->
+
+  <mat-card class="page-card-1" appearance="outlined">
+    <mat-card-header>
+      <mat-card-title>VA Instances</mat-card-title>
+    </mat-card-header>
+    <mat-card-content>
+      <div class="table-container">
+        <table mat-table [dataSource]="dataSource" class="modern-table">
           <ng-container matColumnDef="serial">
             <th mat-header-cell *matHeaderCellDef>ID</th>
             <td mat-cell *matCellDef="let element; let i = index;"> {{ i | globalSerial }}</td>
@@ -40,62 +46,77 @@
           <ng-container matColumnDef="status">
             <th mat-header-cell *matHeaderCellDef>Status</th>
             <td mat-cell *matCellDef="let element">
-              @if (element.status) {
-                <span class="success-icon">
-                  <fa-icon [icon]="['far', 'check-circle']" matTooltip="Running"></fa-icon> Running
+              <div class="status-cell">
+                @if (element.status) {
+                <span class="status-badge success">
+                  <fa-icon [icon]="['fas', 'check']"></fa-icon> Running
                 </span>
-              } @else {
-                <span class="blue-icon">
-                  <fa-icon [icon]="['far', 'xmark-circle']" matTooltip="Shutdown"></fa-icon> Shutdown
+                } @else {
+                <span class="status-badge error">
+                  <fa-icon [icon]="['fas', 'power-off']"></fa-icon> Shutdown
                 </span>
-              }
+                }
+              </div>
             </td>
           </ng-container>
           <ng-container matColumnDef="action">
             <th mat-header-cell *matHeaderCellDef>Action</th>
             <td mat-cell *matCellDef="let element">
-              <div class="row-action a-link">
+              <div class="row-action">
                 @if (element?.status) {
-                  <fa-icon [icon]="['far', 'stop-circle']" size="lg" matTooltip="Shutdown" class="blue-icon"
-                           (click)="startShutdownVAInstance(element)"></fa-icon>
+                <button mat-icon-button (click)="startShutdownVAInstance(element)" matTooltip="Shutdown">
+                  <fa-icon [icon]="['far', 'circle-stop']" class="delete-icon" size="lg"></fa-icon>
+                </button>
                 } @else {
-                  <fa-icon [icon]="['far', 'play-circle']" size="lg" matTooltip="Start" class="success-icon"
-                           (click)="startShutdownVAInstance(element)"></fa-icon>
+                <button mat-icon-button (click)="startShutdownVAInstance(element)" matTooltip="Start">
+                  <fa-icon [icon]="['far', 'play-circle']" class="success-icon" size="lg"></fa-icon>
+                </button>
                 }
-                @if (element?.product_name.toLowerCase() === 'vapv') {
-                  <fa-icon [icon]="['fas', 'id-badge']" size="lg" matTooltip="Show Instance License"
-                           (click)="showVAInstanceLicense(element)"></fa-icon>
+
+                @if (element?.product_name && element?.product_name.toLowerCase() === 'vapv') {
+                <button mat-icon-button (click)="showVAInstanceLicense(element)" matTooltip="Show Instance License">
+                  <fa-icon [icon]="['fas', 'id-badge']" class="license-icon" size="lg"></fa-icon>
+                </button>
                 } @else {
-                  <fa-icon [icon]="['fas', 'id-badge']" size="lg" class="disabled-icon"
-                           matTooltip="The license status on the VA instance is unknown. Contact the vendor for details."></fa-icon>
+                <button mat-icon-button disabled matTooltip="License status unknown. Contact vendor.">
+                  <fa-icon [icon]="['fas', 'id-badge']" class="disabled-icon" size="lg"></fa-icon>
+                </button>
                 }
-                <fa-icon [icon]="['fas', 'repeat']" size="lg" matTooltip="Create Backup"
-                         (click)="backupVAInstance(element)"></fa-icon>
-                <fa-icon [icon]="['fas', 'terminal']" size="lg" matTooltip="Show VNC Console"
-                         (click)="showVNCConsole(element)"></fa-icon>
+
+                <button mat-icon-button (click)="backupVAInstance(element)" matTooltip="Create Backup">
+                  <fa-icon [icon]="['fas', 'repeat']" class="primary-icon" size="lg"></fa-icon>
+                </button>
+
+                <!-- <button mat-icon-button (click)="showVNCConsole(element)" matTooltip="Show VNC Console">
+                  <fa-icon [icon]="['fas', 'terminal']" class="cli-icon" size="lg"></fa-icon>
+                </button> -->
+
                 @if (element.status) {
-                  <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon disabled-icon"
-                           matTooltip="Instance is Running"></fa-icon>
+                <button mat-icon-button disabled matTooltip="Instance is Running">
+                  <fa-icon [icon]="['far', 'trash-can']" class="disabled-icon" size="lg"></fa-icon>
+                </button>
                 } @else {
-                  <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon" matTooltip="Delete Instance"
-                           (click)="deleteVAInstance(element)"></fa-icon>
+                <button mat-icon-button (click)="deleteVAInstance(element)" matTooltip="Delete Instance">
+                  <fa-icon [icon]="['far', 'trash-can']" class="delete-icon" size="lg"></fa-icon>
+                </button>
                 }
               </div>
             </td>
           </ng-container>
           <tr mat-header-row *matHeaderRowDef="dataColumns"></tr>
           <tr mat-row *matRowDef="let row; columns: dataColumns;"></tr>
-          <tr class="mat-row table-no-data" *matNoDataRow>
-            <td class="mat-cell" colspan="11">No results found.</td>
+          <tr class="mat-row" *matNoDataRow>
+            <td class="mat-cell no-data-cell" colspan="11">
+              <div class="no-data-content">
+                <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                <span>No data available</span>
+              </div>
+            </td>
           </tr>
         </table>
-        <mat-paginator
-          [length]="totalRecords"
-          [pageSize]="10"
-          [pageSizeOptions]="[10, 20, 50]"
-        >
+        <mat-paginator [length]="totalRecords" [pageSize]="10" [pageSizeOptions]="[10, 20, 50]">
         </mat-paginator>
       </div>
-    </div>
-  </mat-card-content>
-</mat-card>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instances/avx-va-instances.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instances/avx-va-instances.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instances/avx-va-instances.scss	(working copy)
@@ -0,0 +1,179 @@
+// Page Container
+.avx-page-container {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    padding: 16px;
+    background-color: transparent;
+}
+
+// Action Bar
+.action-bar {
+    display: flex;
+    justify-content: flex-end;
+
+    button {
+        font-weight: 500;
+    }
+}
+
+// Card Styles
+.page-card-1 {
+    width: 100%;
+    border-radius: 8px;
+    background-color: var(--surface-bg); // Theme-aware
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+
+    mat-card-header {
+        background-color: transparent;
+        border-bottom: 1px solid var(--border-color);
+        padding: 16px;
+
+        mat-card-title {
+            font-size: 16px;
+            font-weight: 600;
+            color: var(--primary-color);
+        }
+    }
+
+    mat-card-content {
+        padding: 0;
+    }
+}
+
+// Modern Table Styles
+.modern-table {
+    width: 100%;
+
+    th.mat-header-cell {
+        font-size: 13px;
+        font-weight: 600;
+        color: var(--text-secondary);
+        background-color: var(--table-header-bg);
+        border-bottom: 1px solid var(--border-color);
+        padding: 16px;
+    }
+
+    td.mat-cell {
+        font-size: 13px;
+        color: var(--text-primary);
+        padding: 12px 16px;
+        border-bottom: 1px solid var(--border-color);
+    }
+
+    tr.mat-row:hover {
+        background-color: var(--table-hover);
+    }
+
+    // Link styling
+    .details-page-link {
+        color: var(--primary-color);
+        font-weight: 500;
+        cursor: pointer;
+        text-decoration: none;
+
+        &:hover {
+            text-decoration: underline;
+        }
+    }
+}
+
+// Status Badges
+.status-cell {
+    display: flex;
+    align-items: center;
+}
+
+.status-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    padding: 4px 10px;
+    border-radius: 16px;
+    font-size: 12px;
+    font-weight: 500;
+
+    &.success {
+        // Fallback for light mode, but overridden by host-context or specific dark mode logic if needed
+        background-color: #e8f5e9;
+        color: #2e7d32;
+        border: 1px solid transparent; // Preparation for dark mode border
+    }
+
+    &.error {
+        background-color: #ffebee;
+        color: #c62828;
+        border: 1px solid transparent;
+    }
+}
+
+// Dark Mode Support for Badges
+:host-context(.dark-theme) {
+    .status-badge {
+        background-color: transparent !important;
+
+        &.success {
+            color: var(--success-color);
+            border: 1px solid var(--success-color);
+        }
+
+        &.error {
+            color: var(--warn-color);
+            border: 1px solid var(--warn-color);
+        }
+    }
+}
+
+
+// Action Buttons
+// Action Buttons
+// Action Buttons
+.row-action {
+    display: flex;
+    gap: 12px;
+    align-items: center;
+
+    button,
+    a {
+        background-color: transparent;
+    }
+}
+
+// Semantic Icon Classes
+.delete-icon {
+    color: var(--warn-color);
+    font-size: 16px;
+}
+
+.success-icon {
+    color: var(--success-color);
+    font-size: 16px;
+}
+
+.license-icon {
+    color: var(--text-secondary);
+}
+
+.webui-icon {
+    color: var(--primary-color);
+}
+
+.cli-icon {
+    color: var(--text-secondary);
+}
+
+.save-icon {
+    color: var(--success-color);
+}
+
+.primary-icon {
+    color: var(--primary-color);
+}
+
+// No data row
+.table-no-data {
+    text-align: center;
+    font-style: italic;
+    color: var(--text-secondary);
+    height: 48px;
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instances/avx-va-instances.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instances/avx-va-instances.ts	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instances/avx-va-instances.ts	(working copy)
@@ -1,17 +1,17 @@
-import {Component, inject, OnInit, ViewChild} from '@angular/core';
-import {SharedModule} from '../../../shared/shared-module';
-import {MatTableDataSource} from '@angular/material/table';
-import {MatPaginator} from '@angular/material/paginator';
-import {MAT_DIALOG_DATA, MatDialog, MatDialogConfig, MatDialogRef} from '@angular/material/dialog';
-import {AvxService} from '../../../services/avx-service';
-import {NotificationService} from '../../../services/notification';
-import {Confirmation} from '../../../services/confirmation';
-import {take} from 'rxjs/operators';
-import {GlobalSerialPipe} from '../../../pipes/global-serial-pipe';
-import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {CreateAVXVABackupDialog} from '../avx-va-backup/avx-va-backup';
-import {UtilsService} from '../../../services/utils-service';
-import {Router} from '@angular/router';
+import { Component, inject, OnInit, ViewChild } from '@angular/core';
+import { SharedModule } from '../../../shared/shared-module';
+import { MatTableDataSource } from '@angular/material/table';
+import { MatPaginator } from '@angular/material/paginator';
+import { MAT_DIALOG_DATA, MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dialog';
+import { AvxService } from '../../../services/avx-service';
+import { NotificationService } from '../../../services/notification';
+import { Confirmation } from '../../../services/confirmation';
+import { take } from 'rxjs/operators';
+import { GlobalSerialPipe } from '../../../pipes/global-serial-pipe';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { CreateAVXVABackupDialog } from '../avx-va-backup/avx-va-backup';
+import { UtilsService } from '../../../services/utils-service';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-avx-va-instances',
@@ -138,20 +138,20 @@
       if (result) {
         this._avx.updateAVXInstancePowerStatus(_instance.avx_id, _instance?.va_name, !_instance.status)
           .pipe(take(1)).subscribe({
-          next: (result: any) => {
-            if (result && result.length > 0) {
-              if (result[0]) {
-                this._notification.showSuccess(`Successfully initiated ${operation}, Please wait for a few seconds.`);
-              } else {
-                this._notification.showError(`Failed to initiate ${operation}.`);
+            next: (result: any) => {
+              if (result && result.length > 0) {
+                if (result[0]) {
+                  this._notification.showSuccess(`Successfully initiated ${operation}, Please wait for a few seconds.`);
+                } else {
+                  this._notification.showError(`Failed to initiate ${operation}. (${result[1]})`);
+                }
               }
+            },
+            error: error => {
+              this._notification.showError(`Error: ${error?.message}`);
+              console.log(error);
             }
-          },
-          error: error => {
-            this._notification.showError(`Error: ${error?.message}`);
-            console.log(error);
-          }
-        });
+          });
       }
     });
   }
@@ -174,7 +174,7 @@
       deviceId: _instance?.avx_id,
       instanceName: _instance?.va_name,
       avxInstances: [_instance],
-      devices: [{id: _instance?.avx_id, name: _instance?.avx_name}],
+      devices: [{ id: _instance?.avx_id, name: _instance?.avx_name }],
     }
     const dialogRef = this.dialog.open(CreateAVXVABackupDialog, this.dialogConfig);
     dialogRef.afterClosed().subscribe(isAdded => {
@@ -201,20 +201,20 @@
       if (result) {
         this._avx.deleteVAInstance(_instance.avx_id, _instance?.va_name)
           .pipe(take(1)).subscribe({
-          next: (result: any) => {
-            if (result && result.length > 0) {
-              if (result[0]) {
-                this._notification.showSuccess(`The instance has been deleted successfully.`);
-              } else {
-                this._notification.showError(`Failed to delete instance ${instanceName}.`);
+            next: (result: any) => {
+              if (result && result.length > 0) {
+                if (result[0]) {
+                  this._notification.showSuccess(`The instance has been deleted successfully.`);
+                } else {
+                  this._notification.showError(`Failed to delete instance ${instanceName}.`);
+                }
               }
+            },
+            error: error => {
+              this._notification.showError(`Error: ${error?.message}`);
+              console.log(error);
             }
-          },
-          error: error => {
-            this._notification.showError(`Error: ${error?.message}`);
-            console.log(error);
-          }
-        });
+          });
       }
     });
   }
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/dashboard-system-insights/enlarge-system-devices.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/dashboard-system-insights/enlarge-system-devices.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/dashboard-system-insights/enlarge-system-devices.html	(working copy)
@@ -3,45 +3,50 @@
 <mat-dialog-content>
   <div class="dialog-charts-wrapper">
     @if (deviceStats?.total?.disconnected === 0) {
-      <div class="center">
-        <p>All devices are connected.</p>
-      </div>
+    <div class="center">
+      <p>All devices are connected.</p>
+    </div>
     } @else {
-      <mat-card class="page-card-1" appearance="filled">
-        <mat-card-content>
-          <div class="table-container">
-            <div class="mat-elevation-z0">
-              <table mat-table [dataSource]="deviceStatusDataSource">
-                <ng-container matColumnDef="serial">
-                  <th mat-header-cell *matHeaderCellDef>ID</th>
-                  <td mat-cell *matCellDef="let element; let i = index;"> {{ i | globalSerial }}</td>
-                </ng-container>
-                <ng-container matColumnDef="deviceName">
-                  <th mat-header-cell *matHeaderCellDef>Device Name</th>
-                  <td mat-cell *matCellDef="let element">
-                    <a class="details-page-link" (click)="navigateToDevice(element)">
-                      {{ element?.name }}
-                    </a>
-                  </td>
-                </ng-container>
-                <ng-container matColumnDef="deviceGroup">
-                  <th mat-header-cell *matHeaderCellDef>Model</th>
-                  <td mat-cell *matCellDef="let element">{{ element?.model }}</td>
-                </ng-container>
-                <ng-container matColumnDef="ip">
-                  <th mat-header-cell *matHeaderCellDef>IP Address</th>
-                  <td mat-cell *matCellDef="let element">{{ element?.ip }}</td>
-                </ng-container>
-                <tr mat-header-row *matHeaderRowDef="deviceStatusColumns"></tr>
-                <tr mat-row *matRowDef="let row; columns: deviceStatusColumns;"></tr>
-                <tr class="mat-row table-no-data" *matNoDataRow>
-                  <td class="mat-cell" colspan="11">No results found.</td>
-                </tr>
-              </table>
-            </div>
+    <mat-card class="page-card-1" appearance="filled">
+      <mat-card-content>
+        <div class="table-container">
+          <div class="mat-elevation-z0">
+            <table mat-table [dataSource]="deviceStatusDataSource">
+              <ng-container matColumnDef="serial">
+                <th mat-header-cell *matHeaderCellDef>ID</th>
+                <td mat-cell *matCellDef="let element; let i = index;"> {{ i | globalSerial }}</td>
+              </ng-container>
+              <ng-container matColumnDef="deviceName">
+                <th mat-header-cell *matHeaderCellDef>Device Name</th>
+                <td mat-cell *matCellDef="let element">
+                  <a class="details-page-link" (click)="navigateToDevice(element)">
+                    {{ element?.name }}
+                  </a>
+                </td>
+              </ng-container>
+              <ng-container matColumnDef="deviceGroup">
+                <th mat-header-cell *matHeaderCellDef>Model</th>
+                <td mat-cell *matCellDef="let element">{{ element?.model }}</td>
+              </ng-container>
+              <ng-container matColumnDef="ip">
+                <th mat-header-cell *matHeaderCellDef>IP Address</th>
+                <td mat-cell *matCellDef="let element">{{ element?.ip }}</td>
+              </ng-container>
+              <tr mat-header-row *matHeaderRowDef="deviceStatusColumns"></tr>
+              <tr mat-row *matRowDef="let row; columns: deviceStatusColumns;"></tr>
+              <tr class="mat-row" *matNoDataRow>
+                <td class="mat-cell no-data-cell" colspan="11">
+                  <div class="no-data-content">
+                    <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                    <span>No data available</span>
+                  </div>
+                </td>
+              </tr>
+            </table>
           </div>
-        </mat-card-content>
-      </mat-card>
+        </div>
+      </mat-card-content>
+    </mat-card>
     }
   </div>
 </mat-dialog-content>
@@ -71,4 +76,4 @@
   mat-card-title {
     font-size: medium;
   }
-</style>
+</style>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/devices/devices.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/devices/devices.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/devices/devices.html	(working copy)
@@ -61,11 +61,15 @@
         <ng-container matColumnDef="status">
           <th mat-header-cell *matHeaderCellDef class="action-header"> Status</th>
           <td mat-cell *matCellDef="let element">
-            <div class="row-action a-link">
+            <div class="status-cell">
               @if (element.connection) {
-              <fa-icon [icon]="['far', 'check-circle']" class="success-icon"></fa-icon>
+              <span class="status-badge success">
+                <fa-icon [icon]="['fas', 'check']"></fa-icon> Connected
+              </span>
               } @else {
-              <fa-icon [icon]="['far', 'xmark-circle']" class="delete-icon"></fa-icon>
+              <span class="status-badge error">
+                <fa-icon [icon]="['fas', 'power-off']"></fa-icon> Disconnected
+              </span>
               }
             </div>
           </td>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/devices/devices.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/devices/devices.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/devices/devices.scss	(working copy)
@@ -140,6 +140,51 @@
   width: 10%;
 }
 
+// Status Badges
+.status-cell {
+  display: flex;
+  align-items: center;
+}
+
+.status-badge {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 4px 10px;
+  border-radius: 16px;
+  font-size: 12px;
+  font-weight: 500;
+
+  &.success {
+    background-color: #e8f5e9;
+    color: #2e7d32;
+    border: 1px solid transparent;
+  }
+
+  &.error {
+    background-color: #ffebee;
+    color: #c62828;
+    border: 1px solid transparent;
+  }
+}
+
+// Dark Mode Support for Badges
+:host-context(.dark-theme) {
+  .status-badge {
+    background-color: transparent !important;
+
+    &.success {
+      color: var(--success-color);
+      border: 1px solid var(--success-color);
+    }
+
+    &.error {
+      color: var(--warn-color);
+      border: 1px solid var(--warn-color);
+    }
+  }
+}
+
 .mat-mdc-form-field {
   font-size: 14px;
   width: 100%;
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/operation-logs/operation-logs.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/operation-logs/operation-logs.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/operation-logs/operation-logs.html	(working copy)
@@ -82,8 +82,13 @@
         </ng-container>
         <tr mat-header-row *matHeaderRowDef="logColumns"></tr>
         <tr mat-row *matRowDef="let row; columns: logColumns;"></tr>
-        <tr class="mat-row table-no-data" *matNoDataRow>
-          <td class="mat-cell" colspan="8">No results found.</td>
+        <tr class="mat-row" *matNoDataRow>
+          <td class="mat-cell no-data-cell" colspan="8">
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
+          </td>
         </tr>
       </table>
       <mat-paginator [pageSizeOptions]="[10, 15, 20, 25]" [pageSize]="reqPayload.number" [length]="totalRecords"
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/reports-overview/reports-overview.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/reports-overview/reports-overview.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/reports-overview/reports-overview.html	(working copy)
@@ -34,9 +34,14 @@
       </ng-container>
       <tr mat-header-row *matHeaderRowDef="reportsColumns"></tr>
       <tr mat-row *matRowDef="let row; columns: reportsColumns;"></tr>
-      <tr class="mat-row table-no-data" *matNoDataRow>
-        <td class="mat-cell" colspan="6">No results found.</td>
+      <tr class="mat-row" *matNoDataRow>
+        <td class="mat-cell no-data-cell" colspan="6">
+          <div class="no-data-content">
+            <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+            <span>No data available</span>
+          </div>
+        </td>
       </tr>
     </table>
   </div>
-</div>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-devices/resource-monitoring-devices.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-devices/resource-monitoring-devices.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-devices/resource-monitoring-devices.html	(working copy)
@@ -27,15 +27,17 @@
         <ng-container matColumnDef="status">
           <th mat-header-cell *matHeaderCellDef>Monitor Status</th>
           <td mat-cell *matCellDef="let element">
-            @if (element?.snmp_general?.snmp_enable) {
-            <span class="success-icon">
-              <fa-icon [icon]="['far', 'check-circle']" matTooltip="Monitoring(SNMP) Enabled"></fa-icon>
-            </span>
-            } @else {
-            <span class="blue-icon">
-              <fa-icon [icon]="['far', 'xmark-circle']" matTooltip="Monitoring(SNMP) Disabled"></fa-icon>
-            </span>
-            }
+            <div class="status-cell">
+              @if (element?.snmp_general?.snmp_enable) {
+              <span class="status-badge success">
+                <fa-icon [icon]="['fas', 'check']"></fa-icon> Enabled
+              </span>
+              } @else {
+              <span class="status-badge error">
+                <fa-icon [icon]="['fas', 'power-off']"></fa-icon> Disabled
+              </span>
+              }
+            </div>
           </td>
         </ng-container>
         <ng-container matColumnDef="stats">
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-devices/resource-monitoring-devices.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-devices/resource-monitoring-devices.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-devices/resource-monitoring-devices.scss	(working copy)
@@ -101,4 +101,49 @@
     min-width: 30px;
     text-align: right;
   }
+}
+
+// Status Badges
+.status-cell {
+  display: flex;
+  align-items: center;
+}
+
+.status-badge {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 4px 10px;
+  border-radius: 16px;
+  font-size: 12px;
+  font-weight: 500;
+
+  &.success {
+    background-color: #e8f5e9;
+    color: #2e7d32;
+    border: 1px solid transparent;
+  }
+
+  &.error {
+    background-color: #ffebee;
+    color: #c62828;
+    border: 1px solid transparent;
+  }
+}
+
+// Dark Mode Support for Badges
+:host-context(.dark-theme) {
+  .status-badge {
+    background-color: transparent !important;
+
+    &.success {
+      color: var(--success-color);
+      border: 1px solid var(--success-color);
+    }
+
+    &.error {
+      color: var(--warn-color);
+      border: 1px solid var(--warn-color);
+    }
+  }
 }
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-llb/resource-monitoring-llb.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-llb/resource-monitoring-llb.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-llb/resource-monitoring-llb.html	(working copy)
@@ -23,15 +23,17 @@
         <ng-container matColumnDef="healthStatus">
           <th mat-header-cell *matHeaderCellDef>Health Status</th>
           <td mat-cell *matCellDef="let element">
-            @if (element?.link_status) {
-            <span class="success-icon">
-              <fa-icon [icon]="['far', 'check-circle']" matTooltip="Link is Up"></fa-icon>
-            </span>
-            } @else {
-            <span class="blue-icon">
-              <fa-icon [icon]="['far', 'xmark-circle']" matTooltip="Link is Down"></fa-icon>
-            </span>
-            }
+            <div class="status-cell">
+              @if (element?.link_status) {
+              <span class="status-badge success">
+                <fa-icon [icon]="['fas', 'check']"></fa-icon> Link Up
+              </span>
+              } @else {
+              <span class="status-badge error">
+                <fa-icon [icon]="['fas', 'power-off']"></fa-icon> Link Down
+              </span>
+              }
+            </div>
           </td>
         </ng-container>
         <ng-container matColumnDef="deviceName">
@@ -61,8 +63,13 @@
         </ng-container>
         <tr mat-header-row *matHeaderRowDef="dataColumns; sticky: true"></tr>
         <tr mat-row *matRowDef="let row; columns: dataColumns;"></tr>
-        <tr class="mat-row table-no-data" *matNoDataRow>
-          <td class="mat-cell" colspan="11">No results found.</td>
+        <tr class="mat-row" *matNoDataRow>
+          <td class="mat-cell no-data-cell" colspan="11">
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
+          </td>
         </tr>
       </table>
     </div>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-llb/resource-monitoring-llb.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-llb/resource-monitoring-llb.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-llb/resource-monitoring-llb.scss	(working copy)
@@ -97,4 +97,49 @@
             margin-right: 4px;
         }
     }
+}
+
+// Status Badges
+.status-cell {
+    display: flex;
+    align-items: center;
+}
+
+.status-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    padding: 4px 10px;
+    border-radius: 16px;
+    font-size: 12px;
+    font-weight: 500;
+
+    &.success {
+        background-color: #e8f5e9;
+        color: #2e7d32;
+        border: 1px solid transparent;
+    }
+
+    &.error {
+        background-color: #ffebee;
+        color: #c62828;
+        border: 1px solid transparent;
+    }
+}
+
+// Dark Mode Support for Badges
+:host-context(.dark-theme) {
+    .status-badge {
+        background-color: transparent !important;
+
+        &.success {
+            color: var(--success-color);
+            border: 1px solid var(--success-color);
+        }
+
+        &.error {
+            color: var(--warn-color);
+            border: 1px solid var(--warn-color);
+        }
+    }
 }
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-slb-real/resource-monitoring-slb-real.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-slb-real/resource-monitoring-slb-real.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-slb-real/resource-monitoring-slb-real.html	(working copy)
@@ -23,15 +23,17 @@
         <ng-container matColumnDef="healthStatus">
           <th mat-header-cell *matHeaderCellDef>Health Status</th>
           <td mat-cell *matCellDef="let element">
-            @if (element?.snmp_general?.snmp_enable) {
-            <span class="success-icon">
-              <fa-icon [icon]="['far', 'check-circle']" matTooltip="SNMP Enabled"></fa-icon>
-            </span>
-            } @else {
-            <span class="blue-icon">
-              <fa-icon [icon]="['far', 'xmark-circle']" matTooltip="SNMP Disabled"></fa-icon>
-            </span>
-            }
+            <div class="status-cell">
+              @if (element?.snmp_general?.snmp_enable) {
+              <span class="status-badge success">
+                <fa-icon [icon]="['fas', 'check']"></fa-icon> Enabled
+              </span>
+              } @else {
+              <span class="status-badge error">
+                <fa-icon [icon]="['fas', 'power-off']"></fa-icon> Disabled
+              </span>
+              }
+            </div>
           </td>
         </ng-container>
         <ng-container matColumnDef="deviceName">
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-slb-real/resource-monitoring-slb-real.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-slb-real/resource-monitoring-slb-real.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-slb-real/resource-monitoring-slb-real.scss	(working copy)
@@ -97,4 +97,49 @@
             margin-right: 4px;
         }
     }
+}
+
+// Status Badges
+.status-cell {
+    display: flex;
+    align-items: center;
+}
+
+.status-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    padding: 4px 10px;
+    border-radius: 16px;
+    font-size: 12px;
+    font-weight: 500;
+
+    &.success {
+        background-color: #e8f5e9;
+        color: #2e7d32;
+        border: 1px solid transparent;
+    }
+
+    &.error {
+        background-color: #ffebee;
+        color: #c62828;
+        border: 1px solid transparent;
+    }
+}
+
+// Dark Mode Support for Badges
+:host-context(.dark-theme) {
+    .status-badge {
+        background-color: transparent !important;
+
+        &.success {
+            color: var(--success-color);
+            border: 1px solid var(--success-color);
+        }
+
+        &.error {
+            color: var(--warn-color);
+            border: 1px solid var(--warn-color);
+        }
+    }
 }
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-slb-virtual/resource-monitoring-slb-virtual.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-slb-virtual/resource-monitoring-slb-virtual.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-slb-virtual/resource-monitoring-slb-virtual.html	(working copy)
@@ -23,15 +23,17 @@
         <ng-container matColumnDef="healthStatus">
           <th mat-header-cell *matHeaderCellDef>Health Status</th>
           <td mat-cell *matCellDef="let element">
-            @if (element?.health_status) {
-            <span class="success-icon">
-              <fa-icon [icon]="['far', 'check-circle']" matTooltip="Active"></fa-icon>
-            </span>
-            } @else {
-            <span class="blue-icon">
-              <fa-icon [icon]="['far', 'xmark-circle']" matTooltip="Inactive"></fa-icon>
-            </span>
-            }
+            <div class="status-cell">
+              @if (element?.health_status) {
+              <span class="status-badge success">
+                <fa-icon [icon]="['fas', 'check']"></fa-icon> Active
+              </span>
+              } @else {
+              <span class="status-badge error">
+                <fa-icon [icon]="['fas', 'power-off']"></fa-icon> Inactive
+              </span>
+              }
+            </div>
           </td>
         </ng-container>
         <ng-container matColumnDef="deviceName">
@@ -67,8 +69,13 @@
         </ng-container>
         <tr mat-header-row *matHeaderRowDef="dataColumns; sticky: true"></tr>
         <tr mat-row *matRowDef="let row; columns: dataColumns;"></tr>
-        <tr class="mat-row table-no-data" *matNoDataRow>
-          <td class="mat-cell" colspan="11">No results found.</td>
+        <tr class="mat-row" *matNoDataRow>
+          <td class="mat-cell no-data-cell" colspan="11">
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
+          </td>
         </tr>
       </table>
     </div>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-slb-virtual/resource-monitoring-slb-virtual.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-slb-virtual/resource-monitoring-slb-virtual.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-slb-virtual/resource-monitoring-slb-virtual.scss	(working copy)
@@ -97,4 +97,49 @@
             margin-right: 4px;
         }
     }
+}
+
+// Status Badges
+.status-cell {
+    display: flex;
+    align-items: center;
+}
+
+.status-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    padding: 4px 10px;
+    border-radius: 16px;
+    font-size: 12px;
+    font-weight: 500;
+
+    &.success {
+        background-color: #e8f5e9;
+        color: #2e7d32;
+        border: 1px solid transparent;
+    }
+
+    &.error {
+        background-color: #ffebee;
+        color: #c62828;
+        border: 1px solid transparent;
+    }
+}
+
+// Dark Mode Support for Badges
+:host-context(.dark-theme) {
+    .status-badge {
+        background-color: transparent !important;
+
+        &.success {
+            color: var(--success-color);
+            border: 1px solid var(--success-color);
+        }
+
+        &.error {
+            color: var(--warn-color);
+            border: 1px solid var(--warn-color);
+        }
+    }
 }
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/role-management/role-management.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/role-management/role-management.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/role-management/role-management.html	(working copy)
@@ -33,8 +33,13 @@
         </ng-container>
         <tr mat-header-row *matHeaderRowDef="roleColumns"></tr>
         <tr mat-row *matRowDef="let row; columns: roleColumns;"></tr>
-        <tr class="mat-row table-no-data" *matNoDataRow>
-          <td class="mat-cell" colspan="8">No results found.</td>
+        <tr class="mat-row" *matNoDataRow>
+          <td class="mat-cell no-data-cell" colspan="8">
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
+          </td>
         </tr>
       </table>
       <mat-paginator [pageSizeOptions]="[10, 15, 20, 25]" [length]="totalRecords" showFirstLastButtons></mat-paginator>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/storage-log-location/storage-log-location.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/storage-log-location/storage-log-location.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/storage-log-location/storage-log-location.html	(working copy)
@@ -58,8 +58,13 @@
           </ng-container>
           <tr mat-header-row *matHeaderRowDef="storageColumns"></tr>
           <tr mat-row *matRowDef="let row; columns: storageColumns;"></tr>
-          <tr class="mat-row table-no-data" *matNoDataRow>
-            <td class="mat-cell" colspan="4">No results found.</td>
+          <tr class="mat-row" *matNoDataRow>
+            <td class="mat-cell no-data-cell" colspan="4">
+              <div class="no-data-content">
+                <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                <span>No data available</span>
+              </div>
+            </td>
           </tr>
         </table>
       </div>
@@ -91,8 +96,13 @@
           </ng-container>
           <tr mat-header-row *matHeaderRowDef="archivedLogsColumns"></tr>
           <tr mat-row *matRowDef="let row; columns: archivedLogsColumns;"></tr>
-          <tr class="mat-row table-no-data" *matNoDataRow>
-            <td class="mat-cell" colspan="3">No results found.</td>
+          <tr class="mat-row" *matNoDataRow>
+            <td class="mat-cell no-data-cell" colspan="3">
+              <div class="no-data-content">
+                <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                <span>No data available</span>
+              </div>
+            </td>
           </tr>
         </table>
       </div>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/system-backup-restore/system-backup-restore.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/system-backup-restore/system-backup-restore.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/system-backup-restore/system-backup-restore.html	(working copy)
@@ -33,26 +33,28 @@
           <td mat-cell *matCellDef="let element">
             <div class="row-action a-link">
               @if (element?.status === 'Completed') {
-                <a [href]="'/api/backup/download?filename=' + element?.filename"
-                   [download]="element?.filename"
-                   target="_blank"
-                   rel="noopener">
-                  <fa-icon [icon]="['far', 'circle-down']" size="lg" matTooltip="Download Backup"></fa-icon>
-                </a>
+              <a [href]="'/api/backup/download?filename=' + element?.filename" [download]="element?.filename"
+                target="_blank" rel="noopener">
+                <fa-icon [icon]="['far', 'circle-down']" size="lg" matTooltip="Download Backup"></fa-icon>
+              </a>
               } @else {
-                <fa-icon [icon]="['far', 'circle-down']" size="lg"
-                         [ngClass]="{'disabled-icon': element?.status !== 'Completed'}"
-                         matTooltip="Download Backup"></fa-icon>
+              <fa-icon [icon]="['far', 'circle-down']" size="lg"
+                [ngClass]="{'disabled-icon': element?.status !== 'Completed'}" matTooltip="Download Backup"></fa-icon>
               }
-              <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon"
-                       matTooltip="Delete Backup" (click)="deleteBackup(element)"></fa-icon>
+              <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon" matTooltip="Delete Backup"
+                (click)="deleteBackup(element)"></fa-icon>
             </div>
           </td>
         </ng-container>
         <tr mat-header-row *matHeaderRowDef="backupColumns"></tr>
         <tr mat-row *matRowDef="let row; columns: backupColumns;"></tr>
-        <tr class="mat-row table-no-data" *matNoDataRow>
-          <td class="mat-cell" colspan="4">No results found.</td>
+        <tr class="mat-row" *matNoDataRow>
+          <td class="mat-cell no-data-cell" colspan="4">
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
+          </td>
         </tr>
       </table>
       <mat-paginator [pageSizeOptions]="[5, 10, 20]" showFirstLastButtons></mat-paginator>
@@ -66,7 +68,7 @@
   <mat-card-content>
     <div class="button-container">
       <button mat-raised-button (click)="addBackupSchedule()" [disabled]="scheduledBackupDatasource.data.length > 0"
-              matTooltip="Create Schedule">Create
+        matTooltip="Create Schedule">Create
       </button>
     </div>
     <div class="table-container">
@@ -84,10 +86,10 @@
           <td mat-cell *matCellDef="let element">
             Frequency : {{ element?.frequency | titlecase }},
             @if (element.day_of_the_month != null) {
-              <span>Day of Month: {{ element.day_of_the_month }},</span>
+            <span>Day of Month: {{ element.day_of_the_month }},</span>
             }
             @if (element.day_of_the_week != null) {
-              <span>Day of Week: {{ daysOfWeek[element.day_of_the_week] }},</span>
+            <span>Day of Week: {{ daysOfWeek[element.day_of_the_week] }},</span>
             }
             Time : {{ element.time }}
           </td>
@@ -96,12 +98,10 @@
           <th mat-header-cell *matHeaderCellDef class="action-header w-10"> Action</th>
           <td mat-cell *matCellDef="let element">
             <div class="row-action a-link">
-              <fa-icon [icon]="['far', 'edit']" size="lg"
-                       matTooltip="Edit Schedule"
-                       (click)="editBackupSchedule(element)"></fa-icon>
-              <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon"
-                       matTooltip="Delete Schedule"
-                       (click)="deleteBackupSchedule(element)"></fa-icon>
+              <fa-icon [icon]="['far', 'edit']" size="lg" matTooltip="Edit Schedule"
+                (click)="editBackupSchedule(element)"></fa-icon>
+              <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon" matTooltip="Delete Schedule"
+                (click)="deleteBackupSchedule(element)"></fa-icon>
             </div>
           </td>
         </ng-container>
@@ -129,4 +129,4 @@
       <p><b>Note: </b>The restore process will substitute your current information with the backup data.</p>
     </div>
   </mat-card-content>
-</mat-card>
+</mat-card>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/system-time/system-time.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/system-time/system-time.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/system-time/system-time.html	(working copy)
@@ -5,58 +5,42 @@
         <div class="tab-content">
           <mat-card class="page-card-1" appearance="filled">
             <mat-card-content>
-              <form
-                (ngSubmit)="updateSystemDateTime()"
-                [formGroup]="dateTimeForm"
-                class="system-datetime-form"
-              >
+              <form (ngSubmit)="updateSystemDateTime()" [formGroup]="dateTimeForm" class="system-datetime-form">
                 <div class="form-field-wrapper">
                   <label for="systemDate" class="form-label">System Date *</label>
                   <mat-form-field appearance="outline" subscriptSizing="dynamic">
-                    <input
-                      id="systemDate"
-                      formControlName="systemDate"
-                      matInput
-                      placeholder="System Date"
-                      [matDatepicker]="datePicker"
-                    />
-                    <mat-datepicker-toggle matIconSuffix [for]="datePicker"/>
-                    <mat-datepicker #datePicker/>
+                    <input id="systemDate" formControlName="systemDate" matInput placeholder="System Date"
+                      [matDatepicker]="datePicker" />
+                    <mat-datepicker-toggle matIconSuffix [for]="datePicker" />
+                    <mat-datepicker #datePicker />
                     <mat-hint>MM/DD/YYYY</mat-hint>
                     @if (dateTimeForm.get('systemDate')?.invalid && dateTimeForm.get('systemDate')?.touched) {
-                      <mat-error>
-                        @if (dateTimeForm.get('systemDate')?.errors?.['required']) {
-                          Date is required.
-                        } @else {
-                          Invalid date format (Expected: MM/DD/YYYY).
-                        }
-                      </mat-error>
+                    <mat-error>
+                      @if (dateTimeForm.get('systemDate')?.errors?.['required']) {
+                      Date is required.
+                      } @else {
+                      Invalid date format (Expected: MM/DD/YYYY).
+                      }
+                    </mat-error>
                     }
                   </mat-form-field>
                 </div>
                 <div class="form-field-wrapper">
                   <label for="systemTime" class="form-label">System Time *</label>
                   <mat-form-field appearance="outline" subscriptSizing="dynamic">
-                    <input
-                      id="systemTime"
-                      formControlName="systemTime"
-                      matInput
-                      placeholder="System Time"
-                      [matTimepicker]="timePicker"
-                      matTimepickerMin="00:00"
-                      matTimepickerMax="23:59"
-                    />
-                    <mat-timepicker-toggle matIconSuffix [for]="timePicker"/>
-                    <mat-timepicker #timePicker/>
+                    <input id="systemTime" formControlName="systemTime" matInput placeholder="System Time"
+                      [matTimepicker]="timePicker" matTimepickerMin="00:00" matTimepickerMax="23:59" />
+                    <mat-timepicker-toggle matIconSuffix [for]="timePicker" />
+                    <mat-timepicker #timePicker />
                     <mat-hint>12:00 PM</mat-hint>
                     @if (dateTimeForm.get('systemTime')?.invalid && dateTimeForm.get('systemTime')?.touched) {
-                      <mat-error>
-                        @if (dateTimeForm.get('systemTime')?.errors?.['required']) {
-                          Time is required.
-                        } @else {
-                          Invalid time format (Expected: HH:MM AM/PM).
-                        }
-                      </mat-error>
+                    <mat-error>
+                      @if (dateTimeForm.get('systemTime')?.errors?.['required']) {
+                      Time is required.
+                      } @else {
+                      Invalid time format (Expected: HH:MM AM/PM).
+                      }
+                    </mat-error>
                     }
                   </mat-form-field>
                 </div>
@@ -66,47 +50,44 @@
                     <mat-label>Continent/Main Zone</mat-label>
                     <mat-select formControlName="selectedParent" id="systemTimezone">
                       @for (parent of parentTimezones; track parent.name) {
-                        <mat-option [value]="parent.name"> {{ parent.name }}</mat-option>
+                      <mat-option [value]="parent.name"> {{ parent.name }}</mat-option>
                       }
                     </mat-select>
                     <!--          <mat-error *ngIf="hasError('selectedParent', 'required')">Please select a parent zone</mat-error>-->
                   </mat-form-field>
                   <!--      </div>-->
                   @if (childTimezones.length > 0) {
-                    <!--        <div class="form-field-wrapper">-->
-                      <!--          <label class="form-label"></label>-->
-                    <mat-form-field appearance="outline" subscriptSizing="dynamic">
-                      <mat-label>Country/Region</mat-label>
-                      <mat-select formControlName="selectedChild">
-                        @for (child of childTimezones; track child.name) {
-                          <mat-option [value]="child.name"> {{ child.name }}</mat-option>
-                        }
-                      </mat-select>
-                      <!--          <mat-error *ngIf="hasError('selectedChild', 'required')">Please select a country/region</mat-error>-->
-                    </mat-form-field>
-                    <!--        </div>-->
+                  <!--        <div class="form-field-wrapper">-->
+                  <!--          <label class="form-label"></label>-->
+                  <mat-form-field appearance="outline" subscriptSizing="dynamic">
+                    <mat-label>Country/Region</mat-label>
+                    <mat-select formControlName="selectedChild">
+                      @for (child of childTimezones; track child.name) {
+                      <mat-option [value]="child.name"> {{ child.name }}</mat-option>
+                      }
+                    </mat-select>
+                    <!--          <mat-error *ngIf="hasError('selectedChild', 'required')">Please select a country/region</mat-error>-->
+                  </mat-form-field>
+                  <!--        </div>-->
                   }
 
                   @if (grandchildTimezones.length > 0) {
-                    <!--        <div class="form-field-wrapper">-->
-                      <!--          <label class="form-label"></label>-->
-                    <mat-form-field appearance="outline" subscriptSizing="dynamic">
-                      <mat-label>City/Area</mat-label>
-                      <mat-select formControlName="selectedGrandchild">
-                        @for (grandchild of grandchildTimezones; track grandchild.name) {
-                          <mat-option [value]="grandchild.name"> {{ grandchild.name }}</mat-option>
-                        }
-                      </mat-select>
-                      <!--          <mat-error *ngIf="hasError('selectedGrandchild', 'required')">Please select a city/area</mat-error>-->
-                    </mat-form-field>
-                    <!--        </div>-->
+                  <!--        <div class="form-field-wrapper">-->
+                  <!--          <label class="form-label"></label>-->
+                  <mat-form-field appearance="outline" subscriptSizing="dynamic">
+                    <mat-label>City/Area</mat-label>
+                    <mat-select formControlName="selectedGrandchild">
+                      @for (grandchild of grandchildTimezones; track grandchild.name) {
+                      <mat-option [value]="grandchild.name"> {{ grandchild.name }}</mat-option>
+                      }
+                    </mat-select>
+                    <!--          <mat-error *ngIf="hasError('selectedGrandchild', 'required')">Please select a city/area</mat-error>-->
+                  </mat-form-field>
+                  <!--        </div>-->
                   }
                 </div>
                 <div class="submit-button-wrapper">
-                  <button
-                    type="submit"
-                    mat-raised-button
-                    color="primary">
+                  <button type="submit" mat-raised-button color="primary">
                     Submit
                   </button>
                 </div>
@@ -123,7 +104,7 @@
             <mat-card-content>
               <div class="form-field-wrapper">
                 <mat-slide-toggle labelPosition="before" [(ngModel)]="isSystemNTPEnabled"
-                                  (change)="onNTPToggleChange($event)">Enable NTP
+                  (change)="onNTPToggleChange($event)">Enable NTP
                 </mat-slide-toggle>
               </div>
             </mat-card-content>
@@ -135,7 +116,7 @@
             <mat-card-content>
               <div class="button-container">
                 <button mat-raised-button (click)="addNTPServer()" [disabled]="isNTPEnabled"
-                        matTooltip="Add NTP Server">Add
+                  matTooltip="Add NTP Server">Add
                 </button>
               </div>
               <div class="table-container">
@@ -157,20 +138,24 @@
                     <td mat-cell *matCellDef="let element">
                       <div class="row-action a-link">
                         @if (!isNTPEnabled) {
-                          <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon"
-                                   matTooltip="Delete NTP Server"
-                                   (click)="deleteNTPServer(element)"></fa-icon>
+                        <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon"
+                          matTooltip="Delete NTP Server" (click)="deleteNTPServer(element)"></fa-icon>
                         } @else {
-                          <fa-icon [icon]="['far', 'trash-can']" size="lg" disabled
-                                   matTooltip="Not allowed when NTP is enabled."></fa-icon>
+                        <fa-icon [icon]="['far', 'trash-can']" size="lg" disabled
+                          matTooltip="Not allowed when NTP is enabled."></fa-icon>
                         }
                       </div>
                     </td>
                   </ng-container>
                   <tr mat-header-row *matHeaderRowDef="ntpColumns"></tr>
                   <tr mat-row *matRowDef="let row; columns: ntpColumns;"></tr>
-                  <tr class="mat-row table-no-data" *matNoDataRow>
-                    <td class="mat-cell" colspan="4">No results found.</td>
+                  <tr class="mat-row" *matNoDataRow>
+                    <td class="mat-cell no-data-cell" colspan="4">
+                      <div class="no-data-content">
+                        <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                        <span>No data available</span>
+                      </div>
+                    </td>
                   </tr>
                 </table>
               </div>
@@ -188,4 +173,4 @@
       </ng-template>
     </mat-tab>
   </mat-tab-group>
-</div>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/user-management/user-management.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/user-management/user-management.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/user-management/user-management.html	(working copy)
@@ -50,8 +50,13 @@
         </ng-container>
         <tr mat-header-row *matHeaderRowDef="userColumns"></tr>
         <tr mat-row *matRowDef="let row; columns: userColumns;"></tr>
-        <tr class="mat-row table-no-data" *matNoDataRow>
-          <td class="mat-cell" colspan="8">No results found.</td>
+        <tr class="mat-row" *matNoDataRow>
+          <td class="mat-cell no-data-cell" colspan="8">
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
+          </td>
         </tr>
       </table>
       <mat-paginator [pageSizeOptions]="[5, 10, 15, 20, 25]" [length]="totalRecords"
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/vl-discovered-devices/vl-discovered-devices.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/vl-discovered-devices/vl-discovered-devices.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/vl-discovered-devices/vl-discovered-devices.html	(working copy)
@@ -6,52 +6,53 @@
     <form [formGroup]="devicesForm" class="common-form">
       <div class="form-field-wrapper">
         <mat-slide-toggle labelPosition="before" formControlName="auto_mode"
-                          (change)="updateAutoDiscoveredDevice($event)">Auto Enable
+          (change)="updateAutoDiscoveredDevice($event)">Auto Enable
         </mat-slide-toggle>
       </div>
     </form>
   </mat-card-content>
 </mat-card>
 @if (!devicesForm.get('auto_mode')?.value) {
-  <div class="table-container">
-    <table mat-table [dataSource]="dataSource" class="mat-elevation-z1">
-      <ng-container matColumnDef="serial">
-        <th mat-header-cell *matHeaderCellDef> No.</th>
-        <td mat-cell *matCellDef="let element; let i = index;"> {{ i + 1 }}</td>
-      </ng-container>
-      <ng-container matColumnDef="ip">
-        <th mat-header-cell *matHeaderCellDef> IP Address</th>
-        <td mat-cell *matCellDef="let element">{{ element.ip }}</td>
-      </ng-container>
-      <ng-container matColumnDef="serial_number">
-        <th mat-header-cell *matHeaderCellDef> Serial Number</th>
-        <td mat-cell *matCellDef="let element"> {{ element.serial_number }}</td>
-      </ng-container>
-      <ng-container matColumnDef="status">
-        <th mat-header-cell *matHeaderCellDef> Status</th>
-        <td mat-cell *matCellDef="let element">{{ element.status | titlecase }}</td>
-      </ng-container>
-      <ng-container matColumnDef="action">
-        <th mat-header-cell *matHeaderCellDef class="action-header w-10"> Action</th>
-        <td mat-cell *matCellDef="let element">
-          <div class="row-action a-link">
-            <fa-icon [icon]="['far', 'play-circle']" size="lg" matTooltip="Enable volume license"
-                     (click)="configureDeviceVolumeLicense(element)"></fa-icon>
-            <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon" matTooltip="Remove Device"
-                     (click)="removeDevice(element)"></fa-icon>
-          </div>
-        </td>
-      </ng-container>
-      <tr mat-header-row *matHeaderRowDef="deviceColumns"></tr>
-      <tr mat-row *matRowDef="let row; columns: deviceColumns;"></tr>
-      <tr class="mat-row table-no-data" *matNoDataRow>
-        <td class="mat-cell" colspan="11">No results found.</td>
-      </tr>
-    </table>
-    <mat-paginator
-      [pageSizeOptions]="[10, 15, 20, 25]"
-      [length]="totalRecords"
-      showFirstLastButtons
-    ></mat-paginator>
-  </div>
-}
+<div class="table-container">
+  <table mat-table [dataSource]="dataSource" class="mat-elevation-z1">
+    <ng-container matColumnDef="serial">
+      <th mat-header-cell *matHeaderCellDef> No.</th>
+      <td mat-cell *matCellDef="let element; let i = index;"> {{ i + 1 }}</td>
+    </ng-container>
+    <ng-container matColumnDef="ip">
+      <th mat-header-cell *matHeaderCellDef> IP Address</th>
+      <td mat-cell *matCellDef="let element">{{ element.ip }}</td>
+    </ng-container>
+    <ng-container matColumnDef="serial_number">
+      <th mat-header-cell *matHeaderCellDef> Serial Number</th>
+      <td mat-cell *matCellDef="let element"> {{ element.serial_number }}</td>
+    </ng-container>
+    <ng-container matColumnDef="status">
+      <th mat-header-cell *matHeaderCellDef> Status</th>
+      <td mat-cell *matCellDef="let element">{{ element.status | titlecase }}</td>
+    </ng-container>
+    <ng-container matColumnDef="action">
+      <th mat-header-cell *matHeaderCellDef class="action-header w-10"> Action</th>
+      <td mat-cell *matCellDef="let element">
+        <div class="row-action a-link">
+          <fa-icon [icon]="['far', 'play-circle']" size="lg" matTooltip="Enable volume license"
+            (click)="configureDeviceVolumeLicense(element)"></fa-icon>
+          <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon" matTooltip="Remove Device"
+            (click)="removeDevice(element)"></fa-icon>
+        </div>
+      </td>
+    </ng-container>
+    <tr mat-header-row *matHeaderRowDef="deviceColumns"></tr>
+    <tr mat-row *matRowDef="let row; columns: deviceColumns;"></tr>
+    <tr class="mat-row" *matNoDataRow>
+      <td class="mat-cell no-data-cell" colspan="11">
+        <div class="no-data-content">
+          <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+          <span>No data available</span>
+        </div>
+      </td>
+    </tr>
+  </table>
+  <mat-paginator [pageSizeOptions]="[10, 15, 20, 25]" [length]="totalRecords" showFirstLastButtons></mat-paginator>
+</div>
+}
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/vpn-acl-resources/vpn-acl-resources.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/vpn-acl-resources/vpn-acl-resources.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/vpn-acl-resources/vpn-acl-resources.html	(working copy)
@@ -43,13 +43,12 @@
         </ng-container>
         <tr mat-header-row *matHeaderRowDef="tableColumns; sticky: true"></tr>
         <tr mat-row *matRowDef="let row; columns: tableColumns;"></tr>
-        <tr class="mat-row table-no-data" *matNoDataRow>
+        <tr class="mat-row" *matNoDataRow>
           <td class="mat-cell no-data-cell" colspan="10">
-            @if (input.value) {
-            No results found for "{{input.value}}"
-            } @else {
-            No results found.
-            }
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
           </td>
         </tr>
       </table>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/vpn-acl-rules/vpn-acl-rules.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/vpn-acl-rules/vpn-acl-rules.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/vpn-acl-rules/vpn-acl-rules.html	(working copy)
@@ -63,13 +63,12 @@
           </ng-container>
           <tr mat-header-row *matHeaderRowDef="tableColumns; sticky: true"></tr>
           <tr mat-row *matRowDef="let row; columns: tableColumns;"></tr>
-          <tr class="mat-row table-no-data" *matNoDataRow>
+          <tr class="mat-row" *matNoDataRow>
             <td class="mat-cell no-data-cell" colspan="10">
-              @if (input.value) {
-              No results found for "{{input.value}}"
-              } @else {
-              No results found.
-              }
+              <div class="no-data-content">
+                <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                <span>No data available</span>
+              </div>
             </td>
           </tr>
         </table>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/tasks/tasks.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/tasks/tasks.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/tasks/tasks.html	(working copy)
@@ -58,8 +58,13 @@
 
           <tr mat-header-row *matHeaderRowDef="tasksColumns"></tr>
           <tr mat-row *matRowDef="let row; columns: tasksColumns;"></tr>
-          <tr class="mat-row table-no-data" *matNoDataRow>
-            <td class="mat-cell" colspan="9">No results found.</td>
+          <tr class="mat-row" *matNoDataRow>
+            <td class="mat-cell no-data-cell" colspan="9">
+              <div class="no-data-content">
+                <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+                <span>No data available</span>
+              </div>
+            </td>
           </tr>
         </table>
 
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/upgrade-centre/upgrade-centre.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/upgrade-centre/upgrade-centre.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/upgrade-centre/upgrade-centre.html	(working copy)
@@ -41,23 +41,24 @@
       <td mat-cell *matCellDef="let element">
         <div class="row-action a-link">
           <fa-icon [icon]="['far', 'circle-up']" size="lg" matTooltip="Upload Build"
-                   (click)="uploadBuild(element)"></fa-icon>
+            (click)="uploadBuild(element)"></fa-icon>
           <fa-icon [icon]="['fas', 'gears']" size="lg" matTooltip="System Update"
-                   (click)="systemUpdate(element)"></fa-icon>
+            (click)="systemUpdate(element)"></fa-icon>
           <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon" matTooltip="Remove Build"
-                   (click)="deleteBuild(element)"></fa-icon>
+            (click)="deleteBuild(element)"></fa-icon>
         </div>
       </td>
     </ng-container>
     <tr mat-header-row *matHeaderRowDef="buildColumns"></tr>
     <tr mat-row *matRowDef="let row; columns: buildColumns;"></tr>
-    <tr class="mat-row table-no-data" *matNoDataRow>
-      <td class="mat-cell" colspan="10">No results found.</td>
+    <tr class="mat-row" *matNoDataRow>
+      <td class="mat-cell no-data-cell" colspan="10">
+        <div class="no-data-content">
+          <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+          <span>No data available</span>
+        </div>
+      </td>
     </tr>
   </table>
-  <mat-paginator
-    [pageSizeOptions]="[10, 15, 20, 25]"
-    [length]="totalRecords"
-    showFirstLastButtons
-  ></mat-paginator>
-</div>
+  <mat-paginator [pageSizeOptions]="[10, 15, 20, 25]" [length]="totalRecords" showFirstLastButtons></mat-paginator>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/volume-license-overview/volume-license-overview.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/volume-license-overview/volume-license-overview.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/volume-license-overview/volume-license-overview.html	(working copy)
@@ -51,19 +51,20 @@
       <td mat-cell *matCellDef="let element">
         <div class="row-action a-link">
           <fa-icon [icon]="['far', 'trash-can']" size="lg" class="delete-icon" matTooltip="Delete license"
-                   (click)="deleteVolumeLicense(element)"></fa-icon>
+            (click)="deleteVolumeLicense(element)"></fa-icon>
         </div>
       </td>
     </ng-container>
     <tr mat-header-row *matHeaderRowDef="vlColumns"></tr>
     <tr mat-row *matRowDef="let row; columns: vlColumns;"></tr>
-    <tr class="mat-row table-no-data" *matNoDataRow>
-      <td class="mat-cell" colspan="10">No results found.</td>
+    <tr class="mat-row" *matNoDataRow>
+      <td class="mat-cell no-data-cell" colspan="10">
+        <div class="no-data-content">
+          <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+          <span>No data available</span>
+        </div>
+      </td>
     </tr>
   </table>
-  <mat-paginator
-    [pageSizeOptions]="[10, 15, 20, 25]"
-    [length]="totalRecords"
-    showFirstLastButtons
-  ></mat-paginator>
-</div>
+  <mat-paginator [pageSizeOptions]="[10, 15, 20, 25]" [length]="totalRecords" showFirstLastButtons></mat-paginator>
+</div>
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/vpn-management/vpn-management.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/vpn-management/vpn-management.html	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/vpn-management/vpn-management.html	(working copy)
@@ -41,13 +41,12 @@
         </ng-container>
         <tr mat-header-row *matHeaderRowDef="vpnColumns; sticky: true"></tr>
         <tr mat-row *matRowDef="let row; columns: vpnColumns;"></tr>
-        <tr class="mat-row table-no-data" *matNoDataRow>
+        <tr class="mat-row" *matNoDataRow>
           <td class="mat-cell no-data-cell" colspan="10">
-            @if (input.value) {
-            No results found for "{{input.value}}"
-            } @else {
-            No results found.
-            }
+            <div class="no-data-content">
+              <fa-icon [icon]="['far', 'chart-bar']"></fa-icon>
+              <span>No data available</span>
+            </div>
           </td>
         </tr>
       </table>
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/avx-service.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/avx-service.ts	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/avx-service.ts	(working copy)
@@ -1,6 +1,6 @@
-import {Injectable} from '@angular/core';
-import {URLS} from '../constants/api_urls';
-import {HttpService} from './http';
+import { Injectable } from '@angular/core';
+import { URLS } from '../constants/api_urls';
+import { HttpService } from './http';
 
 @Injectable({
   providedIn: 'root'
@@ -16,148 +16,148 @@
 
   getAVXDeviceImages(deviceId: any) {
     return this.http.get(URLS.GET_AVX_IMAGES_URL, {}, [
-      {name: 'Cm-Data', value: deviceId},
-      {name: 'Cm-Type', value: 'host'}
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
     ]);
   }
 
   getAVXVAInstances(deviceId: any) {
     return this.http.get(URLS.GET_AVX_VA_HOST_BY_DEVICE_ID_URL, {}, [
-      {name: 'Cm-Data', value: deviceId},
-      {name: 'Cm-Type', value: 'host'}
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
     ]);
   }
 
   getAVXVAInstanceConfig(deviceId: any, vaName: string) {
     return this.http.get(`${URLS.GET_AVX_INSTANCE_CONFIG_URL}?initial_filter=%7B%22va_name%22%3A%22${vaName}%22%7D`, {}, [
-      {name: 'Cm-Data', value: deviceId},
-      {name: 'Cm-Type', value: 'host'}
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
     ]);
   }
 
   getAVXVAInstancePortMapping(deviceId: any, vaName: string) {
     return this.http.get(`${URLS.GET_AVX_INSTANCE_PORT_MAPPING_URL}?initial_filter=%7B%22va_name%22%3A%22${vaName}%22%7D`, {}, [
-      {name: 'Cm-Data', value: deviceId},
-      {name: 'Cm-Type', value: 'host'}
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
     ]);
   }
 
   getAVXVAInstancePlatformResource(deviceId: any, vaName: string) {
     return this.http.get(`${URLS.GET_AVX_INSTANCE_PLATFORM_RESOURCES_URL}%22${vaName}%22?field_group=default`, {}, [
-      {name: 'Cm-Data', value: deviceId},
-      {name: 'Cm-Type', value: 'host'}
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
     ]);
   }
 
   getAVXVAInstanceShowVersion(deviceId: any, vaName: string) {
     return this.http.get(`${URLS.GET_AVX_VA_INSTANCE_SHOW_VERSION_URL}?initial_filter=%7B%22va_name%22%3A%22${vaName}%22%7D`, {}, [
-      {name: 'Cm-Data', value: deviceId},
-      {name: 'Cm-Type', value: 'host'}
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
     ]);
   }
 
   getAVXVAInstanceBasicConfig(deviceId: string | null, rawPayload: any) {
     return this.http.post(URLS.GET_AVX_VA_INSTANCE_BASIC_CONFIG_URL, rawPayload, {
-        csrf: true,
-        isFormData: false,
-        csrfInFormData: true
-      }, [
-        {name: 'Cm-Data', value: deviceId},
-        {name: 'Cm-Type', value: 'host'}
-      ]
+      csrf: true,
+      isFormData: false,
+      csrfInFormData: true
+    }, [
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
+    ]
     );
   }
 
   getAVXVABackups(deviceId: any) {
     return this.http.get(URLS.GET_AVX_VA_BACKUP_BY_DEVICE_ID_URL, {}, [
-      {name: 'Cm-Data', value: deviceId},
-      {name: 'Cm-Type', value: 'host'}
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
     ]);
   }
 
   createAVXVABackup(deviceId: string | null, rawPayload: any) {
     return this.http.post(URLS.CREATE_AVX_BACKUP_URL, rawPayload, {
-        csrf: true,
-        isFormData: true,
-        csrfInFormData: true
-      }, [
-        {name: 'Cm-Data', value: deviceId},
-        {name: 'Cm-Type', value: 'host'}
-      ]
+      csrf: true,
+      isFormData: true,
+      csrfInFormData: true
+    }, [
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
+    ]
     );
   }
 
   deleteAVXVABackup(deviceId: string | null, rawPayload: any) {
     return this.http.post(URLS.DELETE_AVX_VA_BACKUP_URL, rawPayload, {
-        csrf: true,
-        isFormData: true,
-        csrfInFormData: true
-      }, [
-        {name: 'Cm-Data', value: deviceId},
-        {name: 'Cm-Type', value: 'host'}
-      ]
+      csrf: true,
+      isFormData: true,
+      csrfInFormData: true
+    }, [
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
+    ]
     );
   }
 
   importAVXVABackup(deviceId: string | null, rawPayload: any) {
     return this.http.post(URLS.IMPORT_AVX_VA_BACKUP_URL, rawPayload, {
-        csrf: true,
-        isFormData: false,
-        csrfInFormData: true
-      }, [
-        {name: 'Cm-Data', value: deviceId},
-        {name: 'Cm-Type', value: 'host'}
-      ]
+      csrf: true,
+      isFormData: true,
+      csrfInFormData: true
+    }, [
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
+    ]
     );
   }
 
   exportAVXVABackup(deviceId: string | null, rawPayload: any) {
     return this.http.post(URLS.EXPORT_AVX_VA_BACKUP_URL, rawPayload, {
-        csrf: true,
-        isFormData: false,
-        csrfInFormData: true
-      }, [
-        {name: 'Cm-Data', value: deviceId},
-        {name: 'Cm-Type', value: 'host'}
-      ]
+      csrf: true,
+      isFormData: true,
+      csrfInFormData: true
+    }, [
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
+    ]
     );
   }
 
   restoreAVXVABackup(deviceId: string | null, rawPayload: any) {
     return this.http.post(URLS.RESTORE_AVX_VA_BACKUP_URL, rawPayload, {
-        csrf: true,
-        isFormData: false,
-        csrfInFormData: true
-      }, [
-        {name: 'Cm-Data', value: deviceId},
-        {name: 'Cm-Type', value: 'host'}
-      ]
+      csrf: true,
+      isFormData: true,
+      csrfInFormData: true
+    }, [
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
+    ]
     );
   }
 
   createInstanceFromBackup(deviceId: string | null, rawPayload: any) {
     let payload = `interactive_msg=${rawPayload?.newName}`;
     return this.http.post(`${URLS.RESTORE_CREATE_AVX_VA_BACKUP_URL}/${rawPayload?.pipeId}`, payload, {
-        csrf: true,
-        isFormData: false,
-        csrfInFormData: true
-      }, [
-        {name: 'Cm-Data', value: deviceId},
-        {name: 'Cm-Type', value: 'host'}
-      ]
+      csrf: true,
+      isFormData: false,
+      csrfInFormData: true
+    }, [
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
+    ]
     );
   }
 
   updateAVXInstancePowerStatus(deviceId: any, instanceName: any, status: any) {
     let payload: any = `post_data=%7B%22status%22%3A${status}%7D`;
     return this.http.post(`${URLS.POWER_ON_OFF_AVX_VA_INSTANCE_URL}/%22${instanceName}%22`, payload, {
-        csrf: true,
-        isFormData: false,
-        csrfInFormData: true
-      }, [
-        {name: 'Cm-Data', value: deviceId},
-        {name: 'Cm-Type', value: 'host'}
-      ]
+      csrf: true,
+      isFormData: false,
+      csrfInFormData: true
+    }, [
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
+    ]
     );
   }
 
@@ -165,95 +165,95 @@
     let payload: any = `action=Assign&options=%7B%22va_name%22%3A%22${instanceName}%22%2C%22license_type%22%3A%22Individual%22%2C%22license_key%22%3A%22${licenseKey}%22%2C%22product_type%22%3A%22apv%22%7D`;
     console.log(payload);
     return this.http.post(URLS.UPDATE_VAPV_LICENSE_KEY_URL, payload, {
-        csrf: true,
-        isFormData: false,
-        csrfInFormData: true
-      }, [
-        {name: 'Cm-Data', value: deviceId},
-        {name: 'Cm-Type', value: 'host'}
-      ]
+      csrf: true,
+      isFormData: false,
+      csrfInFormData: true
+    }, [
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
+    ]
     );
   }
 
   createVAPVLicenseRequestFile(deviceId: any, instanceName: any, vaSize: any) {
     let payload: any = `post_data=%7B%22current_va_name%22%3A%22${instanceName}%22%2C%22licensed_vs%22%3A%22%22%2C%22licensed_user%22%3A%22%22%2C%22licensed_s2s%22%3A%22%22%2C%22licensed_vxag%22%3A%22%22%2C%22va_size%22%3A%22${vaSize}%22%7D`;
     return this.http.post(URLS.CREATE_VAPV_LICENSE_REQUEST_FILE_URL, payload, {
-        csrf: true,
-        isFormData: false,
-        csrfInFormData: true,
-        responseType: 'text'
-      }, [
-        {name: 'Cm-Data', value: deviceId},
-        {name: 'Cm-Type', value: 'host'}
-      ]
+      csrf: true,
+      isFormData: false,
+      csrfInFormData: true,
+      responseType: 'text'
+    }, [
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
+    ]
     );
   }
 
   deleteVAInstance(deviceId: any, instanceName: any) {
     let payload: any = `pk=%7B%22va_name%22%3A%22${instanceName}%22%7D`;
     return this.http.post(URLS.DELETE_AVX_VA_INSTANCE_URL, payload, {
-        csrf: true,
-        isFormData: false,
-        csrfInFormData: true,
-        responseType: 'text'
-      }, [
-        {name: 'Cm-Data', value: deviceId},
-        {name: 'Cm-Type', value: 'host'}
-      ]
+      csrf: true,
+      isFormData: false,
+      csrfInFormData: true,
+      responseType: 'text'
+    }, [
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
+    ]
     );
   }
 
   getAutoAssignResources(deviceId: string | null, rawPayload: any) {
     return this.http.post(URLS.GET_AUTO_ASSIGN_RESOURCES_URL, rawPayload, {
-        csrf: true,
-        isFormData: false,
-        csrfInFormData: true
-      }, [
-        {name: 'Cm-Data', value: deviceId},
-        {name: 'Cm-Type', value: 'host'}
-      ]
+      csrf: true,
+      isFormData: false,
+      csrfInFormData: true
+    }, [
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
+    ]
     );
   }
 
   getAVXDeviceLogSettings(deviceId: any) {
     return this.http.get(URLS.GET_AVX_DEVICE_LOG_SETTINGS_URL, {}, [
-      {name: 'Cm-Data', value: deviceId},
-      {name: 'Cm-Type', value: 'host'}
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
     ]);
   }
 
   getAVXDeviceLog(deviceId: any) {
     return this.http.get(URLS.GET_AVX_DEVICE_LOGS_URL, {}, [
-      {name: 'Cm-Data', value: deviceId},
-      {name: 'Cm-Type', value: 'host'}
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
     ]);
   }
 
   getAVXDeviceConfig(deviceId: any, config: string) {
     return this.http.get(`${URLS.GET_AVX_DEVICE_CONFIG_URL}?fields=[%22${config}%22]`, {}, [
-      {name: 'Cm-Data', value: deviceId},
-      {name: 'Cm-Type', value: 'host'}
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
     ]);
   }
 
   getAVXDeviceSystemInfo(deviceId: any) {
     return this.http.get(URLS.GET_AVX_DEVICE_SYSTEM_INFO_URL, {}, [
-      {name: 'Cm-Data', value: deviceId},
-      {name: 'Cm-Type', value: 'host'}
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
     ]);
   }
 
   getAVXDeviceSystemInfoOverview(deviceId: any) {
     return this.http.get(URLS.GET_AVX_DEVICE_SYSTEM_INFO_OVERVIEW_URL, {}, [
-      {name: 'Cm-Data', value: deviceId},
-      {name: 'Cm-Type', value: 'host'}
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
     ]);
   }
 
   getAVXDeviceResourceOccupation(deviceId: any) {
     return this.http.get(URLS.GET_AVX_DEVICE_RESOURCE_OCCUPATION_URL, {}, [
-      {name: 'Cm-Data', value: deviceId},
-      {name: 'Cm-Type', value: 'host'}
+      { name: 'Cm-Data', value: deviceId },
+      { name: 'Cm-Type', value: 'host' }
     ]);
   }
 
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/shared/shared-module.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/shared/shared-module.ts	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/shared/shared-module.ts	(working copy)
@@ -70,8 +70,10 @@
   solidIcons.faCheckCircle, solidIcons.faExclamationCircle, solidIcons.faExclamationTriangle, solidIcons.faQuestion,
   solidIcons.faDownload, solidIcons.faFolderTree, solidIcons.faRotateRight, solidIcons.faExchangeAlt, solidIcons.faTimes,
   solidIcons.faLink, solidIcons.faMoon, solidIcons.faSun, solidIcons.faCircleHalfStroke,
+  solidIcons.faCheck, solidIcons.faPowerOff,
 ];
 
+
 const customRegularIcons = [
   regularIcons.faBell, regularIcons.faRectangleList, regularIcons.faFloppyDisk,
   regularIcons.faCircleDown, regularIcons.faWindowMaximize, regularIcons.faChartBar,
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/styles.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/styles.scss	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/styles.scss	(working copy)
@@ -598,4 +598,33 @@
 .time-filter {
   margin-top: 8px !important;
   margin-bottom: 8px !important;
+}
+
+/* Global No Data Styling */
+.no-data-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 32px 0;
+  color: var(--text-secondary);
+  gap: 10px;
+  opacity: 0.7;
+  height: 100%;
+  width: 100%;
+
+  fa-icon {
+    font-size: 24px;
+    margin-bottom: 4px;
+  }
+
+  span {
+    font-size: 13px;
+    font-weight: 500;
+  }
+}
+
+.no-data-cell {
+  padding: 0 !important;
+  border-bottom: none !important;
 }
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/router.py
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/router.py	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/router.py	(working copy)
@@ -621,6 +621,8 @@
                         new_url = ('/rest/%s' + req_path[19:]) % get_device_type(host["type"])
                 else:
                     new_url = '/pest' + req_path[14:]
+                if request.META.get('QUERY_STRING'):
+                    new_url += '?' + request.META['QUERY_STRING']
 
                 rest_response_data = call_restapi(
                     request.method, new_url, request.body, host_ip, host["restapi_port"],
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/session.py
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/session.py	(revision 2834)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/session.py	(working copy)
@@ -439,12 +439,7 @@
 
     def _process_request(self, request):
         if getattr(_thread_locals, '_hive_thread_id', -1) == -1:
-            andebug('an.model.cli', 'process_request: {}'.format(request))
-            andebug('an.model.cli', 'Inside getattr if process_request method')
-            andebug('an.model.cli',
-                    'process_request function call trace:\n{}'.format(''.join(traceback.format_stack())))
             _thread_locals._hive_thread_id = HiveSessionMiddleware.global_thread_id
-            andebug('an.model.cli', 'Thread Id: {}'.format(_thread_locals._hive_thread_id))
             HiveSessionMiddleware.global_thread_id += 1
 
         _thread_locals.request = request
