diff --git a/server/notes/static/notes/stylesheets/style.css b/server/notes/static/notes/stylesheets/style.css
index 4217125..791e77f 100644
--- a/server/notes/static/notes/stylesheets/style.css
+++ b/server/notes/static/notes/stylesheets/style.css
@@ -74,10 +74,6 @@ button {
 	margin: auto;
 }
 
-.notes.notes-grid {
-	display: grid;
-}
-
 .note {
 	display: inline-block;
 	width: 100%;
diff --git a/server/notes/templates/notes/home.html b/server/notes/templates/notes/home.html
index b0ab331..a8e8c1f 100644
--- a/server/notes/templates/notes/home.html
+++ b/server/notes/templates/notes/home.html
@@ -7,53 +7,17 @@
 	{% include "notes/messages.html" %}
 
 	<h2>Notes for you</h2>
-	{% if notes %}
-		<div class="notes">
-			{% for note in notes %}
-				<div class="note">
-					<p>{{ note.note }}</p>
-					<p class="note-from">From {{ note.from_user.visible_name }}</p>
-					<p class="note-at">{{ note.created_at|date:"j M, H:i"}}</p>
-				</div>
-			{% endfor %}
-		</div>
-	{% else %}
-		<div class="card">No Notes found</div>
-	{% endif %}
+	{% include "notes/notes.html" with object_list=notes show_from=True show_to=False %}
 
 	<div class="title-and-link">
 		<h2>Active Sent Notes</h2>
 		<a href="{% url "sent-notes" %}">View All including expired</a>
 	</div>
-	{% if alive_created %}
-		<div class="notes">
-			{% for note in alive_created %}
-			<div class="note">
-				<p>{{ note.note }}</p>
-				<p class="note-from">From {{ note.from_user.visible_name }}</p>
-				<p class="note-at">{{ note.created_at|date:"j M Y, H:i"}}</p>
-			</div>
-			{% endfor %}
-		</div>
-	{% else %}
-		<div class="card">No Notes found</div>
-	{% endif %}
+	{% include "notes/notes.html" with object_list=alive_created show_from=False show_to=True %}
 
 	<div class="title-and-link">
 		<h2>Archived Notes</h2>
 		<a href="{% url "archive" %}">View All</a>
 	</div>
-	{% if archive %}
-		<div class="notes">
-			{% for note in archive %}
-			<div class="note">
-				<p>{{ note.note }}</p>
-				<p class="note-from">From {{ note.from_user.visible_name }}</p>
-				<p class="note-at">{{ note.created_at|date:"j M Y, H:i"}}</p>
-			</div>
-			{% endfor %}
-		</div>
-	{% else %}
-		<div class="card">No Notes found</div>
-	{% endif %}
+	{% include "notes/notes.html" with object_list=archive show_from=True show_to=False %}
 {% endblock %}
diff --git a/server/notes/templates/notes/note_list.html b/server/notes/templates/notes/note_list.html
index 9c9571e..c61cda6 100644
--- a/server/notes/templates/notes/note_list.html
+++ b/server/notes/templates/notes/note_list.html
@@ -5,20 +5,5 @@
 {% block body %}
 	<h1>{{ title }}</h1>
 	{% include "notes/messages.html" %}
-
-	{% if object_list %}
-		<div class="notes">
-			{% for note in object_list %}
-			<div class="note">
-				<p>{{ note.note }}</p>
-				{% if show_from %}<p class="note-from">From {{ note.from_user.visible_name }}</p>{% endif %}
-				{% if show_to %}<p class="note-to">To {{ note.to_user.visible_name }}</p>{% endif %}
-				<p class="note-at">{{ note.created_at|date:"j M Y, H:i"}}</p>
-			</div>
-			{% endfor %}
-		</div>
-	{% else %}
-		<div class="card">No Notes found</div>
-	{% endif %}
-
+	{% include "notes/notes.html" %}
 {% endblock %}
diff --git a/server/notes/templates/notes/notes.html b/server/notes/templates/notes/notes.html
new file mode 100644
index 0000000..7fd5c9e
--- /dev/null
+++ b/server/notes/templates/notes/notes.html
@@ -0,0 +1,15 @@
+{% if object_list %}
+	<div class="notes">
+		{% for note in object_list %}
+		<div class="note">
+			<p>{{ note.note | linebreaksbr }}</p>
+			{% if show_from %}<p class="note-from">From {{ note.from_user.visible_name }}</p>{% endif %}
+			{% if show_to %}<p class="note-to">To {{ note.to_user.visible_name }}</p>{% endif %}
+			<p class="note-at">{{ note.created_at|date:"j M Y, H:i"}}</p>
+		</div>
+		{% endfor %}
+	</div>
+{% else %}
+	<div class="card">No Notes found</div>
+{% endif %}
+