diff --git a/server/templates/cake.templ b/server/templates/cake.templ
index 9a7cc07..f13d6cc 100644
--- a/server/templates/cake.templ
+++ b/server/templates/cake.templ
@@ -7,7 +7,7 @@ import (
 )
 
 templ CakePage(cake models.Cake) {
-	@Layout(cakeTitle(cake), CakeForm(cake))
+	@Layout(cakeTitle(cake), nil, CakeForm(cake))
 }
 
 templ CakeForm(cake models.Cake) {
diff --git a/server/templates/cakes.templ b/server/templates/cakes.templ
index 6adfafe..a1091dd 100644
--- a/server/templates/cakes.templ
+++ b/server/templates/cakes.templ
@@ -7,7 +7,7 @@ import (
 )
 
 templ CakesPage(cakes []models.Cake) {
-	@Layout("Katalog", CakesMain(cakes))
+	@Layout("Katalog", nil, CakesMain(cakes))
 }
 
 templ CakesMain(cakes []models.Cake) {
diff --git a/server/templates/confirmation.templ b/server/templates/confirmation.templ
index bc5dbcc..d8851b0 100644
--- a/server/templates/confirmation.templ
+++ b/server/templates/confirmation.templ
@@ -3,7 +3,7 @@ package templates
 import "strconv"
 
 templ Confirmation(title string, id int) {
-	@Layout(title, ConfirmationBody(id))
+	@Layout(title, nil, ConfirmationBody(id))
 }
 
 templ ConfirmationBody(id int) {
diff --git a/server/templates/layout.templ b/server/templates/layout.templ
index 03f7ef5..1706b1c 100644
--- a/server/templates/layout.templ
+++ b/server/templates/layout.templ
@@ -1,15 +1,15 @@
 package templates
 
-templ Layout(title string, main templ.Component) {
-	<!doctype html>
+templ Layout(title string, header, main templ.Component) {
+	<!DOCTYPE html>
 	<html lang="pl">
 		<head>
-			<meta charset="UTF-8" />
-			<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+			<meta charset="UTF-8"/>
+			<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 			<title>{ title } — Zamówienia ciast</title>
-			<link rel="stylesheet" href="/static/fonts/inter.css" />
-			<link rel="stylesheet" href="/static/fonts/material.css" />
-			<link rel="stylesheet" href="/static/style.css" />
+			<link rel="stylesheet" href="/static/fonts/inter.css"/>
+			<link rel="stylesheet" href="/static/fonts/material.css"/>
+			<link rel="stylesheet" href="/static/style.css"/>
 			<script src="/static/htmx2.04.js" defer></script>
 			<script src="/static/order.js"></script>
 		</head>
@@ -20,6 +20,7 @@ templ Layout(title string, main templ.Component) {
 			<main>
 				<header class="topnav">
 					<h1>{ title }</h1>
+					@header
 				</header>
 				<div class="main-content">
 					@main
diff --git a/server/templates/order.templ b/server/templates/order.templ
index efc0cee..7671c81 100644
--- a/server/templates/order.templ
+++ b/server/templates/order.templ
@@ -7,7 +7,7 @@ import (
 )
 
 templ OrderPage(order models.Order, catalogue []models.Cake) {
-	@Layout(orderTitle(order), OrderForm(order, catalogue))
+	@Layout(orderTitle(order), nil, OrderForm(order, catalogue))
 }
 
 templ OrderForm(order models.Order, catalogue []models.Cake) {
diff --git a/server/templates/orders.templ b/server/templates/orders.templ
index d0dfb31..fede480 100644
--- a/server/templates/orders.templ
+++ b/server/templates/orders.templ
@@ -7,10 +7,25 @@ import (
 )
 
 templ OrdersPage(first, last string, orders []models.Order) {
-	@Layout("Panel główny", OrdersMain(first, last, orders))
+	@Layout("Panel główny", DateForm(first, last), OrdersMain(orders))
 }
 
-templ OrdersMain(first, last string, orders []models.Order) {
+templ DateForm(first, last string) {
+	<div style="display:flex;align-items:center;gap:0.5rem">
+		<form hx-get="/orders/search" hx-target="#results-table" hx-trigger="keyup delay:500ms, change" style="display:flex;align-items:center;gap:0.5rem">
+			<div class="form-group" style="flex-direction:row;align-items:center;gap:0.25rem">
+				<label style="font-size:0.75rem;white-space:nowrap">Od</label>
+				<input class="form-input" style="width:8.75rem" type="date" value={ first } name="from"/>
+			</div>
+			<div class="form-group" style="flex-direction:row;align-items:center;gap:0.25rem">
+				<label style="font-size:0.75rem;white-space:nowrap">Do</label>
+				<input class="form-input" style="width:8.75rem" type="date" value={ last } name="to"/>
+			</div>
+		</form>
+	</div>
+}
+
+templ OrdersMain(orders []models.Order) {
 	<div class="metrics-grid">
 		<div>
 			<span class="label">
@@ -60,18 +75,6 @@ templ OrdersMain(first, last string, orders []models.Order) {
 				<span class="material-symbols-outlined">list_alt</span>
 				Aktywne zamówienia
 			</h2>
-			<div style="display:flex;align-items:center;gap:0.5rem">
-				<form hx-get="/orders/search" hx-target="#results-table" hx-trigger="keyup delay:500ms, change" style="display:flex;align-items:center;gap:0.5rem">
-					<div class="form-group" style="flex-direction:row;align-items:center;gap:0.25rem">
-						<label style="font-size:0.75rem;white-space:nowrap">Od</label>
-						<input class="form-input" style="width:8.75rem" type="date" value={ first } name="from"/>
-					</div>
-					<div class="form-group" style="flex-direction:row;align-items:center;gap:0.25rem">
-						<label style="font-size:0.75rem;white-space:nowrap">Do</label>
-						<input class="form-input" style="width:8.75rem" type="date" value={ last } name="to"/>
-					</div>
-				</form>
-			</div>
 		</header>
 		<div class="table-container" id="results-table">
 			@OrdersTable(orders)
