diff --git a/recruitment/templates/survey/candidate_survey_form.html b/recruitment/templates/survey/candidate_survey_form.html
index 7e2617308..d3c4dd525 100644
--- a/recruitment/templates/survey/candidate_survey_form.html
+++ b/recruitment/templates/survey/candidate_survey_form.html
@@ -10,12 +10,16 @@
         {% endfor %}
     </div>
 {% endif %}
-<div class="oh-wrapper p-5">
-    <form action="" method="post" enctype="multipart/form-data" class="p-5">
+<div class="oh-survey_page">
+    <form action="" method="post" enctype="multipart/form-data">
         {% csrf_token %}
-        <h1 class="oh-main__titlebar-title fw-bold">
-            {{candidate.name}}'s {% trans "Survey" %}
-          </h1>
+        <section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
+            <div class="oh-main__titlebar oh-main__titlebar--left">
+                <h1 class="oh-main__titlebar-title fw-bold">
+                    {{candidate.name}}'s {% trans "Survey" %}
+                </h1>
+            </div>
+        </section>
         {{form}}
     </form>
 </div>
diff --git a/recruitment/templates/survey_form.html b/recruitment/templates/survey_form.html
index 495ba0483..622fd49ec 100644
--- a/recruitment/templates/survey_form.html
+++ b/recruitment/templates/survey_form.html
@@ -5,15 +5,15 @@
     padding: 0px;
   }
 </style>
-<div class="oh-general__tab-target oh-profile-section" id="personal">
-  <div class="oh-profile-section__card">
-    <div class="row">
+<div class="oh-general__tab-target" id="personal">
+  <div class="oh-wrapper oh-survey-ques">
+    <div class="row pb-5">
       <div class="col-12">{{form.non_field_errors}}</div>
 
       {% for question in questions %}
 
       {% if question.type == "textarea" %}
-      <div class="d-block">
+      <div class="d-flex oh-card mt-2">
         {% if question.is_mandatory %}
           <span class="oh-label oh-label--question">{{ question.question }}<span class='text-danger'> * {% trans "Mandatory Question" %}</span></span>
         {% else %}
@@ -23,12 +23,12 @@
           type="text"
           name="{{question.question}}"
           class="oh-input w-100"
-          id="id_{{question.id}}"
+          id="id_{{qgvuestion.id}}"
           {% if question.is_mandatory %}required{% endif %}
         ></textarea>
       </div>
       {% elif question.type == "options" %}
-      <div class="d-block">
+      <div class="d-block oh-card">
         {% if question.is_mandatory %}
           <span class="oh-label oh-label--question">{{ question.question }}<span class='text-danger'> * {% trans "Mandatory Question" %}</span></span>
         {% else %}
@@ -48,7 +48,7 @@
           {% endfor %}
         </select>
         {% elif question.type == "multiple" %}
-            <div class="d-block">
+            <div class="d-block oh-card">
               {% if question.is_mandatory %}
                 <span class="oh-label oh-label--question">{{ question.question }}<span class='text-danger'> * {% trans "Mandatory Question" %}</span></span>
               {% else %}
@@ -67,7 +67,7 @@
               </select>
             </div>
             {% elif question.type == "percentage" %}
-              <div class="d-block">
+              <div class="d-block oh-card">
                 {% if question.is_mandatory %}
                   <span class="oh-label oh-label--question">{{ question.question }}<span class='text-danger'> * {% trans "Mandatory Question" %}</span></span>
                 {% else %}
@@ -95,7 +95,7 @@
                 </div>
               </div>
             {% elif question.type == "file" %}
-              <div class="d-block">
+              <div class="d-block oh-card">
                 {% if question.is_mandatory %}
                   <span class="oh-label oh-label--question">{{ question.question }}<span class='text-danger'> * {% trans "Mandatory Question" %}</span></span>
                 {% else %}
@@ -110,7 +110,7 @@
                 />
               </div>
             {% elif question.type == "date" %}
-              <div class="d-block">
+              <div class="d-block oh-card">
                 {% if question.is_mandatory %}
                   <span class="oh-label oh-label--question">{{ question.question }}<span class='text-danger'> * {% trans "Mandatory Question" %}</span></span>
                 {% else %}
@@ -132,7 +132,7 @@
               {% endif %}
               {% include "rating_input.html" %}
             {% elif question.type == "checkbox" %}
-              <div class="d-block">
+              <div class="d-block oh-card">
                 {% if question.is_mandatory %}
                   <span class="oh-label oh-label--question">{{ question.question }}<span class='text-danger'> * {% trans "Mandatory Question" %}</span></span>
                 {% else %}
@@ -157,7 +157,7 @@
 
               </div>
             {% else %}
-              <div class="d-block">
+              <div class="d-block oh-card">
                 {% if question.is_mandatory %}
                   <span class="oh-label oh-label--question">{{ question.question }}<span class='text-danger'> * {% trans "Mandatory Question" %}</span></span>
                 {% else %}
@@ -174,14 +174,16 @@
               </div>
             {% endif %} {% endfor %}
           </div>
-          <div class="d-flex flex-row-reverse">
-            <button
-              type="submit"
-              class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp"
-            >
+          <div class="d-flex justify-content-end align-items-center w-100 mt-4">
+            <button type="submit" class="oh-btn oh-btn--secondary oh-btn--w-100-resp">
               {% trans "Save" %}
             </button>
           </div>
+          <div class="col-sm-12 col-md-12 col-lg-12">
+            <p class="small text-muted text-center">
+              &copy; {% now 'Y' %} {{white_label_company_name}}. All rights resevered.
+            </p>
+          </div>
       </div>
     </div>
   </div>