diff --git a/backend/core/static/js/formHandling.js b/backend/core/static/js/formHandling.js
index 4d42086..a9d6b31 100644
--- a/backend/core/static/js/formHandling.js
+++ b/backend/core/static/js/formHandling.js
@@ -206,7 +206,7 @@ function progressBar() {
         basicBarWrap.classList.remove('d-none');
         advancedProgress.classList.add('d-none');
         advancedBarWrap.classList.add('d-none');
-        if (idxBasic + 1 === basic.length) {
+        if (idxBasic === basic.length) {
             basicProgress.innerHTML = `<span class="text-success fw-bold">Basic question &#10003;</span>`;
             basicBarWrap.classList.add('d-none');
         } else {
diff --git a/backend/core/templates/signup.html b/backend/core/templates/signup.html
index 295b50b..a5a404a 100644
--- a/backend/core/templates/signup.html
+++ b/backend/core/templates/signup.html
@@ -722,28 +722,8 @@
                 </div>
 
 
-
-                <div class="mb-3 question basic-section" id="q14">
-
-
-                    <label class="form-label mt-3">We currently have sufficient information to prepare a basic report. However, providing additional details will help enhance the accuracy and depth of the final report. Would you like to share more information?</label>
-                    <hr>
-                    <div class="text-center">
-                        <div class="text-center pb-3">
-                            <input class="btn btn-warning btn-lg" type="submit" name="half_submit" id="halfsubmit"
-                                   value="Generate report with basic data. ">
-                        </div>
-                    </div>
-                    <small class="form-text text-muted py-3">Click Next if you want to provide more details. Each
-                        question is
-                        optional.</small>
-                </div>
-
-
-                <!-- skip rest if needed -->
-
                 <!-- Network Infrastructure Model -->
-                <div class="mb-3 question advanced-section" id="q15">
+                <div class="mb-3 question basic-section" id="q14">
                     <label class="form-label mt-3">
                         Network Infrastructure Model:
                         <br>
@@ -790,7 +770,7 @@
                 </div>
 
                 <!-- Geographic Operational Scope -->
-                <div class="mb-3 question advanced-section" id="q16">
+                <div class="mb-3 question basic-section" id="q15">
                     <label class="form-label mt-3">
                         Geographic Operational Scope:
                         <br>
@@ -830,7 +810,7 @@
                 </div>
 
                 <!--Customer Base Distribution -->
-                <div class="mb-3 question advanced-section" id="q17">
+                <div class="mb-3 question basic-section" id="q16">
                     <label class="form-label mt-3">
                         Customer Base Distribution:
                         <br>
@@ -864,7 +844,7 @@
 
 
                 <!-- Primary Customer Type -->
-                <div class="mb-3 question advanced-section" id="q18">
+                <div class="mb-3 question basic-section" id="q17">
                     <label class="form-label mt-3">
                         Primary Customer Type:
                         <br>
@@ -910,7 +890,7 @@
 
 
                 <!-- Product/Service Portfolio -->
-                <div class="mb-3 question advanced-section" id="q19">
+                <div class="mb-3 question basic-section" id="q18">
                     <label class="form-label mt-3">
                         Product/Service Portfolio Diversity:
                         <br>
@@ -944,7 +924,7 @@
                 </div>
 
                 <!-- Supplier Base Structure -->
-                <div class="mb-3 question advanced-section" id="q20">
+                <div class="mb-3 question basic-section" id="q19">
                     <label class="form-label mt-3">
                         Dependency on Critical Suppliers:
                         <br>
@@ -977,7 +957,7 @@
                 </div>
 
                 <!-- Intellectual Property Protection -->
-                <div class="mb-3 question advanced-section" id="q21">
+                <div class="mb-3 question basic-section" id="q20">
                     <label class="form-label mt-3">How does your organization protect and manage intellectual
                         property?</label>
                     <hr>
@@ -1018,7 +998,7 @@
                 </div>
 
                 <!-- Sensitive Data -->
-                <div class="mb-3 question advanced-section" id="q22">
+                <div class="mb-3 question basic-section" id="q21">
                     <label class="form-label mt-3">What type of sensitive data does your organization handle?</label>
                     <hr>
                     <div class="pb-3">
@@ -1063,7 +1043,7 @@
                 </div>
 
                 <!-- Critical Business Systems -->
-                <div class="mb-3 question advanced-section" id="q23">
+                <div class="mb-3 question basic-section" id="q22">
                     <label class="form-label mt-3">
                         Integration of Critical Business Systems:
                         <br>
@@ -1102,7 +1082,7 @@
                 </div>
 
                 <!-- Rate of Technology / Business Change -->
-                <div class="mb-3 question advanced-section" id="q24">
+                <div class="mb-3 question basic-section" id="q23">
                     <label class="form-label mt-3">
                         Rate of Technology / Business Change:
                         <br>
@@ -1137,7 +1117,7 @@
                 </div>
 
                 <!-- Relevant Threat Actors -->
-                <div class="mb-3 question advanced-section" id="q25">
+                <div class="mb-3 question basic-section" id="q24">
                     <label class="form-label mt-3">
                         Relevant Threat Actors:
                         <br>