diff --git a/apps/app/src/app/components/session/composer.tsx b/apps/app/src/app/components/session/composer.tsx
index b0f2caf5..64e8fc55 100644
--- a/apps/app/src/app/components/session/composer.tsx
+++ b/apps/app/src/app/components/session/composer.tsx
@@ -1553,7 +1553,7 @@ export default function Composer(props: ComposerProps) {
 
   return (
     <div
-      class={`sticky bottom-0 z-20 bg-gradient-to-t from-dls-surface via-dls-surface/95 to-transparent px-4 md:px-8 ${props.compactTopSpacing ? "pt-0" : "pt-10"} pb-5`}
+      class={`sticky bottom-0 z-20 bg-gradient-to-t from-dls-surface via-dls-surface/95 to-transparent px-4 md:px-8 ${props.compactTopSpacing ? "pt-0" : "pt-3"} pb-5`}
       style={{ contain: "layout style" }}
     >
       <div class="max-w-[800px] mx-auto">
diff --git a/apps/app/src/app/pages/session.tsx b/apps/app/src/app/pages/session.tsx
index ad9dfda1..1cefd834 100644
--- a/apps/app/src/app/pages/session.tsx
+++ b/apps/app/src/app/pages/session.tsx
@@ -3186,7 +3186,7 @@ export default function SessionView(props: SessionViewProps) {
           <div class="flex-1 flex overflow-hidden">
             <div class="relative min-w-0 flex-1 overflow-hidden bg-dls-surface">
               <div
-                class={`h-full overflow-y-auto px-4 sm:px-6 lg:px-10 ${showWorkspaceSetupEmptyState() ? "pt-20 pb-10" : "pt-10 pb-10"} bg-dls-surface`}
+                class={`h-full overflow-y-auto px-4 sm:px-6 lg:px-10 ${showWorkspaceSetupEmptyState() ? "pt-20" : "pt-10"} bg-dls-surface`}
                 style={{ contain: "layout paint style" }}
                 onWheel={(event) => {
                   sessionScroll.markScrollGesture(event.target);
@@ -3241,7 +3241,7 @@ export default function SessionView(props: SessionViewProps) {
                       !deferSessionRender()
                     }
                   >
-                    <div class="text-center py-16 px-6 space-y-6">
+                    <div class="text-center px-6 space-y-6">
                       <div class="w-16 h-16 bg-dls-hover rounded-3xl mx-auto flex items-center justify-center border border-dls-border">
                         <Zap class="text-dls-secondary" />
                       </div>
@@ -3304,7 +3304,7 @@ export default function SessionView(props: SessionViewProps) {
                       </div>
                     </Show>
 
-                    <div>
+                    <Show when={batchedRenderedMessages().length > 0}>
                       <MessageList
                         messages={batchedRenderedMessages()}
                         isStreaming={showRunIndicator()}
@@ -3358,7 +3358,7 @@ export default function SessionView(props: SessionViewProps) {
                           ) : undefined
                         }
                       />
-                    </div>
+                    </Show>
                   </Show>
                 </div>
               </div>