diff --git a/api/manage_templates.php b/api/manage_templates.php
index e5c6439..cff7c97 100644
--- a/api/manage_templates.php
+++ b/api/manage_templates.php
@@ -81,7 +81,7 @@ try {
             $data = json_decode(file_get_contents('php://input'), true);
 
             $stmt = $conn->prepare("INSERT INTO ticket_templates
-                                    (template_name, title_template, description_template, category, type, priority, is_active)
+                                    (template_name, title_template, description_template, category, type, default_priority, is_active)
                                     VALUES (?, ?, ?, ?, ?, ?, ?)");
             $stmt->bind_param('sssssii',
                 $data['template_name'],
@@ -89,7 +89,7 @@ try {
                 $data['description_template'],
                 $data['category'],
                 $data['type'],
-                $data['priority'] ?? 4,
+                $data['default_priority'] ?? 4,
                 $data['is_active'] ?? 1
             );
 
@@ -111,7 +111,7 @@ try {
 
             $stmt = $conn->prepare("UPDATE ticket_templates SET
                                     template_name = ?, title_template = ?, description_template = ?,
-                                    category = ?, type = ?, priority = ?, is_active = ?
+                                    category = ?, type = ?, default_priority = ?, is_active = ?
                                     WHERE template_id = ?");
             $stmt->bind_param('sssssiii',
                 $data['template_name'],
@@ -119,7 +119,7 @@ try {
                 $data['description_template'],
                 $data['category'],
                 $data['type'],
-                $data['priority'] ?? 4,
+                $data['default_priority'] ?? 4,
                 $data['is_active'] ?? 1,
                 $id
             );
diff --git a/assets/css/dashboard.css b/assets/css/dashboard.css
index b81fc9e..4248d48 100644
--- a/assets/css/dashboard.css
+++ b/assets/css/dashboard.css
@@ -2595,8 +2595,9 @@ body.dark-mode select option {
 .setting-row {
     margin-bottom: 1rem;
     display: flex;
-    align-items: center;
-    gap: 1rem;
+    flex-wrap: wrap;
+    align-items: flex-start;
+    gap: 0.5rem 1rem;
 }
 
 .setting-row:last-child {
@@ -2607,6 +2608,55 @@ body.dark-mode select option {
     color: var(--terminal-green);
     font-family: var(--font-mono);
     min-width: 180px;
+    padding-top: 0.5rem;
+    flex-shrink: 0;
+}
+
+/* Form elements within setting rows */
+.setting-row input[type="text"],
+.setting-row input[type="number"],
+.setting-row input[type="date"],
+.setting-row input[type="time"],
+.setting-row select,
+.setting-row textarea {
+    flex: 1;
+    min-width: 200px;
+    font-family: var(--font-mono);
+    background: var(--bg-primary);
+    color: var(--terminal-green);
+    border: 2px solid var(--terminal-green);
+    padding: 0.5rem;
+}
+
+.setting-row input:focus,
+.setting-row select:focus,
+.setting-row textarea:focus {
+    outline: none;
+    border-color: var(--terminal-amber);
+    box-shadow: 0 0 10px rgba(255, 193, 7, 0.3);
+}
+
+.setting-row textarea {
+    resize: vertical;
+    min-height: 100px;
+}
+
+/* Checkbox in setting row */
+.setting-row label:has(input[type="checkbox"]) {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    cursor: pointer;
+    padding-top: 0;
+}
+
+.setting-row input[type="checkbox"] {
+    flex: none;
+    min-width: auto;
+    width: 1.2rem;
+    height: 1.2rem;
+    cursor: pointer;
+    accent-color: var(--terminal-green);
 }
 
 .setting-select {
@@ -2757,11 +2807,23 @@ body.dark-mode select option {
 
     .setting-row {
         flex-direction: column;
-        align-items: flex-start;
+        align-items: stretch;
     }
 
     .setting-row label {
         min-width: auto;
+        padding-top: 0;
+        margin-bottom: 0.25rem;
+    }
+
+    .setting-row input[type="text"],
+    .setting-row input[type="number"],
+    .setting-row input[type="date"],
+    .setting-row input[type="time"],
+    .setting-row select,
+    .setting-row textarea {
+        width: 100%;
+        min-width: auto;
     }
 
     .setting-select {
diff --git a/views/CreateTicketView.php b/views/CreateTicketView.php
index df9d5c4..7041dfc 100644
--- a/views/CreateTicketView.php
+++ b/views/CreateTicketView.php
@@ -8,7 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Create New Ticket</title>
     <link rel="icon" type="image/png" href="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/images/favicon.png">
-    <link rel="stylesheet" href="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/css/dashboard.css?v=20260124e">
+    <link rel="stylesheet" href="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/css/dashboard.css?v=20260126a">
     <link rel="stylesheet" href="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/css/ticket.css?v=20260124e">
     <script src="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/js/dashboard.js?v=20260124e"></script>
     <script>
diff --git a/views/DashboardView.php b/views/DashboardView.php
index 2b8409d..a15f32b 100644
--- a/views/DashboardView.php
+++ b/views/DashboardView.php
@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Ticket Dashboard</title>
     <link rel="icon" type="image/png" href="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/images/favicon.png">
-    <link rel="stylesheet" href="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/css/dashboard.css?v=20260124e">
+    <link rel="stylesheet" href="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/css/dashboard.css?v=20260126a">
     <script src="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/js/ascii-banner.js"></script>
     <script src="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/js/toast.js"></script>
     <script src="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/js/markdown.js?v=20260124e"></script>
diff --git a/views/TicketView.php b/views/TicketView.php
index 9aeb497..20e5d7a 100644
--- a/views/TicketView.php
+++ b/views/TicketView.php
@@ -46,7 +46,7 @@ function formatDetails($details, $actionType) {
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Ticket #<?php echo $ticket['ticket_id']; ?></title>
     <link rel="icon" type="image/png" href="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/images/favicon.png">
-    <link rel="stylesheet" href="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/css/dashboard.css?v=20260124e">
+    <link rel="stylesheet" href="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/css/dashboard.css?v=20260126a">
     <link rel="stylesheet" href="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/css/ticket.css?v=20260124e">
     <script src="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/js/toast.js"></script>
     <script src="<?php echo $GLOBALS['config']['ASSETS_URL']; ?>/js/markdown.js?v=20260124e"></script>
diff --git a/views/admin/TemplatesView.php b/views/admin/TemplatesView.php
index 0a92958..faa3599 100644
--- a/views/admin/TemplatesView.php
+++ b/views/admin/TemplatesView.php
@@ -72,7 +72,7 @@
                                     <td><strong><?php echo htmlspecialchars($tpl['template_name']); ?></strong></td>
                                     <td><?php echo htmlspecialchars($tpl['category'] ?? 'Any'); ?></td>
                                     <td><?php echo htmlspecialchars($tpl['type'] ?? 'Any'); ?></td>
-                                    <td>P<?php echo $tpl['priority'] ?? '4'; ?></td>
+                                    <td>P<?php echo $tpl['default_priority'] ?? '4'; ?></td>
                                     <td>
                                         <span style="color: <?php echo ($tpl['is_active'] ?? 1) ? 'var(--status-open)' : 'var(--status-closed)'; ?>;">
                                             <?php echo ($tpl['is_active'] ?? 1) ? 'Active' : 'Inactive'; ?>
@@ -185,7 +185,7 @@
                 description_template: document.getElementById('description_template').value,
                 category: document.getElementById('category').value || null,
                 type: document.getElementById('type').value || null,
-                priority: parseInt(document.getElementById('priority').value) || 4,
+                default_priority: parseInt(document.getElementById('priority').value) || 4,
                 is_active: document.getElementById('is_active').checked ? 1 : 0
             };
 
@@ -220,7 +220,7 @@
             document.getElementById('description_template').value = tpl.description_template || '';
             document.getElementById('category').value = tpl.category || '';
             document.getElementById('type').value = tpl.type || '';
-            document.getElementById('priority').value = tpl.priority || 4;
+            document.getElementById('priority').value = tpl.default_priority || 4;
             document.getElementById('is_active').checked = (tpl.is_active ?? 1) == 1;
             document.getElementById('modalTitle').textContent = 'Edit Template';
             document.getElementById('templateModal').style.display = 'flex';