diff --git a/src/lib/components/proposals/ProposalsList.svelte b/src/lib/components/proposals/ProposalsList.svelte
index a88c889..8f433ca 100644
--- a/src/lib/components/proposals/ProposalsList.svelte
+++ b/src/lib/components/proposals/ProposalsList.svelte
@@ -9,6 +9,7 @@
   export let show_repo: boolean = false
   export let limit: number = 0
   export let allow_more = true
+  export let sort_youngest_first = true
   let current_limit = limit
 </script>
 
@@ -22,7 +23,7 @@
     <p class="prose">None</p>
   {/if}
   <ul class=" divide-y divide-base-400">
-    {#each proposals_or_issues as proposal, index}
+    {#each sort_youngest_first ? proposals_or_issues.sort((a, b) => (b.created_at || 0) - (a.created_at || 0)) : proposals_or_issues as proposal, index}
       {#if current_limit === 0 || index + 1 <= current_limit}
         <ProposalsListItem {...proposal} {show_repo} />
       {/if}
diff --git a/src/lib/stores/Issue.ts b/src/lib/stores/Issue.ts
index 320897f..bf7902b 100644
--- a/src/lib/stores/Issue.ts
+++ b/src/lib/stores/Issue.ts
@@ -170,9 +170,7 @@ export const ensureIssueFull = (repo_identifier: string, issue_id: string) => {
         })
       }
       selected_issue_replies.update((replies) => {
-        return [...replies, event].sort(
-          (a, b) => (a.created_at || 0) - (b.created_at || 0)
-        )
+        return [...replies, event]
       })
     }
 
diff --git a/src/lib/stores/Issues.ts b/src/lib/stores/Issues.ts
index 95ea062..c666d8e 100644
--- a/src/lib/stores/Issues.ts
+++ b/src/lib/stores/Issues.ts
@@ -126,7 +126,7 @@ export const ensureIssueSummaries = async (repo_id: string | undefined) => {
                 },
                 loading: false,
               },
-            ].sort((a, b) => (b.created_at || 0) - (a.created_at || 0)),
+            ],
           }
         })
       }
diff --git a/src/lib/stores/Proposal.ts b/src/lib/stores/Proposal.ts
index b332bfb..e872022 100644
--- a/src/lib/stores/Proposal.ts
+++ b/src/lib/stores/Proposal.ts
@@ -179,9 +179,7 @@ export const ensureProposalFull = (
         })
       }
       selected_proposal_replies.update((replies) => {
-        return [...replies, event].sort(
-          (a, b) => (a.created_at || 0) - (b.created_at || 0)
-        )
+        return [...replies, event]
       })
       if (event.tags.some((t) => t.length > 1 && t[1] === 'revision-root')) {
         const sub_revision_replies = ndk.subscribe(
diff --git a/src/lib/stores/Proposals.ts b/src/lib/stores/Proposals.ts
index 8cef94f..55f393e 100644
--- a/src/lib/stores/Proposals.ts
+++ b/src/lib/stores/Proposals.ts
@@ -143,7 +143,7 @@ export const ensureProposalSummaries = async (repo_id: string | undefined) => {
                 },
                 loading: false,
               },
-            ].sort((a, b) => (b.created_at || 0) - (a.created_at || 0)),
+            ],
           }
         })
       }
diff --git a/src/lib/wrappers/Thread.svelte b/src/lib/wrappers/Thread.svelte
index 08d897d..779b9eb 100644
--- a/src/lib/wrappers/Thread.svelte
+++ b/src/lib/wrappers/Thread.svelte
@@ -1,19 +1,21 @@
 <script lang="ts">
   import type { NDKEvent } from '@nostr-dev-kit/ndk'
-  import EventCard from './EventCard.svelte'
-  import ThreadWrapper from '$lib/components/events/ThreadWrapper.svelte'
   import { writable } from 'svelte/store'
-  import ComposeReply from './ComposeReply.svelte'
   import type { ThreadTreeNode } from '$lib/components/events/type'
   import ThreadTree from './ThreadTree.svelte'
 
   export let event: NDKEvent
   export let type: 'proposal' | 'issue' = 'proposal'
+  export let show_compose = true
 
   export let replies: NDKEvent[] | undefined = undefined
 
   const getParentId = (reply: NDKEvent): string | undefined => {
-    let t = reply.tags.find((tag) => tag.length === 4 && tag[3] === 'reply')
+    let t =
+      reply.tags.find((tag) => tag.length === 4 && tag[3] === 'reply') ||
+      reply.tags.find((tag) => tag.length === 4 && tag[3] === 'root') ||
+      // include events that don't use nip 10 markers
+      reply.tags.find((tag) => tag.length < 4 && tag[0] === 'e')
     return t ? t[1] : undefined
   }
 
@@ -25,24 +27,28 @@
     const thread_tree: ThreadTreeNode[] = []
     replies.forEach((reply) => {
       let reply_parent_id = getParentId(reply)
-      if (reply_parent_id && hashTable[reply_parent_id])
+      if (reply_parent_id && hashTable[reply_parent_id]) {
         hashTable[reply_parent_id].child_nodes.push(hashTable[reply.id])
-      else thread_tree.push(hashTable[reply.id])
+        hashTable[reply_parent_id].child_nodes.sort(
+          (a, b) => (a.event.created_at || 0) - (b.event.created_at || 0)
+        )
+      } else thread_tree.push(hashTable[reply.id])
     })
     return thread_tree
   }
 
-  let thread_tree_store = writable(createThreadTree(replies ? replies : []))
+  let thread_tree_store = writable(
+    createThreadTree(replies ? [event, ...replies] : [event])
+  )
+  let thread_tree_root: ThreadTreeNode | undefined
+  // TODO: add 'mentions' and secondary references that fall outside of root childNodes
+  //       they should appear in the UI as 'mentioned in' and be clear that replies ar enot incldued
   $: {
-    if (replies) thread_tree_store.set(createThreadTree(replies))
+    if (replies) thread_tree_store.set(createThreadTree([event, ...replies]))
+    thread_tree_root = $thread_tree_store.find((t) => t.event.id === event.id)
   }
 </script>
 
-<EventCard {type} {event} />
-
-<ThreadWrapper num_replies={$thread_tree_store.length}>
-  {#each $thread_tree_store as tree}
-    <ThreadTree {type} {tree} />
-  {/each}
-  <ComposeReply {type} reply_to_event_id={event.id} />
-</ThreadWrapper>
+{#if thread_tree_root}
+  <ThreadTree {type} tree={thread_tree_root} {show_compose} />
+{/if}
diff --git a/src/lib/wrappers/ThreadTree.svelte b/src/lib/wrappers/ThreadTree.svelte
index ec06766..6b8c6ec 100644
--- a/src/lib/wrappers/ThreadTree.svelte
+++ b/src/lib/wrappers/ThreadTree.svelte
@@ -2,9 +2,11 @@
   import EventCard from './EventCard.svelte'
   import ThreadWrapper from '$lib/components/events/ThreadWrapper.svelte'
   import type { ThreadTreeNode } from '$lib/components/events/type'
+  import ComposeReply from './ComposeReply.svelte'
 
   export let tree: ThreadTreeNode
   export let type: 'proposal' | 'issue' = 'proposal'
+  export let show_compose = false
   const countReplies = (tree: ThreadTreeNode, starting: number = 0): number => {
     return (
       tree.child_nodes.length +
@@ -128,4 +130,7 @@
       {/each}
     </ThreadWrapper>
   {/each}
+  {#if show_compose}
+    <ComposeReply {type} reply_to_event_id={tree.event.id} />
+  {/if}
 </ThreadWrapper>