diff --git a/web/templates/stranice/admin_korisnici.html b/web/templates/stranice/admin_korisnici.html
index 3a1a6c2..dc0c69f 100644
--- a/web/templates/stranice/admin_korisnici.html
+++ b/web/templates/stranice/admin_korisnici.html
@@ -69,7 +69,7 @@
                             {{.DatumKreiranja.Format "02.01.2006."}}
                         </td>
                         <td style="padding:10px 20px;text-align:right;white-space:nowrap;">
-                            <a href="/admin/korisnici/{{.ID}}/istorija"
+                            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/admin/korisnici/{{.ID}}/istorija"
                                 style="display:inline-block;padding:5px 12px;border:0.5px solid var(--ivica);border-radius:6px;color:var(--tekst-sporedni);font-size:12px;text-decoration:none;margin-right:6px;">
                                 Istorija prijava
                             </a>
diff --git a/web/templates/stranice/admin_login_istorija.html b/web/templates/stranice/admin_login_istorija.html
index e30e435..180c122 100644
--- a/web/templates/stranice/admin_login_istorija.html
+++ b/web/templates/stranice/admin_login_istorija.html
@@ -1,7 +1,7 @@
 {{template "base" .}} {{define "naslov"}}Istorija prijava — NTech{{end}} {{define "sadrzaj"}}
 <div class="stranica-stack" style="display: flex; flex-direction: column; gap: 16px">
   <div style="display: flex; align-items: center; gap: 12px; flex-wrap: wrap">
-    <a href="/admin/korisnici" class="btn-sekundarno">← Nazad</a>
+    <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/admin/korisnici" class="btn-sekundarno">← Nazad</a>
     <span class="naslov-traka" style="font-size: 15px; font-weight: 500; color: var(--tekst-glavni)">Istorija prijava — {{.PrikazKorisnik.KorisnickoIme}}</span>
   </div>
 
diff --git a/web/templates/stranice/admin_profil.html b/web/templates/stranice/admin_profil.html
index df10a92..55bea2c 100644
--- a/web/templates/stranice/admin_profil.html
+++ b/web/templates/stranice/admin_profil.html
@@ -101,7 +101,7 @@
 						{{if .JelDemo}}Podešavanje 2FA nije dostupno u demo modu.{{else}}Preporučujemo uključivanje dvostepene verifikacije.{{end}}
 					</div>
 				</div>
-				{{if not .JelDemo}}<a href="/admin/profil/totp/pokreni" class="btn-primarno">Podesi 2FA</a>{{end}}
+				{{if not .JelDemo}}<a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/admin/profil/totp/pokreni" class="btn-primarno">Podesi 2FA</a>{{end}}
 			</div>
 		{{ end }}
 	</div>
@@ -115,7 +115,7 @@
 				</svg>
 				<span style="font-size: 14px; color: var(--tekst-glavni)">
 					Podešavanja teme i pozadine nalaze se na
-					<a href="/profil/tema" style="color: var(--sb-akcent); text-decoration: none; font-weight: 500">stranici Tema</a>
+					<a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/profil/tema" style="color: var(--sb-akcent); text-decoration: none; font-weight: 500">stranici Tema</a>
 					.
 				</span>
 			</div>
diff --git a/web/templates/stranice/dashboard.html b/web/templates/stranice/dashboard.html
index c36435e..80ebc36 100644
--- a/web/templates/stranice/dashboard.html
+++ b/web/templates/stranice/dashboard.html
@@ -21,7 +21,7 @@
 {{ end }}
 <div class="grid grid-cols-2 md:grid-cols-5 gap-3 mb-6">
 	<!-- stat kartice -->
-	<a href="/magacin" class="kartica dash-stat animiraj kartica-link">
+	<a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/magacin" class="kartica dash-stat animiraj kartica-link">
 		<div class="dash-ikona dash-ikona-plava">
 			<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="#4f7ef8" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 				<path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z" />
@@ -31,7 +31,7 @@
 		<div style="font-size:14px;color:var(--tekst-glavni);margin-top:4px;font-weight:500;">Artikala na stanju</div>
 	</a>
 
-	<a href="/servis" class="kartica dash-stat animiraj kartica-link">
+	<a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/servis" class="kartica dash-stat animiraj kartica-link">
 		<div class="dash-ikona dash-ikona-zelena">
 			<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="#16a34a" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 				<path d="M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-6.91 6.91a2.12 2.12 0 0 1-3-3l6.91-6.91a6 6 0 0 1 7.94-7.94l-3.76 3.76z" />
@@ -42,7 +42,7 @@
 	</a>
 
 	{{ if index .Dozvole "dashboard.prihod" }}
-		<a href="/izvestaji" class="kartica dash-stat animiraj kartica-link">
+		<a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/izvestaji" class="kartica dash-stat animiraj kartica-link">
 			<div class="dash-ikona dash-ikona-narandzasta">
 				<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="#ea580c" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 					<circle cx="9" cy="21" r="1" />
@@ -55,7 +55,7 @@
 		</a>
 	{{ end }}
 
-	<a href="/magacin?kriticni=1" class="kartica dash-stat animiraj kartica-link">
+	<a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/magacin?kriticni=1" class="kartica dash-stat animiraj kartica-link">
 		<div class="dash-ikona dash-ikona-crvena">
 			<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="#dc2626" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 				<path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z" />
@@ -67,7 +67,7 @@
 		<div style="font-size:14px;color:var(--tekst-glavni);margin-top:4px;font-weight:500;">Kritično niska zaliha</div>
 	</a>
 
-	<a href="/podsetnici" class="kartica dash-stat animiraj kartica-link">
+	<a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/podsetnici" class="kartica dash-stat animiraj kartica-link">
 		<div class="dash-ikona dash-ikona-nebo">
 			<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="#0284c7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 				<path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9" />
diff --git a/web/templates/stranice/dobavljac_forma.html b/web/templates/stranice/dobavljac_forma.html
index f334738..2f1fd4f 100644
--- a/web/templates/stranice/dobavljac_forma.html
+++ b/web/templates/stranice/dobavljac_forma.html
@@ -6,7 +6,7 @@
 <div style="width:100%;">
 
     <!-- nazad dugme -->
-    <a href="/dobavljaci" class="nazad-link">
+    <a href="/dobavljaci" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="15 18 9 12 15 6"/></svg>
         Nazad na dobavljače
     </a>
@@ -83,7 +83,7 @@
 
                 <!-- dugmad -->
                 <div style="display:flex;justify-content:flex-end;gap:10px;margin-top:6px;">
-                    <a href="/dobavljaci" class="btn-sekundarno">Odustani</a>
+                    <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/dobavljaci" class="btn-sekundarno">Odustani</a>
                     <button type="submit" class="btn-primarno">
                         {{if .Izmena}}Sačuvaj izmene{{else}}Dodaj dobavljača{{end}}
                     </button>
diff --git a/web/templates/stranice/dobavljaci.html b/web/templates/stranice/dobavljaci.html
index 303718b..2cb735c 100644
--- a/web/templates/stranice/dobavljaci.html
+++ b/web/templates/stranice/dobavljaci.html
@@ -14,7 +14,7 @@
 
     <!-- gornja traka: dugme + interaktivna pretraga -->
     <div id="dobavljaci-filteri" style="display:flex;gap:10px;flex-wrap:wrap;align-items:center;">
-        <a href="/dobavljaci/novi" class="btn-primarno">+ Novi dobavljač</a>
+        <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/dobavljaci/novi" class="btn-primarno">+ Novi dobavljač</a>
         <form method="GET" action="/dobavljaci" style="display:flex;gap:8px;flex:1;min-width:200px;"
               hx-get="/dobavljaci" hx-target="#dobavljaci-rezultati" hx-select="#dobavljaci-rezultati" hx-swap="innerHTML" hx-push-url="true">
             <input type="text" name="pretraga" value="{{.Pretraga}}"
@@ -55,7 +55,7 @@
                         </td>
                         <td style="padding:12px 16px;text-align:center;">
                             <div style="display:flex;align-items:center;justify-content:center;gap:8px;">
-                                <a href="/dobavljaci/izmeni/{{.ID}}" class="btn-primarno-malo">
+                                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/dobavljaci/izmeni/{{.ID}}" class="btn-primarno-malo">
                                     Izmeni
                                 </a>
                                 {{if index $.Dozvole "dobavljac.obrisi"}}
@@ -72,7 +72,7 @@
                     {{else}}
                     <tr>
                         <td colspan="5" style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
-                            {{if $.Pretraga}}Za datu pretragu nema dobavljača u bazi.{{else}}Nema dobavljača. <a href="/dobavljaci/novi" style="color:var(--sb-akcent);">Dodaj prvog dobavljača.</a>{{end}}
+                            {{if $.Pretraga}}Za datu pretragu nema dobavljača u bazi.{{else}}Nema dobavljača. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/dobavljaci/novi" style="color:var(--sb-akcent);">Dodaj prvog dobavljača.</a>{{end}}
                         </td>
                     </tr>
                     {{end}}
@@ -88,7 +88,7 @@
             <div class="red-izmedju" style="align-items:flex-start;gap:12px;margin-bottom:10px;">
                 <span style="font-size:15px;font-weight:500;color:var(--tekst-glavni);">{{.Naziv}}</span>
                 <div style="display:flex;gap:8px;flex-shrink:0;">
-                    <a href="/dobavljaci/izmeni/{{.ID}}" class="btn-primarno-malo">
+                    <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/dobavljaci/izmeni/{{.ID}}" class="btn-primarno-malo">
                         Izmeni
                     </a>
                     {{if index $.Dozvole "dobavljac.obrisi"}}
@@ -124,7 +124,7 @@
         </div>
         {{else}}
         <div style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
-            {{if $.Pretraga}}Za datu pretragu nema dobavljača u bazi.{{else}}Nema dobavljača. <a href="/dobavljaci/novi" style="color:var(--sb-akcent);">Dodaj prvog dobavljača.</a>{{end}}
+            {{if $.Pretraga}}Za datu pretragu nema dobavljača u bazi.{{else}}Nema dobavljača. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/dobavljaci/novi" style="color:var(--sb-akcent);">Dodaj prvog dobavljača.</a>{{end}}
         </div>
         {{end}}
     </div>
diff --git a/web/templates/stranice/izvestaji.html b/web/templates/stranice/izvestaji.html
index 2244388..94c097c 100644
--- a/web/templates/stranice/izvestaji.html
+++ b/web/templates/stranice/izvestaji.html
@@ -24,9 +24,9 @@
 
     <!-- brzi linkovi ka magacinskim izveštajima -->
     <div style="display:flex;gap:10px;flex-wrap:wrap;">
-        <a href="/izvestaji/prometni-list" class="btn-sekundarno">Prometni list magacina</a>
-        <a href="/izvestaji/stanje-zaliha" class="btn-sekundarno">Stanje zaliha</a>
-        <a href="/izvestaji/popis" class="btn-sekundarno">Popis (inventura)</a>
+        <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/izvestaji/prometni-list" class="btn-sekundarno">Prometni list magacina</a>
+        <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/izvestaji/stanje-zaliha" class="btn-sekundarno">Stanje zaliha</a>
+        <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/izvestaji/popis" class="btn-sekundarno">Popis (inventura)</a>
     </div>
 
     <!-- 1. mesečni prihod -->
@@ -96,7 +96,7 @@
                     {{range .StariNalozi}}
                     <tr style="border-bottom:0.5px solid var(--ivica);">
                         <td style="padding:8px 12px;">
-                            <a href="/servis/{{.ID}}" style="font-size:13px;font-family:monospace;color:var(--sb-akcent);text-decoration:none;">{{.BrojNaloga}}</a>
+                            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/servis/{{.ID}}" style="font-size:13px;font-family:monospace;color:var(--sb-akcent);text-decoration:none;">{{.BrojNaloga}}</a>
                         </td>
                         <td style="padding:8px 12px;font-size:13px;color:var(--tekst-glavni);">{{.Uredjaj}}</td>
                         <td style="padding:8px 12px;font-size:13px;color:var(--tekst-sporedni);">{{.KlijentNaziv}}</td>
diff --git a/web/templates/stranice/klijent_forma.html b/web/templates/stranice/klijent_forma.html
index 915c5ed..fbd495a 100644
--- a/web/templates/stranice/klijent_forma.html
+++ b/web/templates/stranice/klijent_forma.html
@@ -21,7 +21,7 @@
 {{define "sadrzaj"}}
 <div>
 
-    <a href="/klijenti" class="nazad-link">
+    <a href="/klijenti" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="15 18 9 12 15 6"/></svg>
         Nazad na klijente
     </a>
@@ -157,7 +157,7 @@
 
                 <!-- dugmad -->
                 <div style="display:flex;justify-content:flex-end;gap:10px;margin-top:6px;">
-                    <a href="/klijenti" class="btn-sekundarno">Odustani</a>
+                    <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/klijenti" class="btn-sekundarno">Odustani</a>
                     <button type="submit" class="btn-primarno">
                         {{if .Izmena}}Sačuvaj izmene{{else}}Dodaj klijenta{{end}}
                     </button>
diff --git a/web/templates/stranice/klijenti.html b/web/templates/stranice/klijenti.html
index f00ec84..15c23d0 100644
--- a/web/templates/stranice/klijenti.html
+++ b/web/templates/stranice/klijenti.html
@@ -14,7 +14,7 @@
 
     <!-- gornja traka: dugme + interaktivna pretraga -->
     <div style="display:flex;gap:10px;flex-wrap:wrap;align-items:center;">
-        <a href="/klijenti/novi" class="btn-primarno">+ Novi klijent</a>
+        <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/klijenti/novi" class="btn-primarno">+ Novi klijent</a>
         <form method="GET" action="/klijenti" style="display:flex;gap:8px;flex:1;min-width:200px;"
               hx-get="/klijenti" hx-target="#klijenti-rezultati" hx-select="#klijenti-rezultati" hx-swap="innerHTML" hx-push-url="true">
             <input type="text" name="pretraga" value="{{.Pretraga}}"
@@ -83,7 +83,7 @@
                         </td>
                         <td class="centar">
                             <div style="display:flex;align-items:center;justify-content:center;gap:8px;">
-                                <a href="/klijenti/izmeni/{{.ID}}" class="btn-primarno-malo">
+                                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/klijenti/izmeni/{{.ID}}" class="btn-primarno-malo">
                                     Izmeni
                                 </a>
                                 {{if index $.Dozvole "klijent.obrisi"}}
@@ -100,7 +100,7 @@
                     {{else}}
                     <tr>
                         <td colspan="5" class="prazno-stanje">
-                            {{if $.Pretraga}}Za datu pretragu nema klijenata u bazi.{{else}}Nema klijenata. <a href="/klijenti/novi" style="color:var(--sb-akcent);">Dodaj prvog klijenta.</a>{{end}}
+                            {{if $.Pretraga}}Za datu pretragu nema klijenata u bazi.{{else}}Nema klijenata. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/klijenti/novi" style="color:var(--sb-akcent);">Dodaj prvog klijenta.</a>{{end}}
                         </td>
                     </tr>
                     {{end}}
@@ -125,7 +125,7 @@
                     {{end}}
                 </div>
                 <div style="display:flex;gap:8px;flex-shrink:0;">
-                    <a href="/klijenti/izmeni/{{.ID}}" class="btn-primarno-malo">
+                    <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/klijenti/izmeni/{{.ID}}" class="btn-primarno-malo">
                         Izmeni
                     </a>
                     {{if index $.Dozvole "klijent.obrisi"}}
@@ -156,7 +156,7 @@
         </div>
         {{else}}
         <div class="prazno-stanje">
-            {{if $.Pretraga}}Za datu pretragu nema klijenata u bazi.{{else}}Nema klijenata. <a href="/klijenti/novi" style="color:var(--sb-akcent);">Dodaj prvog klijenta.</a>{{end}}
+            {{if $.Pretraga}}Za datu pretragu nema klijenata u bazi.{{else}}Nema klijenata. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/klijenti/novi" style="color:var(--sb-akcent);">Dodaj prvog klijenta.</a>{{end}}
         </div>
         {{end}}
     </div>
diff --git a/web/templates/stranice/magacin.html b/web/templates/stranice/magacin.html
index 70e2bd4..49a4320 100644
--- a/web/templates/stranice/magacin.html
+++ b/web/templates/stranice/magacin.html
@@ -27,7 +27,7 @@
     <!-- dugmad -->
     <div style="display:flex;gap:10px;flex-wrap:wrap;">
         {{if index .Dozvole "artikal.dodaj"}}
-        <a href="/magacin/novi?tip={{.Tip}}" class="btn-primarno">+ {{if eq .Tip "usluga"}}Nova usluga{{else if eq .Tip "trosak"}}Novi trošak{{else}}Novi artikal{{end}}</a>
+        <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/magacin/novi?tip={{.Tip}}" class="btn-primarno">+ {{if eq .Tip "usluga"}}Nova usluga{{else if eq .Tip "trosak"}}Novi trošak{{else}}Novi artikal{{end}}</a>
         {{end}}
         {{if and (eq .Tip "proizvod") (index .Dozvole "kategorija.pregled")}}
         <a href="/magacin/kategorije" class="btn-primarno" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">Kategorije</a>
@@ -87,8 +87,8 @@
                 <tbody>
                     {{range .Artikli}}
                     <tr class="animiraj red-tabele">
-                        <td style="padding:12px 16px;font-size:13px;font-family:monospace;white-space:nowrap;">{{if .Sifra}}<a href="/magacin/kartica/{{.ID}}" class="link-naziv" style="color:var(--tekst-sporedni);">{{.Sifra}}</a>{{else}}—{{end}}</td>
-                        <td style="padding:12px 16px;font-size:14px;"><a href="/magacin/kartica/{{.ID}}" class="link-naziv" style="color:var(--tekst-glavni);font-weight:500;">{{.Naziv}}</a></td>
+                        <td style="padding:12px 16px;font-size:13px;font-family:monospace;white-space:nowrap;">{{if .Sifra}}<a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/magacin/kartica/{{.ID}}" class="link-naziv" style="color:var(--tekst-sporedni);">{{.Sifra}}</a>{{else}}—{{end}}</td>
+                        <td style="padding:12px 16px;font-size:14px;"><a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/magacin/kartica/{{.ID}}" class="link-naziv" style="color:var(--tekst-glavni);font-weight:500;">{{.Naziv}}</a></td>
                         <td style="padding:12px 16px;font-size:13px;color:var(--tekst-sporedni);">
                             {{if .KategorijaNaziv}}{{.KategorijaNaziv}}{{else}}—{{end}}
                         </td>
@@ -108,7 +108,7 @@
                         <td style="padding:12px 16px;text-align:center;">
                             <div style="display:flex;align-items:center;justify-content:center;gap:8px;">
                                 {{if index $.Dozvole "artikal.izmeni"}}
-                                <a href="/magacin/izmeni/{{.ID}}" class="btn-primarno-malo">
+                                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/magacin/izmeni/{{.ID}}" class="btn-primarno-malo">
                                     Izmeni
                                 </a>
                                 {{template "promeniCenuMeni" (dict "ID" .ID "Cena" .ProdajnaCena)}}
@@ -118,7 +118,7 @@
                                 {{end}}{{end}}
                                 {{if index $.Dozvole "artikal.obrisi"}}
                                 {{if $.PrikazArhivirani}}
-                                <a href="/magacin/vrati/{{.ID}}" class="btn-sekundarno-malo"
+                                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/magacin/vrati/{{.ID}}" class="btn-sekundarno-malo"
                                     data-potvrda="Vratiti ovaj artikal u aktivnu listu?">
                                     Vrati
                                 </a>
@@ -135,7 +135,7 @@
                     {{else}}
                     <tr>
                         <td colspan="7" style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
-                            {{if or $.Filter.Pretraga $.KategorijaIDStr $.Filter.SamoKriticni}}Za datu pretragu nema stavki u bazi.{{else}}Nema stavki. <a href="/magacin/novi?tip={{$.Tip}}" style="color:var(--sb-akcent);">Dodaj prvu.</a>{{end}}
+                            {{if or $.Filter.Pretraga $.KategorijaIDStr $.Filter.SamoKriticni}}Za datu pretragu nema stavki u bazi.{{else}}Nema stavki. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/magacin/novi?tip={{$.Tip}}" style="color:var(--sb-akcent);">Dodaj prvu.</a>{{end}}
                         </td>
                     </tr>
                     {{end}}
@@ -150,7 +150,7 @@
         <div class="kartica magacin-kartica animiraj">
             <div class="red-izmedju" style="align-items:flex-start;gap:12px;margin-bottom:10px;flex-wrap:wrap;">
                 <div>
-                    <a href="/magacin/kartica/{{.ID}}" class="link-naziv" style="display:inline-block;font-size:15px;font-weight:500;color:var(--tekst-glavni);">{{.Naziv}}</a>
+                    <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/magacin/kartica/{{.ID}}" class="link-naziv" style="display:inline-block;font-size:15px;font-weight:500;color:var(--tekst-glavni);">{{.Naziv}}</a>
                     {{if .Sifra}}
                     <div style="font-size:12px;font-family:monospace;color:var(--tekst-sporedni);margin-top:2px;">{{.Sifra}}</div>
                     {{end}}
@@ -160,7 +160,7 @@
                 </div>
                 <div style="display:flex;gap:8px;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;">
                     {{if index $.Dozvole "artikal.izmeni"}}
-                    <a href="/magacin/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
+                    <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/magacin/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
                     {{template "promeniCenuMeni" (dict "ID" .ID "Cena" .ProdajnaCena)}}
                     {{end}}
                     {{if index $.Dozvole "artikal.premesti"}}{{if $.Kategorije}}
@@ -168,7 +168,7 @@
                     {{end}}{{end}}
                     {{if index $.Dozvole "artikal.obrisi"}}
                     {{if $.PrikazArhivirani}}
-                    <a href="/magacin/vrati/{{.ID}}" class="btn-sekundarno-malo"
+                    <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/magacin/vrati/{{.ID}}" class="btn-sekundarno-malo"
                         data-potvrda="Vratiti ovaj artikal u aktivnu listu?">
                         Vrati
                     </a>
@@ -203,7 +203,7 @@
         </div>
         {{else}}
         <div style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
-            {{if or $.Filter.Pretraga $.KategorijaIDStr $.Filter.SamoKriticni}}Za datu pretragu nema stavki u bazi.{{else}}Nema stavki. <a href="/magacin/novi?tip={{$.Tip}}" style="color:var(--sb-akcent);">Dodaj prvu.</a>{{end}}
+            {{if or $.Filter.Pretraga $.KategorijaIDStr $.Filter.SamoKriticni}}Za datu pretragu nema stavki u bazi.{{else}}Nema stavki. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/magacin/novi?tip={{$.Tip}}" style="color:var(--sb-akcent);">Dodaj prvu.</a>{{end}}
         </div>
         {{end}}
     </div>
diff --git a/web/templates/stranice/magacin_forma.html b/web/templates/stranice/magacin_forma.html
index bea9366..0ee92ce 100644
--- a/web/templates/stranice/magacin_forma.html
+++ b/web/templates/stranice/magacin_forma.html
@@ -6,7 +6,7 @@
 <div style="width:100%;">
 
     <!-- nazad dugme -->
-    <a href="/magacin" class="nazad-link">
+    <a href="/magacin" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="15 18 9 12 15 6"/></svg>
         Nazad na magacin
     </a>
@@ -155,7 +155,7 @@
 
                 <!-- dugmad -->
                 <div style="display:flex;justify-content:flex-end;gap:10px;margin-top:6px;">
-                    <a href="/magacin" class="btn-sekundarno">Odustani</a>
+                    <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/magacin" class="btn-sekundarno">Odustani</a>
                     <button type="submit" class="btn-primarno">
                         {{if .Izmena}}Sačuvaj izmene{{else}}Dodaj artikal{{end}}
                     </button>
diff --git a/web/templates/stranice/magacin_kartica.html b/web/templates/stranice/magacin_kartica.html
index 0c63d0a..2e94d90 100644
--- a/web/templates/stranice/magacin_kartica.html
+++ b/web/templates/stranice/magacin_kartica.html
@@ -5,7 +5,7 @@
 {{define "sadrzaj"}}
 <div class="kolona" style="gap:16px;">
 
-    <a href="/magacin" class="nazad-link">
+    <a href="/magacin" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="15 18 9 12 15 6"/></svg>
         Nazad na magacin
     </a>
diff --git a/web/templates/stranice/nabavka_detalji.html b/web/templates/stranice/nabavka_detalji.html
index b94d9b8..594f9e8 100644
--- a/web/templates/stranice/nabavka_detalji.html
+++ b/web/templates/stranice/nabavka_detalji.html
@@ -15,7 +15,7 @@
 <div class="kolona" style="gap:16px;">
 
     <!-- nazad dugme -->
-    <a href="/nabavke" class="nazad-link">
+    <a href="/nabavke" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="15 18 9 12 15 6"/></svg>
         Nazad na nabavke
     </a>
diff --git a/web/templates/stranice/nabavka_forma.html b/web/templates/stranice/nabavka_forma.html
index 04da5be..958a23a 100644
--- a/web/templates/stranice/nabavka_forma.html
+++ b/web/templates/stranice/nabavka_forma.html
@@ -21,7 +21,7 @@
 <div style="width:100%;" x-data="nabavkaForma">
 
     <!-- nazad dugme -->
-    <a href="/nabavke" class="nazad-link">
+    <a href="/nabavke" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="15 18 9 12 15 6"/></svg>
         Nazad na nabavke
     </a>
@@ -264,7 +264,7 @@
 
         <!-- dugmad forme -->
         <div style="display:flex;justify-content:flex-end;gap:10px;">
-            <a href="/nabavke" class="btn-sekundarno">Odustani</a>
+            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/nabavke" class="btn-sekundarno">Odustani</a>
             <button type="submit" class="btn-primarno">Sačuvaj nabavku</button>
         </div>
 
diff --git a/web/templates/stranice/nabavke.html b/web/templates/stranice/nabavke.html
index bf877b6..90a280f 100644
--- a/web/templates/stranice/nabavke.html
+++ b/web/templates/stranice/nabavke.html
@@ -14,7 +14,7 @@
 
     <!-- dugme nova nabavka -->
     <div>
-        <a href="/nabavke/nova" class="btn-primarno">+ Nova nabavka</a>
+        <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/nabavke/nova" class="btn-primarno">+ Nova nabavka</a>
     </div>
 
     <!-- desktop tabela -->
@@ -47,7 +47,7 @@
                         </td>
                         <td style="padding:12px 16px;text-align:center;">
                             <div style="display:flex;align-items:center;justify-content:center;gap:8px;">
-                                <a href="/nabavke/{{.ID}}" class="btn-primarno-malo">
+                                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/nabavke/{{.ID}}" class="btn-primarno-malo">
                                     Detalji
                                 </a>
                                 {{if index $.Dozvole "nabavka.obrisi"}}
@@ -64,7 +64,7 @@
                     {{else}}
                     <tr>
                         <td colspan="5" style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
-                            Nema nabavki. <a href="/nabavke/nova" style="color:var(--sb-akcent);">Dodaj prvu nabavku.</a>
+                            Nema nabavki. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/nabavke/nova" style="color:var(--sb-akcent);">Dodaj prvu nabavku.</a>
                         </td>
                     </tr>
                     {{end}}
@@ -94,7 +94,7 @@
             <div style="font-size:13px;color:var(--tekst-sporedni);margin-bottom:10px;">{{.Napomena}}</div>
             {{end}}
             <div style="display:flex;gap:8px;">
-                <a href="/nabavke/{{.ID}}" class="btn-primarno-malo" style="flex:1;justify-content:center;">
+                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/nabavke/{{.ID}}" class="btn-primarno-malo" style="flex:1;justify-content:center;">
                     Detalji
                 </a>
                 {{if index $.Dozvole "nabavka.obrisi"}}
@@ -109,7 +109,7 @@
         </div>
         {{else}}
         <div style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
-            Nema nabavki. <a href="/nabavke/nova" style="color:var(--sb-akcent);">Dodaj prvu nabavku.</a>
+            Nema nabavki. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/nabavke/nova" style="color:var(--sb-akcent);">Dodaj prvu nabavku.</a>
         </div>
         {{end}}
     </div>
diff --git a/web/templates/stranice/nivelacije.html b/web/templates/stranice/nivelacije.html
index db0366a..c84b403 100644
--- a/web/templates/stranice/nivelacije.html
+++ b/web/templates/stranice/nivelacije.html
@@ -17,7 +17,7 @@
                 <input type="date" name="do" value="{{.Do}}" style="padding:8px 10px;border:0.5px solid var(--ivica);border-radius:8px;font-size:13px;background:var(--pozadina);color:var(--tekst-glavni);outline:none;">
             </div>
             <button type="submit" style="padding:8px 16px;background:var(--sb-aktivan);color:var(--tekst-jak);border:0.5px solid var(--ivica);border-radius:8px;font-size:13px;cursor:pointer;">Prikaži</button>
-            {{if or .Od .Do}}<a href="/nivelacije" class="nazad-link" style="margin-bottom:0;">Poništi filter</a>{{end}}
+            {{if or .Od .Do}}<a href="/nivelacije" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" style="margin-bottom:0;">Poništi filter</a>{{end}}
         </form>
     </div>
 
diff --git a/web/templates/stranice/pdv_kir.html b/web/templates/stranice/pdv_kir.html
index 73d2245..e4959a3 100644
--- a/web/templates/stranice/pdv_kir.html
+++ b/web/templates/stranice/pdv_kir.html
@@ -18,9 +18,9 @@
                     <input type="date" name="do" value="{{.Do}}" style="padding:8px 10px;border:0.5px solid var(--ivica);border-radius:8px;font-size:13px;background:var(--pozadina);color:var(--tekst-glavni);outline:none;">
                 </div>
                 <button type="submit" style="padding:8px 16px;background:var(--sb-aktivan);color:var(--tekst-jak);border:0.5px solid var(--ivica);border-radius:8px;font-size:13px;cursor:pointer;">Prikaži</button>
-                {{if or .Od .Do}}<a href="/pdv/kir" class="nazad-link" style="margin-bottom:0;">Poništi filter</a>{{end}}
+                {{if or .Od .Do}}<a href="/pdv/kir" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" style="margin-bottom:0;">Poništi filter</a>{{end}}
             </form>
-            <a href="/pdv/kir/nova" class="btn-primarno" style="font-size:13px;padding:8px 16px;white-space:nowrap;">+ Nov izlazni račun</a>
+            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/pdv/kir/nova" class="btn-primarno" style="font-size:13px;padding:8px 16px;white-space:nowrap;">+ Nov izlazni račun</a>
         </div>
     </div>
 
@@ -65,7 +65,7 @@
                         </td>
                     </tr>
                     {{else}}
-                    <tr><td colspan="10" style="padding:28px;text-align:center;color:var(--tekst-sporedni);">Nema zapisa u izabranom periodu. <a href="/pdv/kir/nova" style="color:var(--sb-akcent);">Dodaj prvi.</a></td></tr>
+                    <tr><td colspan="10" style="padding:28px;text-align:center;color:var(--tekst-sporedni);">Nema zapisa u izabranom periodu. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/pdv/kir/nova" style="color:var(--sb-akcent);">Dodaj prvi.</a></td></tr>
                     {{end}}
                 </tbody>
                 {{if .Zapisi}}
diff --git a/web/templates/stranice/pdv_kir_forma.html b/web/templates/stranice/pdv_kir_forma.html
index 673db88..2614336 100644
--- a/web/templates/stranice/pdv_kir_forma.html
+++ b/web/templates/stranice/pdv_kir_forma.html
@@ -5,7 +5,7 @@
 {{define "sadrzaj"}}
 <div class="stranica-stack" style="width:100%;max-width:760px;">
 
-    <a href="/pdv/kir" class="nazad-link">
+    <a href="/pdv/kir" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="15 18 9 12 15 6"/></svg>
         Nazad na KIR
     </a>
@@ -99,7 +99,7 @@
             </div>
 
             <div style="display:flex;justify-content:flex-end;gap:10px;margin-top:20px;">
-                <a href="/pdv/kir" class="btn-sekundarno" style="font-size:14px;padding:10px 20px;">Odustani</a>
+                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/pdv/kir" class="btn-sekundarno" style="font-size:14px;padding:10px 20px;">Odustani</a>
                 <button type="submit" style="background:var(--sb-akcent);color:#fff;border:none;padding:10px 24px;border-radius:8px;font-size:14px;font-weight:500;cursor:pointer;">Sačuvaj</button>
             </div>
         </div>
diff --git a/web/templates/stranice/pdv_kpr.html b/web/templates/stranice/pdv_kpr.html
index 0474a2b..37d88d5 100644
--- a/web/templates/stranice/pdv_kpr.html
+++ b/web/templates/stranice/pdv_kpr.html
@@ -18,9 +18,9 @@
                     <input type="date" name="do" value="{{.Do}}" style="padding:8px 10px;border:0.5px solid var(--ivica);border-radius:8px;font-size:13px;background:var(--pozadina);color:var(--tekst-glavni);outline:none;">
                 </div>
                 <button type="submit" style="padding:8px 16px;background:var(--sb-aktivan);color:var(--tekst-jak);border:0.5px solid var(--ivica);border-radius:8px;font-size:13px;cursor:pointer;">Prikaži</button>
-                {{if or .Od .Do}}<a href="/pdv/kpr" class="nazad-link" style="margin-bottom:0;">Poništi filter</a>{{end}}
+                {{if or .Od .Do}}<a href="/pdv/kpr" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" style="margin-bottom:0;">Poništi filter</a>{{end}}
             </form>
-            <a href="/pdv/kpr/nova" class="btn-primarno" style="font-size:13px;padding:8px 16px;white-space:nowrap;">+ Nov ulazni račun</a>
+            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/pdv/kpr/nova" class="btn-primarno" style="font-size:13px;padding:8px 16px;white-space:nowrap;">+ Nov ulazni račun</a>
         </div>
     </div>
 
@@ -67,7 +67,7 @@
                         </td>
                     </tr>
                     {{else}}
-                    <tr><td colspan="11" style="padding:28px;text-align:center;color:var(--tekst-sporedni);">Nema zapisa u izabranom periodu. <a href="/pdv/kpr/nova" style="color:var(--sb-akcent);">Dodaj prvi.</a></td></tr>
+                    <tr><td colspan="11" style="padding:28px;text-align:center;color:var(--tekst-sporedni);">Nema zapisa u izabranom periodu. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/pdv/kpr/nova" style="color:var(--sb-akcent);">Dodaj prvi.</a></td></tr>
                     {{end}}
                 </tbody>
                 {{if .Zapisi}}
diff --git a/web/templates/stranice/pdv_kpr_forma.html b/web/templates/stranice/pdv_kpr_forma.html
index fe08e4a..6fc4a8f 100644
--- a/web/templates/stranice/pdv_kpr_forma.html
+++ b/web/templates/stranice/pdv_kpr_forma.html
@@ -5,7 +5,7 @@
 {{define "sadrzaj"}}
 <div class="stranica-stack" style="width:100%;max-width:760px;">
 
-    <a href="/pdv/kpr" class="nazad-link">
+    <a href="/pdv/kpr" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="15 18 9 12 15 6"/></svg>
         Nazad na KPR
     </a>
@@ -113,7 +113,7 @@
             </div>
 
             <div style="display:flex;justify-content:flex-end;gap:10px;margin-top:20px;">
-                <a href="/pdv/kpr" class="btn-sekundarno" style="font-size:14px;padding:10px 20px;">Odustani</a>
+                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/pdv/kpr" class="btn-sekundarno" style="font-size:14px;padding:10px 20px;">Odustani</a>
                 <button type="submit" style="background:var(--sb-akcent);color:#fff;border:none;padding:10px 24px;border-radius:8px;font-size:14px;font-weight:500;cursor:pointer;">Sačuvaj</button>
             </div>
         </div>
diff --git a/web/templates/stranice/podesavanja.html b/web/templates/stranice/podesavanja.html
index 2f467af..d55efed 100644
--- a/web/templates/stranice/podesavanja.html
+++ b/web/templates/stranice/podesavanja.html
@@ -267,7 +267,7 @@
         <div style="display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;gap:12px;">
             <div class="pomocni-tekst">Verzija programa: <span style="color:var(--tekst-glavni);font-weight:500;">{{.Verzija}}</span></div>
             <div style="display:flex;gap:8px;flex-wrap:wrap;">
-                <a href="/podesavanja/backup"
+                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/podesavanja/backup"
                     style="display:inline-flex;align-items:center;gap:6px;padding:8px 16px;background:var(--kartica);border:0.5px solid var(--ivica);border-radius:8px;font-size:13px;color:var(--tekst-sporedni);text-decoration:none;transition:background 0.2s;"
                     onmouseover="this.style.background='var(--pozadina)'" onmouseout="this.style.background='var(--kartica)'">
                     <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
diff --git a/web/templates/stranice/podesavanja_sistem.html b/web/templates/stranice/podesavanja_sistem.html
index dd41a19..b5dc7c4 100644
--- a/web/templates/stranice/podesavanja_sistem.html
+++ b/web/templates/stranice/podesavanja_sistem.html
@@ -14,7 +14,7 @@
         <div style="display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;gap:12px;">
             <div class="pomocni-tekst">Verzija programa: <span style="color:var(--tekst-glavni);font-weight:500;">{{.Verzija}}</span></div>
             <div style="display:flex;gap:8px;flex-wrap:wrap;">
-                <a href="/podesavanja/backup"
+                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/podesavanja/backup"
                     style="display:inline-flex;align-items:center;gap:6px;padding:8px 16px;background:var(--kartica);border:0.5px solid var(--ivica);border-radius:8px;font-size:13px;color:var(--tekst-sporedni);text-decoration:none;transition:background 0.2s;"
                     onmouseover="this.style.background='var(--pozadina)'" onmouseout="this.style.background='var(--kartica)'">
                     <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
diff --git a/web/templates/stranice/podsetnici.html b/web/templates/stranice/podsetnici.html
index 7955b44..bebef85 100644
--- a/web/templates/stranice/podsetnici.html
+++ b/web/templates/stranice/podsetnici.html
@@ -22,7 +22,7 @@
 
     <!-- gornja traka -->
     <div style="display:flex;gap:10px;flex-wrap:wrap;align-items:center;">
-        <a href="/podsetnici/novi" class="btn-primarno">+ Novi podsetnik</a>
+        <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/podsetnici/novi" class="btn-primarno">+ Novi podsetnik</a>
         <form method="GET" action="/podsetnici" style="display:flex;gap:8px;align-items:center;flex:1;min-width:200px;flex-wrap:wrap;">
             <label class="cek-filter" style="display:flex;align-items:center;gap:6px;font-size:14px;color:var(--tekst-sporedni);cursor:pointer;white-space:nowrap;">
                 <input type="checkbox" name="samo_aktivni" value="1" {{if .SamoAktivni}}checked{{end}}
@@ -68,7 +68,7 @@
                         </td>
                         <td style="padding:12px 16px;text-align:center;">
                             <div style="display:flex;align-items:center;justify-content:center;gap:8px;">
-                                <a href="/podsetnici/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
+                                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/podsetnici/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
                                 <form method="POST" action="/podsetnici/zavrseno/{{.ID}}" style="display:inline;">
                                     <button type="submit" class="btn-primarno-malo">
                                         {{if .Zavrseno}}Aktiviraj{{else}}Završi{{end}}
@@ -86,7 +86,7 @@
                     {{else}}
                     <tr>
                         <td colspan="4" style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
-                            Nema podsetnika. <a href="/podsetnici/novi" style="color:var(--sb-akcent);">Dodaj prvi podsetnik.</a>
+                            Nema podsetnika. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/podsetnici/novi" style="color:var(--sb-akcent);">Dodaj prvi podsetnik.</a>
                         </td>
                     </tr>
                     {{end}}
@@ -120,7 +120,7 @@
                 {{.DatumPodsecanja.Format "02.01.2006."}}
             </div>
             <div style="display:flex;gap:8px;flex-wrap:wrap;">
-                <a href="/podsetnici/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
+                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/podsetnici/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
                 <form method="POST" action="/podsetnici/zavrseno/{{.ID}}" style="display:inline;">
                     <button type="submit" class="btn-primarno-malo">
                         {{if .Zavrseno}}Aktiviraj{{else}}Završi{{end}}
@@ -136,7 +136,7 @@
         </div>
         {{else}}
         <div class="kartica" style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
-            Nema podsetnika. <a href="/podsetnici/novi" style="color:var(--sb-akcent);">Dodaj prvi podsetnik.</a>
+            Nema podsetnika. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/podsetnici/novi" style="color:var(--sb-akcent);">Dodaj prvi podsetnik.</a>
         </div>
         {{end}}
     </div>
diff --git a/web/templates/stranice/podsetnik_forma.html b/web/templates/stranice/podsetnik_forma.html
index 1a288d4..4cbaa21 100644
--- a/web/templates/stranice/podsetnik_forma.html
+++ b/web/templates/stranice/podsetnik_forma.html
@@ -5,7 +5,7 @@
 {{define "sadrzaj"}}
 <div style="width:100%;">
 
-    <a href="/podsetnici" class="nazad-link">
+    <a href="/podsetnici" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="15 18 9 12 15 6"/></svg>
         Nazad na podsetnik
     </a>
@@ -67,7 +67,7 @@
                 {{end}}
 
                 <div style="display:flex;justify-content:flex-end;gap:10px;margin-top:4px;">
-                    <a href="/podsetnici" class="btn-sekundarno">Odustani</a>
+                    <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/podsetnici" class="btn-sekundarno">Odustani</a>
                     <button type="submit" class="btn-primarno">
                         {{if .Izmena}}Sačuvaj izmene{{else}}Dodaj podsetnik{{end}}
                     </button>
diff --git a/web/templates/stranice/popis.html b/web/templates/stranice/popis.html
index ba153ab..18932dc 100644
--- a/web/templates/stranice/popis.html
+++ b/web/templates/stranice/popis.html
@@ -46,7 +46,7 @@
                     Samo artikli sa izmenjenom količinom biće korigovani — ostali ostaju nepromenjeni.
                 </div>
             </div>
-            <a href="/izvestaji" class="btn-sekundarno" style="white-space:nowrap;">← Izveštaji</a>
+            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/izvestaji" class="btn-sekundarno" style="white-space:nowrap;">← Izveštaji</a>
         </div>
     </div>
 
diff --git a/web/templates/stranice/prodaja.html b/web/templates/stranice/prodaja.html
index 341ddd9..fbc7c54 100644
--- a/web/templates/stranice/prodaja.html
+++ b/web/templates/stranice/prodaja.html
@@ -12,10 +12,10 @@
             <input type="text" name="pretraga" value="{{.Pretraga}}" placeholder="Pretraži po broju naloga..." style="flex: 1" />
             <button type="submit" class="btn-sekundarno" style="white-space: nowrap">Pretraži</button>
             {{if .Pretraga}}
-            <a href="/prodaja" class="btn-sekundarno" style="white-space: nowrap">✕ Resetuj</a>
+            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/prodaja" class="btn-sekundarno" style="white-space: nowrap">✕ Resetuj</a>
             {{end}}
         </form>
-        <a href="/prodaja/nova" class="btn-primarno">+ Nova prodaja</a>
+        <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/prodaja/nova" class="btn-primarno">+ Nova prodaja</a>
     </div>
 
     <!-- desktop tabela -->
@@ -40,7 +40,7 @@
                         <td style="padding: 12px 16px; text-align: right; font-size: 14px; font-weight: 500; color: var(--tekst-glavni)">{{dinari .Ukupno}} din</td>
                         <td style="padding: 12px 16px; text-align: center">
                             <div style="display: flex; align-items: center; justify-content: center; gap: 8px">
-                                <a href="/prodaja/{{.ID}}" class="btn-primarno-malo">Detalji</a>
+                                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/prodaja/{{.ID}}" class="btn-primarno-malo">Detalji</a>
                                 {{if index $.Dozvole "prodaja.storno"}}
                                 <form method="POST" action="/prodaja/storno/{{.ID}}" style="margin: 0; padding: 0">
                                     <input type="hidden" name="_csrf" value="{{$.CsrfToken}}" />
@@ -54,7 +54,7 @@
                     <tr>
                         <td colspan="5" style="padding: 32px; text-align: center; font-size: 14px; color: var(--tekst-sporedni)">
                             {{if $.Pretraga}} Nema naloga koji odgovaraju pretrazi. {{else}} Nema prodajnih naloga.
-                            <a href="/prodaja/nova" style="color: var(--sb-akcent)">Dodaj prvu prodaju.</a>
+                            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/prodaja/nova" style="color: var(--sb-akcent)">Dodaj prvu prodaju.</a>
                             {{end}}
                         </td>
                     </tr>
@@ -76,12 +76,12 @@
                 </div>
                 <div style="font-size: 15px; font-weight: 500; color: var(--tekst-glavni); white-space: nowrap">{{dinari .Ukupno}} din</div>
             </div>
-            <a href="/prodaja/{{.ID}}" class="btn-primarno-malo" style="justify-content: center; width: 100%; box-sizing: border-box">Detalji</a>
+            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/prodaja/{{.ID}}" class="btn-primarno-malo" style="justify-content: center; width: 100%; box-sizing: border-box">Detalji</a>
         </div>
         {{else}}
         <div style="padding: 32px; text-align: center; font-size: 14px; color: var(--tekst-sporedni)">
             {{if $.Pretraga}} Nema naloga koji odgovaraju pretrazi. {{else}} Nema prodajnih naloga.
-            <a href="/prodaja/nova" style="color: var(--sb-akcent)">Dodaj prvu prodaju.</a>
+            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/prodaja/nova" style="color: var(--sb-akcent)">Dodaj prvu prodaju.</a>
             {{end}}
         </div>
         {{end}}
diff --git a/web/templates/stranice/prodaja_detalji.html b/web/templates/stranice/prodaja_detalji.html
index 71b3d8a..630b75a 100644
--- a/web/templates/stranice/prodaja_detalji.html
+++ b/web/templates/stranice/prodaja_detalji.html
@@ -12,7 +12,7 @@
   {{end}}
 
   <!-- nazad dugme -->
-  <a href="/prodaja" class="nazad-link">
+  <a href="/prodaja" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">
     <svg
       xmlns="http://www.w3.org/2000/svg"
       width="16"
diff --git a/web/templates/stranice/prodaja_forma.html b/web/templates/stranice/prodaja_forma.html
index 5ac55b8..58b44b8 100644
--- a/web/templates/stranice/prodaja_forma.html
+++ b/web/templates/stranice/prodaja_forma.html
@@ -14,7 +14,7 @@
 
 <div style="width: 100%" x-data="prodajaForma">
   <!-- nazad dugme -->
-  <a href="/prodaja" class="nazad-link">
+  <a href="/prodaja" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">
     <svg
       xmlns="http://www.w3.org/2000/svg"
       width="16"
@@ -410,7 +410,7 @@
 
     <!-- dugmad forme -->
     <div style="display: flex; justify-content: flex-end; gap: 10px">
-      <a href="/prodaja" class="btn-sekundarno">Odustani</a>
+      <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/prodaja" class="btn-sekundarno">Odustani</a>
       <button
         type="submit"
         class="btn-primarno"
diff --git a/web/templates/stranice/profil_tema.html b/web/templates/stranice/profil_tema.html
index 97569ef..619d856 100644
--- a/web/templates/stranice/profil_tema.html
+++ b/web/templates/stranice/profil_tema.html
@@ -360,7 +360,7 @@
         <p style="font-size:13px;color:var(--tekst-sporedni);margin:0 0 12px;">
             Ova slika se prikazuje na stranici za prijavu svim korisnicima.
             Podešavanja su dostupna u
-            <a href="/admin/podesavanja/izgled" style="color:var(--sb-akcent);text-decoration:none;">Podešavanjima → Izgled</a>.
+            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/admin/podesavanja/izgled" style="color:var(--sb-akcent);text-decoration:none;">Podešavanjima → Izgled</a>.
         </p>
     </div>
     {{end}}
diff --git a/web/templates/stranice/prometni_list.html b/web/templates/stranice/prometni_list.html
index b799300..8d21cae 100644
--- a/web/templates/stranice/prometni_list.html
+++ b/web/templates/stranice/prometni_list.html
@@ -17,7 +17,7 @@
                 <input type="date" name="do" value="{{.Do}}" style="width:160px;">
             </div>
             <button type="submit" class="btn-primarno">Prikaži</button>
-            <a href="/izvestaji" class="btn-sekundarno">← Izveštaji</a>
+            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/izvestaji" class="btn-sekundarno">← Izveštaji</a>
         </form>
     </div>
 
diff --git a/web/templates/stranice/servis.html b/web/templates/stranice/servis.html
index bd188e8..52e0ec6 100644
--- a/web/templates/stranice/servis.html
+++ b/web/templates/stranice/servis.html
@@ -29,8 +29,8 @@
                 placeholder="Pretraži po broju naloga ili uređaju..."
                 style="flex:1;min-width:160px;">
             <button type="submit" class="btn-primarno" style="flex-shrink:0;">Traži</button>
-            <a href="/servis/arhiva" class="btn-sekundarno" style="white-space:nowrap;flex-shrink:0;">Preuzeto</a>
-            <a href="/servis/novi" class="btn-primarno" style="white-space:nowrap;flex-shrink:0;">+ Novi nalog</a>
+            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/servis/arhiva" class="btn-sekundarno" style="white-space:nowrap;flex-shrink:0;">Preuzeto</a>
+            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/servis/novi" class="btn-primarno" style="white-space:nowrap;flex-shrink:0;">+ Novi nalog</a>
         </div>
     </form>
 
@@ -47,7 +47,7 @@
             <div class="kanban-kartice">
                 {{range $.Nalozi}}
                 {{if eq .Status $status}}
-                <a href="/servis/{{.ID}}" class="kartica kanban-karta">
+                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/servis/{{.ID}}" class="kartica kanban-karta">
                     <div style="font-size:14px;font-weight:500;color:var(--sb-akcent);font-family:monospace;">
                         {{.BrojNaloga}}
                     </div>
@@ -68,7 +68,7 @@
     </div>
     {{else}}
     <div class="kartica animiraj" style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
-        {{if .Pretraga}}Za datu pretragu nema servisnih naloga u bazi.{{else}}Nema servisnih naloga. <a href="/servis/novi" style="color:var(--sb-akcent);">Dodaj prvi nalog.</a>{{end}}
+        {{if .Pretraga}}Za datu pretragu nema servisnih naloga u bazi.{{else}}Nema servisnih naloga. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/servis/novi" style="color:var(--sb-akcent);">Dodaj prvi nalog.</a>{{end}}
     </div>
     {{end}}
 
diff --git a/web/templates/stranice/servis_arhiva.html b/web/templates/stranice/servis_arhiva.html
index adf8609..88c4c38 100644
--- a/web/templates/stranice/servis_arhiva.html
+++ b/web/templates/stranice/servis_arhiva.html
@@ -22,7 +22,7 @@
                 placeholder="Pretraži preuzete naloge po broju ili uređaju..."
                 style="flex:1;min-width:160px;">
             <button type="submit" class="btn-primarno" style="flex-shrink:0;">Traži</button>
-            <a href="/servis" class="btn-sekundarno" style="white-space:nowrap;flex-shrink:0;">← Tabla</a>
+            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/servis" class="btn-sekundarno" style="white-space:nowrap;flex-shrink:0;">← Tabla</a>
         </div>
     </form>
 
@@ -44,7 +44,7 @@
                     {{range .Nalozi}}
                     <tr class="animiraj red-tabele">
                         <td style="padding:12px 16px;">
-                            <a href="/servis/{{.ID}}"
+                            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/servis/{{.ID}}"
                                 style="font-size:14px;font-weight:500;color:var(--sb-akcent);text-decoration:none;font-family:monospace;">
                                 {{.BrojNaloga}}
                             </a>
@@ -60,7 +60,7 @@
                             {{if .DatumZavrsetka}}{{.DatumZavrsetka.Format "02.01.2006."}}{{else}}—{{end}}
                         </td>
                         <td style="padding:12px 16px;text-align:center;">
-                            <a href="/servis/{{.ID}}" class="btn-primarno-malo">Otvori</a>
+                            <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/servis/{{.ID}}" class="btn-primarno-malo">Otvori</a>
                         </td>
                     </tr>
                     {{else}}
@@ -78,7 +78,7 @@
     <!-- mobilne kartice -->
     <div class="servis-kartice">
         {{range .Nalozi}}
-        <a href="/servis/{{.ID}}" class="kartica servis-kartica animiraj kartica-link">
+        <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/servis/{{.ID}}" class="kartica servis-kartica animiraj kartica-link">
             <div class="red-izmedju" style="align-items:flex-start;gap:12px;margin-bottom:10px;">
                 <div>
                     <div style="font-size:15px;font-weight:500;color:var(--sb-akcent);font-family:monospace;">{{.BrojNaloga}}</div>
diff --git a/web/templates/stranice/servis_forma.html b/web/templates/stranice/servis_forma.html
index 3577cbc..c1b19d4 100644
--- a/web/templates/stranice/servis_forma.html
+++ b/web/templates/stranice/servis_forma.html
@@ -316,7 +316,7 @@
             {{else}}
             <!-- dugmad (samo za novi nalog) -->
             <div style="display:flex;justify-content:flex-end;gap:10px;margin-top:18px;">
-                <a href="/servis" class="btn-sekundarno">Odustani</a>
+                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/servis" class="btn-sekundarno">Odustani</a>
                 <button type="submit" class="btn-primarno">Sačuvaj nalog</button>
             </div>
             {{end}}
diff --git a/web/templates/stranice/stanje_zaliha.html b/web/templates/stranice/stanje_zaliha.html
index cb0582e..91d87f1 100644
--- a/web/templates/stranice/stanje_zaliha.html
+++ b/web/templates/stranice/stanje_zaliha.html
@@ -8,7 +8,7 @@
     <!-- zaglavlje -->
     <div style="display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;gap:10px;">
         <div style="display:flex;align-items:center;gap:12px;">
-            <a href="/izvestaji" class="nazad-link" style="margin-bottom:0;">
+            <a href="/izvestaji" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" style="margin-bottom:0;">
                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="15 18 9 12 15 6"/></svg>
                 Izveštaji
             </a>
diff --git a/web/templates/stranice/troskovi.html b/web/templates/stranice/troskovi.html
index c73d373..222834a 100644
--- a/web/templates/stranice/troskovi.html
+++ b/web/templates/stranice/troskovi.html
@@ -19,7 +19,7 @@
     <!-- dugme nov -->
     <div style="display:flex;gap:10px;flex-wrap:wrap;">
         {{if index .Dozvole "artikal.dodaj"}}
-        <a href="/troskovi/novi" class="btn-primarno">+ Nov trošak</a>
+        <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/troskovi/novi" class="btn-primarno">+ Nov trošak</a>
         {{end}}
     </div>
 
@@ -54,7 +54,7 @@
                         <td style="padding:12px 16px;text-align:right;font-size:14px;color:var(--tekst-glavni);">{{dinari .Cena}} din</td>
                         <td style="padding:12px 16px;text-align:center;">
                             <div style="display:flex;align-items:center;justify-content:center;gap:8px;">
-                                <a href="/troskovi/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
+                                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/troskovi/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
                                 {{if index $.Dozvole "artikal.obrisi"}}
                                 <form method="POST" action="/troskovi/obrisi/{{.ID}}" style="display:inline;">
                                     <input type="hidden" name="_csrf" value="{{$.CsrfToken}}">
@@ -68,7 +68,7 @@
                     {{else}}
                     <tr>
                         <td colspan="4" style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
-                            {{if $.Pretraga}}Za datu pretragu nema troškova u bazi.{{else}}Nema troškova. <a href="/troskovi/novi" style="color:var(--sb-akcent);">Dodaj prvi trošak.</a>{{end}}
+                            {{if $.Pretraga}}Za datu pretragu nema troškova u bazi.{{else}}Nema troškova. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/troskovi/novi" style="color:var(--sb-akcent);">Dodaj prvi trošak.</a>{{end}}
                         </td>
                     </tr>
                     {{end}}
@@ -89,7 +89,7 @@
                 <div style="font-size:15px;font-weight:600;color:var(--sb-akcent);white-space:nowrap;">{{dinari .Cena}} din</div>
             </div>
             <div style="display:flex;gap:8px;">
-                <a href="/troskovi/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
+                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/troskovi/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
                 {{if index $.Dozvole "artikal.obrisi"}}
                 <form method="POST" action="/troskovi/obrisi/{{.ID}}" style="display:inline;">
                     <input type="hidden" name="_csrf" value="{{$.CsrfToken}}">
@@ -100,7 +100,7 @@
         </div>
         {{else}}
         <div style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
-            {{if $.Pretraga}}Za datu pretragu nema troškova u bazi.{{else}}Nema troškova. <a href="/troskovi/novi" style="color:var(--sb-akcent);">Dodaj prvi trošak.</a>{{end}}
+            {{if $.Pretraga}}Za datu pretragu nema troškova u bazi.{{else}}Nema troškova. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/troskovi/novi" style="color:var(--sb-akcent);">Dodaj prvi trošak.</a>{{end}}
         </div>
         {{end}}
     </div>
diff --git a/web/templates/stranice/troskovi_forma.html b/web/templates/stranice/troskovi_forma.html
index c9b269a..1a29244 100644
--- a/web/templates/stranice/troskovi_forma.html
+++ b/web/templates/stranice/troskovi_forma.html
@@ -5,7 +5,7 @@
 {{define "sadrzaj"}}
 <div class="kolona" style="gap:16px;max-width:680px;">
 
-    <a href="/troskovi" class="nazad-link">
+    <a href="/troskovi" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="15 18 9 12 15 6"/></svg>
         Nazad na troškove
     </a>
@@ -52,7 +52,7 @@
             </div>
 
             <div style="display:flex;justify-content:flex-end;gap:10px;margin-top:20px;">
-                <a href="/troskovi" class="btn-sekundarno">Odustani</a>
+                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/troskovi" class="btn-sekundarno">Odustani</a>
                 <button type="submit" class="btn-primarno">Sačuvaj trošak</button>
             </div>
         </div>
diff --git a/web/templates/stranice/usluge.html b/web/templates/stranice/usluge.html
index 4503b03..60daa89 100644
--- a/web/templates/stranice/usluge.html
+++ b/web/templates/stranice/usluge.html
@@ -15,7 +15,7 @@
     <!-- dugme nova -->
     <div style="display:flex;gap:10px;flex-wrap:wrap;">
         {{if index .Dozvole "artikal.dodaj"}}
-        <a href="/usluge/nova" class="btn-primarno">+ Nova usluga</a>
+        <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/usluge/nova" class="btn-primarno">+ Nova usluga</a>
         {{end}}
     </div>
 
@@ -54,7 +54,7 @@
                         <td style="padding:12px 16px;text-align:center;font-size:13px;color:var(--tekst-sporedni);">{{.PdvStopa}}%</td>
                         <td style="padding:12px 16px;text-align:center;">
                             <div style="display:flex;align-items:center;justify-content:center;gap:8px;">
-                                <a href="/usluge/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
+                                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/usluge/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
                                 {{if index $.Dozvole "artikal.obrisi"}}
                                 <form method="POST" action="/usluge/obrisi/{{.ID}}" style="display:inline;">
                                     <input type="hidden" name="_csrf" value="{{$.CsrfToken}}">
@@ -68,7 +68,7 @@
                     {{else}}
                     <tr>
                         <td colspan="6" style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
-                            {{if $.Pretraga}}Za datu pretragu nema usluga u bazi.{{else}}Nema usluga. <a href="/usluge/nova" style="color:var(--sb-akcent);">Dodaj prvu uslugu.</a>{{end}}
+                            {{if $.Pretraga}}Za datu pretragu nema usluga u bazi.{{else}}Nema usluga. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/usluge/nova" style="color:var(--sb-akcent);">Dodaj prvu uslugu.</a>{{end}}
                         </td>
                     </tr>
                     {{end}}
@@ -89,7 +89,7 @@
                 <div style="font-size:15px;font-weight:600;color:var(--sb-akcent);white-space:nowrap;">{{dinari .Cena}} din</div>
             </div>
             <div style="display:flex;gap:8px;">
-                <a href="/usluge/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
+                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/usluge/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
                 {{if index $.Dozvole "artikal.obrisi"}}
                 <form method="POST" action="/usluge/obrisi/{{.ID}}" style="display:inline;">
                     <input type="hidden" name="_csrf" value="{{$.CsrfToken}}">
@@ -100,7 +100,7 @@
         </div>
         {{else}}
         <div style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
-            {{if $.Pretraga}}Za datu pretragu nema usluga u bazi.{{else}}Nema usluga. <a href="/usluge/nova" style="color:var(--sb-akcent);">Dodaj prvu uslugu.</a>{{end}}
+            {{if $.Pretraga}}Za datu pretragu nema usluga u bazi.{{else}}Nema usluga. <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/usluge/nova" style="color:var(--sb-akcent);">Dodaj prvu uslugu.</a>{{end}}
         </div>
         {{end}}
     </div>
diff --git a/web/templates/stranice/usluge_forma.html b/web/templates/stranice/usluge_forma.html
index 8002fb6..247983f 100644
--- a/web/templates/stranice/usluge_forma.html
+++ b/web/templates/stranice/usluge_forma.html
@@ -5,7 +5,7 @@
 {{define "sadrzaj"}}
 <div class="kolona" style="gap:16px;max-width:680px;">
 
-    <a href="/usluge" class="nazad-link">
+    <a href="/usluge" class="nazad-link" hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML">
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="15 18 9 12 15 6"/></svg>
         Nazad na usluge
     </a>
@@ -69,7 +69,7 @@
             </div>
 
             <div style="display:flex;justify-content:flex-end;gap:10px;margin-top:20px;">
-                <a href="/usluge" class="btn-sekundarno">Odustani</a>
+                <a hx-boost="true" hx-target="#glavni-sadrzaj" hx-select="#glavni-sadrzaj" hx-swap="outerHTML" href="/usluge" class="btn-sekundarno">Odustani</a>
                 <button type="submit" class="btn-primarno">Sačuvaj uslugu</button>
             </div>
         </div>