diff --git a/web/templates/stranice/magacin_forma.html b/web/templates/stranice/magacin_forma.html
index 7bdbdec..55df3bf 100644
--- a/web/templates/stranice/magacin_forma.html
+++ b/web/templates/stranice/magacin_forma.html
@@ -47,7 +47,7 @@
                 <!-- Magacin je isključivo za proizvode (prate lager); usluge i troškovi
                      imaju svoje module, zato ovde tip više nije izbor -->
                 <input type="hidden" name="tip" value="proizvod">
-                <div style="display:grid;grid-template-columns:1fr 110px 1fr;gap:12px;">
+                <div class="forma-grid-3" style="grid-template-columns:1fr 110px 1fr;">
                     <div>
                         <label class="polje-labela">
                             Naziv <span style="color:#dc2626;">*</span>
@@ -115,7 +115,7 @@
                 {{end}}
 
                 <!-- cene: nabavna / prodajna / sa PDV -->
-                <div style="display:grid;grid-template-columns:1fr 1fr{{if index .Moduli "pdv"}} 1fr{{end}};gap:12px;">
+                <div class="{{if index .Moduli "pdv"}}forma-grid-3{{else}}forma-grid-2{{end}}">
                     <div>
                         <label class="polje-labela">Nabavna cena (din)</label>
                         <input type="number" id="nabavna-cena" name="nabavna_cena"
diff --git a/web/templates/stranice/nabavka_forma.html b/web/templates/stranice/nabavka_forma.html
index 958a23a..71227ab 100644
--- a/web/templates/stranice/nabavka_forma.html
+++ b/web/templates/stranice/nabavka_forma.html
@@ -182,7 +182,7 @@
                                     </template>
                                 </select>
                             </div>
-                            <div style="display:grid;grid-template-columns:1fr 1fr;gap:10px;">
+                            <div class="forma-grid-2" style="gap:10px;">
                                 <div>
                                     <label style="font-size:12px;color:var(--tekst-sporedni);display:block;margin-bottom:4px;">Količina</label>
                                     <input type="number" :name="'kolicina[]'" x-model="stavka.kolicina" @input="preracunajSve()" min="1" :disabled="!isMobile" style="width:100%;">
@@ -192,7 +192,7 @@
                                     <input type="number" :name="'cena_po_komadu[]'" x-model="stavka.cena" @input="preracunajSve()" min="0" step="0.01" :disabled="!isMobile" style="width:100%;">
                                 </div>
                             </div>
-                            <div style="display:grid;grid-template-columns:1fr 1fr;gap:10px;">
+                            <div class="forma-grid-2" style="gap:10px;">
                                 <div>
                                     <label style="font-size:12px;color:var(--tekst-sporedni);display:block;margin-bottom:4px;">Marža %</label>
                                     <input type="number" :name="'marza[]'" x-model="stavka.marza" @input="izracunajProdajnu(stavka)" min="0" step="0.01" :disabled="!isMobile" style="width:100%;">
@@ -316,7 +316,7 @@
                         style="width:100%;resize:vertical;"></textarea>
                 </div>
 
-                <div style="display:grid;grid-template-columns:1fr 1fr;gap:12px;">
+                <div class="forma-grid-2">
                     <div>
                         <label class="polje-labela">Količina na stanju</label>
                         <input type="number" x-model="modalKolicina" min="0" placeholder="0" style="width:100%;">
@@ -327,7 +327,7 @@
                     </div>
                 </div>
 
-                <div style="display:grid;grid-template-columns:1fr 1fr;gap:12px;">
+                <div class="forma-grid-2">
                     <div>
                         <label class="polje-labela">Nabavna cena (din)</label>
                         <input type="number" x-model="modalNabavnaCena" min="0" step="0.01"
@@ -392,7 +392,7 @@
                         @keydown.enter.prevent="sacuvajDobavljaca()">
                 </div>
 
-                <div style="display:grid;grid-template-columns:1fr 1fr;gap:12px;">
+                <div class="forma-grid-2">
                     <div>
                         <label class="polje-labela">Kontakt osoba</label>
                         <input type="text" x-model="modalDobKontakt" placeholder="npr. Marko Petrović" style="width:100%;">
@@ -408,7 +408,7 @@
                     <input type="text" x-model="modalDobEmail" placeholder="npr. nabavka@techdistrib.rs" style="width:100%;">
                 </div>
 
-                <div style="display:grid;grid-template-columns:1fr 1fr;gap:12px;">
+                <div class="forma-grid-2">
                     <div>
                         <label class="polje-labela">PIB</label>
                         <input type="text" x-model="modalDobPib" placeholder="npr. 123456789" style="width:100%;">
diff --git a/web/templates/stranice/pdv_kir_forma.html b/web/templates/stranice/pdv_kir_forma.html
index 2614336..191ae0f 100644
--- a/web/templates/stranice/pdv_kir_forma.html
+++ b/web/templates/stranice/pdv_kir_forma.html
@@ -14,7 +14,7 @@
         <!-- dokument -->
         <div class="kartica animiraj" style="margin-bottom:16px;">
             <div style="font-size:15px;font-weight:500;color:var(--tekst-glavni);margin-bottom:16px;padding-bottom:12px;border-bottom:0.5px solid var(--ivica);">Dokument</div>
-            <div style="display:grid;grid-template-columns:1fr 1fr;gap:14px;">
+            <div class="forma-grid-2" style="gap:14px;">
                 <div>
                     <label class="polje-labela">Datum prometa</label>
                     <input type="date" name="datum_prometa" value="{{.Danas}}" required style="width:100%;padding:8px 12px;border:0.5px solid var(--ivica);border-radius:8px;font-size:14px;background:var(--pozadina);color:var(--tekst-glavni);outline:none;">
@@ -50,7 +50,7 @@
                     <label class="polje-labela">Naziv kupca</label>
                     <input type="text" name="kupac_naziv" required style="width:100%;padding:8px 12px;border:0.5px solid var(--ivica);border-radius:8px;font-size:14px;background:var(--pozadina);color:var(--tekst-glavni);outline:none;">
                 </div>
-                <div style="display:grid;grid-template-columns:1fr 1fr;gap:14px;">
+                <div class="forma-grid-2" style="gap:14px;">
                     <div>
                         <label class="polje-labela">PIB / JMBG</label>
                         <input type="text" name="kupac_pib" style="width:100%;padding:8px 12px;border:0.5px solid var(--ivica);border-radius:8px;font-size:14px;background:var(--pozadina);color:var(--tekst-glavni);outline:none;">
@@ -67,7 +67,7 @@
         <div class="kartica animiraj" style="margin-bottom:16px;">
             <div style="font-size:15px;font-weight:500;color:var(--tekst-glavni);margin-bottom:6px;padding-bottom:12px;border-bottom:0.5px solid var(--ivica);">Iznosi po stopama</div>
             <div class="pomocni-tekst" style="font-size:12px;margin-bottom:14px;">Ostavite 0 gde nema prometa. „Ukupno" se računa automatski kao zbir osnovica, PDV-a i oslobođenog prometa.</div>
-            <div style="display:grid;grid-template-columns:1fr 1fr;gap:14px;">
+            <div class="forma-grid-2" style="gap:14px;">
                 <div>
                     <label class="polje-labela">Osnovica opšta (20%)</label>
                     <input type="number" step="0.01" min="0" name="osnovica_opsta" value="0" style="width:100%;padding:8px 12px;border:0.5px solid var(--ivica);border-radius:8px;font-size:14px;background:var(--pozadina);color:var(--tekst-glavni);outline:none;">
diff --git a/web/templates/stranice/pdv_kpr_forma.html b/web/templates/stranice/pdv_kpr_forma.html
index 6fc4a8f..763f687 100644
--- a/web/templates/stranice/pdv_kpr_forma.html
+++ b/web/templates/stranice/pdv_kpr_forma.html
@@ -14,7 +14,7 @@
         <!-- dokument -->
         <div class="kartica animiraj" style="margin-bottom:16px;">
             <div style="font-size:15px;font-weight:500;color:var(--tekst-glavni);margin-bottom:16px;padding-bottom:12px;border-bottom:0.5px solid var(--ivica);">Dokument</div>
-            <div style="display:grid;grid-template-columns:1fr 1fr;gap:14px;">
+            <div class="forma-grid-2" style="gap:14px;">
                 <div>
                     <label class="polje-labela">Datum prometa</label>
                     <input type="date" name="datum_prometa" value="{{.Danas}}" required style="width:100%;padding:8px 12px;border:0.5px solid var(--ivica);border-radius:8px;font-size:14px;background:var(--pozadina);color:var(--tekst-glavni);outline:none;">
@@ -54,7 +54,7 @@
                     <label class="polje-labela">Naziv dobavljača</label>
                     <input type="text" name="dobavljac_naziv" required style="width:100%;padding:8px 12px;border:0.5px solid var(--ivica);border-radius:8px;font-size:14px;background:var(--pozadina);color:var(--tekst-glavni);outline:none;">
                 </div>
-                <div style="display:grid;grid-template-columns:1fr 1fr;gap:14px;">
+                <div class="forma-grid-2" style="gap:14px;">
                     <div>
                         <label class="polje-labela">PIB</label>
                         <input type="text" name="dobavljac_pib" style="width:100%;padding:8px 12px;border:0.5px solid var(--ivica);border-radius:8px;font-size:14px;background:var(--pozadina);color:var(--tekst-glavni);outline:none;">
@@ -71,7 +71,7 @@
         <div class="kartica animiraj" style="margin-bottom:16px;">
             <div style="font-size:15px;font-weight:500;color:var(--tekst-glavni);margin-bottom:6px;padding-bottom:12px;border-bottom:0.5px solid var(--ivica);">Iznosi po stopama</div>
             <div class="pomocni-tekst" style="font-size:12px;margin-bottom:14px;">PDV (opšta/posebna) je iznos koji se može odbiti. „Ukupno" se računa automatski.</div>
-            <div style="display:grid;grid-template-columns:1fr 1fr;gap:14px;">
+            <div class="forma-grid-2" style="gap:14px;">
                 <div>
                     <label class="polje-labela">Osnovica opšta (20%)</label>
                     <input type="number" step="0.01" min="0" name="osnovica_opsta" value="0" style="width:100%;padding:8px 12px;border:0.5px solid var(--ivica);border-radius:8px;font-size:14px;background:var(--pozadina);color:var(--tekst-glavni);outline:none;">
diff --git a/web/templates/stranice/podesavanja.html b/web/templates/stranice/podesavanja.html
index d55efed..e23326c 100644
--- a/web/templates/stranice/podesavanja.html
+++ b/web/templates/stranice/podesavanja.html
@@ -85,7 +85,7 @@
                         placeholder="npr. Ulica i broj, Grad">
                 </div>
 
-                <div style="display:grid;grid-template-columns:1fr 1fr;gap:14px;">
+                <div class="forma-grid-2" style="gap:14px;">
                     <div>
                         <label class="polje-labela">Telefon</label>
                         <input type="text" name="telefon" value="{{.Telefon}}"
diff --git a/web/templates/stranice/prodaja_forma.html b/web/templates/stranice/prodaja_forma.html
index 58b44b8..dc0706f 100644
--- a/web/templates/stranice/prodaja_forma.html
+++ b/web/templates/stranice/prodaja_forma.html
@@ -336,8 +336,7 @@
                   </template>
                 </select>
               </div>
-              <div
-                style="display: grid; grid-template-columns: 1fr 1fr; gap: 10px">
+              <div class="forma-grid-2" style="gap: 10px">
                 <div>
                   <label
                     style="