diff --git a/internal/web/handlers_itemtypes.go b/internal/web/handlers_itemtypes.go
index 95218c3..818c4c0 100644
--- a/internal/web/handlers_itemtypes.go
+++ b/internal/web/handlers_itemtypes.go
@@ -46,7 +46,7 @@ func (a *App) handleItemTypeCreate(w http.ResponseWriter, r *http.Request) {
 		a.Render(w, http.StatusBadRequest, "itemtypes_form", itemTypeFormData{User: currentUser(r), ItemType: it, FieldTypes: models.AllFieldTypes, Error: err.Error()})
 		return
 	}
-	http.Redirect(w, r, "/item-types/"+strconv.FormatInt(it.ID, 10)+"/edit", http.StatusSeeOther)
+	http.Redirect(w, r, "/settings/item-types/"+strconv.FormatInt(it.ID, 10)+"/edit", http.StatusSeeOther)
 }
 
 func (a *App) handleItemTypeEditForm(w http.ResponseWriter, r *http.Request) {
@@ -87,7 +87,7 @@ func (a *App) handleItemTypeUpdate(w http.ResponseWriter, r *http.Request) {
 		a.Render(w, http.StatusBadRequest, "itemtypes_form", itemTypeFormData{User: currentUser(r), ItemType: it, FieldTypes: models.AllFieldTypes, Error: err.Error()})
 		return
 	}
-	http.Redirect(w, r, "/item-types/"+strconv.FormatInt(id, 10)+"/edit", http.StatusSeeOther)
+	http.Redirect(w, r, "/settings/item-types/"+strconv.FormatInt(id, 10)+"/edit", http.StatusSeeOther)
 }
 
 func (a *App) handleItemTypeDelete(w http.ResponseWriter, r *http.Request) {
@@ -97,10 +97,10 @@ func (a *App) handleItemTypeDelete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if err := a.ItemTypes.Delete(r.Context(), id); err != nil {
-		http.Redirect(w, r, "/item-types/"+strconv.FormatInt(id, 10)+"/edit?error="+err.Error(), http.StatusSeeOther)
+		http.Redirect(w, r, "/settings/item-types/"+strconv.FormatInt(id, 10)+"/edit?error="+err.Error(), http.StatusSeeOther)
 		return
 	}
-	http.Redirect(w, r, "/item-types", http.StatusSeeOther)
+	http.Redirect(w, r, "/settings/item-types", http.StatusSeeOther)
 }
 
 func (a *App) handleFieldCreate(w http.ResponseWriter, r *http.Request) {
@@ -124,7 +124,7 @@ func (a *App) handleFieldCreate(w http.ResponseWriter, r *http.Request) {
 	if err := a.ItemTypes.CreateField(r.Context(), f); err != nil {
 		a.Log.Warn("create field failed", "error", err)
 	}
-	http.Redirect(w, r, "/item-types/"+strconv.FormatInt(id, 10)+"/edit", http.StatusSeeOther)
+	http.Redirect(w, r, "/settings/item-types/"+strconv.FormatInt(id, 10)+"/edit", http.StatusSeeOther)
 }
 
 func (a *App) handleFieldUpdate(w http.ResponseWriter, r *http.Request) {
@@ -159,7 +159,7 @@ func (a *App) handleFieldUpdate(w http.ResponseWriter, r *http.Request) {
 	if err := a.ItemTypes.UpdateField(r.Context(), f); err != nil {
 		a.Log.Warn("update field failed", "error", err)
 	}
-	http.Redirect(w, r, "/item-types/"+strconv.FormatInt(itemTypeID, 10)+"/edit", http.StatusSeeOther)
+	http.Redirect(w, r, "/settings/item-types/"+strconv.FormatInt(itemTypeID, 10)+"/edit", http.StatusSeeOther)
 }
 
 func (a *App) handleFieldDelete(w http.ResponseWriter, r *http.Request) {
@@ -176,7 +176,7 @@ func (a *App) handleFieldDelete(w http.ResponseWriter, r *http.Request) {
 	if err := a.ItemTypes.DeleteField(r.Context(), fieldID); err != nil {
 		a.Log.Warn("delete field failed", "error", err)
 	}
-	http.Redirect(w, r, "/item-types/"+strconv.FormatInt(itemTypeID, 10)+"/edit", http.StatusSeeOther)
+	http.Redirect(w, r, "/settings/item-types/"+strconv.FormatInt(itemTypeID, 10)+"/edit", http.StatusSeeOther)
 }
 
 func atoiDefault(s string, def int) int {
diff --git a/internal/web/handlers_users.go b/internal/web/handlers_users.go
index 3017780..64b440b 100644
--- a/internal/web/handlers_users.go
+++ b/internal/web/handlers_users.go
@@ -50,7 +50,7 @@ func (a *App) handleUserCreate(w http.ResponseWriter, r *http.Request) {
 		a.Render(w, http.StatusBadRequest, "users_form", userFormData{User: currentUser(r), EditUser: u, Error: err.Error()})
 		return
 	}
-	http.Redirect(w, r, "/users", http.StatusSeeOther)
+	http.Redirect(w, r, "/settings/users", http.StatusSeeOther)
 }
 
 func (a *App) handleUserEditForm(w http.ResponseWriter, r *http.Request) {
@@ -92,7 +92,7 @@ func (a *App) handleUserUpdate(w http.ResponseWriter, r *http.Request) {
 		a.Render(w, http.StatusBadRequest, "users_form", userFormData{User: currentUser(r), EditUser: u, Error: err.Error()})
 		return
 	}
-	http.Redirect(w, r, "/users", http.StatusSeeOther)
+	http.Redirect(w, r, "/settings/users", http.StatusSeeOther)
 }
 
 func (a *App) handleUserPassword(w http.ResponseWriter, r *http.Request) {
@@ -111,7 +111,7 @@ func (a *App) handleUserPassword(w http.ResponseWriter, r *http.Request) {
 			a.Log.Warn("set password failed", "error", err)
 		}
 	}
-	http.Redirect(w, r, "/users/"+strconv.FormatInt(id, 10)+"/edit", http.StatusSeeOther)
+	http.Redirect(w, r, "/settings/users/"+strconv.FormatInt(id, 10)+"/edit", http.StatusSeeOther)
 }
 
 func (a *App) handleUserDelete(w http.ResponseWriter, r *http.Request) {
@@ -123,5 +123,5 @@ func (a *App) handleUserDelete(w http.ResponseWriter, r *http.Request) {
 	if err := a.Users.Delete(r.Context(), id); err != nil {
 		a.Log.Warn("delete user failed", "error", err)
 	}
-	http.Redirect(w, r, "/users", http.StatusSeeOther)
+	http.Redirect(w, r, "/settings/users", http.StatusSeeOther)
 }
diff --git a/internal/web/router.go b/internal/web/router.go
index 81c4bc4..700ac6c 100644
--- a/internal/web/router.go
+++ b/internal/web/router.go
@@ -59,27 +59,9 @@ func (a *App) Router() http.Handler {
 	mux.HandleFunc("GET /export/assets.csv", a.requireLogin(a.handleExportCSV))
 	mux.HandleFunc("POST /import/assets.csv", a.requireAdmin(a.handleImportCSV))
 
-	// Item types (admin, traditional pages)
-	mux.HandleFunc("GET /item-types", a.requireAdmin(a.handleItemTypesList))
-	mux.HandleFunc("GET /item-types/new", a.requireAdmin(a.handleItemTypeNewForm))
-	mux.HandleFunc("POST /item-types", a.requireAdmin(a.handleItemTypeCreate))
-	mux.HandleFunc("GET /item-types/{id}/edit", a.requireAdmin(a.handleItemTypeEditForm))
-	mux.HandleFunc("POST /item-types/{id}", a.requireAdmin(a.handleItemTypeUpdate))
-	mux.HandleFunc("POST /item-types/{id}/delete", a.requireAdmin(a.handleItemTypeDelete))
-	mux.HandleFunc("POST /item-types/{id}/fields", a.requireAdmin(a.handleFieldCreate))
-	mux.HandleFunc("POST /item-types/{id}/fields/{fieldID}", a.requireAdmin(a.handleFieldUpdate))
-	mux.HandleFunc("POST /item-types/{id}/fields/{fieldID}/delete", a.requireAdmin(a.handleFieldDelete))
-
-	// Users (admin, traditional pages)
-	mux.HandleFunc("GET /users", a.requireAdmin(a.handleUsersList))
-	mux.HandleFunc("GET /users/new", a.requireAdmin(a.handleUserNewForm))
-	mux.HandleFunc("POST /users", a.requireAdmin(a.handleUserCreate))
-	mux.HandleFunc("GET /users/{id}/edit", a.requireAdmin(a.handleUserEditForm))
-	mux.HandleFunc("POST /users/{id}", a.requireAdmin(a.handleUserUpdate))
-	mux.HandleFunc("POST /users/{id}/password", a.requireAdmin(a.handleUserPassword))
-	mux.HandleFunc("POST /users/{id}/delete", a.requireAdmin(a.handleUserDelete))
-
-	// Settings (admin, traditional page)
+	// Settings (admin, traditional pages) - Item Types, Users, and general
+	// settings all live under one unified /settings section with shared
+	// sub-navigation, rather than as separate top-level nav items.
 	mux.HandleFunc("GET /settings", a.requireAdmin(a.handleSettingsPage))
 	mux.HandleFunc("POST /settings/general", a.requireAdmin(a.handleSettingsGeneral))
 	mux.HandleFunc("POST /settings/statuses", a.requireAdmin(a.handleStatusCreate))
@@ -87,6 +69,24 @@ func (a *App) Router() http.Handler {
 	mux.HandleFunc("POST /settings/statuses/{id}/delete", a.requireAdmin(a.handleStatusDelete))
 	mux.HandleFunc("POST /settings/statuses/{id}/reorder", a.requireAdmin(a.handleStatusReorder))
 
+	mux.HandleFunc("GET /settings/item-types", a.requireAdmin(a.handleItemTypesList))
+	mux.HandleFunc("GET /settings/item-types/new", a.requireAdmin(a.handleItemTypeNewForm))
+	mux.HandleFunc("POST /settings/item-types", a.requireAdmin(a.handleItemTypeCreate))
+	mux.HandleFunc("GET /settings/item-types/{id}/edit", a.requireAdmin(a.handleItemTypeEditForm))
+	mux.HandleFunc("POST /settings/item-types/{id}", a.requireAdmin(a.handleItemTypeUpdate))
+	mux.HandleFunc("POST /settings/item-types/{id}/delete", a.requireAdmin(a.handleItemTypeDelete))
+	mux.HandleFunc("POST /settings/item-types/{id}/fields", a.requireAdmin(a.handleFieldCreate))
+	mux.HandleFunc("POST /settings/item-types/{id}/fields/{fieldID}", a.requireAdmin(a.handleFieldUpdate))
+	mux.HandleFunc("POST /settings/item-types/{id}/fields/{fieldID}/delete", a.requireAdmin(a.handleFieldDelete))
+
+	mux.HandleFunc("GET /settings/users", a.requireAdmin(a.handleUsersList))
+	mux.HandleFunc("GET /settings/users/new", a.requireAdmin(a.handleUserNewForm))
+	mux.HandleFunc("POST /settings/users", a.requireAdmin(a.handleUserCreate))
+	mux.HandleFunc("GET /settings/users/{id}/edit", a.requireAdmin(a.handleUserEditForm))
+	mux.HandleFunc("POST /settings/users/{id}", a.requireAdmin(a.handleUserUpdate))
+	mux.HandleFunc("POST /settings/users/{id}/password", a.requireAdmin(a.handleUserPassword))
+	mux.HandleFunc("POST /settings/users/{id}/delete", a.requireAdmin(a.handleUserDelete))
+
 	return a.loadSession(mux)
 }
 
diff --git a/web/templates/layout.html b/web/templates/layout.html
index b70d491..2978919 100644
--- a/web/templates/layout.html
+++ b/web/templates/layout.html
@@ -20,8 +20,6 @@
       <ul class="navbar-nav me-auto">
         <li class="nav-item"><a class="nav-link" href="/inventory">Inventory</a></li>
         {{if .User.IsAdmin}}
-        <li class="nav-item"><a class="nav-link" href="/item-types">Item Types</a></li>
-        <li class="nav-item"><a class="nav-link" href="/users">Users</a></li>
         <li class="nav-item"><a class="nav-link" href="/settings">Settings</a></li>
         {{end}}
       </ul>
diff --git a/web/templates/pages/itemtypes_form.html b/web/templates/pages/itemtypes_form.html
index c5a02c2..3011ae9 100644
--- a/web/templates/pages/itemtypes_form.html
+++ b/web/templates/pages/itemtypes_form.html
@@ -1,15 +1,21 @@
 {{define "content"}}
-<div class="container-fluid p-3" style="max-width: 900px">
+<div class="container-fluid p-3">
+  <h4 class="mb-3">Settings</h4>
+  <div class="row g-3">
+    <div class="col-md-3 col-lg-2">
+      {{template "settings_nav" "itemtypes"}}
+    </div>
+    <div class="col-md-9 col-lg-10" style="max-width: 900px">
   <div class="d-flex align-items-center mb-3">
-    <h4 class="mb-0">{{if .ItemType}}Edit Item Type{{else}}New Item Type{{end}}</h4>
-    <a href="/item-types" class="btn btn-sm btn-outline-secondary ms-auto">Back to Item Types</a>
+    <h5 class="mb-0">{{if .ItemType}}Edit Item Type{{else}}New Item Type{{end}}</h5>
+    <a href="/settings/item-types" class="btn btn-sm btn-outline-secondary ms-auto">Back to Item Types</a>
   </div>
 
   {{if .Error}}<div class="alert alert-danger">{{.Error}}</div>{{end}}
 
   <div class="card mb-4">
     <div class="card-body">
-      <form method="post" action="{{if .ItemType}}/item-types/{{.ItemType.ID}}{{else}}/item-types{{end}}">
+      <form method="post" action="{{if .ItemType}}/settings/item-types/{{.ItemType.ID}}{{else}}/settings/item-types{{end}}">
         <div class="row g-3">
           <div class="col-md-6">
             <label class="form-label">Name</label>
@@ -36,7 +42,7 @@
         </div>
         <button type="submit" class="btn btn-primary mt-3">Save</button>
         {{if .ItemType}}
-        <button type="submit" formaction="/item-types/{{.ItemType.ID}}/delete" class="btn btn-outline-danger mt-3" onclick="return confirm('Delete this item type? This is only possible if no assets use it.')">Delete Item Type</button>
+        <button type="submit" formaction="/settings/item-types/{{.ItemType.ID}}/delete" class="btn btn-outline-danger mt-3" onclick="return confirm('Delete this item type? This is only possible if no assets use it.')">Delete Item Type</button>
         {{end}}
       </form>
     </div>
@@ -65,7 +71,7 @@
                 data-options="{{range $i, $o := .Options}}{{if $i}}&#10;{{end}}{{$o}}{{end}}" data-sort-order="{{.SortOrder}}">
                 Edit
               </button>
-              <form method="post" action="/item-types/{{$.ItemType.ID}}/fields/{{.ID}}/delete" class="d-inline" onsubmit="return confirm('Delete this field? Existing values will be lost.')">
+              <form method="post" action="/settings/item-types/{{$.ItemType.ID}}/fields/{{.ID}}/delete" class="d-inline" onsubmit="return confirm('Delete this field? Existing values will be lost.')">
                 <button type="submit" class="btn btn-sm btn-outline-danger">Delete</button>
               </form>
             </td>
@@ -79,7 +85,7 @@
     </div>
     <div class="card-body border-top">
       <h6 id="fieldFormTitle">Add Field</h6>
-      <form method="post" action="/item-types/{{.ItemType.ID}}/fields" id="fieldForm" class="row g-2 align-items-end">
+      <form method="post" action="/settings/item-types/{{.ItemType.ID}}/fields" id="fieldForm" class="row g-2 align-items-end">
         <div class="col-md-3">
           <label class="form-label small mb-1">Name</label>
           <input type="text" class="form-control form-control-sm" name="name" id="fieldFormName" required>
@@ -112,9 +118,11 @@
       <button type="button" class="btn btn-sm btn-link d-none" id="fieldFormCancel">Cancel edit</button>
     </div>
   </div>
-  <script>window.itemTypeFieldsBaseAction = "/item-types/{{.ItemType.ID}}/fields";</script>
+  <script>window.itemTypeFieldsBaseAction = "/settings/item-types/{{.ItemType.ID}}/fields";</script>
   {{else}}
   <p class="text-body-secondary">Save the item type first to add custom fields.</p>
   {{end}}
+    </div>
+  </div>
 </div>
 {{end}}
diff --git a/web/templates/pages/itemtypes_list.html b/web/templates/pages/itemtypes_list.html
index dd9f21e..5023d0e 100644
--- a/web/templates/pages/itemtypes_list.html
+++ b/web/templates/pages/itemtypes_list.html
@@ -1,27 +1,35 @@
 {{define "content"}}
 <div class="container-fluid p-3">
-  <div class="d-flex align-items-center mb-3">
-    <h4 class="mb-0">Item Types</h4>
-    <a href="/item-types/new" class="btn btn-primary btn-sm ms-auto"><i class="bi bi-plus-lg"></i> New Item Type</a>
-  </div>
-  <div class="table-responsive">
-    <table class="table table-hover align-middle">
-      <thead><tr><th>Icon</th><th>Name</th><th>Description</th><th>Custom Fields</th><th>Status</th><th></th></tr></thead>
-      <tbody>
-        {{range .ItemTypes}}
-        <tr>
-          <td><i class="bi {{iconOr .Icon "bi-box-seam"}} fs-5"></i></td>
-          <td><a href="/item-types/{{.ID}}/edit">{{.Name}}</a></td>
-          <td class="text-body-secondary">{{.Description}}</td>
-          <td>{{len .Fields}}</td>
-          <td>{{if .Enabled}}<span class="badge text-bg-success">Enabled</span>{{else}}<span class="badge text-bg-secondary">Disabled</span>{{end}}</td>
-          <td class="text-end"><a href="/item-types/{{.ID}}/edit" class="btn btn-sm btn-outline-secondary">Edit</a></td>
-        </tr>
-        {{else}}
-        <tr><td colspan="6" class="text-body-secondary">No item types defined yet.</td></tr>
-        {{end}}
-      </tbody>
-    </table>
+  <h4 class="mb-3">Settings</h4>
+  <div class="row g-3">
+    <div class="col-md-3 col-lg-2">
+      {{template "settings_nav" "itemtypes"}}
+    </div>
+    <div class="col-md-9 col-lg-10">
+      <div class="d-flex align-items-center mb-3">
+        <h5 class="mb-0">Item Types</h5>
+        <a href="/settings/item-types/new" class="btn btn-primary btn-sm ms-auto"><i class="bi bi-plus-lg"></i> New Item Type</a>
+      </div>
+      <div class="table-responsive">
+        <table class="table table-hover align-middle">
+          <thead><tr><th>Icon</th><th>Name</th><th>Description</th><th>Custom Fields</th><th>Status</th><th></th></tr></thead>
+          <tbody>
+            {{range .ItemTypes}}
+            <tr>
+              <td><i class="bi {{iconOr .Icon "bi-box-seam"}} fs-5"></i></td>
+              <td><a href="/settings/item-types/{{.ID}}/edit">{{.Name}}</a></td>
+              <td class="text-body-secondary">{{.Description}}</td>
+              <td>{{len .Fields}}</td>
+              <td>{{if .Enabled}}<span class="badge text-bg-success">Enabled</span>{{else}}<span class="badge text-bg-secondary">Disabled</span>{{end}}</td>
+              <td class="text-end"><a href="/settings/item-types/{{.ID}}/edit" class="btn btn-sm btn-outline-secondary">Edit</a></td>
+            </tr>
+            {{else}}
+            <tr><td colspan="6" class="text-body-secondary">No item types defined yet.</td></tr>
+            {{end}}
+          </tbody>
+        </table>
+      </div>
+    </div>
   </div>
 </div>
 {{end}}
diff --git a/web/templates/pages/settings.html b/web/templates/pages/settings.html
index c02b5eb..f3d8e77 100644
--- a/web/templates/pages/settings.html
+++ b/web/templates/pages/settings.html
@@ -1,6 +1,11 @@
 {{define "content"}}
-<div class="container-fluid p-3" style="max-width: 800px">
+<div class="container-fluid p-3">
   <h4 class="mb-3">Settings</h4>
+  <div class="row g-3">
+    <div class="col-md-3 col-lg-2">
+      {{template "settings_nav" "general"}}
+    </div>
+    <div class="col-md-9 col-lg-10" style="max-width: 800px">
 
   <div class="card mb-4">
     <div class="card-header py-2 fw-semibold">General</div>
@@ -82,5 +87,8 @@
       </form>
     </div>
   </div>
+
+    </div>
+  </div>
 </div>
 {{end}}
diff --git a/web/templates/pages/users_form.html b/web/templates/pages/users_form.html
index cd7916a..60df824 100644
--- a/web/templates/pages/users_form.html
+++ b/web/templates/pages/users_form.html
@@ -1,61 +1,69 @@
 {{define "content"}}
-<div class="container-fluid p-3" style="max-width: 600px">
-  <div class="d-flex align-items-center mb-3">
-    <h4 class="mb-0">{{if .EditUser}}Edit User{{else}}New User{{end}}</h4>
-    <a href="/users" class="btn btn-sm btn-outline-secondary ms-auto">Back to Users</a>
-  </div>
+<div class="container-fluid p-3">
+  <h4 class="mb-3">Settings</h4>
+  <div class="row g-3">
+    <div class="col-md-3 col-lg-2">
+      {{template "settings_nav" "users"}}
+    </div>
+    <div class="col-md-9 col-lg-10" style="max-width: 600px">
+      <div class="d-flex align-items-center mb-3">
+        <h5 class="mb-0">{{if .EditUser}}Edit User{{else}}New User{{end}}</h5>
+        <a href="/settings/users" class="btn btn-sm btn-outline-secondary ms-auto">Back to Users</a>
+      </div>
 
-  {{if .Error}}<div class="alert alert-danger">{{.Error}}</div>{{end}}
+      {{if .Error}}<div class="alert alert-danger">{{.Error}}</div>{{end}}
 
-  <div class="card mb-3">
-    <div class="card-body">
-      <form method="post" action="{{if .EditUser}}/users/{{.EditUser.ID}}{{else}}/users{{end}}">
-        <div class="mb-3">
-          <label class="form-label">Username</label>
-          <input type="text" class="form-control" name="username" value="{{if .EditUser}}{{.EditUser.Username}}{{end}}" required autofocus>
+      <div class="card mb-3">
+        <div class="card-body">
+          <form method="post" action="{{if .EditUser}}/settings/users/{{.EditUser.ID}}{{else}}/settings/users{{end}}">
+            <div class="mb-3">
+              <label class="form-label">Username</label>
+              <input type="text" class="form-control" name="username" value="{{if .EditUser}}{{.EditUser.Username}}{{end}}" required autofocus>
+            </div>
+            {{if not .EditUser}}
+            <div class="mb-3">
+              <label class="form-label">Password</label>
+              <input type="password" class="form-control" name="password" required autocomplete="new-password">
+            </div>
+            {{end}}
+            <div class="mb-3">
+              <label class="form-label">Role</label>
+              <select class="form-select" name="role">
+                <option value="user" {{if .EditUser}}{{if eq .EditUser.Role "user"}}selected{{end}}{{end}}>User</option>
+                <option value="admin" {{if .EditUser}}{{if eq .EditUser.Role "admin"}}selected{{end}}{{end}}>Admin</option>
+              </select>
+            </div>
+            <div class="form-check mb-3">
+              <input class="form-check-input" type="checkbox" name="enabled" id="enabled" {{if .EditUser}}{{if .EditUser.Enabled}}checked{{end}}{{else}}checked{{end}}>
+              <label class="form-check-label" for="enabled">Enabled</label>
+            </div>
+            <button type="submit" class="btn btn-primary">Save</button>
+          </form>
+          {{if .EditUser}}
+          <form method="post" action="/settings/users/{{.EditUser.ID}}/delete" class="d-inline mt-2" onsubmit="return confirm('Delete this user?')">
+            <button type="submit" class="btn btn-outline-danger">Delete User</button>
+          </form>
+          {{end}}
         </div>
-        {{if not .EditUser}}
-        <div class="mb-3">
-          <label class="form-label">Password</label>
-          <input type="password" class="form-control" name="password" required autocomplete="new-password">
-        </div>
-        {{end}}
-        <div class="mb-3">
-          <label class="form-label">Role</label>
-          <select class="form-select" name="role">
-            <option value="user" {{if .EditUser}}{{if eq .EditUser.Role "user"}}selected{{end}}{{end}}>User</option>
-            <option value="admin" {{if .EditUser}}{{if eq .EditUser.Role "admin"}}selected{{end}}{{end}}>Admin</option>
-          </select>
-        </div>
-        <div class="form-check mb-3">
-          <input class="form-check-input" type="checkbox" name="enabled" id="enabled" {{if .EditUser}}{{if .EditUser.Enabled}}checked{{end}}{{else}}checked{{end}}>
-          <label class="form-check-label" for="enabled">Enabled</label>
-        </div>
-        <button type="submit" class="btn btn-primary">Save</button>
-      </form>
+      </div>
+
       {{if .EditUser}}
-      <form method="post" action="/users/{{.EditUser.ID}}/delete" class="d-inline mt-2" onsubmit="return confirm('Delete this user?')">
-        <button type="submit" class="btn btn-outline-danger">Delete User</button>
-      </form>
+      <div class="card">
+        <div class="card-header py-2 fw-semibold">Change Password</div>
+        <div class="card-body">
+          <form method="post" action="/settings/users/{{.EditUser.ID}}/password" class="row g-2 align-items-end">
+            <div class="col">
+              <label class="form-label">New Password</label>
+              <input type="password" class="form-control" name="password" autocomplete="new-password">
+            </div>
+            <div class="col-auto">
+              <button type="submit" class="btn btn-outline-primary">Set Password</button>
+            </div>
+          </form>
+        </div>
+      </div>
       {{end}}
     </div>
   </div>
-
-  {{if .EditUser}}
-  <div class="card">
-    <div class="card-header py-2 fw-semibold">Change Password</div>
-    <div class="card-body">
-      <form method="post" action="/users/{{.EditUser.ID}}/password" class="row g-2 align-items-end">
-        <div class="col">
-          <label class="form-label">New Password</label>
-          <input type="password" class="form-control" name="password" autocomplete="new-password">
-        </div>
-        <div class="col-auto">
-          <button type="submit" class="btn btn-outline-primary">Set Password</button>
-        </div>
-      </form>
-    </div>
-  </div>
-  {{end}}
 </div>
 {{end}}
diff --git a/web/templates/pages/users_list.html b/web/templates/pages/users_list.html
index b40b2bd..5c38bcb 100644
--- a/web/templates/pages/users_list.html
+++ b/web/templates/pages/users_list.html
@@ -1,24 +1,32 @@
 {{define "content"}}
 <div class="container-fluid p-3">
-  <div class="d-flex align-items-center mb-3">
-    <h4 class="mb-0">Users</h4>
-    <a href="/users/new" class="btn btn-primary btn-sm ms-auto"><i class="bi bi-person-plus"></i> New User</a>
-  </div>
-  <div class="table-responsive">
-    <table class="table table-hover align-middle">
-      <thead><tr><th>Username</th><th>Role</th><th>Status</th><th>Created</th><th></th></tr></thead>
-      <tbody>
-        {{range .Users}}
-        <tr>
-          <td><a href="/users/{{.ID}}/edit">{{.Username}}</a></td>
-          <td>{{if .IsAdmin}}<span class="badge text-bg-primary">Admin</span>{{else}}<span class="badge text-bg-secondary">User</span>{{end}}</td>
-          <td>{{if .Enabled}}<span class="badge text-bg-success">Enabled</span>{{else}}<span class="badge text-bg-secondary">Disabled</span>{{end}}</td>
-          <td>{{fmtDateShort .CreatedAt}}</td>
-          <td class="text-end"><a href="/users/{{.ID}}/edit" class="btn btn-sm btn-outline-secondary">Edit</a></td>
-        </tr>
-        {{end}}
-      </tbody>
-    </table>
+  <h4 class="mb-3">Settings</h4>
+  <div class="row g-3">
+    <div class="col-md-3 col-lg-2">
+      {{template "settings_nav" "users"}}
+    </div>
+    <div class="col-md-9 col-lg-10">
+      <div class="d-flex align-items-center mb-3">
+        <h5 class="mb-0">Users</h5>
+        <a href="/settings/users/new" class="btn btn-primary btn-sm ms-auto"><i class="bi bi-person-plus"></i> New User</a>
+      </div>
+      <div class="table-responsive">
+        <table class="table table-hover align-middle">
+          <thead><tr><th>Username</th><th>Role</th><th>Status</th><th>Created</th><th></th></tr></thead>
+          <tbody>
+            {{range .Users}}
+            <tr>
+              <td><a href="/settings/users/{{.ID}}/edit">{{.Username}}</a></td>
+              <td>{{if .IsAdmin}}<span class="badge text-bg-primary">Admin</span>{{else}}<span class="badge text-bg-secondary">User</span>{{end}}</td>
+              <td>{{if .Enabled}}<span class="badge text-bg-success">Enabled</span>{{else}}<span class="badge text-bg-secondary">Disabled</span>{{end}}</td>
+              <td>{{fmtDateShort .CreatedAt}}</td>
+              <td class="text-end"><a href="/settings/users/{{.ID}}/edit" class="btn btn-sm btn-outline-secondary">Edit</a></td>
+            </tr>
+            {{end}}
+          </tbody>
+        </table>
+      </div>
+    </div>
   </div>
 </div>
 {{end}}
diff --git a/web/templates/partials/settings_nav.html b/web/templates/partials/settings_nav.html
new file mode 100644
index 0000000..d1dac96
--- /dev/null
+++ b/web/templates/partials/settings_nav.html
@@ -0,0 +1,13 @@
+{{define "settings_nav"}}
+<div class="list-group settings-nav">
+  <a href="/settings" class="list-group-item list-group-item-action{{if eq . "general"}} active{{end}}">
+    <i class="bi bi-sliders me-2"></i>General
+  </a>
+  <a href="/settings/item-types" class="list-group-item list-group-item-action{{if eq . "itemtypes"}} active{{end}}">
+    <i class="bi bi-tags me-2"></i>Item Types
+  </a>
+  <a href="/settings/users" class="list-group-item list-group-item-action{{if eq . "users"}} active{{end}}">
+    <i class="bi bi-people me-2"></i>Users
+  </a>
+</div>
+{{end}}