diff --git a/pkg/web/routes/layout.templ b/pkg/web/routes/layout.templ
index 8bd0caf..b3dbf6a 100644
--- a/pkg/web/routes/layout.templ
+++ b/pkg/web/routes/layout.templ
@@ -2,12 +2,7 @@ package routes
 
 import "github.com/LazyBachelor/LazyPM/pkg/web/components"
 
-type BaseLayoutProps struct {
-	SearchQuery string
-}
-
-func buildLayoutProps(searchQuery string) components.LayoutProps {
-	return components.LayoutProps{
+var baseLayout = components.LayoutProps{
 		Title:       "Beads Test Application",
 		Description: "A sample application using Beads storage service",
 		Head: components.HeadProps{
@@ -17,28 +12,30 @@ func buildLayoutProps(searchQuery string) components.LayoutProps {
 				{Href: "/assets/manifest.json", Rel: "manifest"},
 			},
 			Scripts: []components.Script{
+				{Src: "https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js", Defer: true},
 				{Src: "/assets/js/htmx.min.js", Defer: true},
 				{Src: "/assets/js/ajax.min.js", Defer: true},
 			},
 		},
 		Routes: []components.NavRoutes{
-			{Name: "Dashboard", Path: "/dashboard", Icon: components.IconDashboard()},
+			{Name: "Dashboard", Path: "/", Icon: components.IconDashboard()},
+			/* Add back when functionality is implemented
 			{Name: "Issues", Path: "/", Icon: components.IconIssues()},
 			{Name: "Agile Board", Path: "/board", Icon: components.IconAgileBoard()},
 			{Name: "Backlog", Path: "/backlog", Icon: components.IconBacklog()},
 			{Name: "Reports", Path: "/reports", Icon: components.IconReports()},
 			{Name: "Settings", Path: "/settings", Icon: components.IconSettings()},
+			*/
 		},
 		Header: components.HeaderProps{
-			Title:        "LazyPM Dashboard",
-			NavbarCenter: components.SearchForm(searchQuery),
+			Title:        "LazyPM",
 			NavbarEnd:    components.Status(),
 		},
 	}
-}
 
-templ BaseLayout(props BaseLayoutProps) {
-	@components.Layout(buildLayoutProps(props.SearchQuery)) {
+
+templ BaseLayout() {
+	@components.Layout(baseLayout) {
 		{ children... }
 	}
 }
diff --git a/pkg/web/routes/layout_templ.go b/pkg/web/routes/layout_templ.go
index e8dc269..cac9195 100644
--- a/pkg/web/routes/layout_templ.go
+++ b/pkg/web/routes/layout_templ.go
@@ -10,42 +10,38 @@ import templruntime "github.com/a-h/templ/runtime"
 
 import "github.com/LazyBachelor/LazyPM/pkg/web/components"
 
-type BaseLayoutProps struct {
-	SearchQuery string
+var baseLayout = components.LayoutProps{
+	Title:       "Beads Test Application",
+	Description: "A sample application using Beads storage service",
+	Head: components.HeadProps{
+		Links: []components.Link{
+			{Href: "/assets/css/styles.css", Rel: "preload", As: "style"},
+			{Href: "/assets/css/styles.css", Rel: "stylesheet"},
+			{Href: "/assets/manifest.json", Rel: "manifest"},
+		},
+		Scripts: []components.Script{
+			{Src: "https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js", Defer: true},
+			{Src: "/assets/js/htmx.min.js", Defer: true},
+			{Src: "/assets/js/ajax.min.js", Defer: true},
+		},
+	},
+	Routes: []components.NavRoutes{
+		{Name: "Dashboard", Path: "/", Icon: components.IconDashboard()},
+		/* Add back when functionality is implemented
+		{Name: "Issues", Path: "/", Icon: components.IconIssues()},
+		{Name: "Agile Board", Path: "/board", Icon: components.IconAgileBoard()},
+		{Name: "Backlog", Path: "/backlog", Icon: components.IconBacklog()},
+		{Name: "Reports", Path: "/reports", Icon: components.IconReports()},
+		{Name: "Settings", Path: "/settings", Icon: components.IconSettings()},
+		*/
+	},
+	Header: components.HeaderProps{
+		Title:     "LazyPM",
+		NavbarEnd: components.Status(),
+	},
 }
 
-func buildLayoutProps(searchQuery string) components.LayoutProps {
-	return components.LayoutProps{
-		Title:       "Beads Test Application",
-		Description: "A sample application using Beads storage service",
-		Head: components.HeadProps{
-			Links: []components.Link{
-				{Href: "/assets/css/styles.css", Rel: "preload", As: "style"},
-				{Href: "/assets/css/styles.css", Rel: "stylesheet"},
-				{Href: "/assets/manifest.json", Rel: "manifest"},
-			},
-			Scripts: []components.Script{
-				{Src: "/assets/js/htmx.min.js", Defer: true},
-				{Src: "/assets/js/ajax.min.js", Defer: true},
-			},
-		},
-		Routes: []components.NavRoutes{
-			{Name: "Dashboard", Path: "/dashboard", Icon: components.IconDashboard()},
-			{Name: "Issues", Path: "/", Icon: components.IconIssues()},
-			{Name: "Agile Board", Path: "/board", Icon: components.IconAgileBoard()},
-			{Name: "Backlog", Path: "/backlog", Icon: components.IconBacklog()},
-			{Name: "Reports", Path: "/reports", Icon: components.IconReports()},
-			{Name: "Settings", Path: "/settings", Icon: components.IconSettings()},
-		},
-		Header: components.HeaderProps{
-			Title:        "LazyPM Dashboard",
-			NavbarCenter: components.SearchForm(searchQuery),
-			NavbarEnd:    components.Status(),
-		},
-	}
-}
-
-func BaseLayout(props BaseLayoutProps) templ.Component {
+func BaseLayout() templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -84,7 +80,7 @@ func BaseLayout(props BaseLayoutProps) templ.Component {
 			}
 			return nil
 		})
-		templ_7745c5c3_Err = components.Layout(buildLayoutProps(props.SearchQuery)).Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = components.Layout(baseLayout).Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}