diff --git a/app/lish/[did]/[publication]/PublicationNav.tsx b/app/lish/[did]/[publication]/PublicationNav.tsx
index ca05d139..1f5a8c1f 100644
--- a/app/lish/[did]/[publication]/PublicationNav.tsx
+++ b/app/lish/[did]/[publication]/PublicationNav.tsx
@@ -1,4 +1,5 @@
 import { SpeedyLink } from "components/SpeedyLink";
+import { sortPublicationPages } from "./sortPublicationPages";
 
 export type PublicationNavPage = {
   id: number;
@@ -13,12 +14,7 @@ export function PublicationNav(props: {
 }) {
   if (props.pages.length === 0) return null;
 
-  let sortedPages = [...props.pages].sort((a, b) => {
-    let aHome = a.path === "/" ? 0 : 1;
-    let bHome = b.path === "/" ? 0 : 1;
-    if (aHome !== bHome) return aHome - bHome;
-    return (a.path ?? "").localeCompare(b.path ?? "");
-  });
+  let sortedPages = sortPublicationPages(props.pages);
 
   return (
     <nav className="publicationNav border-t border-b border-border-light w-full sm:max-w-[calc(var(--page-width-units)*1.25)] mx-auto">
diff --git a/app/lish/[did]/[publication]/[rkey]/DocumentPageRenderer.tsx b/app/lish/[did]/[publication]/[rkey]/DocumentPageRenderer.tsx
index 81be445b..df7fc566 100644
--- a/app/lish/[did]/[publication]/[rkey]/DocumentPageRenderer.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/DocumentPageRenderer.tsx
@@ -1,17 +1,8 @@
 import { AtpAgent } from "@atproto/api";
-import { ids } from "lexicons/api/lexicons";
 import {
-  PubLeafletBlocksBskyPost,
-  PubLeafletBlocksStandardSitePost,
-  PubLeafletBlocksOrderedList,
-  PubLeafletBlocksUnorderedList,
   PubLeafletPagesLinearDocument,
   PubLeafletPagesCanvas,
-  PubLeafletBlocksPoll,
 } from "lexicons/api";
-import { type $Typed } from "lexicons/api/util";
-import { get_standard_site_posts } from "app/api/rpc/[command]/get_standard_site_posts";
-import { supabaseServerClient } from "supabase/serverClient";
 import { QuoteHandler } from "./QuoteHandler";
 import {
   PublicationBackgroundProvider,
@@ -19,13 +10,9 @@ import {
 } from "components/ThemeManager/PublicationThemeProvider";
 import { getPostPageData } from "./getPostPageData";
 import { PostPages } from "./PostPages";
-import { extractCodeBlocks } from "./extractCodeBlocks";
+import { collectAndFetchBlockResources } from "./collectAndFetchBlockResources";
 import { LeafletLayout } from "components/LeafletLayout";
-import { fetchPollData } from "./fetchPollData";
-import {
-  getDocumentPages,
-  hasLeafletContent,
-} from "src/utils/normalizeRecords";
+import { getDocumentPages } from "src/utils/normalizeRecords";
 import { DocumentProvider } from "contexts/DocumentContext";
 import { LeafletContentProvider } from "contexts/LeafletContentContext";
 import { FontLoader } from "components/FontLoader";
@@ -74,84 +61,24 @@ export async function DocumentPageRenderer({
         </div>
       </div>
     );
-  let bskyPosts =
-    pages.flatMap((p) => {
-      let page = p as PubLeafletPagesLinearDocument.Main;
-      return extractBlocksByType<$Typed<PubLeafletBlocksBskyPost.Main>>(
-        page.blocks || [],
-        ids.PubLeafletBlocksBskyPost,
-      );
-    }) || [];
-
-  // Batch bsky posts into groups of 25 and fetch in parallel
-  let bskyPostBatches = [];
-  for (let i = 0; i < bskyPosts.length; i += 25) {
-    bskyPostBatches.push(bskyPosts.slice(i, i + 25));
-  }
-
-  let bskyPostResponses = await Promise.all(
-    bskyPostBatches.map((batch) =>
-      agent.getPosts(
-        {
-          uris: batch.map((p) => {
-            let block = p?.block as unknown as PubLeafletBlocksBskyPost.Main;
-            return block.postRef.uri;
-          }),
-        },
-        { headers: {} },
-      ),
-    ),
-  );
 
-  let bskyPostData =
-    bskyPostResponses.length > 0
-      ? bskyPostResponses.flatMap((response) => response.data.posts)
-      : [];
-
-  let standardSitePostBlocks = pages.flatMap((p) => {
-    let page = p as PubLeafletPagesLinearDocument.Main;
-    return extractBlocksByType<$Typed<PubLeafletBlocksStandardSitePost.Main>>(
-      page.blocks || [],
-      ids.PubLeafletBlocksStandardSitePost,
-    );
+  const {
+    bskyPostData,
+    standardSitePostData: standardSitePosts,
+    pollData,
+    prerenderedCodeBlocks,
+  } = await collectAndFetchBlockResources({
+    agent,
+    pages: pages as (
+      | PubLeafletPagesLinearDocument.Main
+      | PubLeafletPagesCanvas.Main
+    )[],
   });
-  let standardSitePostUris = Array.from(
-    new Set(standardSitePostBlocks.map((b) => b.block.uri)),
-  );
-  let standardSitePostsResult =
-    standardSitePostUris.length > 0
-      ? await get_standard_site_posts.handler(
-          { uris: standardSitePostUris },
-          { supabase: supabaseServerClient },
-        )
-      : { result: { posts: [] } };
-  let standardSitePosts = standardSitePostsResult.result.posts;
-
-  // Extract poll blocks and fetch vote data
-  let pollBlocks = pages.flatMap((p) => {
-    let page = p as PubLeafletPagesLinearDocument.Main;
-    return extractBlocksByType<$Typed<PubLeafletBlocksPoll.Main>>(
-      page.blocks || [],
-      ids.PubLeafletBlocksPoll,
-    );
-  });
-  let pollData = await fetchPollData(
-    pollBlocks.map((b) => b.block.pollRef.uri),
-  );
 
   const pubRecord = document.normalizedPublication;
   let pub_creator = document.publication?.identity_did || did;
   let isStandalone = !pubRecord;
 
-  let firstPage = pages[0];
-  let firstPageBlocks =
-    (
-      firstPage as
-        | PubLeafletPagesLinearDocument.Main
-        | PubLeafletPagesCanvas.Main
-    ).blocks || [];
-  let prerenderedCodeBlocks = await extractCodeBlocks(firstPageBlocks);
-
   return (
     <DocumentProvider value={document}>
       <LeafletContentProvider value={{ pages }}>
@@ -204,54 +131,3 @@ export async function DocumentPageRenderer({
     </DocumentProvider>
   );
 }
-
-function extractBlocksByType<T extends { $type: string }>(
-  blocks: PubLeafletPagesLinearDocument.Block[],
-  type: string,
-): { block: T }[] {
-  let results: { block: T }[] = [];
-  for (let b of blocks) {
-    if (b.block.$type === type) {
-      results.push(b as unknown as { block: T });
-    }
-    if (
-      b.block.$type === ids.PubLeafletBlocksOrderedList ||
-      b.block.$type === ids.PubLeafletBlocksUnorderedList
-    ) {
-      let list = b.block as
-        | PubLeafletBlocksOrderedList.Main
-        | PubLeafletBlocksUnorderedList.Main;
-      extractFromListItems(list.children, type, results);
-    }
-  }
-  return results;
-}
-
-function extractFromListItems<T extends { $type: string }>(
-  items:
-    | PubLeafletBlocksOrderedList.ListItem[]
-    | PubLeafletBlocksUnorderedList.ListItem[],
-  type: string,
-  results: { block: T }[],
-) {
-  for (let item of items) {
-    if ((item.content as { $type?: string })?.$type === type) {
-      results.push({
-        block: item.content as unknown as T,
-      });
-    }
-    if (item.children) {
-      extractFromListItems(item.children, type, results);
-    }
-    let orderedChildren = (item as PubLeafletBlocksUnorderedList.ListItem)
-      .orderedListChildren;
-    if (orderedChildren) {
-      extractFromListItems(orderedChildren.children, type, results);
-    }
-    let unorderedChildren = (item as PubLeafletBlocksOrderedList.ListItem)
-      .unorderedListChildren;
-    if (unorderedChildren) {
-      extractFromListItems(unorderedChildren.children, type, results);
-    }
-  }
-}
diff --git a/app/lish/[did]/[publication]/[rkey]/PublicationPageRenderer.tsx b/app/lish/[did]/[publication]/[rkey]/PublicationPageRenderer.tsx
index 41fd7c94..bfaea9bf 100644
--- a/app/lish/[did]/[publication]/[rkey]/PublicationPageRenderer.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/PublicationPageRenderer.tsx
@@ -1,24 +1,15 @@
-import { ids } from "lexicons/api/lexicons";
 import {
-  PubLeafletBlocksBskyPost,
-  PubLeafletBlocksPoll,
   PubLeafletBlocksPostsList,
-  PubLeafletBlocksStandardSitePost,
-  PubLeafletBlocksOrderedList,
-  PubLeafletBlocksUnorderedList,
   PubLeafletPagesLinearDocument,
   PubLeafletPublicationPage,
 } from "lexicons/api";
-import { type $Typed } from "lexicons/api/util";
 import { AtpAgent } from "@atproto/api";
 
-import { supabaseServerClient } from "supabase/serverClient";
 import {
   normalizeDocumentRecord,
   normalizePublicationRecord,
   type NormalizedPublication,
 } from "src/utils/normalizeRecords";
-import { get_standard_site_posts } from "app/api/rpc/[command]/get_standard_site_posts";
 
 import {
   PublicationBackgroundProvider,
@@ -38,8 +29,7 @@ import { PublicationStickyHeader } from "../PublicationStickyHeader";
 import { getPublicationURL } from "app/lish/createPub/getPublicationURL";
 import { blobRefToSrc } from "src/utils/blobRefToSrc";
 
-import { extractCodeBlocks } from "./extractCodeBlocks";
-import { fetchPollData } from "./fetchPollData";
+import { collectAndFetchBlockResources } from "./collectAndFetchBlockResources";
 import { PostContent } from "./PostContent";
 
 export type PublicationPageRecord = PubLeafletPublicationPage.Record;
@@ -93,47 +83,17 @@ export async function PublicationPageRenderer({
       }),
   });
 
-  const bskyPostBlocks = extractBlocksByType<
-    $Typed<PubLeafletBlocksBskyPost.Main>
-  >(allBlocks, ids.PubLeafletBlocksBskyPost);
-  const bskyPostBatches: typeof bskyPostBlocks[] = [];
-  for (let i = 0; i < bskyPostBlocks.length; i += 25) {
-    bskyPostBatches.push(bskyPostBlocks.slice(i, i + 25));
-  }
-  const bskyPostResponses = await Promise.all(
-    bskyPostBatches.map((batch) =>
-      agent.getPosts(
-        { uris: batch.map((p) => p.block.postRef.uri) },
-        { headers: {} },
-      ),
-    ),
-  );
-  const bskyPostData = bskyPostResponses.flatMap((r) => r.data.posts);
-
-  const standardSitePostUris = Array.from(
-    new Set(
-      extractBlocksByType<$Typed<PubLeafletBlocksStandardSitePost.Main>>(
-        allBlocks,
-        ids.PubLeafletBlocksStandardSitePost,
-      ).map((b) => b.block.uri),
-    ),
-  );
-  const standardSitePostsResult =
-    standardSitePostUris.length > 0
-      ? await get_standard_site_posts.handler(
-          { uris: standardSitePostUris },
-          { supabase: supabaseServerClient },
-        )
-      : { result: { posts: [] } };
-  const standardSitePosts = standardSitePostsResult.result.posts;
+  const resourcePages =
+    firstPage && firstPage.$type === "pub.leaflet.pages.linearDocument"
+      ? [firstPage as PubLeafletPagesLinearDocument.Main]
+      : [];
 
-  const pollBlocks = extractBlocksByType<$Typed<PubLeafletBlocksPoll.Main>>(
-    allBlocks,
-    ids.PubLeafletBlocksPoll,
-  );
-  const pollData = await fetchPollData(
-    pollBlocks.map((b) => b.block.pollRef.uri),
-  );
+  const {
+    bskyPostData,
+    standardSitePostData: standardSitePosts,
+    pollData,
+    prerenderedCodeBlocks,
+  } = await collectAndFetchBlockResources({ agent, pages: resourcePages });
 
   const hasPostsList = allBlocks.some((b) =>
     PubLeafletBlocksPostsList.isMain(b.block),
@@ -168,8 +128,6 @@ export async function PublicationPageRenderer({
       }
     : undefined;
 
-  const prerenderedCodeBlocks = await extractCodeBlocks(allBlocks);
-
   const theme = normalizedPublication?.theme;
   const showPageBackground = !!theme?.showPageBackground;
 
@@ -260,52 +218,3 @@ export async function PublicationPageRenderer({
     </DocumentProvider>
   );
 }
-
-function extractBlocksByType<T extends { $type: string }>(
-  blocks: PubLeafletPagesLinearDocument.Block[],
-  type: string,
-): { block: T }[] {
-  const results: { block: T }[] = [];
-  for (const b of blocks) {
-    if (b.block.$type === type) {
-      results.push(b as unknown as { block: T });
-    }
-    if (
-      b.block.$type === ids.PubLeafletBlocksOrderedList ||
-      b.block.$type === ids.PubLeafletBlocksUnorderedList
-    ) {
-      const list = b.block as
-        | PubLeafletBlocksOrderedList.Main
-        | PubLeafletBlocksUnorderedList.Main;
-      extractFromListItems(list.children, type, results);
-    }
-  }
-  return results;
-}
-
-function extractFromListItems<T extends { $type: string }>(
-  items:
-    | PubLeafletBlocksOrderedList.ListItem[]
-    | PubLeafletBlocksUnorderedList.ListItem[],
-  type: string,
-  results: { block: T }[],
-) {
-  for (const item of items) {
-    if ((item.content as { $type?: string })?.$type === type) {
-      results.push({ block: item.content as unknown as T });
-    }
-    if (item.children) {
-      extractFromListItems(item.children, type, results);
-    }
-    const orderedChildren = (item as PubLeafletBlocksUnorderedList.ListItem)
-      .orderedListChildren;
-    if (orderedChildren) {
-      extractFromListItems(orderedChildren.children, type, results);
-    }
-    const unorderedChildren = (item as PubLeafletBlocksOrderedList.ListItem)
-      .unorderedListChildren;
-    if (unorderedChildren) {
-      extractFromListItems(unorderedChildren.children, type, results);
-    }
-  }
-}
diff --git a/app/lish/[did]/[publication]/[rkey]/collectAndFetchBlockResources.ts b/app/lish/[did]/[publication]/[rkey]/collectAndFetchBlockResources.ts
new file mode 100644
index 00000000..1ce43d3c
--- /dev/null
+++ b/app/lish/[did]/[publication]/[rkey]/collectAndFetchBlockResources.ts
@@ -0,0 +1,91 @@
+import { ids } from "lexicons/api/lexicons";
+import {
+  PubLeafletBlocksBskyPost,
+  PubLeafletBlocksPoll,
+  PubLeafletBlocksStandardSitePost,
+  PubLeafletPagesLinearDocument,
+  PubLeafletPagesCanvas,
+} from "lexicons/api";
+import { type $Typed } from "lexicons/api/util";
+import { AtpAgent, AppBskyFeedDefs } from "@atproto/api";
+import { supabaseServerClient } from "supabase/serverClient";
+import {
+  get_standard_site_posts,
+  type StandardSitePostData,
+} from "app/api/rpc/[command]/get_standard_site_posts";
+import { extractBlocksByType } from "./extractBlocksByType";
+import { extractCodeBlocks } from "./extractCodeBlocks";
+import { fetchPollData, type PollData } from "./fetchPollData";
+
+type Page =
+  | PubLeafletPagesLinearDocument.Main
+  | PubLeafletPagesCanvas.Main;
+
+export async function collectAndFetchBlockResources({
+  agent,
+  pages,
+}: {
+  agent: AtpAgent;
+  pages: Page[];
+}): Promise<{
+  bskyPostData: AppBskyFeedDefs.PostView[];
+  standardSitePostData: StandardSitePostData[];
+  pollData: PollData[];
+  prerenderedCodeBlocks: Map<string, string>;
+}> {
+  const allBlocks: PubLeafletPagesLinearDocument.Block[] = pages.flatMap(
+    (p) => (p as PubLeafletPagesLinearDocument.Main).blocks ?? [],
+  );
+
+  const bskyPostBlocks = extractBlocksByType<
+    $Typed<PubLeafletBlocksBskyPost.Main>
+  >(allBlocks, ids.PubLeafletBlocksBskyPost);
+  const bskyPostBatches: typeof bskyPostBlocks[] = [];
+  for (let i = 0; i < bskyPostBlocks.length; i += 25) {
+    bskyPostBatches.push(bskyPostBlocks.slice(i, i + 25));
+  }
+  const bskyPostResponses = await Promise.all(
+    bskyPostBatches.map((batch) =>
+      agent.getPosts(
+        { uris: batch.map((p) => p.block.postRef.uri) },
+        { headers: {} },
+      ),
+    ),
+  );
+  const bskyPostData = bskyPostResponses.flatMap((r) => r.data.posts);
+
+  const standardSitePostUris = Array.from(
+    new Set(
+      extractBlocksByType<$Typed<PubLeafletBlocksStandardSitePost.Main>>(
+        allBlocks,
+        ids.PubLeafletBlocksStandardSitePost,
+      ).map((b) => b.block.uri),
+    ),
+  );
+  const standardSitePostsResult =
+    standardSitePostUris.length > 0
+      ? await get_standard_site_posts.handler(
+          { uris: standardSitePostUris },
+          { supabase: supabaseServerClient },
+        )
+      : { result: { posts: [] } };
+  const standardSitePostData = standardSitePostsResult.result.posts;
+
+  const pollBlocks = extractBlocksByType<$Typed<PubLeafletBlocksPoll.Main>>(
+    allBlocks,
+    ids.PubLeafletBlocksPoll,
+  );
+  const pollData = await fetchPollData(
+    pollBlocks.map((b) => b.block.pollRef.uri),
+  );
+
+  const firstPageBlocks = (pages[0] as Page | undefined)?.blocks ?? [];
+  const prerenderedCodeBlocks = await extractCodeBlocks(firstPageBlocks);
+
+  return {
+    bskyPostData,
+    standardSitePostData,
+    pollData,
+    prerenderedCodeBlocks,
+  };
+}
diff --git a/app/lish/[did]/[publication]/[rkey]/extractBlocksByType.ts b/app/lish/[did]/[publication]/[rkey]/extractBlocksByType.ts
new file mode 100644
index 00000000..0dcc7827
--- /dev/null
+++ b/app/lish/[did]/[publication]/[rkey]/extractBlocksByType.ts
@@ -0,0 +1,55 @@
+import { ids } from "lexicons/api/lexicons";
+import {
+  PubLeafletBlocksOrderedList,
+  PubLeafletBlocksUnorderedList,
+  PubLeafletPagesLinearDocument,
+} from "lexicons/api";
+
+export function extractBlocksByType<T extends { $type: string }>(
+  blocks: PubLeafletPagesLinearDocument.Block[],
+  type: string,
+): { block: T }[] {
+  const results: { block: T }[] = [];
+  for (const b of blocks) {
+    if (b.block.$type === type) {
+      results.push(b as unknown as { block: T });
+    }
+    if (
+      b.block.$type === ids.PubLeafletBlocksOrderedList ||
+      b.block.$type === ids.PubLeafletBlocksUnorderedList
+    ) {
+      const list = b.block as
+        | PubLeafletBlocksOrderedList.Main
+        | PubLeafletBlocksUnorderedList.Main;
+      extractFromListItems(list.children, type, results);
+    }
+  }
+  return results;
+}
+
+function extractFromListItems<T extends { $type: string }>(
+  items:
+    | PubLeafletBlocksOrderedList.ListItem[]
+    | PubLeafletBlocksUnorderedList.ListItem[],
+  type: string,
+  results: { block: T }[],
+) {
+  for (const item of items) {
+    if ((item.content as { $type?: string })?.$type === type) {
+      results.push({ block: item.content as unknown as T });
+    }
+    if (item.children) {
+      extractFromListItems(item.children, type, results);
+    }
+    const orderedChildren = (item as PubLeafletBlocksUnorderedList.ListItem)
+      .orderedListChildren;
+    if (orderedChildren) {
+      extractFromListItems(orderedChildren.children, type, results);
+    }
+    const unorderedChildren = (item as PubLeafletBlocksOrderedList.ListItem)
+      .unorderedListChildren;
+    if (unorderedChildren) {
+      extractFromListItems(unorderedChildren.children, type, results);
+    }
+  }
+}
diff --git a/app/lish/[did]/[publication]/[rkey]/page.tsx b/app/lish/[did]/[publication]/[rkey]/page.tsx
index 05ea0f8a..8e8ba33f 100644
--- a/app/lish/[did]/[publication]/[rkey]/page.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/page.tsx
@@ -1,13 +1,12 @@
 import { supabaseServerClient } from "supabase/serverClient";
 import { Metadata } from "next";
 import { DocumentPageRenderer } from "./DocumentPageRenderer";
-import { PublicationPageRenderer } from "./PublicationPageRenderer";
+import { tryRenderPublicationPage } from "../tryRenderPublicationPage";
 import { normalizeDocumentRecord } from "src/utils/normalizeRecords";
 import {
   documentUriFilter,
   publicationNameOrUriFilter,
 } from "src/utils/uriHelpers";
-import { PubLeafletPublicationPage } from "lexicons/api";
 
 export async function generateMetadata(props: {
   params: Promise<{ publication: string; did: string; rkey: string }>;
@@ -108,23 +107,13 @@ export default async function Post(props: {
     .limit(1);
   let publication = publications?.[0];
 
-  let matchingPage = publication?.publication_pages?.find(
-    (p) => p.path === "/" + rkey && p.record_uri && p.record,
-  );
-  if (publication && matchingPage && matchingPage.record) {
-    let pageRecord = matchingPage.record as unknown as PubLeafletPublicationPage.Record;
-    return (
-      <PublicationPageRenderer
-        did={did}
-        page={{
-          id: matchingPage.id,
-          path: matchingPage.path ?? "/",
-          title: matchingPage.title,
-          record: pageRecord,
-        }}
-        publication={publication}
-      />
-    );
+  if (publication) {
+    const pageRender = tryRenderPublicationPage({
+      did,
+      publication,
+      path: "/" + rkey,
+    });
+    if (pageRender) return pageRender;
   }
 
   return <DocumentPageRenderer did={did} rkey={rkey} />;
diff --git a/app/lish/[did]/[publication]/edit/[[...route]]/PublicationPagesNav.tsx b/app/lish/[did]/[publication]/edit/[[...route]]/PublicationPagesNav.tsx
index 997749ef..18c1afcb 100644
--- a/app/lish/[did]/[publication]/edit/[[...route]]/PublicationPagesNav.tsx
+++ b/app/lish/[did]/[publication]/edit/[[...route]]/PublicationPagesNav.tsx
@@ -6,6 +6,7 @@ import { ButtonSecondary } from "components/Buttons";
 import { AddTiny } from "components/Icons/AddTiny";
 import { createPublicationPage } from "actions/createPublicationPage";
 import { usePublicationData } from "../../dashboard/PublicationSWRProvider";
+import { sortPublicationPages } from "../../sortPublicationPages";
 
 export function PublicationPagesNav(props: {
   did: string;
@@ -42,12 +43,7 @@ export function PublicationPagesNav(props: {
     router.push(hrefForPath(created.path));
   }
 
-  let sortedPages = [...pages].sort((a, b) => {
-    let ap = a.path === "/" ? 0 : 1;
-    let bp = b.path === "/" ? 0 : 1;
-    if (ap !== bp) return ap - bp;
-    return (a.path ?? "").localeCompare(b.path ?? "");
-  });
+  let sortedPages = sortPublicationPages(pages);
 
   return (
     <nav className="publicationPagesNav border-t border-b border-border-light shrink-0 w-full sm:max-w-[calc(var(--page-width-units)*1.25)] mx-auto">
diff --git a/app/lish/[did]/[publication]/page.tsx b/app/lish/[did]/[publication]/page.tsx
index db04410f..9f237f07 100644
--- a/app/lish/[did]/[publication]/page.tsx
+++ b/app/lish/[did]/[publication]/page.tsx
@@ -9,8 +9,7 @@ import React from "react";
 import { NotFoundLayout } from "components/PageLayouts/NotFoundLayout";
 import { normalizePublicationRecord } from "src/utils/normalizeRecords";
 import { PublicationContent } from "./PublicationContent";
-import { PublicationPageRenderer } from "./[rkey]/PublicationPageRenderer";
-import { PubLeafletPublicationPage } from "lexicons/api";
+import { tryRenderPublicationPage } from "./tryRenderPublicationPage";
 import {
   PublicationThemeProvider,
   PublicationBackgroundProvider,
@@ -54,27 +53,13 @@ export default async function Publication(props: {
 
   if (!publication) return <PubNotFound />;
 
-  let homePage = publication.publication_pages?.find(
-    (p) => p.path === "/" && p.record_uri && p.record,
-  );
-
   try {
-    if (homePage && homePage.record) {
-      let pageRecord =
-        homePage.record as unknown as PubLeafletPublicationPage.Record;
-      return (
-        <PublicationPageRenderer
-          did={did}
-          page={{
-            id: homePage.id,
-            path: "/",
-            title: homePage.title,
-            record: pageRecord,
-          }}
-          publication={publication}
-        />
-      );
-    }
+    const homePageRender = tryRenderPublicationPage({
+      did,
+      publication,
+      path: "/",
+    });
+    if (homePageRender) return homePageRender;
     return (
       <PublicationThemeProvider
         theme={record?.theme}
diff --git a/app/lish/[did]/[publication]/sortPublicationPages.ts b/app/lish/[did]/[publication]/sortPublicationPages.ts
new file mode 100644
index 00000000..9637d3ac
--- /dev/null
+++ b/app/lish/[did]/[publication]/sortPublicationPages.ts
@@ -0,0 +1,10 @@
+export function sortPublicationPages<T extends { path: string | null }>(
+  pages: T[],
+): T[] {
+  return [...pages].sort((a, b) => {
+    let aHome = a.path === "/" ? 0 : 1;
+    let bHome = b.path === "/" ? 0 : 1;
+    if (aHome !== bHome) return aHome - bHome;
+    return (a.path ?? "").localeCompare(b.path ?? "");
+  });
+}
diff --git a/app/lish/[did]/[publication]/tryRenderPublicationPage.tsx b/app/lish/[did]/[publication]/tryRenderPublicationPage.tsx
new file mode 100644
index 00000000..1b6a2ec8
--- /dev/null
+++ b/app/lish/[did]/[publication]/tryRenderPublicationPage.tsx
@@ -0,0 +1,48 @@
+import {
+  PublicationPageRenderer,
+  type PublicationPageRecord,
+} from "./[rkey]/PublicationPageRenderer";
+
+type RendererProps = Parameters<typeof PublicationPageRenderer>[0];
+
+type PublicationForRenderer = Omit<
+  RendererProps["publication"],
+  "publication_pages"
+> & {
+  publication_pages?: {
+    id: number;
+    path: string | null;
+    title: string;
+    record: unknown;
+    record_uri: string | null;
+  }[];
+};
+
+export function tryRenderPublicationPage({
+  did,
+  publication,
+  path,
+}: {
+  did: string;
+  publication: PublicationForRenderer;
+  path: string;
+}) {
+  const matchingPage = publication.publication_pages?.find(
+    (p) => p.path === path && p.record_uri && p.record,
+  );
+  if (!matchingPage || !matchingPage.record) return null;
+  const pageRecord =
+    matchingPage.record as unknown as PublicationPageRecord;
+  return (
+    <PublicationPageRenderer
+      did={did}
+      page={{
+        id: matchingPage.id,
+        path: matchingPage.path ?? "/",
+        title: matchingPage.title,
+        record: pageRecord,
+      }}
+      publication={publication}
+    />
+  );
+}
diff --git a/components/Blocks/EmbedBlock.tsx b/components/Blocks/EmbedBlock.tsx
index 3a35c48e..543edfa5 100644
--- a/components/Blocks/EmbedBlock.tsx
+++ b/components/Blocks/EmbedBlock.tsx
@@ -24,6 +24,7 @@ import { useIframeChannel } from "src/hooks/useIframeChannel";
 import { scrollIntoView } from "src/utils/scrollIntoView";
 import { EmbedBlockData } from "src/partsPageChannel";
 import { useColorAttribute } from "components/ThemeManager/useColorAttribute";
+import { assertStandardSitePostFacts } from "src/utils/addLinkBlock";
 
 export const EmbedBlock = (props: BlockProps & { preview?: boolean }) => {
   let entity_set = useEntitySetContext();
@@ -269,18 +270,7 @@ const BlockLinkInput = (props: BlockProps) => {
       if (res.status === 200) {
         let data = await (res.json() as LinkPreviewMetadataResult);
         if (data.leafletPost) {
-          await rep.mutate.assertFact([
-            {
-              entity,
-              attribute: "block/type",
-              data: { type: "block-type-union", value: "standard-site-post" },
-            },
-            {
-              entity,
-              attribute: "block/standard-site-post",
-              data: { type: "string", value: data.leafletPost.uri },
-            },
-          ]);
+          await assertStandardSitePostFacts(rep, entity, data.leafletPost.uri);
           setLoading(false);
           return;
         }
diff --git a/components/Blocks/PostsListBlock.tsx b/components/Blocks/PostsListBlock.tsx
index 5bb7ab47..4aa66c19 100644
--- a/components/Blocks/PostsListBlock.tsx
+++ b/components/Blocks/PostsListBlock.tsx
@@ -1,4 +1,4 @@
-import { forwardRef, useMemo } from "react";
+import { useMemo } from "react";
 import { useUIState } from "src/useUIState";
 import { useEntity, useReplicache } from "src/replicache";
 import { BlockProps, BlockLayout } from "./Block";
@@ -10,7 +10,7 @@ import { PublicationPostsList } from "app/lish/[did]/[publication]/PublicationPo
 import { Popover } from "components/Popover";
 import { Toggle } from "components/Toggle";
 import { ToggleGroup } from "components/ToggleGroup";
-import { SettingsTiny } from "components/Icons/SettingsTiny";
+import { SettingsTriggerButton } from "./SettingsTriggerButton";
 
 type PostsListView = "compact" | "full";
 
@@ -93,22 +93,6 @@ function PostsListPlaceholder() {
   );
 }
 
-const SettingsTriggerButton = forwardRef<
-  HTMLButtonElement,
-  React.ButtonHTMLAttributes<HTMLButtonElement>
->((props, ref) => (
-  <button
-    {...props}
-    ref={ref}
-    onMouseDown={(e) => e.preventDefault()}
-    aria-label="Posts List Settings"
-    className="flex items-center"
-  >
-    <SettingsTiny />
-  </button>
-));
-SettingsTriggerButton.displayName = "SettingsTriggerButton";
-
 function PostsListSettingsButton(props: { entityID: string }) {
   let { rep } = useReplicache();
   let { data } = usePublicationData();
@@ -141,7 +125,7 @@ function PostsListSettingsButton(props: { entityID: string }) {
       side="top"
       align="end"
       sideOffset={6}
-      trigger={<SettingsTriggerButton />}
+      trigger={<SettingsTriggerButton aria-label="Posts List Settings" />}
     >
       <div className="flex flex-col gap-3 text-primary py-1 min-w-[220px]">
         <div className="flex flex-col gap-1">
diff --git a/components/Blocks/SettingsTriggerButton.tsx b/components/Blocks/SettingsTriggerButton.tsx
new file mode 100644
index 00000000..42d88436
--- /dev/null
+++ b/components/Blocks/SettingsTriggerButton.tsx
@@ -0,0 +1,18 @@
+import { forwardRef } from "react";
+import { SettingsTiny } from "components/Icons/SettingsTiny";
+
+export const SettingsTriggerButton = forwardRef<
+  HTMLButtonElement,
+  React.ButtonHTMLAttributes<HTMLButtonElement>
+>(({ "aria-label": ariaLabel = "Settings", ...props }, ref) => (
+  <button
+    {...props}
+    ref={ref}
+    onMouseDown={(e) => e.preventDefault()}
+    aria-label={ariaLabel}
+    className="flex items-center"
+  >
+    <SettingsTiny />
+  </button>
+));
+SettingsTriggerButton.displayName = "SettingsTriggerButton";
diff --git a/components/Blocks/StandardSitePostBlock/index.tsx b/components/Blocks/StandardSitePostBlock/index.tsx
index d2f0bf52..35a82f92 100644
--- a/components/Blocks/StandardSitePostBlock/index.tsx
+++ b/components/Blocks/StandardSitePostBlock/index.tsx
@@ -1,10 +1,9 @@
-import { forwardRef } from "react";
 import { BlockProps, BlockLayout } from "../Block";
 import { useEntity, useReplicache } from "src/replicache";
 import { useUIState } from "src/useUIState";
 import { Popover } from "components/Popover";
 import { ToggleGroup } from "components/ToggleGroup";
-import { SettingsTiny } from "components/Icons/SettingsTiny";
+import { SettingsTriggerButton } from "../SettingsTriggerButton";
 import {
   StandardSitePostItem,
   type StandardSitePostSize,
@@ -37,22 +36,6 @@ export const StandardSitePostBlock = (
   );
 };
 
-const SettingsTriggerButton = forwardRef<
-  HTMLButtonElement,
-  React.ButtonHTMLAttributes<HTMLButtonElement>
->((props, ref) => (
-  <button
-    {...props}
-    ref={ref}
-    onMouseDown={(e) => e.preventDefault()}
-    aria-label="Standard Site Post Settings"
-    className="flex items-center"
-  >
-    <SettingsTiny />
-  </button>
-));
-SettingsTriggerButton.displayName = "SettingsTriggerButton";
-
 function StandardSitePostSettingsButton(props: { entityID: string }) {
   let { rep } = useReplicache();
   let sizeFact = useEntity(props.entityID, "standard-site-post/size");
@@ -64,7 +47,9 @@ function StandardSitePostSettingsButton(props: { entityID: string }) {
       side="top"
       align="end"
       sideOffset={6}
-      trigger={<SettingsTriggerButton />}
+      trigger={
+        <SettingsTriggerButton aria-label="Standard Site Post Settings" />
+      }
     >
       <div className="flex flex-col gap-3 text-primary py-1 min-w-[220px]">
         <div className="flex flex-col gap-1">
diff --git a/src/utils/addLinkBlock.ts b/src/utils/addLinkBlock.ts
index e08367cb..a5e29ea6 100644
--- a/src/utils/addLinkBlock.ts
+++ b/src/utils/addLinkBlock.ts
@@ -9,6 +9,25 @@ import { AtpAgent } from "@atproto/api";
 import { v7 } from "uuid";
 import { getAspectRatio } from "src/utils/aspectRatio";
 
+export async function assertStandardSitePostFacts(
+  rep: Replicache<ReplicacheMutators>,
+  entityID: string,
+  uri: string,
+) {
+  await rep.mutate.assertFact([
+    {
+      entity: entityID,
+      attribute: "block/type",
+      data: { type: "block-type-union", value: "standard-site-post" },
+    },
+    {
+      entity: entityID,
+      attribute: "block/standard-site-post",
+      data: { type: "string", value: uri },
+    },
+  ]);
+}
+
 export async function addLinkBlock(
   url: string,
   entityID: string,
@@ -42,18 +61,7 @@ export async function addLinkBlock(
   let data = await (res.json() as LinkPreviewMetadataResult);
 
   if (data.leafletPost) {
-    await rep.mutate.assertFact([
-      {
-        entity: entityID,
-        attribute: "block/type",
-        data: { type: "block-type-union", value: "standard-site-post" },
-      },
-      {
-        entity: entityID,
-        attribute: "block/standard-site-post",
-        data: { type: "string", value: data.leafletPost.uri },
-      },
-    ]);
+    await assertStandardSitePostFacts(rep, entityID, data.leafletPost.uri);
     return;
   }