diff --git a/app/UI/@layout.latte b/app/UI/@layout.latte
index 98cf79d..3a47c72 100644
--- a/app/UI/@layout.latte
+++ b/app/UI/@layout.latte
@@ -33,46 +33,41 @@
 			<div class="collapse navbar-collapse" id="mainNavbar">
 				<!-- Hlavní kategorie - viditelné pouze pro přihlášené -->
 				{if $user->isLoggedIn()}
-					<ul class="navbar-nav me-auto nav nav-tabs" id="mainCategoryTabs" role="tablist">
+					<ul class="navbar-nav me-auto nav nav-tabs" id="mainCategoryTabs">
 						<!-- FAKTURY -->
-						<li class="nav-item" role="presentation">
-							<button n:class="nav-link, $presenter->isLinkCurrent('Faktura:*') ? active" 
-									id="cat-invoices-tab" data-bs-toggle="tab" data-bs-target="#toolbar-invoices" type="button" role="tab">
+						<li class="nav-item">
+							<a n:href="Faktura:" n:class="nav-link, $presenter->isLinkCurrent('Faktura:*') || $presenter->isLinkCurrent('FakturaEdit:*') ? active">
 								<i class="bi bi-file-earmark-text me-1"></i> Faktury
-							</button>
+							</a>
 						</li>
 						
 						<!-- ZÁKAZNÍCI -->
-						<li class="nav-item" role="presentation">
-							<button n:class="nav-link, $presenter->isLinkCurrent('Zakaznik:*') ? active" 
-									id="cat-customers-tab" data-bs-toggle="tab" data-bs-target="#toolbar-customers" type="button" role="tab">
+						<li class="nav-item">
+							<a n:href="Zakaznik:" n:class="nav-link, $presenter->isLinkCurrent('Zakaznik:*') || $presenter->isLinkCurrent('ZakaznikEdit:*') ? active">
 								<i class="bi bi-people me-1"></i> Zákazníci
-							</button>
+							</a>
 						</li>
 
 						<!-- MOJE OSVČ -->
-						<li class="nav-item" role="presentation">
-							<button n:class="nav-link, $presenter->isLinkCurrent('Firma:*') || $presenter->isLinkCurrent('Nastaveni:*') ? active" 
-									id="cat-profile-tab" data-bs-toggle="tab" data-bs-target="#toolbar-profile" type="button" role="tab">
+						<li class="nav-item">
+							<a n:href="Firma:edit" n:class="nav-link, $presenter->isLinkCurrent('Firma:*') || $presenter->isLinkCurrent('Nastaveni:*') ? active">
 								<i class="bi bi-building me-1"></i> Moje OSVČ
-							</button>
+							</a>
 						</li>
 
 						<!-- KUFŘÍK -->
-						<li class="nav-item" role="presentation">
-							<button n:class="nav-link, $presenter->isLinkCurrent('Uzivatel:*') ? active" 
-									id="cat-briefcase-tab" data-bs-toggle="tab" data-bs-target="#toolbar-briefcase" type="button" role="tab">
+						<li class="nav-item">
+							<a n:href="Uzivatel:edit" n:class="nav-link, $presenter->isLinkCurrent('Uzivatel:*') ? active">
 								<i class="bi bi-box me-1"></i> Kufřík
-							</button>
+							</a>
 						</li>
 
 						<!-- ADMIN — pouze systémový administrátor -->
 						{if $user->isInRole('admin')}
-							<li class="nav-item" role="presentation">
-								<button n:class="nav-link, $presenter->isLinkCurrent('Admin:*') ? active" 
-										id="cat-admin-tab" data-bs-toggle="tab" data-bs-target="#toolbar-admin" type="button" role="tab">
+							<li class="nav-item">
+								<a n:href="Admin:databaze" n:class="nav-link, $presenter->isLinkCurrent('Admin:*') ? active">
 									<i class="bi bi-shield-lock me-1"></i> Admin
-								</button>
+								</a>
 							</li>
 						{/if}
 					</ul>
@@ -116,7 +111,7 @@
 					<div class="tab-content" id="actionToolbarContent">
 						
 						<!-- FAKTURY -->
-						<div n:class="tab-pane, fade, $presenter->isLinkCurrent('Faktura:*') ? 'show active'" id="toolbar-invoices" role="tabpanel">
+						<div n:class="tab-pane, fade, $presenter->isLinkCurrent('Faktura:*') || $presenter->isLinkCurrent('FakturaEdit:*') ? 'show active'" id="toolbar-invoices" role="tabpanel">
 							<div class="toolbar-group">
 								<div class="action-buttons">
 									<a n:href="Faktura:" type="button" class="btn btn-outline-primary btn-action">
@@ -179,7 +174,7 @@
 						</div>
 
 						<!-- ZÁKAZNÍCI -->
-						<div n:class="tab-pane, fade, $presenter->isLinkCurrent('Zakaznik:*') ? 'show active'" id="toolbar-customers" role="tabpanel">
+						<div n:class="tab-pane, fade, $presenter->isLinkCurrent('Zakaznik:*') || $presenter->isLinkCurrent('ZakaznikEdit:*') ? 'show active'" id="toolbar-customers" role="tabpanel">
 							<div class="action-buttons">
 								<a n:href="Zakaznik:default" type="button" class="btn btn-outline-primary btn-action">
 									<i class="bi bi-people-fill"></i>