diff --git a/internal/handler/kes.go b/internal/handler/kes.go
index 6b1e062..a61b787 100644
--- a/internal/handler/kes.go
+++ b/internal/handler/kes.go
@@ -58,13 +58,32 @@ var sablonskeFunkcije = template.FuncMap{
 		return fmt.Sprintf("%d", int64(math.Round(*v)))
 	},
 	// dinari formatira iznos sa separatorom hiljada (tačka) i 2 decimale (zarez):
-	// 1234567.5 → "1.234.567,50"
-	"dinari": func(v float64) string {
-		return formatirajDinare(v, 2)
+	// 1234567.5 → "1.234.567,50"; prihvata float64 i int64
+	"dinari": func(v any) string {
+		switch val := v.(type) {
+		case int64:
+			return formatirajDinare(float64(val), 2)
+		case int:
+			return formatirajDinare(float64(val), 2)
+		case float64:
+			return formatirajDinare(val, 2)
+		default:
+			return fmt.Sprintf("%v", v)
+		}
 	},
 	// dinariCeli formatira iznos sa separatorom hiljada, bez decimala: 1234567 → "1.234.567"
-	"dinariCeli": func(v float64) string {
-		return formatirajDinare(v, 0)
+	// Prihvata float64 i int64 (PPPDV polja su int64).
+	"dinariCeli": func(v any) string {
+		switch val := v.(type) {
+		case int64:
+			return formatirajDinare(float64(val), 0)
+		case int:
+			return formatirajDinare(float64(val), 0)
+		case float64:
+			return formatirajDinare(val, 0)
+		default:
+			return fmt.Sprintf("%v", v)
+		}
 	},
 	// telefon formatira srpski broj telefona radi lakšeg čitanja: "0641234567" → "064 123 4567"
 	"telefon": formatirajTelefon,
diff --git a/web/templates/stranice/fiskal_verifikacija.html b/web/templates/stranice/fiskal_verifikacija.html
index fe1f6fd..de6eb36 100644
--- a/web/templates/stranice/fiskal_verifikacija.html
+++ b/web/templates/stranice/fiskal_verifikacija.html
@@ -24,7 +24,7 @@
         .firma-info { font-size: 12px; color: #64748b; margin-top: 4px; line-height: 1.6; }
 
         /* kartica */
-        .kartica { background: #fff; margin: 12px 12px 0; border-radius: 12px; box-shadow: 0 1px 3px rgba(0,0,0,0.08); overflow: hidden; }
+        .kartica { background: #fff; margin: 12px; border-radius: 12px; box-shadow: 0 1px 3px rgba(0,0,0,0.08); overflow: hidden; }
         .kartica-naslov { font-size: 11px; font-weight: 700; text-transform: uppercase; letter-spacing: 0.7px; color: #64748b; padding: 12px 16px 8px; border-bottom: 1px solid #f1f5f9; }
 
         /* red podataka */
diff --git a/web/templates/stranice/pdv_obracun.html b/web/templates/stranice/pdv_obracun.html
index 60a6ec6..166f19c 100644
--- a/web/templates/stranice/pdv_obracun.html
+++ b/web/templates/stranice/pdv_obracun.html
@@ -87,7 +87,7 @@
     </div>
 
     <!-- rezultat: obaveza za uplatu / povraćaj -->
-    <div class="kartica animiraj" style="display:flex;justify-content:space-between;align-items:center;gap:12px;flex-wrap:wrap;
+    <div class="kartica animiraj" style="display:flex;justify-content:space-between;align-items:center;gap:12px;flex-wrap:wrap;margin-bottom:16px;
         border-left:4px solid {{if .Obracun.ZaUplatu}}var(--greska){{else}}var(--uspeh){{end}};">
         <div>
             <div style="font-size:13px;color:var(--tekst-sporedni);">
@@ -124,58 +124,58 @@
                     <tr style="border-bottom:0.5px solid var(--ivica);">
                         <td style="padding:8px 12px;color:var(--tekst-sporedni);">001</td>
                         <td style="padding:8px 12px;">Oslobođen sa pravom na odbitak</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje001}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje001}}</td>
                         <td style="padding:8px 12px;text-align:right;color:var(--tekst-sporedni);">—</td>
                     </tr>
                     <tr style="border-bottom:0.5px solid var(--ivica);">
                         <td style="padding:8px 12px;color:var(--tekst-sporedni);">002</td>
                         <td style="padding:8px 12px;">Oslobođen bez prava na odbitak</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje002}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje002}}</td>
                         <td style="padding:8px 12px;text-align:right;color:var(--tekst-sporedni);">—</td>
                     </tr>
                     <tr style="border-bottom:0.5px solid var(--ivica);">
                         <td style="padding:8px 12px;color:var(--tekst-sporedni);">003<div style="font-size:11px;">103</div></td>
                         <td style="padding:8px 12px;">Promet po opštoj stopi (20%)</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje003}}</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje103}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje003}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje103}}</td>
                     </tr>
                     <tr style="border-bottom:0.5px solid var(--ivica);">
                         <td style="padding:8px 12px;color:var(--tekst-sporedni);">004<div style="font-size:11px;">104</div></td>
                         <td style="padding:8px 12px;">Promet po posebnoj stopi (10%)</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje004}}</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje104}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje004}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje104}}</td>
                     </tr>
                     <tr style="border-bottom:0.5px solid var(--ivica);font-weight:500;background:var(--pozadina);">
                         <td style="padding:8px 12px;">005<div style="font-size:11px;">105</div></td>
                         <td style="padding:8px 12px;">ZBIR (1+2+3+4)</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje005}}</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje105}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje005}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje105}}</td>
                     </tr>
 
                     <tr style="border-bottom:0.5px solid var(--ivica);"><td style="padding:8px 12px;font-weight:500;padding-top:14px;" colspan="4">II. Prethodni porez</td></tr>
                     <tr style="border-bottom:0.5px solid var(--ivica);color:var(--tekst-sporedni);">
                         <td style="padding:8px 12px;">006<div style="font-size:11px;">106</div></td>
                         <td style="padding:8px 12px;">Prethodni porez pri uvozu</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje006}}</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje106}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje006}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje106}}</td>
                     </tr>
                     <tr style="border-bottom:0.5px solid var(--ivica);color:var(--tekst-sporedni);">
                         <td style="padding:8px 12px;">007<div style="font-size:11px;">107</div></td>
                         <td style="padding:8px 12px;">PDV nadoknada poljoprivredniku</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje007}}</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje107}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje007}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje107}}</td>
                     </tr>
                     <tr style="border-bottom:0.5px solid var(--ivica);">
                         <td style="padding:8px 12px;color:var(--tekst-sporedni);">008<div style="font-size:11px;">108</div></td>
                         <td style="padding:8px 12px;">Ostali prethodni porez (domaće nabavke)</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje008}}</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje108}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje008}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje108}}</td>
                     </tr>
                     <tr style="font-weight:500;background:var(--pozadina);">
                         <td style="padding:8px 12px;">009<div style="font-size:11px;">109</div></td>
                         <td style="padding:8px 12px;">ZBIR (6+7+8)</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje009}}</td>
-                        <td style="padding:8px 12px;text-align:right;">{{.PPPDV.Polje109}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje009}}</td>
+                        <td style="padding:8px 12px;text-align:right;">{{dinari .PPPDV.Polje109}}</td>
                     </tr>
                 </tbody>
                 <tfoot>
@@ -185,7 +185,7 @@
                             Iznos PDV u periodu (105 − 109)
                             {{if .PPPDV.Povracaj}}<span style="color:var(--uspeh);"> — za povraćaj</span>{{else}}<span style="color:var(--greska);"> — za uplatu</span>{{end}}
                         </td>
-                        <td style="padding:10px 12px;text-align:right;color:{{if .PPPDV.Povracaj}}var(--uspeh){{else}}var(--greska){{end}};">{{.PPPDV.Polje110Apsolutno}}</td>
+                        <td style="padding:10px 12px;text-align:right;color:{{if .PPPDV.Povracaj}}var(--uspeh){{else}}var(--greska){{end}};">{{dinari .PPPDV.Polje110Apsolutno}}</td>
                     </tr>
                     <tr>
                         <td style="padding:8px 12px;color:var(--tekst-sporedni);">11</td>
diff --git a/web/templates/stranice/podesavanja_fiskalizacija.html b/web/templates/stranice/podesavanja_fiskalizacija.html
index ef00a78..d8c1adb 100644
--- a/web/templates/stranice/podesavanja_fiskalizacija.html
+++ b/web/templates/stranice/podesavanja_fiskalizacija.html
@@ -5,7 +5,7 @@
 {{define "sadrzaj"}}
 <div class="stranica-stack" style="width:100%;max-width:100%;">
 
-    <div class="kartica animiraj">
+    <div class="kartica animiraj" style="margin-bottom:16px;">
         <div style="display:flex;align-items:center;gap:10px;margin-bottom:16px;padding-bottom:12px;border-bottom:0.5px solid var(--ivica);">
             <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="var(--sb-akcent)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="5" width="20" height="14" rx="2"/><line x1="2" y1="10" x2="22" y2="10"/></svg>
             <span style="font-size:15px;font-weight:500;color:var(--tekst-glavni);">L-PFR veza</span>