diff --git a/docs/static/appkit-ui/styles.gen.css b/docs/static/appkit-ui/styles.gen.css
index a2192039d..5dbf7869a 100644
--- a/docs/static/appkit-ui/styles.gen.css
+++ b/docs/static/appkit-ui/styles.gen.css
@@ -3967,6 +3967,11 @@
       flex-direction: row;
     }
   }
+  .sm\:items-center {
+    @media (width >= 40rem) {
+      align-items: center;
+    }
+  }
   .sm\:justify-end {
     @media (width >= 40rem) {
       justify-content: flex-end;
@@ -3977,6 +3982,11 @@
       gap: calc(var(--spacing) * 2.5);
     }
   }
+  .sm\:gap-6 {
+    @media (width >= 40rem) {
+      gap: calc(var(--spacing) * 6);
+    }
+  }
   .sm\:pr-2\.5 {
     @media (width >= 40rem) {
       padding-right: calc(var(--spacing) * 2.5);
diff --git a/packages/appkit-ui/src/react/charts/options.ts b/packages/appkit-ui/src/react/charts/options.ts
index 5146b4694..9f0d1ac66 100644
--- a/packages/appkit-ui/src/react/charts/options.ts
+++ b/packages/appkit-ui/src/react/charts/options.ts
@@ -270,6 +270,7 @@ export function buildCartesianOption(
       right: "10%",
       top: ctx.title ? "15%" : "10%",
       bottom: ctx.showLegend && hasMultipleSeries ? "20%" : "15%",
+      containLabel: true,
     },
     xAxis: {
       type: isScatter ? "value" : isTimeSeries ? "time" : "category",
diff --git a/packages/appkit-ui/src/react/hooks/index.ts b/packages/appkit-ui/src/react/hooks/index.ts
index b1a5a1446..e272616d2 100644
--- a/packages/appkit-ui/src/react/hooks/index.ts
+++ b/packages/appkit-ui/src/react/hooks/index.ts
@@ -25,6 +25,7 @@ export {
   type UseChartDataResult,
   useChartData,
 } from "./use-chart-data";
+export { useIsMobile } from "./use-mobile";
 export { usePluginClientConfig } from "./use-plugin-config";
 export {
   type UseServingInvokeOptions,
diff --git a/packages/appkit-ui/src/react/table/data-table.tsx b/packages/appkit-ui/src/react/table/data-table.tsx
index 91e8a5ccc..2b7306d03 100644
--- a/packages/appkit-ui/src/react/table/data-table.tsx
+++ b/packages/appkit-ui/src/react/table/data-table.tsx
@@ -256,8 +256,9 @@ export function DataTable(props: DataTableProps) {
                 </Table>
               </div>
             </div>
-            <div className="flex items-center justify-between py-4">
-              <div className="flex items-center gap-6">
+            {/* On mobile, flex-col-reverse places pagination buttons above the info row for easier thumb access */}
+            <div className="flex flex-col-reverse sm:flex-row items-start sm:items-center justify-between gap-3 py-4">
+              <div className="flex flex-wrap items-center gap-3 sm:gap-6">
                 <div className="text-foreground text-sm">
                   {totalRows > 0
                     ? finalLabels.showing
diff --git a/template/client/src/App.tsx b/template/client/src/App.tsx
index d3cc4bc81..33d2312d4 100644
--- a/template/client/src/App.tsx
+++ b/template/client/src/App.tsx
@@ -1,10 +1,18 @@
 import { createBrowserRouter, RouterProvider, NavLink, Outlet } from 'react-router';
+import { useState, useEffect } from 'react';
 import {
+  Button,
   Card,
   CardContent,
   CardHeader,
   CardTitle,
+  Sheet,
+  SheetContent,
+  SheetHeader,
+  SheetTitle,
+  useIsMobile,
 } from '@databricks/appkit-ui/react';
+import { Menu } from 'lucide-react';
 {{- if .plugins.agents}}
 import { AgentChat } from './pages/agents/AgentChat';
 {{- end}}
@@ -37,59 +45,98 @@ const navLinkClass = ({ isActive }: { isActive: boolean }) =>
       : 'text-muted-foreground hover:bg-muted hover:text-foreground'
   }`;
 
-function Layout() {
+const mobileNavLinkClass = ({ isActive }: { isActive: boolean }) =>
+  `block px-3 py-2 rounded-md text-sm font-medium transition-colors ${
+    isActive
+      ? 'bg-primary text-primary-foreground'
+      : 'text-muted-foreground hover:bg-muted hover:text-foreground'
+  }`;
+
+type NavLinkClassFn = (props: { isActive: boolean }) => string;
+
+function NavLinks({ className, linkClass, onClick }: { className?: string; linkClass: NavLinkClassFn; onClick?: () => void }) {
   return (
-    <div className="min-h-screen bg-background flex flex-col">
-      <header className="border-b px-6 py-3 flex items-center gap-4">
-        <h1 className="text-lg font-semibold text-foreground">{{.projectName}}</h1>
-        <nav className="flex gap-1">
-          <NavLink to="/" end className={navLinkClass}>
-            Home
-          </NavLink>
+    <nav className={className}>
+      <NavLink to="/" end className={linkClass} onClick={onClick}>
+        Home
+      </NavLink>
 {{- if .plugins.agents}}
-          <NavLink to="/agents" className={navLinkClass}>
-            Agents
-          </NavLink>
+      <NavLink to="/agents" className={linkClass} onClick={onClick}>
+        Agents
+      </NavLink>
 {{- end}}
 {{- if .plugins.analytics}}
-          <NavLink to="/analytics" className={navLinkClass}>
-            Analytics
-          </NavLink>
+      <NavLink to="/analytics" className={linkClass} onClick={onClick}>
+        Analytics
+      </NavLink>
 {{- end}}
 {{- if .plugins.lakebase}}
-          <NavLink to="/lakebase" className={navLinkClass}>
-            Lakebase
-          </NavLink>
+      <NavLink to="/lakebase" className={linkClass} onClick={onClick}>
+        Lakebase
+      </NavLink>
 {{- end}}
 {{- if .plugins.genie}}
-          <NavLink to="/genie" className={navLinkClass}>
-            Genie
-          </NavLink>
+      <NavLink to="/genie" className={linkClass} onClick={onClick}>
+        Genie
+      </NavLink>
 {{- end}}
 {{- if .plugins.files}}
-          <NavLink to="/files" className={navLinkClass}>
-            Files
-          </NavLink>
+      <NavLink to="/files" className={linkClass} onClick={onClick}>
+        Files
+      </NavLink>
 {{- end}}
 {{- if .plugins.serving}}
-          <NavLink to="/serving" className={navLinkClass}>
-            Serving
-          </NavLink>
+      <NavLink to="/serving" className={linkClass} onClick={onClick}>
+        Serving
+      </NavLink>
 {{- end}}
 {{- if .plugins.vectorSearch}}
-          <NavLink to="/vector-search" className={navLinkClass}>
-            Vector Search
-          </NavLink>
+      <NavLink to="/vector-search" className={linkClass} onClick={onClick}>
+        Vector Search
+      </NavLink>
 {{- end}}
 {{- if .plugins.jobs}}
-          <NavLink to="/jobs" className={navLinkClass}>
-            Jobs
-          </NavLink>
+      <NavLink to="/jobs" className={linkClass} onClick={onClick}>
+        Jobs
+      </NavLink>
 {{- end}}
-        </nav>
+    </nav>
+  );
+}
+
+function Layout() {
+  const isMobile = useIsMobile();
+  const [mobileNavOpen, setMobileNavOpen] = useState(false);
+
+  // Close mobile nav when viewport crosses to desktop
+  useEffect(() => {
+    if (!isMobile) setMobileNavOpen(false);
+  }, [isMobile]);
+
+  return (
+    <div className="min-h-screen bg-background flex flex-col">
+      <header className="border-b px-4 md:px-6 py-3 flex items-center gap-4">
+        <h1 className="text-lg font-semibold text-foreground">{{.projectName}}</h1>
+        {/* Desktop nav — hidden below md breakpoint */}
+        <NavLinks className="hidden md:flex gap-1" linkClass={navLinkClass} />
+        {/* Mobile nav — visible below md breakpoint */}
+        <div className="ml-auto md:hidden">
+          <Sheet open={mobileNavOpen} onOpenChange={setMobileNavOpen}>
+            <Button variant="ghost" size="icon" onClick={() => setMobileNavOpen(true)}>
+              <Menu className="h-5 w-5" />
+              <span className="sr-only">Open navigation</span>
+            </Button>
+            <SheetContent side="left">
+              <SheetHeader>
+                <SheetTitle>Navigation</SheetTitle>
+              </SheetHeader>
+              <NavLinks className="flex flex-col gap-1" linkClass={mobileNavLinkClass} onClick={() => setMobileNavOpen(false)} />
+            </SheetContent>
+          </Sheet>
+        </div>
       </header>
 
-      <main className="flex-1 p-6">
+      <main className="flex-1 p-4 md:p-6">
         <Outlet />
       </main>
     </div>
diff --git a/template/client/src/pages/agents/AgentChat.tsx b/template/client/src/pages/agents/AgentChat.tsx
index a64855335..5d1e5758d 100644
--- a/template/client/src/pages/agents/AgentChat.tsx
+++ b/template/client/src/pages/agents/AgentChat.tsx
@@ -141,7 +141,7 @@ export function AgentChat() {
         </p>
       </div>
 
-      <Card className="h-[600px] flex flex-col">
+      <Card className="h-[min(600px,70vh)] flex flex-col">
         <CardContent
           className="flex-1 overflow-y-auto p-4 space-y-3"
           ref={scrollRef}
diff --git a/template/client/src/pages/files/FilesPage.tsx b/template/client/src/pages/files/FilesPage.tsx
index a64fdb30b..e36ebb5c4 100644
--- a/template/client/src/pages/files/FilesPage.tsx
+++ b/template/client/src/pages/files/FilesPage.tsx
@@ -289,7 +289,7 @@ export function FilesPage() {
         </p>
       </div>
 
-      <div className="flex items-center justify-between">
+      <div className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-3">
         <div className="flex items-center gap-3">
           {volumes.length > 1 && (
             <select
@@ -351,7 +351,7 @@ export function FilesPage() {
         </div>
       </div>
 
-      <div className="flex gap-6">
+      <div className="flex flex-col md:flex-row gap-4 md:gap-6">
         <DirectoryList
           className="flex-2 min-w-0"
           entries={entries}
diff --git a/template/client/src/pages/genie/GeniePage.tsx b/template/client/src/pages/genie/GeniePage.tsx
index b9bf78f7b..50b003c09 100644
--- a/template/client/src/pages/genie/GeniePage.tsx
+++ b/template/client/src/pages/genie/GeniePage.tsx
@@ -10,7 +10,7 @@ export function GeniePage() {
           Ask questions about your data using Databricks AI/BI Genie.
         </p>
       </div>
-      <div className="h-[600px] border rounded-lg overflow-hidden">
+      <div className="h-[min(600px,70vh)] border rounded-lg overflow-hidden">
         <GenieChat alias="default" />
       </div>
     </div>
diff --git a/template/client/src/pages/jobs/JobsPage.tsx b/template/client/src/pages/jobs/JobsPage.tsx
index b105fbb8a..7705bedab 100644
--- a/template/client/src/pages/jobs/JobsPage.tsx
+++ b/template/client/src/pages/jobs/JobsPage.tsx
@@ -154,7 +154,7 @@ export function JobsPage() {
         </p>
       </div>
 
-      <div className="flex items-center gap-3">
+      <div className="flex flex-wrap items-center gap-3">
         <label
           htmlFor={inputId}
           className="text-sm font-medium text-foreground"
@@ -166,7 +166,7 @@ export function JobsPage() {
           type="text"
           value={jobKey}
           onChange={(e) => setJobKey(e.target.value)}
-          className="rounded-md border border-input bg-background px-3 py-1.5 text-sm w-48"
+          className="rounded-md border border-input bg-background px-3 py-1.5 text-sm w-full sm:w-48"
         />
         <Button
           onClick={fetchStatus}
diff --git a/template/client/src/pages/serving/ServingPage.tsx b/template/client/src/pages/serving/ServingPage.tsx
index b80934ba7..981156ca5 100644
--- a/template/client/src/pages/serving/ServingPage.tsx
+++ b/template/client/src/pages/serving/ServingPage.tsx
@@ -69,7 +69,7 @@ export function ServingPage() {
         </p>
       </div>
 
-      <div className="border rounded-lg flex flex-col h-[600px]">
+      <div className="border rounded-lg flex flex-col h-[min(600px,70vh)]">
         <div className="flex-1 overflow-y-auto p-4 space-y-4">
           {messages.map((msg) => (
             <div
diff --git a/tools/generate-app-templates.ts b/tools/generate-app-templates.ts
index 1eff93570..742b81b77 100644
--- a/tools/generate-app-templates.ts
+++ b/tools/generate-app-templates.ts
@@ -66,6 +66,7 @@ const APP_TEMPLATES: AppTemplate[] = [
       "analytics.sql-warehouse.id": "placeholder",
       "files.files.path": "placeholder",
       "genie.genie-space.id": "placeholder",
+      "genie.genie-space.name": "placeholder",
       "lakebase.postgres.branch": "placeholder",
       "lakebase.postgres.database": "placeholder",
       "serving.serving-endpoint.name": "placeholder",
@@ -86,6 +87,7 @@ const APP_TEMPLATES: AppTemplate[] = [
     features: ["genie"],
     set: {
       "genie.genie-space.id": "placeholder",
+      "genie.genie-space.name": "placeholder",
     },
     description:
       "Node.js app with AI/BI Genie for natural language data queries",