diff --git a/inventory/routes/entry.py b/inventory/routes/entry.py
index a111eba..5ed0007 100644
--- a/inventory/routes/entry.py
+++ b/inventory/routes/entry.py
@@ -40,8 +40,6 @@ def _fields_for_model(model: str):
             {"name": "location", "row": "status", "label": "Location", "wrap": {"class": "col"},
              "attrs": {"class": "form-control"}, "label_attrs": {"class": "form-label"},
              "label_spec": "{name} - {room_function.description}"},
-            # {"name": "condition", "row": "status", "label": "Condition", "wrap": {"class": "col"},
-            #  "attrs": {"class": "form-control"}, "label_attrs": {"class": "form-label"}},
             {"name": "condition", "label": "Condition", "row": "status", "wrap": {"class": "col"},
              "type": "select", "options": [
                  {"label": "Deployed", "value": "Deployed"},
@@ -66,8 +64,8 @@ def _fields_for_model(model: str):
             {"name": "names", "order": 20, "attrs": {"class": "row"}, "parent": "everything"},
             {"name": "device", "order": 30, "attrs": {"class": "row mt-2"}, "parent": "everything"},
             {"name": "status", "order": 40, "attrs": {"class": "row mt-2"}, "parent": "everything"},
-            {"name": "notes", "order": 45, "attrs": {"class": "row mt-2"}, "parent": "everything"},
             {"name": "image", "order": 50, "attrs": {"class": "col-4"}, "parent": "kitchen_sink"},
+            {"name": "notes", "order": 55, "attrs": {"class": "row mt-2"}},
         ]
 
     elif model.lower() == 'user':
diff --git a/inventory/templates/inventory_note.html b/inventory/templates/inventory_note.html
index d2c5088..e970b86 100644
--- a/inventory/templates/inventory_note.html
+++ b/inventory/templates/inventory_note.html
@@ -1,5 +1,5 @@
 <label class="form-label">Notes</label>
-<div class="d-flex justify-content-between align-items-start">
+<div class="d-flex justify-content-between align-items-start border rounded py-1 px-2">
     <div class="me-3 w-100 markdown-body" id="editContainer"></div>
     <script type="application/json" id="noteContent">{{ (field['template_ctx']['values']['notes'] if field['template_ctx']['values']['notes'] else '') | tojson }}</script>
     <div class="form-check form-switch">