diff --git a/__tests__/ui-features.test.ts b/__tests__/ui-features.test.ts
index 274d80e..4cb91b8 100644
--- a/__tests__/ui-features.test.ts
+++ b/__tests__/ui-features.test.ts
@@ -29,9 +29,10 @@ describe('UI Features Tests', () => {
     expect(adminContent).toMatch(/type="number"[\s\S]*?name="refill"/);
     expect(adminContent).toMatch(/type="number"[\s\S]*?name="vakum"/);
     expect(adminContent).toMatch(/type="number"[\s\S]*?name="otvoreno"/);
-    expect(adminContent).toContain('Refill količina');
-    expect(adminContent).toContain('Vakuum količina');
-    expect(adminContent).toContain('Otvoreno količina');
+    expect(adminContent).toContain('Refill');
+    expect(adminContent).toContain('Vakuum');
+    expect(adminContent).toContain('Otvoreno');
+    expect(adminContent).toContain('Ukupna količina');
   });
 
   it('should have number input for quantity', () => {
diff --git a/app/upadaj/dashboard/page.tsx b/app/upadaj/dashboard/page.tsx
index 12059a4..eccba26 100644
--- a/app/upadaj/dashboard/page.tsx
+++ b/app/upadaj/dashboard/page.tsx
@@ -421,9 +421,19 @@ function FilamentForm({
 
   const handleSubmit = (e: React.FormEvent) => {
     e.preventDefault();
+    
+    // Calculate total quantity
+    const refillCount = parseInt(formData.refill) || (formData.refill?.toLowerCase() === 'da' ? 1 : 0);
+    const vakuumMatch = formData.vakum?.match(/^(\d+)\s*vakuum/);
+    const vakuumCount = vakuumMatch ? parseInt(vakuumMatch[1]) : (formData.vakum?.toLowerCase().includes('vakuum') ? 1 : 0);
+    const otvorenMatch = formData.otvoreno?.match(/^(\d+)\s*otvorena/);
+    const otvorenCount = otvorenMatch ? parseInt(otvorenMatch[1]) : (formData.otvoreno?.toLowerCase().includes('otvorena') ? 1 : 0);
+    const totalQuantity = refillCount + vakuumCount + otvorenCount;
+    
     onSave({
       ...filament,
-      ...formData
+      ...formData,
+      kolicina: totalQuantity.toString()
     });
   };
 
@@ -564,20 +574,6 @@ function FilamentForm({
           </div>
         </div>
 
-        <div>
-          <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Količina</label>
-          <input
-            type="number"
-            name="kolicina"
-            value={formData.kolicina}
-            onChange={handleChange}
-            min="0"
-            step="1"
-            placeholder="0"
-            className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:outline-none focus:ring-2 focus:ring-blue-500"
-          />
-        </div>
-
         <div>
           <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Cena</label>
           <input
@@ -592,7 +588,7 @@ function FilamentForm({
 
         {/* Quantity inputs for refill, vakuum, and otvoreno */}
         <div>
-          <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Refill količina</label>
+          <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Refill</label>
           <input
             type="number"
             name="refill"
@@ -618,7 +614,7 @@ function FilamentForm({
         </div>
 
         <div>
-          <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Vakuum količina</label>
+          <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Vakuum</label>
           <input
             type="number"
             name="vakum"
@@ -645,7 +641,7 @@ function FilamentForm({
         </div>
 
         <div>
-          <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Otvoreno količina</label>
+          <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Otvoreno</label>
           <input
             type="number"
             name="otvoreno"
@@ -671,6 +667,25 @@ function FilamentForm({
           />
         </div>
 
+        {/* Total quantity display */}
+        <div>
+          <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Ukupna količina</label>
+          <input
+            type="number"
+            name="kolicina"
+            value={(() => {
+              const refillCount = parseInt(formData.refill) || (formData.refill?.toLowerCase() === 'da' ? 1 : 0);
+              const vakuumMatch = formData.vakum?.match(/^(\d+)\s*vakuum/);
+              const vakuumCount = vakuumMatch ? parseInt(vakuumMatch[1]) : (formData.vakum?.toLowerCase().includes('vakuum') ? 1 : 0);
+              const otvorenMatch = formData.otvoreno?.match(/^(\d+)\s*otvorena/);
+              const otvorenCount = otvorenMatch ? parseInt(otvorenMatch[1]) : (formData.otvoreno?.toLowerCase().includes('otvorena') ? 1 : 0);
+              return refillCount + vakuumCount + otvorenCount;
+            })()}
+            readOnly
+            className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-gray-100 dark:bg-gray-600 text-gray-900 dark:text-gray-100 cursor-not-allowed"
+          />
+        </div>
+
         <div className="md:col-span-2 flex justify-end gap-4 mt-4">
           <button
             type="button"