diff --git a/routes.py b/routes.py
index b8e6934..034ceee 100644
--- a/routes.py
+++ b/routes.py
@@ -436,4 +436,5 @@ def settings():
     types = db.session.query(Item.id, Item.description.label("name")).order_by(Item.description).all()
     sections = db.session.query(Area).order_by(Area.name).all()
     functions = db.session.query(RoomFunction.id, RoomFunction.description.label("name")).order_by(RoomFunction.description).all()
-    return render_template('settings.html', title="Settings", brands=brands, types=types, sections=sections, functions=functions)
+    rooms = eager_load_room_relationships(db.session.query(Room).order_by(Room.name)).all()
+    return render_template('settings.html', title="Settings", brands=brands, types=types, sections=sections, functions=functions, rooms=rooms)
diff --git a/static/js/widget.js b/static/js/widget.js
index fd571a4..f6e89b4 100644
--- a/static/js/widget.js
+++ b/static/js/widget.js
@@ -1,12 +1,13 @@
 const ComboBoxWidget = (() => {
     let tempIdCounter = -1;
 
-    function initComboBox(ns) {
+    function initComboBox(ns, config = {}) {
         const input = document.querySelector(`#${ns}-input`);
         const list = document.querySelector(`#${ns}-list`);
         const addBtn = document.querySelector(`#${ns}-add`);
         const removeBtn = document.querySelector(`#${ns}-remove`);
         let currentlyEditing = null;
+        let tempIdCounter = -1;
 
         if (!input || !list || !addBtn || !removeBtn) {
             console.warn(`ComboBoxWidget: Missing elements for namespace '${ns}'`);
@@ -19,6 +20,7 @@ const ComboBoxWidget = (() => {
 
         input.addEventListener('input', () => {
             addBtn.disabled = input.value.trim() === '';
+            updateAddButtonIcon();
         });
 
         list.addEventListener('change', () => {
@@ -26,10 +28,9 @@ const ComboBoxWidget = (() => {
             removeBtn.disabled = selected.length === 0;
 
             if (selected.length === 1) {
-                // Load the text into input for editing
                 input.value = selected[0].textContent;
-                addBtn.disabled = input.value.trim() === '';
                 currentlyEditing = selected[0];
+                addBtn.disabled = input.value.trim() === '';
             } else {
                 input.value = '';
                 currentlyEditing = null;
@@ -42,30 +43,57 @@ const ComboBoxWidget = (() => {
         addBtn.addEventListener('click', () => {
             const newItem = input.value.trim();
             if (!newItem) return;
-        
+
             if (currentlyEditing) {
-                currentlyEditing.textContent = newItem;
+                if (config.onEdit) {
+                    config.onEdit(currentlyEditing, newItem);
+                } else {
+                    currentlyEditing.textContent = newItem;
+                }
                 currentlyEditing = null;
             } else {
                 const option = document.createElement('option');
                 option.textContent = newItem;
                 option.value = tempIdCounter--;
+
+                if (config.onAdd) {
+                    config.onAdd(option);
+                }
+
                 list.appendChild(option);
             }
-        
+
             input.value = '';
             addBtn.disabled = true;
             removeBtn.disabled = true;
-            sortOptions(list);
+            updateAddButtonIcon();
+
+            if (config.sort !== false) {
+                sortOptions(list);
+            }
         });
 
         removeBtn.addEventListener('click', () => {
-            Array.from(list.selectedOptions).forEach(opt => opt.remove());
+            Array.from(list.selectedOptions).forEach(option => {
+                if (config.onRemove) {
+                    config.onRemove(option);
+                }
+                option.remove();
+            });
+
             currentlyEditing = null;
-            removeBtn.disabled = true;
             input.value = '';
             addBtn.disabled = true;
+            removeBtn.disabled = true;
+            updateAddButtonIcon();
         });
+
+        function sortOptions(selectElement) {
+            const sorted = Array.from(selectElement.options)
+                .sort((a, b) => a.text.localeCompare(b.text));
+            selectElement.innerHTML = '';
+            sorted.forEach(option => selectElement.appendChild(option));
+        }
     }
 
     function sortOptions(selectElement) {
diff --git a/templates/fragments/_combobox_fragment.html b/templates/fragments/_combobox_fragment.html
index e5919ae..66667ea 100644
--- a/templates/fragments/_combobox_fragment.html
+++ b/templates/fragments/_combobox_fragment.html
@@ -1,6 +1,6 @@
 {% import "fragments/_icon_fragment.html" as icons %}
 
-{% macro render_combobox(id, options, label=none, placeholder=none) %}
+{% macro render_combobox(id, options, label=none, placeholder=none, onAdd=none, onRemove=none, onEdit=none) %}
     {% if label %}
         <label for="{{ id }}-input" class="form-label">{{ label }}</label>
     {% endif %}
@@ -23,7 +23,11 @@
 
     <script>
         document.addEventListener('DOMContentLoaded', () => {
-            ComboBoxWidget.initComboBox("{{ id }}");
+            ComboBoxWidget.initComboBox("{{ id }}", {
+                {% if onAdd %}onAdd: {{ onAdd }},{% endif %}
+                {% if onRemove %}onRemove: {{ onRemove }},{% endif %}
+                {% if onEdit %}onEdit: {{ onEdit }}{% endif %}
+            });
         });
     </script>
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
diff --git a/templates/settings.html b/templates/settings.html
index 4b30ab3..4d94c17 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -57,6 +57,16 @@
                         ) }}
                     </div>
                 </div>
+                <div class="row">
+                    <div class="col">
+                        {{ combos.render_combobox(
+                            id='room',
+                            options=rooms,
+                            label='Rooms',
+                            placeholder='Add a new room'
+                        ) }}
+                    </div>
+                </div>
             </div>
         </div>
     </div>