diff --git a/onboarding/templates/onboarding/candidate_creation_form.html b/onboarding/templates/onboarding/candidate_creation_form.html
index a9c2d239a..13d6c448c 100644
--- a/onboarding/templates/onboarding/candidate_creation_form.html
+++ b/onboarding/templates/onboarding/candidate_creation_form.html
@@ -8,4 +8,5 @@
         <button type="submit" class="oh-btn oh-btn--secondary w-100">
             {% trans "Apply" %}
         </button>
-</form>
\ No newline at end of file
+    </div>
+</form>
diff --git a/onboarding/templates/onboarding/candidates.html b/onboarding/templates/onboarding/candidates.html
index 88077c8f9..dc77ff9fd 100644
--- a/onboarding/templates/onboarding/candidates.html
+++ b/onboarding/templates/onboarding/candidates.html
@@ -214,8 +214,9 @@
       success: function (response) {
         $("#ohMessages").append(`
             <div class="oh-alert-container">
-                  <div class="oh-alert oh-alert--animated oh-alert--${response.type}">
-                    ${response.message}
+				<div class="oh-alert oh-alert--animated oh-alert--${response.type}">
+				${response.message}
+				</div>
             </div>`);
       }
     });
@@ -236,8 +237,9 @@
         success: function (response) {
           $("#ohMessages").append(`
             <div class="oh-alert-container">
-                  <div class="oh-alert oh-alert--animated oh-alert--${response.type}">
-                    ${response.message}
+				<div class="oh-alert oh-alert--animated oh-alert--${response.type}">
+				${response.message}
+				</div>
             </div>`);
         },
       });
diff --git a/onboarding/templates/onboarding/group_by.html b/onboarding/templates/onboarding/group_by.html
index 3990dda81..cd6c12d70 100644
--- a/onboarding/templates/onboarding/group_by.html
+++ b/onboarding/templates/onboarding/group_by.html
@@ -1,17 +1,17 @@
-{% load attendancefilters recruitmentfilters %} {% load basefilters %} {% load static %}
-{% load i18n %} {% include 'filter_tags.html' %} 
+{% load attendancefilters recruitmentfilters basefilters static i18n %}
+{% include 'filter_tags.html' %} 
 <div id="ohMessages"></div>
 <div class="oh-checkpoint-badge text-success mb-2" id="selectAllInstances" style="cursor: pointer;">
     {% trans "Select All Candidates" %}
-  </div>
-  <div class="oh-checkpoint-badge text-secondary mb-2" id="unselectAllInstances" style="cursor: pointer;">
-    {% trans "Unselect All Candidates" %}
-  </div>
-  <div class="oh-checkpoint-badge text-info mb-2" id="exportCandidates" style="cursor: pointer;">
-      {% trans "Export Candidates" %}
-  </div>
-  <div class="oh-checkpoint-badge text-danger mb-2" id="selectedCandidate" >
-  </div>
+</div>
+<div class="oh-checkpoint-badge text-secondary mb-2" id="unselectAllInstances" style="cursor: pointer;">
+	{% trans "Unselect All Candidates" %}
+</div>
+<div class="oh-checkpoint-badge text-info mb-2" id="exportCandidates" style="cursor: pointer;">
+	{% trans "Export Candidates" %}
+</div>
+<div class="oh-checkpoint-badge text-danger mb-2" id="selectedCandidate" >
+</div>
 <div class="oh-card">
     {% for candidate in candidates %}
     <div class="oh-accordion-meta">
@@ -533,6 +533,7 @@
                 <div class="oh-alert-container">
                     <div class="oh-alert oh-alert--animated oh-alert--${response.type}">
                         ${response.message}
+					</div>
                 </div>`);
         }
         });
@@ -555,6 +556,7 @@
                 <div class="oh-alert-container">
                     <div class="oh-alert oh-alert--animated oh-alert--${response.type}">
                         ${response.message}
+					</div>
                 </div>`);
             },
         });
diff --git a/onboarding/templates/onboarding/onboarding_view.html b/onboarding/templates/onboarding/onboarding_view.html
index 408fc907c..597e32673 100644
--- a/onboarding/templates/onboarding/onboarding_view.html
+++ b/onboarding/templates/onboarding/onboarding_view.html
@@ -139,7 +139,6 @@
 
    
     
-</div>
 </div>
 <!-- stage-form -->
 <div class="oh-modal" id="editModal1" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
diff --git a/onboarding/templates/onboarding/stage_form.html b/onboarding/templates/onboarding/stage_form.html
index c7aee069b..21cfaf8f5 100644
--- a/onboarding/templates/onboarding/stage_form.html
+++ b/onboarding/templates/onboarding/stage_form.html
@@ -32,4 +32,5 @@
         <button id="formStage" type="submit" class="oh-btn oh-btn--secondary w-100">
             {% trans "Create" %}
         </button>
+    </div>
 </form>
\ No newline at end of file
diff --git a/onboarding/templates/onboarding/stage_update.html b/onboarding/templates/onboarding/stage_update.html
index 7ce87445e..d4ae46521 100644
--- a/onboarding/templates/onboarding/stage_update.html
+++ b/onboarding/templates/onboarding/stage_update.html
@@ -32,4 +32,5 @@
         <button  type="submit" class="oh-btn oh-btn--secondary w-100">
             {% trans "Update" %}
         </button>
+    </div>
 </form>
\ No newline at end of file