diff --git a/pms/filters.py b/pms/filters.py
index 5ccf6a95a..dbee266da 100644
--- a/pms/filters.py
+++ b/pms/filters.py
@@ -92,6 +92,7 @@ class ActualObjectiveFilter(FilterSet):
         model = Objective
         fields = [
             "managers",
+            "archive",
             "assignees",
             "duration",
             "employee_objective",
diff --git a/pms/templates/feedback/feedback_list.html b/pms/templates/feedback/feedback_list.html
index 8e8f70123..b80c5adbb 100644
--- a/pms/templates/feedback/feedback_list.html
+++ b/pms/templates/feedback/feedback_list.html
@@ -95,7 +95,7 @@
             <div class="oh-sticky-table__th">{% trans "Title" %}</div>
             <div class="oh-sticky-table__th">{% trans "Status" %}</div>
             <div class="oh-sticky-table__th">{% trans "Due In" %}</div>
-            <div class="oh-sticky-table__th"></div>
+            <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
           </div>
         </div>
         <div class="oh-sticky-table__tbody">
@@ -232,7 +232,7 @@
             <div class="oh-sticky-table__th">{% trans "Title" %}</div>
             <div class="oh-sticky-table__th">{% trans "Status" %}</div>
             <div class="oh-sticky-table__th">{% trans "Due Date" %}</div>
-            <div class="oh-sticky-table__th"></div>
+            <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 
           </div>
         </div>
@@ -373,7 +373,7 @@
             <div class="oh-sticky-table__th">{% trans "Title" %}</div>
             <div class="oh-sticky-table__th">{% trans "Status" %}</div>
             <div class="oh-sticky-table__th">{% trans "Due In" %}</div>
-            <div class="oh-sticky-table__th"></div>
+            <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 
 
           </div>
@@ -511,7 +511,7 @@
             <div class="oh-sticky-table__th">{% trans "Subject" %}</div>
             <div class="oh-sticky-table__th">{% trans "Based on" %}</div>
             <div class="oh-sticky-table__th">{% trans "Create At" %}</div>
-            <div class="oh-sticky-table__th"></div>
+            <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 
           </div>
         </div>
diff --git a/pms/templates/feedback/feedback_list_view.html b/pms/templates/feedback/feedback_list_view.html
index 4852e6e3b..a0302b5e5 100644
--- a/pms/templates/feedback/feedback_list_view.html
+++ b/pms/templates/feedback/feedback_list_view.html
@@ -35,7 +35,7 @@
         <div class="oh-main__titlebar-button-container">
           
             <div class="oh-dropdown" x-data="{open: false}">
-              <button class="oh-btn ml-2" @click="open = !open">
+              <button class="oh-btn ml-2" @click="open = !open" onclick="event.preventDefault()">
                 <ion-icon name="filter" class="mr-1"></ion-icon>{% trans "Filter" %}<div id="filterCount"></div>
               </button>
               <div class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4" x-show="open"
diff --git a/pms/templates/feedback/question_template/question_template_detailed_view.html b/pms/templates/feedback/question_template/question_template_detailed_view.html
index 3acb59fcb..06a889463 100644
--- a/pms/templates/feedback/question_template/question_template_detailed_view.html
+++ b/pms/templates/feedback/question_template/question_template_detailed_view.html
@@ -10,7 +10,7 @@
 
 
 <div class="oh-wrapper">
-    <div id="questionView" style="overflow-y: auto; overflow-x: hidden; max-height: 450px;">
+    <div id="questionView" style="overflow-y: auto; overflow-x: hidden; max-height: 450px; margin-top: 50px; border:1px solid hsl(213,22%,84%);">
 
         {% include 'feedback/question/question_all.html' %}
 
diff --git a/pms/templates/okr/emp_objective_form.html b/pms/templates/okr/emp_objective_form.html
index b540cdaee..81d482848 100644
--- a/pms/templates/okr/emp_objective_form.html
+++ b/pms/templates/okr/emp_objective_form.html
@@ -5,7 +5,7 @@
     <h2 class="oh-modal__dialog-title" >
         {% trans "Update Employee Objective" %}
     </h2>
-    <button type="button" class="oh-modal__close--custom" onclick="$('#objectDetailsModal').removeClass('oh-modal--show');">
+    <button type="button" class="oh-modal__close--custom" onclick="$('#objectivesModal').removeClass('oh-modal--show');">
         <ion-icon name="close-outline" role="img" aria-label="close outline"></ion-icon>
       </button>
     </div>
diff --git a/pms/templates/okr/okr_list.html b/pms/templates/okr/okr_list.html
index 42499256a..39ad93451 100644
--- a/pms/templates/okr/okr_list.html
+++ b/pms/templates/okr/okr_list.html
@@ -82,17 +82,17 @@
                                 <div class="oh-card__body">
                                     <!-- start of column toggle button-->
                                     <div class="oh-table_sticky--wrapper">
-                                    <div class="oh-sticky-dropdown--header">
-                                        <div class="oh-dropdown" x-data="{open: false}">
-                                            <button class="oh-sticky-dropdown_btn " @click="open = !open"><ion-icon name="ellipsis-vertical-sharp"
-                                                role="img" class="md hydrated" aria-label="ellipsis vertical sharp"></ion-icon></button>
-                                            <div class="oh-dropdown__menu oh-sticky-table_dropdown" x-show="open" @click.outside="open = false">
-                                                <ul class="oh-dropdown__items" id="allObjectiveCells">
-                                                </ul>
+                                        <div class="oh-sticky-dropdown--header">
+                                            <div class="oh-dropdown" x-data="{open: false}">
+                                                <button class="oh-sticky-dropdown_btn " @click="open = !open"><ion-icon name="ellipsis-vertical-sharp"
+                                                    role="img" class="md hydrated" aria-label="ellipsis vertical sharp"></ion-icon></button>
+                                                <div class="oh-dropdown__menu oh-sticky-table_dropdown" x-show="open" @click.outside="open = false">
+                                                    <ul class="oh-dropdown__items" id="allObjectiveCells">
+                                                    </ul>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
-                                    </div>
                                     <!-- end of column toggle button-->
                                     <div id="all_objective-table" data-table-name="all_objective_table">
                                         <div class="oh-sticky-table oh-sticky-table--no-highlight">
@@ -100,22 +100,20 @@
                                             <div class="oh-sticky-table__table">
                                                 <div class="oh-sticky-table__thead">
                                                     <div class="oh-sticky-table__tr">
-                                                        <div data-cell-index="7" data-cell-title='{% trans "Title" %}' 
-                                                            class="oh-sticky-table__th"
-                                                        >{% trans "Title" %}</div>
-                                                        <div data-cell-index="7" data-cell-title='{% trans "Managers" %}' 
+                                                        <div class="oh-sticky-table__th">{% trans "Title" %}</div>
+                                                        <div data-cell-index="1" data-cell-title='{% trans "Managers" %}' 
                                                             class="oh-sticky-table__th"
                                                         >{% trans "Managers" %}</div>
-                                                        <div data-cell-index="7" data-cell-title='{% trans "Key Results" %}' 
+                                                        <div data-cell-index="2" data-cell-title='{% trans "Key Results" %}' 
                                                             class="oh-sticky-table__th"
                                                         >{% trans "Key Results" %}</div>
-                                                        <div data-cell-index="7" data-cell-title='{% trans "Assignees" %}' 
+                                                        <div data-cell-index="3" data-cell-title='{% trans "Assignees" %}' 
                                                             class="oh-sticky-table__th"
                                                         >{% trans "Assignees" %}</div>
-                                                        <div data-cell-index="7" data-cell-title='{% trans "Duration" %}' 
+                                                        <div data-cell-index="4" data-cell-title='{% trans "Duration" %}' 
                                                             class="oh-sticky-table__th"
                                                         >{% trans "Duration" %}</div>
-                                                        <div data-cell-index="7" data-cell-title='{% trans "Description" %}' 
+                                                        <div data-cell-index="5" data-cell-title='{% trans "Description" %}' 
                                                             class="oh-sticky-table__th"
                                                         >{% trans "Description" %}</div>
                                                         {% if  perms.pms.add_employeeobjective or perms.pms.change_objective or perms.pms.delete_objective %}
@@ -205,7 +203,7 @@
                                                                 {% endfor %}
                                                                 <span class="count-span">{{objective.key_result_id.all|length}} {% trans "Key results" %}</span>
                                                             </div> 
-                                                            <div data-cell-index="1" class="oh-sticky-table__td">
+                                                            <div data-cell-index="3" class="oh-sticky-table__td">
                                                                 {% for emp_objective in objective.employee_objective.all %}
                                                                     <div id="assigneesContainer{{emp_objective.id}}">
                                                                         <span class="oh-user-panel oh-collapse-panel" data-type="user" >
@@ -234,16 +232,16 @@
                                                                 {% endfor %}
                                                                 <span class="count-span">{{ objective.employee_objective.all|length}} {% trans "Assignees" %}</span>   
                                                             </div>
-                                                            <div data-cell-index="5" class="oh-sticky-table__td ">
+                                                            <div data-cell-index="4" class="oh-sticky-table__td ">
                                                                 {{objective.duration}}
                                                             </div>
-                                                            <div data-cell-index="3" class="oh-sticky-table__td">
+                                                            <div data-cell-index="5" class="oh-sticky-table__td">
                                                                 {{objective.description}}
                                                             </div>
                                                             {% if  perms.pms.add_employeeobjective or perms.pms.change_objective or perms.pms.delete_objective %}
 
                                                             <div class="oh-sticky-table__td oh-sticky-table__right">
-                                                                <div class="oh-btn-group" >
+                                                                <div class="oh-btn-group" onclick="event.stopPropagation()">
                                                                     {% if perms.pms.add_employeeobjective %}
                                                                         <a 
                                                                             onclick="event.preventDefault();event.stopPropagation()"
@@ -259,13 +257,27 @@
                                                                         {% comment %} <a hx-get="" hx-target='#duplicateFormContainer' hx-swap='innerHTML' data-toggle='oh-modal-toggle' data-target='#duplicateRecruitmentModal'  class="oh-btn oh-btn--light-bkg w-100" title="{% trans 'Duplicate' %}"><ion-icon name="copy-outline"></ion-icon></a> {% endcomment %}
                                                                     {% if perms.pms.delete_objective %}
                                                                         {% if objective.archive %}
-                                                                            <a 
-                                                                                onclick="event.stopPropagation()"
-                                                                                href='{% url "objective-archive" objective.id %}' class="oh-btn oh-btn--light-bkg w-100" title="{% trans 'Unarchive' %}"><ion-icon name="archive"></ion-icon></a>
+                                                                                <form 
+                                                                                    action='{% url "objective-archive" objective.id %}'
+                                                                                    onsubmit="return confirm('{% trans "Do you want to unarchive this objective?" %}')" 
+                                                                                    method="post"
+                                                                                    style="display: contents;width:100%">
+                                                                                    {% csrf_token %}
+                                                                                    <button onclick="event.stopPropagation()" class="oh-btn oh-btn--light-bkg w-100" title="{% trans 'Unarchive' %}">
+                                                                                        <ion-icon name="archive"></ion-icon>
+                                                                                    </button>
+                                                                                </form>
                                                                         {% else %}
-                                                                            <a 
-                                                                                onclick="event.stopPropagation()"
-                                                                                href='{% url "objective-archive" objective.id %}' class="oh-btn oh-btn--light-bkg w-100" title="{% trans 'Archive' %}"><ion-icon name="archive"></ion-icon></a>
+                                                                                <form 
+                                                                                    action='{% url "objective-archive" objective.id %}'
+                                                                                    onsubmit="return confirm('{% trans "Do you want to archive this objective?" %}')" 
+                                                                                    method="post"
+                                                                                    style="display: contents;width:100%">
+                                                                                    {% csrf_token %}
+                                                                                    <button onclick="event.stopPropagation()" class="oh-btn oh-btn--light-bkg w-100" title="{% trans 'Archive' %}">
+                                                                                        <ion-icon name="archive"></ion-icon>
+                                                                                    </button>
+                                                                                </form>
                                                                         {% endif %}
                                                                     {% endif %}
                                                                     {% if perms.pms.delete_objective %}
@@ -471,7 +483,7 @@
                                                                 {{objective.objective_id.description}}
                                                             </div>
                                                             <div class="oh-sticky-table__td oh-sticky-table__right">
-                                                                <div class="oh-btn-group" >
+                                                                <div class="oh-btn-group" onclick="event.stopPropagation()">
                                                                     {% if perms.pms.change_objective %}
                                                                         <a 
                                                                             onclick="event.preventDefault();event.stopPropagation()"
@@ -480,13 +492,27 @@
                                                                     {% endif %}
                                                                     {% if perms.pms.delete_objective %}
                                                                         {% if objective.archive %}
-                                                                            <a 
-                                                                                onclick="event.stopPropagation()"
-                                                                                href='{% url "archive-employee-objective" objective.id %}' class="oh-btn oh-btn--light-bkg w-100" title="{% trans 'Unarchive' %}"><ion-icon name="archive"></ion-icon></a>
+                                                                                <form 
+                                                                                    action='{% url "archive-employee-objective" objective.id %}'
+                                                                                    onsubmit="return confirm('{% trans "Do you want to unarchive this objective?" %}')" 
+                                                                                    method="post"
+                                                                                    style="display: contents;width:100%">
+                                                                                    {% csrf_token %}
+                                                                                    <button onclick="event.stopPropagation()" class="oh-btn oh-btn--light-bkg w-100" title="{% trans 'Unarchive' %}">
+                                                                                        <ion-icon name="archive"></ion-icon>
+                                                                                    </button>
+                                                                                </form>
                                                                         {% else %}
-                                                                            <a 
-                                                                                onclick="event.stopPropagation()"
-                                                                                href='{% url "archive-employee-objective" objective.id %}' class="oh-btn oh-btn--light-bkg w-100" title="{% trans 'Archive' %}"><ion-icon name="archive"></ion-icon></a>
+                                                                                <form 
+                                                                                    action='{% url "archive-employee-objective" objective.id %}'
+                                                                                    onsubmit="return confirm('{% trans "Do you want to archive this objective?" %}')" 
+                                                                                    method="post"
+                                                                                    style="display: contents;width:100%">
+                                                                                    {% csrf_token %}
+                                                                                    <button onclick="event.stopPropagation()" class="oh-btn oh-btn--light-bkg w-100" title="{% trans 'Archive' %}">
+                                                                                        <ion-icon name="archive"></ion-icon>
+                                                                                    </button>
+                                                                                </form>
                                                                         {% endif %}
                                                                     {% endif %}
                                                                     {% if perms.pms.delete_objective %}
@@ -593,4 +619,21 @@
             $('[data-target="#self_objective"]').click()
         }
     });
+
+    toggleColumns("all_objective-table", "allObjectiveCells");
+    localStorageShiftRequestCells = localStorage.getItem("all_objective_table");
+    if (!localStorageShiftRequestCells) {
+      $("#allObjectiveCells").find("[type=checkbox]").prop("checked", true);
+    }
+    $("[type=checkbox]").change();
+
+
+    toggleColumns("own-objective-table", "OwnObjectiveCells");
+    localStorageShiftRequestCells = localStorage.getItem("own_objective_table");
+    if (!localStorageShiftRequestCells) {
+      $("#OwnObjectiveCells").find("[type=checkbox]").prop("checked", true);
+    }
+    $("[type=checkbox]").change();
+
+  
 </script>
\ No newline at end of file
diff --git a/pms/templates/okr/okr_nav.html b/pms/templates/okr/okr_nav.html
index 4717352a6..031c3e6ca 100644
--- a/pms/templates/okr/okr_nav.html
+++ b/pms/templates/okr/okr_nav.html
@@ -99,6 +99,14 @@
                                                     {{objective_filer_form.employee_objective__progress_percentage}}
                                                 </div>
                                             </div>
+                                            <div class="col-sm-12 col-md-12 col-lg-6">
+                                                <div class="oh-input-group">
+                                                    <label class="oh-label" for=""
+                                                        >{% trans "Is Archived" %}</label
+                                                    >
+                                                    {{objective_filer_form.archive}}
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -158,7 +166,7 @@
                         </div>
                     </div> {% endcomment %}
 
-                    <div class="oh-btn-group ml-2">
+                    {% comment %} <div class="oh-btn-group ml-2">
                         <div class="oh-dropdown" x-data="{open: false}">
                             <button
                                 class="oh-btn oh-btn--dropdown oh-btn oh-btn--shadow"
@@ -202,7 +210,7 @@
                                 </ul>
                             </div>
                         </div>
-                    </div>
+                    </div> {% endcomment %}
 
                     <!-- checking  user permission for objective creation -->
                     {% if perms.pms.add_employeeobjective or request.user|filtersubordinates %}