diff --git a/src/character/templates/character/notes_display.html b/src/character/templates/character/notes_display.html
index 2c483af..69098eb 100644
--- a/src/character/templates/character/notes_display.html
+++ b/src/character/templates/character/notes_display.html
@@ -1,10 +1,13 @@
-<p>
-    <a hx-get="{% url "character:notes_change" pk=character.pk %}"
-        hx-target="#notes"
-        hx-swap="innerHTML"
-        class="btn btn-primary btn-sm"
-    >
-        <i class="fa-solid fa-pen-to-square"></i> Edit
-    </a>
-</p>
-{{ character.notes|linebreaks }}
+<div class="row" id="notes">
+    <h4 class="mt-3">
+        Notes
+        <a hx-get="{% url "character:notes_change" pk=character.pk %}"
+            hx-target="#notes"
+            hx-swap="outerHTML"
+            class="btn btn-primary btn-sm"
+        >
+            <i class="fa-solid fa-pen-to-square"></i> Edit
+        </a>
+    </h4>
+    {{ character.notes|linebreaks }}
+</div>
diff --git a/src/character/templates/character/notes_update.html b/src/character/templates/character/notes_update.html
index 401e004..004e256 100644
--- a/src/character/templates/character/notes_update.html
+++ b/src/character/templates/character/notes_update.html
@@ -1,13 +1,16 @@
-<form>
-    <p>
-        <a hx-post="{% url "character:notes_change" pk=character.pk %}"
-            hx-target="#notes"
-            hx-swap="innerHTML"
-            class="btn btn-primary btn-sm"
-        >
-            <i class="fa-solid fa-save"></i> Save
-        </a>
-    </p>
-    {% csrf_token %}
-    <textarea class="form-control" name="notes" rows="10">{{ character.notes }}</textarea>
-</form>
+<div class="row" id="notes">
+    <form>
+        <h4 class="mt-3">
+            Notes
+            <a hx-post="{% url "character:notes_change" pk=character.pk %}"
+                hx-target="#notes"
+                hx-swap="innerHTML"
+                class="btn btn-primary btn-sm"
+            >
+                <i class="fa-solid fa-save"></i> Save
+            </a>
+        </h4>
+        {% csrf_token %}
+        <textarea class="form-control" name="notes" rows="10">{{ character.notes }}</textarea>
+    </form>
+</div>
diff --git a/src/character/templates/character/view.html b/src/character/templates/character/view.html
index 25da45f..6538a0e 100644
--- a/src/character/templates/character/view.html
+++ b/src/character/templates/character/view.html
@@ -361,8 +361,5 @@
             </div>
         {% endfor %}
     </div>
-    <h4 class="mt-3">Notes</h4>
-    <div class="row" id="notes">
-        {% include "character/notes_display.html" %}
-    </div>
+    {% include "character/notes_display.html" %}
 {% endblock %}