diff --git a/assets/css/app.css b/assets/css/app.css
index b07c5c9..2ba3d84 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -47,8 +47,8 @@
       @apply flex md:flex-row lg:flex-col mb-6 lg:mb-0;
     }
 
-    & .menu {
-      @apply flex-1;
+    & ul.menu {
+      @apply m-0;
     }
   }
 
diff --git a/lib/chiya/notes/note.ex b/lib/chiya/notes/note.ex
index 9db2e01..04d18d4 100644
--- a/lib/chiya/notes/note.ex
+++ b/lib/chiya/notes/note.ex
@@ -102,6 +102,16 @@ defmodule Chiya.Notes.Note do
     end
   end
 
+  def note_excerpt(note_content) do
+    if String.contains?(note_content, "<!-- more -->") do
+      note_content
+      |> String.split("<!-- more -->")
+      |> List.first()
+    else
+      String.slice(note_content, 0..150) <> ".."
+    end
+  end
+
   @doc false
   def changeset(note, attrs) do
     # if you need to have a preloaded note here,
diff --git a/lib/chiya_web/components/layouts/root_public.html.heex b/lib/chiya_web/components/layouts/root_public.html.heex
index 976968b..6344eeb 100644
--- a/lib/chiya_web/components/layouts/root_public.html.heex
+++ b/lib/chiya_web/components/layouts/root_public.html.heex
@@ -72,30 +72,24 @@
 
     <main id="site-content" class="container print:hidden">
       <aside id="primary-sidebar">
-        <nav class="prose">
-          <div class="menu">
-            <strong>Channels</strong>
+        <nav class="prose max-w-none">
+          <h3>Channels</h3>
+          <ul class="menu">
+            <%= for channel <- @channels do %>
+              <li>
+                <a href={~p"/channel/#{channel.slug}"}>
+                  <%= channel.name %>
+                </a>
+              </li>
+            <% end %>
+          </ul>
 
-            <ul>
-              <%= for channel <- @channels do %>
-                <li>
-                  <a href={~p"/channel/#{channel.slug}"}>
-                    <%= channel.name %>
-                  </a>
-                </li>
-              <% end %>
-            </ul>
-          </div>
-
-          <div class="menu">
-            <strong>Elsewhere</strong>
-
-            <ul>
-              <%= for identity <- @public_identities do %>
-                <li><a href={identity.url}><%= identity.name %></a></li>
-              <% end %>
-            </ul>
-          </div>
+          <h3>Elsewhere</h3>
+          <ul class="menu">
+            <%= for identity <- @public_identities do %>
+              <li><a href={identity.url}><%= identity.name %></a></li>
+            <% end %>
+          </ul>
         </nav>
       </aside>
 
diff --git a/lib/chiya_web/controllers/page_html/note_list_default.html.heex b/lib/chiya_web/controllers/page_html/note_list_default.html.heex
index 9885f4e..ee90a3d 100644
--- a/lib/chiya_web/controllers/page_html/note_list_default.html.heex
+++ b/lib/chiya_web/controllers/page_html/note_list_default.html.heex
@@ -1,28 +1,30 @@
 <section class="note-list default stack">
   <%= for note <- assigns.notes do %>
-    <article>
-      <a href={~p"/note/#{note.slug}"} class="block">
-        <header class="flex flex-row items-center gap-1">
-          <span class="text-theme-primary text-lg font-semibold leading-8 flex-1">
+    <article class="prose max-w-none">
+      <header class="flex flex-row items-center gap-1">
+        <span class="text-theme-primary text-lg font-semibold leading-8 flex-1">
+          <a href={~p"/note/#{note.slug}"}>
             <%= note.name %>
-          </span>
-          <span class="text-theme-base/75 text-sm">
-            <%= pretty_date(note.published_at) %>
-          </span>
-        </header>
+          </a>
+        </span>
+      </header>
 
-        <%= if assigns.show_content do %>
-          <p class="text-theme-base">
-            <%= String.slice(note.content, 0..150) %>
-          </p>
-        <% end %>
+      <%= if assigns.show_content do %>
+        <p class="text-theme-base mb-3">
+          <%= Chiya.Notes.Note.note_excerpt(note.content) %>
+        </p>
+      <% end %>
 
+      <footer class="flex">
+        <span class="text-theme-base/75 flex-1">
+          <%= pretty_date(note.published_at) %>
+        </span>
         <%= if not Enum.empty?(note.tags) do %>
           <span class="inline-block">
             <.tag_list note={note} linked={false} />
           </span>
         <% end %>
-      </a>
+      </footer>
     </article>
   <% end %>
 </section>