diff --git a/app/templates/config.php b/app/templates/config.php
index 6e773a2..6902ce8 100644
--- a/app/templates/config.php
+++ b/app/templates/config.php
@@ -1,113 +1,101 @@
-<!-- config file -->
-<div class="container-fluid mt-2">
-    <div id="messages-container"></div>
 
-    <div class="row mb-4">
-        <div class="col-12 mb-4">
-            <h2>Configuration</h2>
-            <?php if ($configMessage): ?>
-                <?= $configMessage ?>
-            <?php endif; ?>
-        </div>
-    </div>
+                <!-- config file -->
+                <div class="container-fluid mt-2">
+                    <div class="row mb-4">
+                        <div class="col-12 mb-5">
+                            <h2>Configuration</h2>
+<?php if ($configMessage): ?>
+                                <?= $configMessage ?>
+<?php endif; ?>
+                        </div>
 
-    <div class="card shadow-sm">
-        <div class="card-header bg-light d-flex justify-content-between align-items-center py-3">
-            <h5 class="card-title mb-0">
-                <i class="fas fa-wrench me-2 text-secondary"></i>
-                Jilo Web app configuration
-            </h5>
-            <?php if ($userObject->hasRight($user_id, 'edit config file')): ?>
-            <div>
-                <button type="button" class="btn btn-outline-primary btn-sm toggle-edit" <?= !$isWritable ? 'disabled' : '' ?>>
-                    <i class="fas fa-edit me-2"></i>Edit
-                </button>
-                <div class="edit-controls d-none">
-                    <button type="button" class="btn btn-danger btn-sm save-config">
-                        <i class="fas fa-save me-2"></i>Save
-                    </button>
-                    <button type="button" class="btn btn-outline-secondary btn-sm ms-2 cancel-edit">
-                        Cancel
-                    </button>
-                </div>
-            </div>
-            <?php endif; ?>
-        </div>
-        <div class="card-body p-4">
-            <form id="configForm">
-                <?php
-                function renderConfigItem($key, $value, $path = '') {
-                    $fullPath = $path ? $path . '[' . $key . ']' : $key;
-                    // Only capitalize first letter, not every word
-                    $displayName = ucfirst(str_replace('_', ' ', $key));
-
-                    if (is_array($value)) {
-                        echo '<div class="config-section mb-4">';
-                        echo '<h6 class="border-bottom pb-2 mb-3">' . htmlspecialchars($displayName) . '</h6>';
-                        echo '<div class="ps-4">';
-                        foreach ($value as $subKey => $subValue) {
-                            renderConfigItem($subKey, $subValue, $fullPath);
-                        }
-                        echo '</div>';
-                        echo '</div>';
-                    } else {
-                        ?>
-                        <div class="config-item row mb-3 align-items-center">
-                            <div class="col-md-4 text-end">
-                                <label class="form-label mb-0"><?= htmlspecialchars($displayName) ?></label>
+                        <div class="card shadow-sm">
+                            <div class="card-header bg-light d-flex justify-content-between align-items-center py-3">
+                                <h5 class="card-title mb-0">
+                                    <i class="fas fa-wrench me-2 text-secondary"></i>
+                                    Jilo Web app configuration
+                                </h5>
+<?php if ($userObject->hasRight($user_id, 'edit config file')) { ?>
+                                <div>
+                                    <button type="button" class="btn btn-outline-primary btn-sm toggle-edit" <?= !$isWritable ? 'disabled' : '' ?>>
+                                        <i class="fas fa-edit me-2"></i>Edit
+                                    </button>
+                                    <div class="edit-controls d-none">
+                                        <button type="button" class="btn btn-danger btn-sm save-config">
+                                            <i class="fas fa-save me-2"></i>Save
+                                        </button>
+                                        <button type="button" class="btn btn-outline-secondary btn-sm ms-2 cancel-edit">
+                                            Cancel
+                                        </button>
+                                    </div>
+                                </div>
+<?php } ?>
                             </div>
-                            <div class="col-md-8">
-                                <div class="view-mode">
-                                    <?php if (is_bool($value) || $key === 'registration_enabled'): ?>
-                                        <span class="badge <?= $value ? 'bg-success' : 'bg-secondary' ?>">
-                                            <?= $value ? 'Enabled' : 'Disabled' ?>
-                                        </span>
-                                    <?php elseif ($key === 'environment'): ?>
-                                        <span class="badge <?= $value === 'production' ? 'bg-danger' : 'bg-info' ?>">
-                                            <?= htmlspecialchars($value) ?>
-                                        </span>
-                                    <?php else: ?>
-                                        <?php if (empty($value) && $value !== '0'): ?>
-                                            <span class="text-muted fst-italic">blank</span>
-                                        <?php else: ?>
-                                            <span class="text-body">
-                                                <?= htmlspecialchars($value) ?>
-                                            </span>
-                                        <?php endif; ?>
-                                    <?php endif; ?>
-                                </div>
-                                <div class="edit-mode d-none">
-                                    <?php if (is_bool($value) || $key === 'registration_enabled'): ?>
-                                        <div class="form-check form-switch">
-                                            <input class="form-check-input" type="checkbox" 
-                                                   name="<?= htmlspecialchars($fullPath) ?>"
-                                                   <?= $value ? 'checked' : '' ?>>
+
+                            <div class="card-body p-4">
+                                <form id="configForm">
+<?php
+function renderConfigItem($key, $value, $path = '') {
+    $fullPath = $path ? $path . '[' . $key . ']' : $key;
+    // Only capitalize first letter, not every word
+    $displayName = ucfirst(str_replace('_', ' ', $key));
+
+    if (is_array($value)) {
+        echo "\t\t\t\t\t\t\t\t\t<div class=\"config-section mb-4\">";
+        echo "\n\t\t\t\t\t\t\t\t\t\t<h6 class=\"border-bottom pb-2 mb-3\">" . htmlspecialchars($displayName) . '</h6>';
+        echo "\n\t\t\t\t\t\t\t\t\t\t<div class=\"ps-4\">\n";
+            foreach ($value as $subKey => $subValue) {
+                renderConfigItem($subKey, $subValue, $fullPath);
+            }
+        echo "\t\t\t\t\t\t\t\t\t\t</div>\n";
+        echo "\t\t\t\t\t\t\t\t\t</div>\n";
+    } else {
+?>
+                                    <div class="config-item row mb-3 align-items-center">
+                                        <div class="col-md-4 text-end">
+                                            <label class="form-label mb-0"><?= htmlspecialchars($displayName) ?></label>
                                         </div>
-                                    <?php elseif ($key === 'environment'): ?>
-                                        <select class="form-select form-select-sm" name="<?= htmlspecialchars($fullPath) ?>">
-                                            <option value="development" <?= $value === 'development' ? 'selected' : '' ?>>Development</option>
-                                            <option value="production" <?= $value === 'production' ? 'selected' : '' ?>>Production</option>
-                                        </select>
-                                    <?php else: ?>
-                                        <input type="text" class="form-control form-control-sm" 
-                                               name="<?= htmlspecialchars($fullPath) ?>"
-                                               value="<?= htmlspecialchars($value ?? '') ?>">
-                                    <?php endif; ?>
-                                </div>
+                                        <div class="col-md-8">
+                                            <div class="view-mode">
+<?php if (is_bool($value) || $key === 'registration_enabled') { ?>
+                                                <span class="badge <?= $value ? 'bg-success' : 'bg-secondary' ?>"><?= $value ? 'Enabled' : 'Disabled' ?></span>
+<?php } elseif ($key === 'environment') { ?>
+                                                <span class="badge <?= $value === 'production' ? 'bg-danger' : 'bg-info' ?>"><?= htmlspecialchars($value) ?></span>
+<?php } else {
+        if (empty($value) && $value !== '0') { ?>
+                                                <span class="text-muted fst-italic">blank</span>
+<?php   } else { ?>
+                                                <span class="text-body"><?= htmlspecialchars($value) ?></span>
+<?php   } ?>
+<?php } ?>
+                                            </div>
+                                            <div class="edit-mode d-none">
+<?php if (is_bool($value) || $key === 'registration_enabled') { ?>
+                                                <div class="form-check form-switch">
+                                                    <input class="form-check-input" type="checkbox" name="<?= htmlspecialchars($fullPath) ?>" <?= $value ? 'checked' : '' ?>>
+                                                </div>
+<?php } elseif ($key === 'environment') { ?>
+                                                <select class="form-select form-select-sm" name="<?= htmlspecialchars($fullPath) ?>">
+                                                    <option value="development" <?= $value === 'development' ? 'selected' : '' ?>>Development</option>
+                                                    <option value="production" <?= $value === 'production' ? 'selected' : '' ?>>Production</option>
+                                                </select>
+<?php } else { ?>
+                                                <input type="text" class="form-control form-control-sm" name="<?= htmlspecialchars($fullPath) ?>" value="<?= htmlspecialchars($value ?? '') ?>">
+<?php } ?>
+                                            </div>
+                                        </div>
+                                    </div>
+<?php }
+    }
+    foreach ($config as $key => $value) {
+        renderConfigItem($key, $value);
+    } ?>
+                                </form>
                             </div>
                         </div>
-                        <?php
-                    }
-                }
-
-                foreach ($config as $key => $value) {
-                    renderConfigItem($key, $value);
-                }
-                ?>
-            </form>
-        </div>
-    </div>
-</div>
+                    </div>
+                </div>
+                <!-- /config file -->
 
 <script>
 $(function() {
@@ -251,4 +239,3 @@ $(function() {
     });
 });
 </script>
-<!-- /config file -->