diff --git a/app/src/renderer/Core/Core.svelte b/app/src/renderer/Core/Core.svelte
index 3849f47a8..cfe78513e 100644
--- a/app/src/renderer/Core/Core.svelte
+++ b/app/src/renderer/Core/Core.svelte
@@ -231,7 +231,11 @@
 
     unsubs.push(handlePreloadEvents())
 
-    await checkAndCreateDemoItems()
+    try {
+      await checkAndCreateDemoItems()
+    } catch (err) {
+      log.error('Error creating demo items:', err)
+    }
     // cleanup temporary resources created for chat
     await resourceManager.deleteResourcesByTags([ResourceTag.createdForChat(true)])
 
diff --git a/app/src/renderer/Resource/components/notebook/NotebookContents.svelte b/app/src/renderer/Resource/components/notebook/NotebookContents.svelte
index c59e66842..742b46f2d 100644
--- a/app/src/renderer/Resource/components/notebook/NotebookContents.svelte
+++ b/app/src/renderer/Resource/components/notebook/NotebookContents.svelte
@@ -417,7 +417,6 @@
     </h3>
     <SearchInput bind:value={searchQuery} />
   </header>
-
   <div class="categories-scroll-container" bind:this={categoryScrollContainer}>
     <div class="categories-scroll-content">
       {#each categories as category}
diff --git a/app/src/renderer/Resource/components/notebook/NotebookEditor/NotebookEditor.svelte b/app/src/renderer/Resource/components/notebook/NotebookEditor/NotebookEditor.svelte
index 5c37d9df2..3ab34728a 100644
--- a/app/src/renderer/Resource/components/notebook/NotebookEditor/NotebookEditor.svelte
+++ b/app/src/renderer/Resource/components/notebook/NotebookEditor/NotebookEditor.svelte
@@ -95,7 +95,7 @@
   }
 </script>
 
-<div class="dialog-backdrop" onclick={handleClose}></div>
+<div class="dialog-backdrop"></div>
 <dialog open>
   <header>
     {#if mode === 'edit'}
@@ -182,14 +182,16 @@
     z-index: 10000;
     background: light-dark(rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.3));
     backdrop-filter: blur(1px);
+    max-width: none !important;
   }
+
   dialog {
     position: fixed;
     z-index: 10001;
     inset: 0;
 
     margin: 0 auto;
-    margin-top: 10%;
+    margin-top: 15% !important;
     width: 100%;
     max-width: 70ch;
 
diff --git a/app/src/renderer/Resource/components/notebook/NotebookSidecar.svelte b/app/src/renderer/Resource/components/notebook/NotebookSidecar.svelte
index bc95421de..3ef73d91f 100644
--- a/app/src/renderer/Resource/components/notebook/NotebookSidecar.svelte
+++ b/app/src/renderer/Resource/components/notebook/NotebookSidecar.svelte
@@ -7,10 +7,8 @@
 
 <style lang="scss">
   .sidecar {
-    position: absolute;
-    top: 0;
-    left: calc(100% + 3.5rem);
-    max-width: 400px;
+    position: relative;
+    margin-bottom: 2rem !important;
     width: 100%;
     border: 1px solid light-dark(rgba(0, 0, 0, 0.1), rgba(71, 85, 105, 0.3));
     border-radius: 12px;
@@ -25,21 +23,10 @@
     &:hover {
       opacity: 1;
     }
-  }
-
-  @media screen and (max-width: 1590px) {
-    .sidecar {
-      top: unset;
-      left: unset;
-      position: relative;
-      margin-top: 2rem;
-      margin-left: 1rem;
-      max-width: unset;
 
-      :global(li) {
-        max-width: 430px;
-        max-height: 4rem;
-      }
+    :global(li) {
+      max-width: 430px;
+      max-height: 4rem;
     }
   }
 </style>
diff --git a/app/src/renderer/Resource/routes/IndexRoute.svelte b/app/src/renderer/Resource/routes/IndexRoute.svelte
index 4b7ff4a55..7ffb0ce78 100644
--- a/app/src/renderer/Resource/routes/IndexRoute.svelte
+++ b/app/src/renderer/Resource/routes/IndexRoute.svelte
@@ -254,13 +254,13 @@
 
     {#if $ttyQuery.length <= 0}
       <section class="contents-wrapper">
+        {#if viewLocation === ViewLocation.Tab && $ttyQuery.length <= 0}
+          <NotebookSidecarExample onselect={handleRunExample} />
+        {/if}
+
         <NotebookContents />
       </section>
     {/if}
-
-    {#if viewLocation === ViewLocation.Tab && $ttyQuery.length <= 0}
-      <NotebookSidecarExample onselect={handleRunExample} />
-    {/if}
   </main>
 
   <!-- <NotebookSidebar title="Surf" bind:open={resourcesPanelOpen} /> -->
@@ -282,7 +282,6 @@
       flex-shrink: 1;
       padding-inline: 0.5rem;
 
-      transform: translateY(0px);
       transition:
         opacity 223ms ease-out,
         transform 223ms ease-out;
diff --git a/app/src/renderer/Resource/routes/NotebookDetailRoute.svelte b/app/src/renderer/Resource/routes/NotebookDetailRoute.svelte
index 9c4c12233..d3e8968bf 100644
--- a/app/src/renderer/Resource/routes/NotebookDetailRoute.svelte
+++ b/app/src/renderer/Resource/routes/NotebookDetailRoute.svelte
@@ -305,7 +305,6 @@
   section {
     padding-inline: 12px;
 
-    transform: translateY(0px);
     transition:
       opacity 223ms ease-out,
       transform 223ms ease-out;
diff --git a/packages/services/src/lib/demoitems.ts b/packages/services/src/lib/demoitems.ts
index 34622de51..61b7f1340 100644
--- a/packages/services/src/lib/demoitems.ts
+++ b/packages/services/src/lib/demoitems.ts
@@ -112,14 +112,23 @@ export async function createDemoNote(note: DemoNote, notebook: Notebook) {
   const notebookManager = useNotebookManager()
   const resourceManager = useResourceManager()
 
-  const existingOnboardingNotes = await resourceManager.listResourcesByTags([
-    SearchResourceTags.Deleted(false),
-    SearchResourceTags.ResourceType(ResourceTypes.DOCUMENT_SPACE_NOTE),
-    SearchResourceTags.Onboarding(note.id)
-  ])
-
-  if (existingOnboardingNotes.length > 0) {
-    const resource = existingOnboardingNotes[0] as ResourceNote
+  const existingOnboardingNotes = await resourceManager.listResourcesByTags(
+    [
+      SearchResourceTags.Deleted(false),
+      SearchResourceTags.ResourceType(ResourceTypes.DOCUMENT_SPACE_NOTE),
+      SearchResourceTags.Onboarding(note.id)
+    ],
+    {
+      limit: 1
+    }
+  )
+
+  if (!existingOnboardingNotes) {
+    throw new Error('Failed to list existing onboarding notes')
+  }
+
+  if (existingOnboardingNotes.items.length > 0) {
+    const resource = existingOnboardingNotes.items[0] as ResourceNote
     log.debug('Onboarding note already exists, skipping creation', note, resource.id)
 
     await resource.updateContent(note.content)