diff --git a/inventory/templates/fragments/_editor_fragment.html b/inventory/templates/fragments/_editor_fragment.html
index 9e96624..8bd2c83 100644
--- a/inventory/templates/fragments/_editor_fragment.html
+++ b/inventory/templates/fragments/_editor_fragment.html
@@ -9,17 +9,17 @@
                     <a class="nav-link text-black">{{ title }}</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link{% if mode == 'edit' %} active{% endif %}" data-bs-toggle="tab" data-bs-target="#editor{{ id }}" id="editTab{{ id }}">{{ icons.render_icon('pencil', 16) }}</a>
+                    <a class="nav-link{% if mode == 'view' %} active{% endif %}" data-bs-toggle="tab" data-bs-target="#viewer{{ id }}">{{ icons.render_icon('file-earmark-richtext', 16) }}</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link{% if mode == 'view' %} active{% endif %}" data-bs-toggle="tab" data-bs-target="#viewer{{ id }}">{{ icons.render_icon('file-earmark-richtext', 16) }}</a>
+                    <a class="nav-link{% if mode == 'edit' %} active{% endif %}" data-bs-toggle="tab" data-bs-target="#editor{{ id }}" id="editTab{{ id }}">{{ icons.render_icon('pencil', 16) }}</a>
                 </li>
             </ul>
             <div class="tab-content" id="tabContent{{ id }}">
+                <div class="tab-pane fade{% if mode == 'view' %} show active border border-top-0{% endif %} p-2 markdown-body" id="viewer{{ id }}"></div>
                 <div class="tab-pane fade{% if mode == 'edit' %} show active border border-top-0{% endif %}" id="editor{{ id }}">
                     <textarea id="textEditor{{ id }}" name="update{{ id }}" class="form-control border-top-0 rounded-top-0" data-note-id="{{ id }}">{{ content if content }}</textarea>
                 </div>
-                <div class="tab-pane fade{% if mode == 'view' %} show active border border-top-0{% endif %} p-2 markdown-body" id="viewer{{ id }}"></div>
             </div>
         </div>
     </div>
diff --git a/inventory/templates/inventory.html b/inventory/templates/inventory.html
index fc83419..2768dfa 100644
--- a/inventory/templates/inventory.html
+++ b/inventory/templates/inventory.html
@@ -114,10 +114,18 @@
         </div>
     </div>
     <div class="row">
-        <div class="col">
-            <label for="notes" class="form-label">Notes &amp; Comments</label>
+        <div class="col p-3">
+            {#
+            <label for="notes" class="form-label">Notes & Comments</label>
             <textarea name="notes" id="notes" class="form-control"
                 rows="10">{{ item.notes if item.notes else '' }}</textarea>
+            #}
+            {{ editor.render_editor(
+                id = "notes",
+                title = "Notes & Comments",
+                mode = 'view' if item.id else 'edit',
+                content = item.notes if item.notes else ''
+            ) }}
         </div>
         {% if worklog %}
         <div class="col">