diff --git a/AppCode/AOHandler.py b/AppCode/AOHandler.py
index 86b0820..bc5327a 100644
--- a/AppCode/AOHandler.py
+++ b/AppCode/AOHandler.py
@@ -34,12 +34,14 @@ class AOHandler:
     # Add AO record 
     def add_ao(self, data):
             fields = [
-                "year","gross_total_income", "disallowance_14a", "disallowance_37",
-                "deduction_80ia_business", "deduction_80ia_misc", "deduction_80ia_other", "deduction_sec37_disallowance", "deduction_80g",
-                "net_taxable_income", "tax_30_percent", "tax_book_profit_18_5", "tax_payable",
-                "surcharge_12", "edu_cess_3", "total_tax_payable", "mat_credit",
-                "interest_234c", "total_tax", "advance_tax", "tds", "tcs","sat",
-                "tax_on_assessment", "refund","Remarks"
+                'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
+                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
+                'deduction_sec37_disallowance', 'deduction_80g',
+                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+                'tax_payable', 'surcharge', 'edu_cess',
+                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
             ]
 
             values = [data.get(f, 0) for f in fields]
@@ -50,15 +52,16 @@ class AOHandler:
     
     # UPDATE AO RECORD by AO id
     def update_ao(self, id, data):
-
         fields = [
-            "year","gross_total_income", "disallowance_14a", "disallowance_37",
-            "deduction_80ia_business", "deduction_80ia_misc", "deduction_80ia_other", "deduction_sec37_disallowance", "deduction_80g",
-            "net_taxable_income", "tax_30_percent", "tax_book_profit_18_5", "tax_payable",
-            "surcharge_12", "edu_cess_3", "total_tax_payable", "mat_credit",
-            "interest_234c", "total_tax", "advance_tax", "tds", "tcs","sat",
-            "tax_on_assessment", "refund","Remarks"
-        ]
+                'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
+                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
+                'deduction_sec37_disallowance', 'deduction_80g',
+                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+                'tax_payable', 'surcharge', 'edu_cess',
+                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
+            ]
 
         values = [id] + [data.get(f, 0) for f in fields]
 
@@ -107,10 +110,11 @@ class AOHandler:
                 "tax_30_percent": "Tax @ 30%",
                 "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
                 "tax_payable": "Tax Payable",
-                "surcharge_12": "Surcharge @ 12%",
-                "edu_cess_3": "Education Cess @ 3%",
+                "surcharge": "Surcharge",
+                "edu_cess": "Education Cess",
                 "total_tax_payable": "Total Tax Payable",
-                "mat_credit": "Less: MAT Credit Utilized",
+                "mat_credit_created": "Add: MAT Credit Created",
+                "mat_credit_utilized": "Less: MAT Credit Utilized",
                 "interest_234c": "Add: Interest u/s 234C",
                 "total_tax": "Total Tax",
                 "advance_tax": "Advance Tax",
diff --git a/AppCode/CITHandler.py b/AppCode/CITHandler.py
index a1d9ca0..96b9ed9 100644
--- a/AppCode/CITHandler.py
+++ b/AppCode/CITHandler.py
@@ -37,13 +37,15 @@ class CITHandler:
     # INSERT CIT RECORD
     def add_cit(self, data):
         columns = [
-            'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-            'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-            'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
-            'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
-            'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
-            'total_tax', 'advance_tax', 'tds', 'tcs','sat', 'tax_on_assessment', 'refund', 'Remarks'
-        ]
+                'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
+                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
+                'deduction_sec37_disallowance', 'deduction_80g',
+                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+                'tax_payable', 'surcharge', 'edu_cess',
+                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
+            ]
 
         values = [data.get(col, 0) for col in columns]
 
@@ -53,13 +55,15 @@ class CITHandler:
     # UPDATE CIT RECORD
     def update_cit(self, id, data):
         columns = [
-            'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-            'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-            'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
-            'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
-            'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
-            'total_tax', 'advance_tax', 'tds', 'tcs','sat', 'tax_on_assessment', 'refund', 'Remarks'
-        ]
+                'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
+                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
+                'deduction_sec37_disallowance', 'deduction_80g',
+                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+                'tax_payable', 'surcharge', 'edu_cess',
+                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
+            ]
 
         values = [id] + [data.get(col, 0) for col in columns]
 
@@ -106,10 +110,11 @@ class CITHandler:
                 "tax_30_percent": "Tax @ 30%",
                 "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
                 "tax_payable": "Tax Payable",
-                "surcharge_12": "Surcharge @ 12%",
-                "edu_cess_3": "Education Cess @ 3%",
+                "surcharge": "Surcharge @ %",
+                "edu_cess": "Education Cess @ %",
                 "total_tax_payable": "Total Tax Payable",
-                "mat_credit": "Less: MAT Credit Utilized",
+                "mat_credit_created": "Add: MAT Credit Created",
+                "mat_credit_utilized": "Less: MAT Credit Utilized",
                 "interest_234c": "Add: Interest u/s 234C",
                 "total_tax": "Total Tax",
                 "advance_tax": "Advance Tax",
diff --git a/AppCode/ITATHandler.py b/AppCode/ITATHandler.py
index f714e5f..d307389 100644
--- a/AppCode/ITATHandler.py
+++ b/AppCode/ITATHandler.py
@@ -32,13 +32,15 @@ class ITATHandler:
     # INSERT ITAT (PROC)
     def add_itat(self, data):
         columns = [
-                    'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-                    'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-                    'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
-                    'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
-                    'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
-                    'total_tax', 'advance_tax', 'tds', 'tcs','sat', 'tax_on_assessment', 'refund', 'Remarks'
-                ]
+            'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
+            'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
+            'deduction_sec37_disallowance', 'deduction_80g',
+            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+            'tax_payable', 'surcharge', 'edu_cess',
+            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+            'sat', 'tax_on_assessment', 'refund', 'Remarks'
+        ]
         values = [data.get(col, 0) for col in columns]
 
         self.cursor.callproc("InsertITAT", values)
@@ -49,10 +51,12 @@ class ITATHandler:
         columns = [
             'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
             'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-            'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
-            'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
-            'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
-            'total_tax', 'advance_tax', 'tds', 'tcs', 'sat','tax_on_assessment', 'refund','Remarks'
+            'deduction_sec37_disallowance', 'deduction_80g',
+            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+            'tax_payable', 'surcharge', 'edu_cess',
+            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+            'sat', 'tax_on_assessment', 'refund', 'Remarks'
         ]
         values = [id] + [data.get(col, 0) for col in columns]  
 
@@ -99,8 +103,8 @@ class ITATHandler:
                 "tax_30_percent": "Tax @ 30%",
                 "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
                 "tax_payable": "Tax Payable",
-                "surcharge_12": "Surcharge @ 12%",
-                "edu_cess_3": "Education Cess @ 3%",
+                "surcharge": "Surcharge @ %",
+                "edu_cess": "Education Cess @ %",
                 "total_tax_payable": "Total Tax Payable",
                 "mat_credit": "Less: MAT Credit Utilized",
                 "interest_234c": "Add: Interest u/s 234C",
diff --git a/AppCode/ITRHandler.py b/AppCode/ITRHandler.py
index 3731c99..4cb6bf1 100644
--- a/AppCode/ITRHandler.py
+++ b/AppCode/ITRHandler.py
@@ -47,12 +47,13 @@ class ITRHandler:
         columns = [
             'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
             'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-            'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
-            'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
-            'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
-            'total_tax', 'advance_tax', 'tds', 'tcs','sat', 'tax_on_assessment', 'refund', 'Remarks'
+            'deduction_sec37_disallowance', 'deduction_80g',
+            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+            'tax_payable', 'surcharge', 'edu_cess',
+            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+            'sat', 'tax_on_assessment', 'refund', 'Remarks'
         ]
-
         values = [data.get(col, 0) for col in columns]
 
         # Call your stored procedure
@@ -64,10 +65,12 @@ class ITRHandler:
         columns = [
             'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
             'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-            'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
-            'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
-            'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
-            'total_tax', 'advance_tax', 'tds', 'tcs', 'sat','tax_on_assessment', 'refund','Remarks'
+            'deduction_sec37_disallowance', 'deduction_80g',
+            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+            'tax_payable', 'surcharge', 'edu_cess',
+            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+            'sat', 'tax_on_assessment', 'refund', 'Remarks'
         ]
 
         values = [id] + [data.get(col, 0) for col in columns]  
@@ -110,10 +113,11 @@ class ITRHandler:
                 "tax_30_percent": "Tax @ 30%",
                 "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
                 "tax_payable": "Tax Payable",
-                "surcharge_12": "Surcharge @ 12%",
-                "edu_cess_3": "Education Cess @ 3%",
+                "surcharge": "Surcharge @ %",
+                "edu_cess": "Education Cess @ %",
                 "total_tax_payable": "Total Tax Payable",
-                "mat_credit": "Less: MAT Credit Utilized",
+                "mat_credit_created": "Add: MAT Credit Created",
+                "mat_credit_utilized": "Less: MAT Credit Utilized",
                 "interest_234c": "Add: Interest u/s 234C",
                 "total_tax": "Total Tax",
                 "advance_tax": "Advance Tax",
diff --git a/AppCode/__pycache__/AOHandler.cpython-313.pyc b/AppCode/__pycache__/AOHandler.cpython-313.pyc
index f533e36..1302561 100644
Binary files a/AppCode/__pycache__/AOHandler.cpython-313.pyc and b/AppCode/__pycache__/AOHandler.cpython-313.pyc differ
diff --git a/AppCode/__pycache__/CITHandler.cpython-313.pyc b/AppCode/__pycache__/CITHandler.cpython-313.pyc
index f4bad4e..edb2317 100644
Binary files a/AppCode/__pycache__/CITHandler.cpython-313.pyc and b/AppCode/__pycache__/CITHandler.cpython-313.pyc differ
diff --git a/AppCode/__pycache__/ITATHandler.cpython-313.pyc b/AppCode/__pycache__/ITATHandler.cpython-313.pyc
index 4f59d0e..d189e80 100644
Binary files a/AppCode/__pycache__/ITATHandler.cpython-313.pyc and b/AppCode/__pycache__/ITATHandler.cpython-313.pyc differ
diff --git a/AppCode/__pycache__/ITRHandler.cpython-313.pyc b/AppCode/__pycache__/ITRHandler.cpython-313.pyc
index 25312c2..64df430 100644
Binary files a/AppCode/__pycache__/ITRHandler.cpython-313.pyc and b/AppCode/__pycache__/ITRHandler.cpython-313.pyc differ
diff --git a/static/js/ao_calc.js b/static/js/ao_calc.js
index 14e771e..8e5b445 100644
--- a/static/js/ao_calc.js
+++ b/static/js/ao_calc.js
@@ -17,22 +17,22 @@ document.addEventListener("DOMContentLoaded", function () {
         var disallowance_14a = getValue("disallowance_14a");
         var disallowance_37 = getValue("disallowance_37");
 
-        // -- total gross income ---
+        // -- total gross income --
         var gross_total = gross_total_income + disallowance_37 + disallowance_14a
-        console.log("gross_total income:: " + gross_total)
+        // console.log("gross_total income:: " + gross_total)
 
         // --- DEDUCTIONS ---
         var d80_business = getValue("deduction_80ia_business");
         var d80_misc = getValue("deduction_80ia_misc");
         var d80_other = getValue("deduction_80ia_other");
+        var d80_sec37 = getValue("deduction_sec37_disallowance");
 
-        var deduction_sec37 = d80_business + d80_misc + d80_other;
-        setValue("deduction_sec37_disallowance", deduction_sec37);
+        var deduction = d80_business + d80_misc + d80_other + d80_sec37 - 1.35;
 
         var deduction_80g = getValue("deduction_80g");
 
         // --- NET TAXABLE INCOME ---
-        var net_taxable_income = gross_total - deduction_sec37 - deduction_80g;
+        var net_taxable_income = gross_total - deduction - deduction_80g;
         setValue("net_taxable_income", net_taxable_income);
 
         // --- TAX 30% ---
@@ -42,24 +42,36 @@ document.addEventListener("DOMContentLoaded", function () {
         // --- TAX PAYABLE (18.5%) ---
         var tax185 = getValue("tax_book_profit_18_5");
 
+        // --- Education Cess 3% ---
         var tax_payable = (tax30 > tax185) ? tax30 : tax185;
         setValue("tax_payable", tax_payable);
 
+        // // --- SURCHARGE ---
+        // var percent = getValue("persentage");
+        // var surcharge = tax_payable * (percent / 100);
+        // setValue("surcharge", surcharge);
+
+        // // --- edu_cess ---
+        // var per_cess = getValue("persentage_cess")
+        // var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        // setValue("edu_cess", edu_cess);
+
         // --- SURCHARGE ---
         var percent = getValue("persentage");
         var surcharge = tax_payable * (percent / 100);
-        setValue("surcharge_12", surcharge);
+        setValue("surcharge", surcharge);
 
-        // --- Education Cess 3% ---
-        var edu_cess = (tax_payable + surcharge) * 0.03;
-        setValue("edu_cess_3", edu_cess);
+        // --- EDUCATION CESS ---
+        var per_cess = getValue("persentage_cess");
+        var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        setValue("edu_cess", edu_cess);
 
         // --- total tax payable ---
         var total_tax_payable = tax_payable + surcharge + edu_cess;
         setValue("total_tax_payable", total_tax_payable);
 
         // --- FINAL TAX ---
-        var mat_credit = getValue("mat_credit");
+        var mat_credit = getValue("mat_credit_utilized");
         var interest_234c = getValue("interest_234c");
 
         var total_tax = total_tax_payable + mat_credit + interest_234c;
diff --git a/static/js/cit_calc.js b/static/js/cit_calc.js
index c8bf5c7..1a08b64 100644
--- a/static/js/cit_calc.js
+++ b/static/js/cit_calc.js
@@ -45,21 +45,31 @@ document.addEventListener("DOMContentLoaded", function () {
         var tax_payable = (tax30 > tax185) ? tax30 : tax185;
         setValue("tax_payable", tax_payable);
 
+        // // --- SURCHARGE ---
+        // var percent = getValue("persentage");
+        // var surcharge = tax_payable * (percent / 100);
+        // setValue("surcharge_12", surcharge);
+
+        // // --- Education Cess 3% ---
+        // var edu_cess = (tax_payable + surcharge) * 0.03;
+        // setValue("edu_cess_3", edu_cess);
+
         // --- SURCHARGE ---
         var percent = getValue("persentage");
         var surcharge = tax_payable * (percent / 100);
-        setValue("surcharge_12", surcharge);
+        setValue("surcharge", surcharge);
 
-        // --- Education Cess 3% ---
-        var edu_cess = (tax_payable + surcharge) * 0.03;
-        setValue("edu_cess_3", edu_cess);
+        // --- EDUCATION CESS ---
+        var per_cess = getValue("persentage_cess");
+        var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        setValue("edu_cess", edu_cess);
 
         // --- total tax payable ---
         var total_tax_payable = tax_payable + surcharge + edu_cess;
         setValue("total_tax_payable", total_tax_payable);
 
         // --- FINAL TAX ---
-        var mat_credit = getValue("mat_credit");
+        var mat_credit = getValue("mat_credit_utilized");
         var interest_234c = getValue("interest_234c");
 
         var total_tax = total_tax_payable + mat_credit + interest_234c;
diff --git a/static/js/itr_calc.js b/static/js/itr_calc.js
index ac993a9..8e5b445 100644
--- a/static/js/itr_calc.js
+++ b/static/js/itr_calc.js
@@ -19,7 +19,7 @@ document.addEventListener("DOMContentLoaded", function () {
 
         // -- total gross income --
         var gross_total = gross_total_income + disallowance_37 + disallowance_14a
-        console.log("gross_total income:: " + gross_total)
+        // console.log("gross_total income:: " + gross_total)
 
         // --- DEDUCTIONS ---
         var d80_business = getValue("deduction_80ia_business");
@@ -46,20 +46,32 @@ document.addEventListener("DOMContentLoaded", function () {
         var tax_payable = (tax30 > tax185) ? tax30 : tax185;
         setValue("tax_payable", tax_payable);
 
+        // // --- SURCHARGE ---
+        // var percent = getValue("persentage");
+        // var surcharge = tax_payable * (percent / 100);
+        // setValue("surcharge", surcharge);
+
+        // // --- edu_cess ---
+        // var per_cess = getValue("persentage_cess")
+        // var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        // setValue("edu_cess", edu_cess);
+
         // --- SURCHARGE ---
         var percent = getValue("persentage");
         var surcharge = tax_payable * (percent / 100);
-        setValue("surcharge_12", surcharge);
+        setValue("surcharge", surcharge);
 
-        var edu_cess = (tax_payable + surcharge) * 0.03;
-        setValue("edu_cess_3", edu_cess);
+        // --- EDUCATION CESS ---
+        var per_cess = getValue("persentage_cess");
+        var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        setValue("edu_cess", edu_cess);
 
         // --- total tax payable ---
         var total_tax_payable = tax_payable + surcharge + edu_cess;
         setValue("total_tax_payable", total_tax_payable);
 
         // --- FINAL TAX ---
-        var mat_credit = getValue("mat_credit");
+        var mat_credit = getValue("mat_credit_utilized");
         var interest_234c = getValue("interest_234c");
 
         var total_tax = total_tax_payable + mat_credit + interest_234c;
diff --git a/templates/add_ao.html b/templates/add_ao.html
index 85c412d..74756e1 100644
--- a/templates/add_ao.html
+++ b/templates/add_ao.html
@@ -92,11 +92,15 @@
             </div>
             <div>
                 <label>Surcharge:</label>
-                <input type="number" name="surcharge_12" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge" class="auto" value="0.00" readonly>
             </div>
             <div>
-                <label>Education Cess @ 3%:</label>
-                <input type="number" name="edu_cess_3" class="auto" step="any" value="0.00" readonly>
+                <label>Enter Percentage (%) Cess:</label>
+                <input type="number" name="persentage_cess" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
 
@@ -106,9 +110,15 @@
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
             </div>
+        </div>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="0.00" oninput="calculate()" required>
+            </div>
             <div>
                 <label>Less :Mat Credit Utilized:</label>
-                <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
+                <input type="number" name="mat_credit_utilized" step="any" value="0.00" oninput="calculate()" required>
             </div>
             <div>
                 <label>Add :Interest 234c:</label>
@@ -163,16 +173,9 @@
     </form>
 </div>
 
+{% endblock %}
+
 {% block extra_js %}
 <script src="{{ url_for('static', filename='js/ao_calc.js') }}"></script>
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
-{% endblock %}
-
-
-<script>
-    function showSuccessMessage() {
-        alert("Form submitted successfully!");
-        return true;
-    }
-</script>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/add_cit.html b/templates/add_cit.html
index 4986fd1..5d1630d 100644
--- a/templates/add_cit.html
+++ b/templates/add_cit.html
@@ -8,7 +8,6 @@
 {% endblock %}
 {% block content %}
 <div class="container">
-
     <h2 style="text-align:center;">New CIT Form </h2>
     <form id="cit" method="POST">
         <div class="form-group full-width inline-2">
@@ -17,13 +16,13 @@
                 <select id="year" name="year" required></select>
                 <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Gross Total Income:</label>
                 <input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>Add :Disallowance u/s 14A:</label>
                 <input type="number" name="disallowance_14a" step="any" value="0.00" oninput="calculate()" required>
@@ -44,25 +43,25 @@
                 <label>Deduction 80IA Misc:</label>
                 <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>Deduction 80IA Other Operating Revenue:</label>
                 <input type="number" name="deduction_80ia_other" step="any" value="0.00" oninput="calculate()" required>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Deduction Sec 37 Disallowance:</label>
                 <input type="number" name="deduction_sec37_disallowance" step="any" value="0.00" oninput="calculate()"
                     required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>Less: Deduction 80G: </label>
                 <input type="number" name="deduction_80g" step="any" value="0.00" oninput="calculate()" required>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Net Taxable Income:</label>
                 <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
@@ -78,11 +77,10 @@
                 <label>Tax @ 18.5% on Book Profit (B):</label>
                 <input type="number" name="tax_book_profit_18_5" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
-
-        <div class="form-group">
-            <label>Tax Payable (Higher of A or B):</label>
-            <input type="number" name="tax_payable" class="auto" step="any" value="0.00" readonly>
+            <div>
+                <label>Tax Payable (Higher of A or B):</label>
+                <input type="number" name="tax_payable" class="auto" step="any" value="0.00" readonly>
+            </div>
         </div>
 
         <div class="form-group full-width inline-2">
@@ -92,15 +90,20 @@
             </div>
             <div>
                 <label>Surcharge:</label>
-                <input type="number" name="surcharge_12" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge" class="auto" value="0.00" readonly>
             </div>
+            <div>
+                <label>Enter Percentage (%) Cess:</label>
+                <input type="number" name="persentage_cess" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="0.00" readonly>
+            </div>
+
         </div>
 
         <div class="form-group full-width inline-2">
-            <div>
-                <label>Education Cess @ 3%:</label>
-                <input type="number" name="edu_cess_3" class="auto" step="any" value="0.00" readonly>
-            </div>
             <div>
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
@@ -109,8 +112,12 @@
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Mat Credit Utilized:</label>
-                <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Mat Credit Utilized:</label>
+                <input type="number" name="mat_credit_utilized" step="any" value="0.00" oninput="calculate()" required>
             </div>
             <div>
                 <label>Add :Interest 234c:</label>
@@ -123,13 +130,13 @@
                 <label>Total Tax:</label>
                 <input type="number" name="total_tax" step="any" class="auto" value="0.00" readonly>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Advance Tax:</label>
                 <input type="number" name="advance_tax" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>TDS :</label>
                 <input type="number" name="tds" step="any" value="0.00" oninput="calculate()" required>
@@ -138,7 +145,6 @@
                 <label>TCS :</label>
                 <input type="number" name="tcs" step="any" value="0.00" oninput="calculate()" required>
             </div>
-
         </div>
 
         <div class="form-group full-width inline-2">
@@ -150,7 +156,6 @@
                 <label>Tax on Regular Assessment:</label>
                 <input type="number" name="tax_on_assessment" step="any" value="0.00" oninput="calculate()">
             </div>
-
         </div>
         <div class="form-group">
             <label>Refund:</label>
diff --git a/templates/add_itat.html b/templates/add_itat.html
index 4b26648..8d32c71 100644
--- a/templates/add_itat.html
+++ b/templates/add_itat.html
@@ -9,9 +9,7 @@
 
 {% block content %}
 <div class="container">
-
     <h2 style="text-align:center;">New Income Tax Appellate Tribunal Form</h2>
-
     <form id="itat" method="POST" onsubmit="return showSuccessMessage()">
 
         <div class="form-group full-width inline-2">
@@ -20,13 +18,13 @@
                 <select id="year" name="year" required></select>
                 <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Gross Total Income:</label>
                 <input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>Add :Disallowance u/s 14A:</label>
                 <input type="number" name="disallowance_14a" step="any" value="0.00" oninput="calculate()" required>
@@ -39,33 +37,35 @@
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Deduction 80IA Business Income:</label>
+                <label>Less :Deduction 80IA Business Income:</label>
                 <input type="number" name="deduction_80ia_business" step="any" value="0.00" oninput="calculate()"
                     required>
             </div>
             <div>
-                <label>Deduction 80IA Misc:</label>
+                <label>Less :Deduction 80IA Misc:</label>
                 <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
             </div>
+            <div>
+                <label>Less :Deduction 80IA Other Operating Revenue:</label>
+                <input type="number" name="deduction_80ia_other" step="any" value="0.00" oninput="calculate()" required>
+            </div>
         </div>
 
+
+
         <div class="form-group full-width inline-2">
             <div>
-                <label>Deduction 80IA Other Operating Revenue:</label>
-                <input type="number" name="deduction_80ia_other" step="any" value="0.00" oninput="calculate()" required>
-            </div>
-            <div>
-                <label>Deduction Sec 37 Disallowance:</label>
+                <label>Less :Deduction Sec 37 Disallowance:</label>
                 <input type="number" name="deduction_sec37_disallowance" step="any" value="0.00" oninput="calculate()"
                     required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>Less: Deduction 80G: </label>
                 <input type="number" name="deduction_80g" step="any" value="0.00" oninput="calculate()" required>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Net Taxable Income:</label>
                 <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
@@ -81,11 +81,10 @@
                 <label>Tax @ 18.5% on Book Profit (B):</label>
                 <input type="number" name="tax_book_profit_18_5" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
-
-        <div class="form-group">
-            <label>Tax Payable (Higher of A or B):</label>
-            <input type="number" name="tax_payable" class="auto" step="any" value="0.00" readonly>
+            <div>
+                <label>Tax Payable (Higher of A or B):</label>
+                <input type="number" name="tax_payable" class="auto" step="any" value="0.00" readonly>
+            </div>
         </div>
 
         <div class="form-group full-width inline-2">
@@ -95,15 +94,20 @@
             </div>
             <div>
                 <label>Surcharge:</label>
-                <input type="number" name="surcharge_12" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge" class="auto" value="0.00" readonly>
+            </div>
+
+            <div>
+                <label>Enter Percentage (%) Cess:</label>
+                <input type="number" name="persentage_cess" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
 
         <div class="form-group full-width inline-2">
-            <div>
-                <label>Education Cess @ 3%:</label>
-                <input type="number" name="edu_cess_3" class="auto" step="any" value="0.00" readonly>
-            </div>
             <div>
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
@@ -112,8 +116,12 @@
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Mat Credit Utilized:</label>
-                <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Mat Credit Utilized:</label>
+                <input type="number" name="mat_credit_utilized" step="any" value="0.00" oninput="calculate()" required>
             </div>
             <div>
                 <label>Add :Interest 234c:</label>
@@ -126,13 +134,13 @@
                 <label>Total Tax:</label>
                 <input type="number" name="total_tax" step="any" class="auto" value="0.00" readonly>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Advance Tax:</label>
                 <input type="number" name="advance_tax" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>TDS :</label>
                 <input type="number" name="tds" step="any" value="0.00" oninput="calculate()" required>
@@ -173,11 +181,4 @@
 {% block extra_js %}
 <script src="{{ url_for('static', filename='js/itr_calc.js') }}"></script>
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
-{% endblock %}
-
-<script>
-    function showSuccessMessage() {
-        alert("Form submitted successfully!");
-        return true;
-    }
-</script>
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/templates/add_itr.html b/templates/add_itr.html
index 35a8e3a..267e5e6 100644
--- a/templates/add_itr.html
+++ b/templates/add_itr.html
@@ -10,7 +10,6 @@
 {% block content %}
 <div class="container">
     <h2 style="text-align:center;">New Income Tax Return Form</h2>
-
     <form id="itr" method="POST">
         <div class="form-group full-width inline-2">
             <div>
@@ -91,21 +90,32 @@
             </div>
             <div>
                 <label>Surcharge:</label>
-                <input type="number" name="surcharge_12" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge" class="auto" value="0.00" readonly>
             </div>
             <div>
-                <label>Education Cess @ 3%:</label>
-                <input type="number" name="edu_cess_3" class="auto" step="any" value="0.00" readonly>
+                <label>Enter Percentage (%) Cess:</label>
+                <input type="number" name="persentage_cess" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess: </label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
+
         <div class="form-group full-width inline-2">
             <div>
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
             </div>
+        </div>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="0.00" oninput="calculate()" required>
+            </div>
             <div>
                 <label>Less :Mat Credit Utilized:</label>
-                <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
+                <input type="number" name="mat_credit_utilized" step="any" value="0.00" oninput="calculate()" required>
             </div>
             <div>
                 <label>Add :Interest 234c:</label>
diff --git a/templates/ao_reports.html b/templates/ao_reports.html
index 44a45f1..cea0f14 100644
--- a/templates/ao_reports.html
+++ b/templates/ao_reports.html
@@ -7,29 +7,18 @@
 {% endblock %}
 
 {% block content %}
-<div class="main">
-    <div class="container">
-
-        <h2>Download AO Report</h2>
-
-        <form method="GET" action="{{ url_for('ao_report') }}" target="_blank">
-
-            <label for="year">Select Year:</label><br>
-
-            <select name="year" id="year" required>
-                <option value="">-- Select Year --</option>
-                {% for y in years %}
-                <option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option>
-                {% endfor %}
-            </select>
-
-            <br>
-
-            <button type="submit">Download Excel</button>
-
-        </form>
-
-    </div>
+<div class="container">
+    <h2>Download AO Report</h2>
+    <form method="GET" action="{{ url_for('ao_report') }}" target="_blank">
+        <label for="year">Select Year:</label><br>
+        <select name="year" id="year" required>
+            <option value="">-- Select Year --</option>
+            {% for y in years %}
+            <option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option>
+            {% endfor %}
+        </select>
+        <br>
+        <button type="submit">Download Excel</button>
+    </form>
 </div>
-
 {% endblock %}
\ No newline at end of file
diff --git a/templates/cit_reports.html b/templates/cit_reports.html
index fafbc20..be2e1c1 100644
--- a/templates/cit_reports.html
+++ b/templates/cit_reports.html
@@ -7,28 +7,18 @@
 {% endblock %}
 
 {% block content %}
-<div class="main">
-    <div class="container">
-
-        <h2>Download CIT Report</h2>
-
-        <form method="GET" action="{{ url_for('cit_report') }}" target="_blank">
-
-            <label for="year">Select Year:</label><br>
-
-            <select name="year" id="year" required>
-                <option value="">-- Select Year --</option>
-                {% for y in years %}
-                <option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option>
-                {% endfor %}
-            </select>
-
-            <br>
-            <button type="submit">Download Excel</button>
-
-        </form>
-
-    </div>
+<div class="container">
+    <h2>Download CIT Report</h2>
+    <form method="GET" action="{{ url_for('cit_report') }}" target="_blank">
+        <label for="year">Select Year:</label><br>
+        <select name="year" id="year" required>
+            <option value="">-- Select Year --</option>
+            {% for y in years %}
+            <option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option>
+            {% endfor %}
+        </select>
+        <br>
+        <button type="submit">Download Excel</button>
+    </form>
 </div>
-
 {% endblock %}
\ No newline at end of file
diff --git a/templates/display_ao.html b/templates/display_ao.html
index d5c9075..cdd2799 100644
--- a/templates/display_ao.html
+++ b/templates/display_ao.html
@@ -1,15 +1,13 @@
 {% extends "base.html" %}
-
 {% block title %}AO Records{% endblock %}
 
-{% block content %}
-
-<!-- Load only display_itr CSS -->
+{% block extra_css %}
 <link rel="stylesheet" href="{{ url_for('static', filename='css/display_model.css') }}">
+{% endblock %}
+
+{% block content %}
 <div class="container">
-
     <h2 style="text-align: center;">Assessing Officer Records 👨‍💼</h2>
-
     <!-- Add AO Record Button -->
     <div style="text-align: right; margin-bottom: 10px;">
         <a href="{{ url_for('add_ao') }}" class="btn btn-add">➕ Add AO Record</a>
diff --git a/templates/display_cit.html b/templates/display_cit.html
index 0de9802..fd5f2fe 100644
--- a/templates/display_cit.html
+++ b/templates/display_cit.html
@@ -1,57 +1,56 @@
 {% extends "base.html" %}
-
 {% block title %}CIT Records{% endblock %}
 
+{% block extra_css %}
+<link rel="stylesheet" href="{{ url_for('static', filename='css/display_model.css') }}">
+{% endblock %}
 
 {% block content %}
-<!-- Load only display_itr CSS -->
-<link rel="stylesheet" href="{{ url_for('static', filename='css/display_model.css') }}">
-<div class="main">
-    <div class="container">
 
-        <h2 style="text-align: center;">CIT Records🧾</h2>
-        <div style="text-align: right; margin-bottom: 10px;">
-            <a href="{{ url_for('add_cit') }}" class="btn btn-add">➕ Add New Record</a>
-        </div>
-        {% if cit_records %}
-        <div class="table-wrapper">
-            <table>
-                <thead>
-                    <tr>
-                        <th>Year</th>
-                        <th>Gross Total Income</th>
-                        <th>Net Taxable Income</th>
-                        <th>Total Tax Payable</th>
-                        <th>Refund</th>
-                        <th>Actions</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for record in cit_records %}
-                    <tr>
-                        <td>AY {{ record.year }}-{{ record.year+1 }}</td>
-                        <td>{{ "{:,.2f}".format(record.gross_total_income) }}</td>
-                        <td>{{ "{:,.2f}".format(record.net_taxable_income) }}</td>
-                        <td>{{ "{:,.2f}".format(record.total_tax_payable) }}</td>
-                        <td>{{ "{:,.2f}".format(record.refund) }}</td>
-                        <td class="action-cell">
-                            <a href="{{ url_for('update_cit', id=record.id) }}" class="btn btn-update">Edit</a>
-                            <form action="{{ url_for('delete_cit', id=record.id) }}" method="post"
-                                onsubmit="return confirm('Are you sure you want to delete this record?');">
-                                <button type="submit" class="btn btn-delete">Delete</button>
-                            </form>
-                        </td>
-                    </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-        </div>
-
-        {% else %}
-        <p style="text-align: center; margin-top: 20px;" class="no-record">
-            No records found. Click the button above to add one!
-        </p>
-        {% endif %}
+<div class="container">
+    <h2 style="text-align: center;">CIT Records🧾</h2>
+    <div style="text-align: right; margin-bottom: 10px;">
+        <a href="{{ url_for('add_cit') }}" class="btn btn-add">➕ Add New Record</a>
     </div>
+    {% if cit_records %}
+    <div class="table-wrapper">
+        <table>
+            <thead>
+                <tr>
+                    <th>Year</th>
+                    <th>Gross Total Income</th>
+                    <th>Net Taxable Income</th>
+                    <th>Total Tax Payable</th>
+                    <th>Refund</th>
+                    <th>Actions</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for record in cit_records %}
+                <tr>
+                    <td>AY {{ record.year }}-{{ record.year+1 }}</td>
+                    <td>{{ "{:,.2f}".format(record.gross_total_income) }}</td>
+                    <td>{{ "{:,.2f}".format(record.net_taxable_income) }}</td>
+                    <td>{{ "{:,.2f}".format(record.total_tax_payable) }}</td>
+                    <td>{{ "{:,.2f}".format(record.refund) }}</td>
+                    <td class="action-cell">
+                        <a href="{{ url_for('update_cit', id=record.id) }}" class="btn btn-update">Edit</a>
+                        <form action="{{ url_for('delete_cit', id=record.id) }}" method="post"
+                            onsubmit="return confirm('Are you sure you want to delete this record?');">
+                            <button type="submit" class="btn btn-delete">Delete</button>
+                        </form>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+
+    {% else %}
+    <p style="text-align: center; margin-top: 20px;" class="no-record">
+        No records found. Click the button above to add one!
+    </p>
+    {% endif %}
 </div>
+
 {% endblock %}
\ No newline at end of file
diff --git a/templates/display_itat.html b/templates/display_itat.html
index e1f5a1f..26cb4f5 100644
--- a/templates/display_itat.html
+++ b/templates/display_itat.html
@@ -2,62 +2,58 @@
 
 {% block title %}ITAT Records{% endblock %}
 
-<!-- Load page-specific CSS -->
 {% block extra_css %}
 <link rel="stylesheet" href="{{ url_for('static', filename='css/display_model.css') }}">
 {% endblock %}
 
 {% block content %}
-<div class="main">
-    <div class="container">
+<div class="container">
+    <h2 style="text-align: center;">Income Tax Appellate Tribunal Records 📄</h2>
+    <div style="text-align: right; margin-bottom: 10px;">
 
-        <h2 style="text-align: center;">Income Tax Appellate Tribunal Records 📄</h2>
-        <div style="text-align: right; margin-bottom: 10px;">
+        <a href="{{ url_for('add_itat') }}" class="btn btn-add">➕ Add New Record</a>
 
-            <a href="{{ url_for('add_itat') }}" class="btn btn-add">➕ Add New Record</a>
+        <!-- TABLE -->
+        {% if records %}
+        <div class="table-wrapper">
+            <table>
+                <thead>
+                    <tr>
+                        <th>Year</th>
+                        <th>MAT Tax Credit</th>
+                        <th>Surcharge</th>
+                        <th>Cess</th>
+                        <th>Total Credit</th>
+                        <th>Actions</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for record in records %}
+                    <tr>
+                        <td>AY {{ record.year }}-{{ record.year+1 }}</td>
+                        <td>{{ "{:,.2f}".format(record.gross_total_income) }}</td>
+                        <td>{{ "{:,.2f}".format(record.net_taxable_income) }}</td>
+                        <td>{{ "{:,.2f}".format(record.total_tax_payable) }}</td>
+                        <td>{{ "{:,.2f}".format(record.refund) }}</td>
 
-            <!-- TABLE -->
-            {% if records %}
-            <div class="table-wrapper">
-                <table>
-                    <thead>
-                        <tr>
-                            <th>Year</th>
-                            <th>MAT Tax Credit</th>
-                            <th>Surcharge</th>
-                            <th>Cess</th>
-                            <th>Total Credit</th>
-                            <th>Actions</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for record in records %}
-                        <tr>
-                            <td>AY {{ record.year }}-{{ record.year+1 }}</td>
-                            <td>{{ "{:,.2f}".format(record.gross_total_income) }}</td>
-                            <td>{{ "{:,.2f}".format(record.net_taxable_income) }}</td>
-                            <td>{{ "{:,.2f}".format(record.total_tax_payable) }}</td>
-                            <td>{{ "{:,.2f}".format(record.refund) }}</td>
-
-                            <td class="action-cell">
-                                <a href="{{ url_for('update_itat', id=record.id) }}" class="btn btn-update">Edit</a>
-
-                                <form action="{{ url_for('delete_itat', id=record.id) }}" method="post"
-                                    onsubmit="return confirm('Are you sure you want to delete this record?');">
-                                    <button type="submit" class="btn btn-delete">Delete</button>
-                                </form>
-                            </td>
-                        </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-
-            {% else %}
-            <p class="no-record">No ITAT records found. Click the button above to add one!</p>
-            {% endif %}
+                        <td class="action-cell">
+                            <a href="{{ url_for('update_itat', id=record.id) }}" class="btn btn-update">Edit</a>
 
+                            <form action="{{ url_for('delete_itat', id=record.id) }}" method="post"
+                                onsubmit="return confirm('Are you sure you want to delete this record?');">
+                                <button type="submit" class="btn btn-delete">Delete</button>
+                            </form>
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
         </div>
+
+        {% else %}
+        <p class="no-record">No ITAT records found. Click the button above to add one!</p>
+        {% endif %}
+
     </div>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/display_itr.html b/templates/display_itr.html
index 9d635e2..9a8e774 100644
--- a/templates/display_itr.html
+++ b/templates/display_itr.html
@@ -1,14 +1,12 @@
 {% extends "base.html" %}
-
 {% block title %}ITR Records{% endblock %}
 
-{% block content %}
-<!-- Load only display_itr CSS -->
+{% block extra_css %}
 <link rel="stylesheet" href="{{ url_for('static', filename='css/display_model.css') }}">
+{% endblock %}
 
-
+{% block content %}
 <div class="container">
-
     <h2>Income Tax Return Records 🧾</h2>
     <div style="text-align: right; margin-bottom: 10px;">
         <a href="{{ url_for('add_itr') }}" class="btn btn-add">➕ Add New Record</a>
diff --git a/templates/itat_reports.html b/templates/itat_reports.html
index 4b3614d..d4d7776 100644
--- a/templates/itat_reports.html
+++ b/templates/itat_reports.html
@@ -7,25 +7,18 @@
 {% endblock %}
 
 {% block content %}
-<div class="main">
-    <div class="container">
-
-        <h2>Download ITAT Report</h2>
-        <form method="GET" action="{{ url_for('itat_report') }}" target="_blank">
-
-            <label for="year">Select Year:</label><br>
-            <select name="year" id="year" required>
-                <option value="">-- Select Year --</option>
-                {% for y in years %}
-                <option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option>
-                {% endfor %}
-            </select>
-            <br>
-            <button type="submit">Download Excel</button>
-
-        </form>
-    </div>
+<div class="container">
+    <h2>Download ITAT Report</h2>
+    <form method="GET" action="{{ url_for('itat_report') }}" target="_blank">
+        <label for="year">Select Year:</label><br>
+        <select name="year" id="year" required>
+            <option value="">-- Select Year --</option>
+            {% for y in years %}
+            <option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option>
+            {% endfor %}
+        </select>
+        <br>
+        <button type="submit">Download Excel</button>
+    </form>
 </div>
-
-
 {% endblock %}
\ No newline at end of file
diff --git a/templates/itr_reports.html b/templates/itr_reports.html
index 36675a5..0698681 100644
--- a/templates/itr_reports.html
+++ b/templates/itr_reports.html
@@ -7,27 +7,18 @@
 {% endblock %}
 
 {% block content %}
-<div class="main">
-    <div class="container">
-
-        <h2>Download ITR Report</h2>
-        <form method="GET" action="{{ url_for('itr_report') }}" target="_blank">
-
-            <label for="year">Select Year:</label><br>
-            <select name="year" id="year" required>
-                <option value="">-- Select Year --</option>
-                {% for y in years %}
-                <option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option>
-                {% endfor %}
-            </select>
-
-            <br>
-            <button type="submit">
-                Download Excel
-            </button>
-
-        </form>
-    </div>
+<div class="container">
+    <h2>Download ITR Report</h2>
+    <form method="GET" action="{{ url_for('itr_report') }}" target="_blank">
+        <label for="year">Select Year:</label><br>
+        <select name="year" id="year" required>
+            <option value="">-- Select Year --</option>
+            {% for y in years %}
+            <option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option>
+            {% endfor %}
+        </select>
+        <br>
+        <button type="submit">Download Excel</button>
+    </form>
 </div>
-
 {% endblock %}
\ No newline at end of file
diff --git a/templates/mat_credit.html b/templates/mat_credit.html
index 6e8ac91..92b0e9f 100644
--- a/templates/mat_credit.html
+++ b/templates/mat_credit.html
@@ -9,7 +9,7 @@
 {% block content %}
 <div class="container">
     <div class="container">
-
+        <h2 style="text-align:center;">MAT Credit and Utilization Records</h2>
         <!-- YEAR ADD CONTROLS -->
         <div class="year-controls">
             <select id="yearSelect">
diff --git a/templates/reports.html b/templates/reports.html
index 6663f28..2e7333c 100644
--- a/templates/reports.html
+++ b/templates/reports.html
@@ -5,15 +5,13 @@
 <link rel="stylesheet" href="{{ url_for('static', filename='css/report.css') }}">
 {% endblock %}
 {% block content %}
-<div class="main">
-    <div class="container">
-        <h2>Reports</h2>
-        <ul>
-            <li><a href="{{ url_for('itr_report') }}">→ View ITR Reports</a></li>
-            <li><a href="{{ url_for('ao_report') }}">→ View AO Reports</a></li>
-            <li><a href="{{ url_for('cit_report') }}">→ View CIT Reports</a></li>
-            <li><a href="{{ url_for('itat_report') }}">→ View ITAT Reports</a></li>
-        </ul>
-    </div>
+<div class="container">
+    <h2>Reports</h2>
+    <ul>
+        <li><a href="{{ url_for('itr_report') }}">→ View ITR Reports</a></li>
+        <li><a href="{{ url_for('ao_report') }}">→ View AO Reports</a></li>
+        <li><a href="{{ url_for('cit_report') }}">→ View CIT Reports</a></li>
+        <li><a href="{{ url_for('itat_report') }}">→ View ITAT Reports</a></li>
+    </ul>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/summary_reports.html b/templates/summary_reports.html
index b5c594f..def7dd6 100644
--- a/templates/summary_reports.html
+++ b/templates/summary_reports.html
@@ -8,28 +8,25 @@
 {% endblock %}
 
 {% block content %}
-<div class="main">
-    <div class="container">
-        <h2>Download Year-wise Summary Report</h2>
+<div class="container">
+    <h2>Download Year-wise Summary Report</h2>
 
-        {% if message %}
-        <p class="message">{{ message }}</p>
-        {% endif %}
+    {% if message %}
+    <p class="message">{{ message }}</p>
+    {% endif %}
 
-        <form method="GET" action="{{ url_for('summary_report') }}">
-            <label>Select Year:</label>
-            <select name="year" id="year" required>
-                <option value="">-- Select Year --</option>
-                {% for year in years %}
-                <option value="{{ year }}">AY {{ year }}-{{ year + 1 }}</option>
-                {% endfor %}
-            </select>
+    <form method="GET" action="{{ url_for('summary_report') }}">
+        <label>Select Year:</label>
+        <select name="year" id="year" required>
+            <option value="">-- Select Year --</option>
+            {% for year in years %}
+            <option value="{{ year }}">AY {{ year }}-{{ year + 1 }}</option>
+            {% endfor %}
+        </select>
 
-            <button type="submit">Download Summary Report</button>
-        </form>
+        <button type="submit">Download Summary Report</button>
+    </form>
 
-    </div>
 </div>
 
-
 {% endblock %}
\ No newline at end of file
diff --git a/templates/update_ao.html b/templates/update_ao.html
index 35895da..9229ffa 100644
--- a/templates/update_ao.html
+++ b/templates/update_ao.html
@@ -8,11 +8,8 @@
 
 {% block content %}
 <div class="container">
-
     <h2>Update AO Record for Year {{ record.year }}--{{ record.year + 1 }}</h2>
-
     <form method="POST" action="{{ url_for('update_ao', id=record.id) }}">
-
         <div class="form-group full-width inline-2">
             <div>
                 <label>Year:</label>
@@ -57,7 +54,6 @@
         </div>
 
         <div class="form-group full-width inline-2">
-
             <div>
                 <label>Less :Deduction Sec 37 Disallowance:</label>
                 <input type="number" name="deduction_sec37_disallowance" step="any"
@@ -76,7 +72,6 @@
                 value="{{ record.net_taxable_income}}" readonly>
         </div>
 
-
         <div class=" form-group full-width inline-2">
             <div>
                 <label>Tax @ 30% (A):</label>
@@ -95,36 +90,32 @@
             </div>
         </div>
 
-
-
         <div class="form-group full-width inline-2">
-            <div>
-                <label>Enter Percentage (%) Surcharge:</label>
-                <input type="number" name="persentage" step="any" value="{{ record.persentage}}" oninput="calculate()">
-            </div>
             <div>
                 <label>Surcharge:</label>
-                <input type="number" name="surcharge_12" class="auto" value="{{ record.surcharge_12}}" readonly>
+                <input type="number" name="surcharge" class="auto" value="{{ record.surcharge}}" readonly>
             </div>
-
             <div>
-                <label>Education Cess @ 3%:</label>
-                <input type="number" name="edu_cess_3" class="auto" step="any" value="{{ record.edu_cess_3}}" readonly>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="{{ record.edu_cess}}" readonly>
             </div>
         </div>
 
         <div class="form-group full-width inline-2">
-
             <div>
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any"
                     value="{{ record.total_tax_payable}}" readonly>
             </div>
-
+            <div>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="{{ record.mat_credit_created }}"
+                    oninput="calculate()" required>
+            </div>
             <div>
                 <label>Less :Mat Credit Utilized:</label>
-                <input type="number" name="mat_credit" step="any" value="{{ record.mat_credit}}" oninput="calculate()"
-                    required>
+                <input type="number" name="mat_credit_utilized" step="any" value="{{ record.mat_credit_utilized }}"
+                    oninput="calculate()" required>
             </div>
             <div>
                 <label>Add :Interest 234c:</label>
@@ -154,7 +145,6 @@
                 <label>TCS :</label>
                 <input type="number" name="tcs" step="any" value="{{ record.tcs}}" oninput="calculate()" required>
             </div>
-
         </div>
 
         <div class="form-group full-width inline-2">
@@ -167,7 +157,6 @@
                 <input type="number" name="tax_on_assessment" step="any" value="{{ record.tax_on_assessment}}"
                     oninput="calculate()" required>
             </div>
-
         </div>
 
         <div class="form-group">
diff --git a/templates/update_cit.html b/templates/update_cit.html
index 961ad6b..2495d77 100644
--- a/templates/update_cit.html
+++ b/templates/update_cit.html
@@ -9,25 +9,171 @@
 {% block content %}
 
 <div class="container">
-
     <h2>Update CIT Record for AY {{ record.year }}</h2>
-
     <form method="POST" action="{{ url_for('update_cit', id=record.id) }}">
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Year:</label>
+                <input type="tex" name="year" value="{{record.year}}" class="auto" readonly>
+            </div>
+        </div>
 
-        <label for="year">Year:</label>
-        <input type="text" id="year" name="year" value="{{ record.year }}" readonly class="readonly-field">
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Gross Total Income:</label>
+                <input type="number" name="gross_total_income" step="any" value="{{ record.gross_total_income}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Disallowance u/s 14A:</label>
+                <input type="number" name="disallowance_14a" step="any" value="{{ record.disallowance_14a}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Disallowance u/s 37:</label>
+                <input type="number" name="disallowance_37" step="any" value="{{ record.disallowance_37}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
 
-        {% for field in record.keys() if field not in ['id', 'year','Remarks'] %}
-        <label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>
-        <input type="number" id="{{ field }}" name="{{ field }}" step="any" value="{{ record[field] }}" required>
-        {% endfor %}
-        <label for="Remarks">Remarks:</label>
-        <input type="text" id="Remarks" name="Remarks" value="{{ record.Remarks }}">
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Less :Deduction 80IA Business Income:</label>
+                <input type="number" name="deduction_80ia_business" step="any"
+                    value="{{ record.deduction_80ia_business}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Deduction 80IA Misc:</label>
+                <input type="number" name="deduction_80ia_misc" step="any" value="{{ record.deduction_80ia_misc}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Deduction 80IA Other Operating Revenue:</label>
+                <input type="number" name="deduction_80ia_other" step="any" value="{{ record.deduction_80ia_other}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Less :Deduction Sec 37 Disallowance:</label>
+                <input type="number" name="deduction_sec37_disallowance" step="any"
+                    value="{{ record.deduction_sec37_disallowance}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less: Deduction 80G: </label>
+                <input type="number" name="deduction_80g" step="any" value="{{ record.deduction_80g}}"
+                    oninput="calculate()" required>
+            </div>
+
+        </div>
+        <div class=" form-group">
+            <label>Net Taxable Income:</label>
+            <input type="number" name="net_taxable_income" class="auto" step="any"
+                value="{{ record.net_taxable_income}}" readonly>
+        </div>
+
+
+        <div class=" form-group full-width inline-2">
+            <div>
+                <label>Tax @ 30% (A):</label>
+                <input type="number" name="tax_30_percent" step="any" value="{{ record.tax_30_percent}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax @ 18.5% on Book Profit (B):</label>
+                <input type="number" name="tax_book_profit_18_5" step="any" value="{{ record.tax_book_profit_18_5}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax Payable (Higher of A or B):</label>
+                <input type="number" name="tax_payable" class="auto" step="any" value="{{ record.tax_payable}}"
+                    readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Surcharge:</label>
+                <input type="number" name="surcharge" class="auto" value="{{ record.surcharge}}" readonly>
+            </div>
+            <div>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="{{ record.edu_cess}}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Total tax Payable:</label>
+                <input type="number" name="total_tax_payable" class="auto" step="any"
+                    value="{{ record.total_tax_payable}}" readonly>
+            </div>
+            <div>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="{{ record.mat_credit_created }}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Mat Credit Utilized:</label>
+                <input type="number" name="mat_credit_utilized" step="any" value="{{ record.mat_credit_utilized }}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Interest 234c:</label>
+                <input type="number" name="interest_234c" step="any" value="{{ record.interest_234c}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Total Tax:</label>
+                <input type="number" name="total_tax" step="any" class="auto" value="{{ record.total_tax}}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Advance Tax:</label>
+                <input type="number" name="advance_tax" step="any" value="{{ record.advance_tax}}" oninput="calculate()"
+                    required>
+            </div>
+            <div>
+                <label>TDS :</label>
+                <input type="number" name="tds" step="any" value="{{ record.tds}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>TCS :</label>
+                <input type="number" name="tcs" step="any" value="{{ record.tcs}}" oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>SAT :</label>
+                <input type="number" name="sat" step="any" value="{{ record.sat}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax on Regular Assessment:</label>
+                <input type="number" name="tax_on_assessment" step="any" value="{{ record.tax_on_assessment}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Refund:</label>
+            <input type="number" name="refund" class="auto" step="any" value="{{ record.refund}}" readonly>
+        </div>
+
+        <div class="form-group">
+            <label>Remarks:</label>
+            <input type="text" name="Remarks" value="{{ record.Remarks}}">
+        </div>
 
         <button type="submit">Update Record</button>
 
     </form>
-
 </div>
 
 {% endblock %}
\ No newline at end of file
diff --git a/templates/update_itat.html b/templates/update_itat.html
index 12a6d73..bd874fe 100644
--- a/templates/update_itat.html
+++ b/templates/update_itat.html
@@ -7,25 +7,169 @@
 {% block content %}
 
 <div class="container">
-
     <h2>Update ITAT Record for Year {{ record.year }}</h2>
-
     <form method="POST" action="{{ url_for('update_itat', id=record.id) }}">
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Year:</label>
+                <input type="tex" name="year" value="{{record.year}}" class="auto" readonly>
+            </div>
+        </div>
 
-        <label for="year">Year:</label>
-        <input type="text" id="year" name="year" value="{{ record.year }}" readonly class="readonly-field">
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Gross Total Income:</label>
+                <input type="number" name="gross_total_income" step="any" value="{{ record.gross_total_income}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Disallowance u/s 14A:</label>
+                <input type="number" name="disallowance_14a" step="any" value="{{ record.disallowance_14a}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Disallowance u/s 37:</label>
+                <input type="number" name="disallowance_37" step="any" value="{{ record.disallowance_37}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
 
-        {% for field in record.keys() if field not in ['id', 'year', 'Remarks'] %}
-        <label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>
-        <input type="number" id="{{ field }}" name="{{ field }}" step="any" value="{{ record[field] }}" required>
-        {% endfor %}
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Less :Deduction 80IA Business Income:</label>
+                <input type="number" name="deduction_80ia_business" step="any"
+                    value="{{ record.deduction_80ia_business}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Deduction 80IA Misc:</label>
+                <input type="number" name="deduction_80ia_misc" step="any" value="{{ record.deduction_80ia_misc}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Deduction 80IA Other Operating Revenue:</label>
+                <input type="number" name="deduction_80ia_other" step="any" value="{{ record.deduction_80ia_other}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
 
-        <label for="Remarks">Remarks:</label>
-        <input type="text" id="Remarks" name="Remarks" value="{{ record.Remarks }}">
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Less :Deduction Sec 37 Disallowance:</label>
+                <input type="number" name="deduction_sec37_disallowance" step="any"
+                    value="{{ record.deduction_sec37_disallowance}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less: Deduction 80G: </label>
+                <input type="number" name="deduction_80g" step="any" value="{{ record.deduction_80g}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
+        <div class=" form-group">
+            <label>Net Taxable Income:</label>
+            <input type="number" name="net_taxable_income" class="auto" step="any"
+                value="{{ record.net_taxable_income}}" readonly>
+        </div>
+
+
+        <div class=" form-group full-width inline-2">
+            <div>
+                <label>Tax @ 30% (A):</label>
+                <input type="number" name="tax_30_percent" step="any" value="{{ record.tax_30_percent}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax @ 18.5% on Book Profit (B):</label>
+                <input type="number" name="tax_book_profit_18_5" step="any" value="{{ record.tax_book_profit_18_5}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax Payable (Higher of A or B):</label>
+                <input type="number" name="tax_payable" class="auto" step="any" value="{{ record.tax_payable}}"
+                    readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Surcharge:</label>
+                <input type="number" name="surcharge" class="auto" value="{{ record.surcharge}}" readonly>
+            </div>
+            <div>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="{{ record.edu_cess}}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Total tax Payable:</label>
+                <input type="number" name="total_tax_payable" class="auto" step="any"
+                    value="{{ record.total_tax_payable}}" readonly>
+            </div>
+            <div>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="{{ record.mat_credit_created }}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Mat Credit Utilized:</label>
+                <input type="number" name="mat_credit_utilized" step="any" value="{{ record.mat_credit_utilized }}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Interest 234c:</label>
+                <input type="number" name="interest_234c" step="any" value="{{ record.interest_234c}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Total Tax:</label>
+                <input type="number" name="total_tax" step="any" class="auto" value="{{ record.total_tax}}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Advance Tax:</label>
+                <input type="number" name="advance_tax" step="any" value="{{ record.advance_tax}}" oninput="calculate()"
+                    required>
+            </div>
+            <div>
+                <label>TDS :</label>
+                <input type="number" name="tds" step="any" value="{{ record.tds}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>TCS :</label>
+                <input type="number" name="tcs" step="any" value="{{ record.tcs}}" oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>SAT :</label>
+                <input type="number" name="sat" step="any" value="{{ record.sat}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax on Regular Assessment:</label>
+                <input type="number" name="tax_on_assessment" step="any" value="{{ record.tax_on_assessment}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Refund:</label>
+            <input type="number" name="refund" class="auto" step="any" value="{{ record.refund}}" readonly>
+        </div>
+
+        <div class="form-group">
+            <label>Remarks:</label>
+            <input type="text" name="Remarks" value="{{ record.remarks}}">
+        </div>
 
         <button type="submit">Update Record</button>
     </form>
-
 </div>
 
 {% endblock %}
\ No newline at end of file
diff --git a/templates/update_itr.html b/templates/update_itr.html
index 1e2309c..ff4ebf6 100644
--- a/templates/update_itr.html
+++ b/templates/update_itr.html
@@ -8,11 +8,8 @@
 
 {% block content %}
 <div class="container">
-
     <h2>Update ITR Record for Year {{record.year}} - {{record.year+1}}</h2>
-
     <form method="POST" action="{{ url_for('update_itr', id=record.id) }}">
-
         <div class="form-group full-width inline-2">
             <div>
                 <label>Year:</label>
@@ -56,8 +53,6 @@
             </div>
         </div>
 
-
-
         <div class="form-group full-width inline-2">
             <div>
                 <label>Less :Deduction Sec 37 Disallowance:</label>
@@ -97,20 +92,14 @@
             </div>
         </div>
 
-
-
         <div class="form-group full-width inline-2">
-            <div>
-                <label>Enter Percentage (%) Surcharge:</label>
-                <input type="number" name="persentage" step="any" value="{{ record.persentage }}" oninput="calculate()">
-            </div>
             <div>
                 <label>Surcharge:</label>
-                <input type="number" name="surcharge_12" class="auto" value="{{ record.surcharge_12 }}" readonly>
+                <input type="number" name="surcharge" class="auto" value="{{ record.surcharge }}" readonly>
             </div>
             <div>
-                <label>Education Cess @ 3%:</label>
-                <input type="number" name="edu_cess_3" class="auto" step="any" value="{{ record.edu_cess_3 }}" readonly>
+                <label>Education Cess :</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="{{ record.edu_cess }}" readonly>
             </div>
         </div>
 
@@ -120,10 +109,15 @@
                 <input type="number" name="total_tax_payable" class="auto" step="any"
                     value="{{ record.total_tax_payable }}" readonly>
             </div>
+            <div>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="{{ record.mat_credit_created }}"
+                    oninput="calculate()" required>
+            </div>
             <div>
                 <label>Less :Mat Credit Utilized:</label>
-                <input type="number" name="mat_credit" step="any" value="{{ record.mat_credit }}" oninput="calculate()"
-                    required>
+                <input type="number" name="mat_credit_utilized" step="any" value="{{ record.mat_credit_utilized }}"
+                    oninput="calculate()" required>
             </div>
             <div>
                 <label>Add :Interest 234c:</label>
@@ -153,7 +147,6 @@
                 <label>TCS :</label>
                 <input type="number" name="tcs" step="any" value="{{ record.tcs }}" oninput="calculate()" required>
             </div>
-
         </div>
 
         <div class="form-group full-width inline-2">
@@ -177,10 +170,9 @@
             <input type="text" name="Remarks" value="{{ record.Remarks }}">
         </div>
         <button type="submit">Update Record</button>
-
     </form>
-
 </div>
+
 {% endblock %}
 {% block extra_js %}
 <script src="{{ url_for('static', filename='js/itr_calc.js') }}"></script>
diff --git a/templates/upload.html b/templates/upload.html
index 665e482..19c2c93 100644
--- a/templates/upload.html
+++ b/templates/upload.html
@@ -7,33 +7,24 @@
 {% endblock %}
 
 {% block content %}
-<div class="main">
-    <div class="container">
+<div class="container">
+    <h2>Upload Income Tax Documents</h2>
+    <form id="income_tax_documents" method="POST" enctype="multipart/form-data">
+        <label>Year:</label>
+        <select id="year" name="year" required></select>
+        <div id="yearError" style="color: red; display: none; margin-bottom: 10px;"></div>
+        <label>Stage:</label>
+        <select name="stage" required>
+            <option value="ITR">ITR</option>
+            <option value="AO">AO</option>
+            <option value="CIT">CIT</option>
+            <option value="ITAT">ITAT</option>
+        </select>
+        <label>Select Documents:</label>
+        <input type="file" name="documents" multiple required>
 
-        <h2>Upload Income Tax Documents</h2>
-
-        <form id="income_tax_documents" method="POST" enctype="multipart/form-data">
-
-            <label>Year:</label>
-            <select id="year" name="year" required></select>
-
-            <div id="yearError" style="color: red; display: none; margin-bottom: 10px;"></div>
-
-            <label>Stage:</label>
-            <select name="stage" required>
-                <option value="ITR">ITR</option>
-                <option value="AO">AO</option>
-                <option value="CIT">CIT</option>
-                <option value="ITAT">ITAT</option>
-            </select>
-
-            <label>Select Documents:</label>
-            <input type="file" name="documents" multiple required>
-
-            <button type="submit">Upload</button>
-        </form>
-
-    </div>
+        <button type="submit">Upload</button>
+    </form>
 </div>
 {% endblock %}
 
diff --git a/templates/view_docs.html b/templates/view_docs.html
index 54b0f66..2e04993 100644
--- a/templates/view_docs.html
+++ b/templates/view_docs.html
@@ -1,83 +1,66 @@
 {% extends "base.html" %}
-
 {% block title %}Document Records{% endblock %}
-
 {% block extra_css %}
 <link rel="stylesheet" href="{{ url_for('static', filename='css/documents.css') }}">
 {% endblock %}
-
 {% block content %}
 
-<div class="main">
-    <div class="container">
+<div class="container">
+    <h2>Document Records</h2>
+    <!-- FILTER FORM -->
+    <form method="GET">
+        <label for="year">Filter by Year:</label>
+        <select name="year">
+            <option value="">All</option>
+            {% for y in years %}
+            <option value="{{ y }}">AY {{ y }}-{{ y+1 }}</option>
+            {% endfor %}
+        </select>
 
-        <h2>Document Records</h2>
-        <!-- FILTER FORM -->
-        <form method="GET">
-            <label for="year">Filter by Year:</label>
-            <select name="year">
-                <option value="">All</option>
-                {% for y in years %}
-                <option value="{{ y }}">AY {{ y }}-{{ y+1 }}</option>
+        <label for="stage">Filter by Stage:</label>
+        <select name="stage">
+            <option value="">All</option>
+            {% set stages = ['ITR','AO','CIT','ITAT'] %}
+            {% for stage in stages %}
+            <option value="{{stage}}">{{stage}}</option>
+            {% endfor %}
+        </select>
+        <button type="submit">Apply</button>
+    </form>
+
+    <!-- DOCUMENT TABLE -->
+    <div class="table-responsive">
+        <table>
+            <thead>
+                <tr>
+                    <th>File</th>
+                    <th>Type</th>
+                    <th>Stage</th>
+                    <th>Year</th>
+                    <th>Uploaded At</th>
+                    <th>Download</th>
+                    <th>View</th>
+                </tr>
+            </thead>
+
+            <tbody>
+                {% for doc in documents %}
+                <tr>
+                    <td>{{ doc.filename }}</td>
+                    <td>{{ doc.filetype }}</td>
+                    <td>{{ doc.stage }}</td>
+                    <td>AY {{ doc.year }}-{{ doc.year +1 }}</td>
+                    <td>{{ doc.uploaded_at }}</td>
+
+                    <td> <a href="{{ url_for('uploaded_file', filename=doc.filename) }}?mode=download">Download</a>
+                    </td>
+
+                    <td><a href="{{ url_for('uploaded_file', filename=doc.filename) }}?mode=view"
+                            target="_blank">View</a></td>
+                </tr>
                 {% endfor %}
-            </select>
-
-            <label for="stage">Filter by Stage:</label>
-            <!-- <select name="stage">
-                <option value="">All</option>
-                <option value="ITR">ITR</option>
-                <option value="AO">AO</option>
-                <option value="CIT">CIT</option>
-                <option value="ITAT">ITAT</option>
-            </select> -->
-
-            <select name="stage">
-                <option value="">All</option>
-                {% set stages = ['ITR','AO','CIT','ITAT'] %}
-                {% for stage in stages %}
-                <option value="{{stage}}">{{stage}}</option>
-                {% endfor %}
-            </select>
-
-            <button type="submit">Apply</button>
-        </form>
-
-        <!-- DOCUMENT TABLE -->
-        <div class="table-responsive">
-            <table>
-                <thead>
-                    <tr>
-                        <th>File</th>
-                        <th>Type</th>
-                        <th>Stage</th>
-                        <th>Year</th>
-                        <th>Uploaded At</th>
-                        <th>Download</th>
-                        <th>View</th>
-                    </tr>
-                </thead>
-
-                <tbody>
-                    {% for doc in documents %}
-                    <tr>
-                        <td>{{ doc.filename }}</td>
-                        <td>{{ doc.filetype }}</td>
-                        <td>{{ doc.stage }}</td>
-                        <td>AY {{ doc.year }}-{{ doc.year +1 }}</td>
-                        <td>{{ doc.uploaded_at }}</td>
-
-                        <td> <a href="{{ url_for('uploaded_file', filename=doc.filename) }}?mode=download">Download/a>
-                        </td>
-
-                        <td><a href="{{ url_for('uploaded_file', filename=doc.filename) }}?mode=view"
-                                target="_blank">View</a></td>
-                    </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-        </div>
-
+            </tbody>
+        </table>
     </div>
 </div>
-
 {% endblock %}
\ No newline at end of file