diff --git a/webapp/static/pxe-theme.css b/webapp/static/pxe-theme.css
index 279a10b..dac101a 100644
--- a/webapp/static/pxe-theme.css
+++ b/webapp/static/pxe-theme.css
@@ -144,7 +144,7 @@ a { color: var(--link); }
   max-width: 100%;
   filter: brightness(0) invert(1);
 }
-.sidebar-header h1 {
+.sidebar-header .brand-title {
   font-size: 14px;
   font-weight: 400;
   text-transform: uppercase;
@@ -412,12 +412,12 @@ a { color: var(--link); }
 .pxe-btn-primary:hover,   .btn-primary:hover   { background: var(--primary-dark);   color: #fff; }
 .pxe-btn-secondary, .btn-secondary { background: var(--secondary); color: #fff; border-color: var(--secondary); }
 .pxe-btn-secondary:hover, .btn-secondary:hover { background: var(--secondary-dark); color: #fff; }
-.pxe-btn-success,   .btn-success   { background: var(--success);   color: #fff; border-color: var(--success); }
-.pxe-btn-success:hover,   .btn-success:hover   { background: var(--success-dark);   color: #fff; }
+.pxe-btn-success,   .btn-success   { background: var(--success);   color: #00003d; border-color: var(--success); }
+.pxe-btn-success:hover,   .btn-success:hover   { background: var(--success-dark);   color: #00003d; }
 .pxe-btn-info,      .btn-info      { background: var(--info);      color: #fff; border-color: var(--info); }
 .pxe-btn-info:hover,      .btn-info:hover      { background: var(--info-dark);      color: #fff; }
-.pxe-btn-warning,   .btn-warning   { background: var(--warning);   color: #fff; border-color: var(--warning); }
-.pxe-btn-warning:hover,   .btn-warning:hover   { background: var(--warning-dark);   color: #fff; }
+.pxe-btn-warning,   .btn-warning   { background: var(--warning);   color: #00003d; border-color: var(--warning); }
+.pxe-btn-warning:hover,   .btn-warning:hover   { background: var(--warning-dark);   color: #00003d; }
 .pxe-btn-danger,    .btn-danger    { background: var(--danger);    color: #fff; border-color: var(--danger); }
 .pxe-btn-danger:hover,    .btn-danger:hover    { background: var(--danger-dark);    color: #fff; }
 
@@ -440,7 +440,7 @@ a { color: var(--link); }
 .btn-outline-danger:hover { background: var(--danger); color: #fff; }
 .btn-outline-secondary:hover { background: var(--secondary); color: #fff; }
 .btn-outline-success { color: var(--success); border-color: var(--success); }
-.btn-outline-success:hover { background: var(--success); color: #fff; }
+.btn-outline-success:hover { background: var(--success); color: #00003d; }
 .btn-outline-info { color: var(--info); border-color: var(--info); }
 .btn-outline-info:hover { background: var(--info); color: #fff; }
 
@@ -630,8 +630,8 @@ input[type="radio"] {
   white-space: nowrap;
   color: #fff;
 }
-.badge-success,  .badge.bg-success   { background: var(--success); color: #fff; }
-.badge-warning,  .badge.bg-warning   { background: var(--warning); color: #fff; }
+.badge-success,  .badge.bg-success   { background: var(--success); color: #00003d; }
+.badge-warning,  .badge.bg-warning   { background: var(--warning); color: #00003d; }
 .badge-danger,   .badge.bg-danger    { background: var(--danger);  color: #fff; }
 .badge-info,     .badge.bg-info      { background: var(--info);    color: #fff; }
 .badge-primary,  .badge.bg-primary   { background: var(--primary); color: #fff; }
@@ -709,7 +709,7 @@ input[type="radio"] {
 .settings-success,
 .alert-success {
   background: var(--success);
-  color: #fff;
+  color: #00003d;
   border-color: var(--success);
 }
 .alert-warning {
diff --git a/webapp/templates/audit.html b/webapp/templates/audit.html
index c14f40d..9711606 100644
--- a/webapp/templates/audit.html
+++ b/webapp/templates/audit.html
@@ -3,7 +3,7 @@
 
 {% block content %}
 <div class="page-header">
-  <h2>Audit Log</h2>
+  <h1>Audit Log</h1>
   <div class="header-actions">
     <span class="badge badge-secondary badge-lg">{{ entries|length }} entries</span>
   </div>
diff --git a/webapp/templates/backups.html b/webapp/templates/backups.html
index 6bc9fa6..9a91c6c 100644
--- a/webapp/templates/backups.html
+++ b/webapp/templates/backups.html
@@ -3,7 +3,7 @@
 
 {% block content %}
 <div class="page-header">
-  <h2>Clonezilla Backups</h2>
+  <h1>Clonezilla Backups</h1>
   <div class="header-actions">
     <button class="pxe-btn pxe-btn-primary" data-bs-toggle="modal" data-bs-target="#uploadModal">
       <i class="bi bi-upload"></i> Upload Backup
@@ -134,7 +134,7 @@ document.getElementById('deleteModal').addEventListener('show.bs.modal', functio
   var filename = btn.getAttribute('data-filename');
   var machine = btn.getAttribute('data-machine');
   document.getElementById('deleteMachine').textContent = machine;
-  document.getElementById('deleteForm').action = '/backups/delete/' + encodeURIComponent(filename);
+  document.getElementById('deleteForm').action = "{{ url_for('clonezilla_delete', filename='__F__') }}".replace('__F__', encodeURIComponent(filename));
 });
 </script>
 {% endblock %}
diff --git a/webapp/templates/base.html b/webapp/templates/base.html
index 62915db..78ab0b9 100644
--- a/webapp/templates/base.html
+++ b/webapp/templates/base.html
@@ -31,7 +31,7 @@
   <nav class="sidebar d-flex flex-column">
     <div class="sidebar-header">
       <img class="sidebar-logo" src="{{ url_for('static', filename='ge-aerospace-logo.svg') }}" alt="GE Aerospace">
-      <h1>PXE Manager</h1>
+      <div class="brand-title">PXE Manager</div>
     </div>
 
     <ul class="sidebar-nav nav flex-column mt-2">
diff --git a/webapp/templates/dashboard.html b/webapp/templates/dashboard.html
index 3de36e7..1a241e2 100644
--- a/webapp/templates/dashboard.html
+++ b/webapp/templates/dashboard.html
@@ -3,7 +3,7 @@
 
 {% block content %}
 <div class="page-header">
-  <h2>Dashboard</h2>
+  <h1>Dashboard</h1>
   <div class="header-actions">
     <a href="{{ url_for('images_import') }}" class="btn btn-outline-secondary btn-sm">
       <i class="bi bi-box-arrow-in-down"></i> Image Import
@@ -267,11 +267,11 @@ document.addEventListener('show.bs.modal', function(e) {
     if (e.target.id === 'cloneImageModal') {
         e.target.querySelector('#cloneSrcKey').textContent = srcKey;
         e.target.querySelector('#cloneSrcFriendly').textContent = srcFriendly;
-        document.getElementById('cloneForm').action = '/images/' + encodeURIComponent(srcKey) + '/clone';
+        document.getElementById('cloneForm').action = "{{ url_for('images_clone', image_type='__K__') }}".replace('__K__', encodeURIComponent(srcKey));
     } else if (e.target.id === 'deleteImageModal') {
         e.target.querySelector('#deleteSrcKey').textContent = srcKey;
         e.target.querySelector('#deleteSrcFriendly').textContent = srcFriendly;
-        document.getElementById('deleteForm').action = '/images/' + encodeURIComponent(srcKey) + '/delete';
+        document.getElementById('deleteForm').action = "{{ url_for('images_delete', image_type='__K__') }}".replace('__K__', encodeURIComponent(srcKey));
     }
 });
 </script>
diff --git a/webapp/templates/enrollment.html b/webapp/templates/enrollment.html
index 672241c..3c66ba1 100644
--- a/webapp/templates/enrollment.html
+++ b/webapp/templates/enrollment.html
@@ -3,7 +3,7 @@
 
 {% block content %}
 <div class="page-header">
-  <h2><i class="bi bi-pc-display"></i> Enrollment Packages</h2>
+  <h1><i class="bi bi-pc-display"></i> Enrollment Packages</h1>
   <div class="header-actions">
     <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadModal">
       <i class="bi bi-upload"></i> Upload Package
@@ -132,7 +132,7 @@ document.getElementById('deleteModal').addEventListener('show.bs.modal', functio
   var btn = event.relatedTarget;
   var filename = btn.getAttribute('data-filename');
   document.getElementById('deleteFilename').textContent = filename;
-  document.getElementById('deleteForm').action = '/enrollment/delete/' + encodeURIComponent(filename);
+  document.getElementById('deleteForm').action = "{{ url_for('enrollment_delete', filename='__F__') }}".replace('__F__', encodeURIComponent(filename));
 });
 </script>
 {% endblock %}
diff --git a/webapp/templates/imaging_detail.html b/webapp/templates/imaging_detail.html
index d3a6e62..89d7579 100644
--- a/webapp/templates/imaging_detail.html
+++ b/webapp/templates/imaging_detail.html
@@ -4,9 +4,9 @@
 {% block content %}
 <div class="page-header">
   <div>
-    <h2>{{ session.serial }}
+    <h1>{{ session.serial }}
       {% if session.hostname_target %}<span class="text-light" style="font-size:14px; font-weight:400;">{{ session.hostname_target }}</span>{% endif %}
-    </h2>
+    </h1>
     <div style="margin-top:0.5rem; display:flex; gap:0.4rem; flex-wrap:wrap;">
       {% if session.pctype %}<span class="badge badge-info">{{ session.pctype }}</span>{% endif %}
       {% if session.machinenumber %}<span class="badge badge-secondary">#{{ session.machinenumber }}</span>{% endif %}
diff --git a/webapp/templates/report_view.html b/webapp/templates/report_view.html
index 1839318..a91676b 100644
--- a/webapp/templates/report_view.html
+++ b/webapp/templates/report_view.html
@@ -30,7 +30,7 @@
 
 <div class="page-header">
   <div>
-    <h2>Drive Erasure Certificate</h2>
+    <h1>Drive Erasure Certificate</h1>
     <code class="mono" style="color:var(--text-light);">{{ filename }}</code>
   </div>
   <div class="header-actions">
diff --git a/webapp/templates/reports.html b/webapp/templates/reports.html
index d0033ce..5c90f5f 100644
--- a/webapp/templates/reports.html
+++ b/webapp/templates/reports.html
@@ -3,7 +3,7 @@
 
 {% block content %}
 <div class="page-header">
-  <h2><i class="bi bi-shield-check"></i> Blancco Erasure Reports</h2>
+  <h1><i class="bi bi-shield-check"></i> Blancco Erasure Reports</h1>
   <div class="header-actions">
     <span class="badge badge-secondary badge-lg">{{ reports|length }} report{{ 's' if reports|length != 1 }}</span>
   </div>
@@ -107,7 +107,7 @@ document.getElementById('deleteModal').addEventListener('show.bs.modal', functio
   var btn = event.relatedTarget;
   var filename = btn.getAttribute('data-filename');
   document.getElementById('deleteFilename').textContent = filename;
-  document.getElementById('deleteForm').action = '/reports/delete/' + encodeURIComponent(filename);
+  document.getElementById('deleteForm').action = "{{ url_for('blancco_delete_report', filename='__F__') }}".replace('__F__', encodeURIComponent(filename));
 });
 </script>
 {% endblock %}
diff --git a/webapp/templates/startnet_editor.html b/webapp/templates/startnet_editor.html
index 12dd6fb..a5c86d3 100644
--- a/webapp/templates/startnet_editor.html
+++ b/webapp/templates/startnet_editor.html
@@ -49,7 +49,7 @@
 
 {% block content %}
 <div class="page-header">
-  <h2>startnet.cmd Editor</h2>
+  <h1>startnet.cmd Editor</h1>
   {% if wim_exists %}
   <div class="header-actions">
     <button type="submit" form="startnetForm" class="pxe-btn pxe-btn-primary">