diff --git a/templates/account/login.html b/templates/account/login.html
index 0a720c0b..e2cb0db6 100644
--- a/templates/account/login.html
+++ b/templates/account/login.html
@@ -77,7 +77,7 @@
                 </div>
             </div>
         </section>
-        {% include 'footer.html' %}
+        
         {% if LOGIN_BY_CODE_ENABLED or PASSKEY_LOGIN_ENABLED %}
             <hr>
             {% element button_group vertical=True %}
diff --git a/templates/account/signup-wizard.html b/templates/account/signup-wizard.html
index 22ed1586..dbff7727 100644
--- a/templates/account/signup-wizard.html
+++ b/templates/account/signup-wizard.html
@@ -3,7 +3,7 @@
 {% load i18n static %}
 
 {% block content %}
-    <section class="main my-2">
+    <section class="main my-4">
         <div class="container" style="max-width:60rem;">
             <div class="row form-container" id="form-container">
                 <div class="col-12 ">
@@ -32,36 +32,38 @@
                                 {{ form|crispy }}
                             </div>
                             <button class="btn btn-primary" type="submit">{% trans 'Sign Up' %}</button>
-                        </form>
-                    </div>
+                        </div>
+                    </form>
                 </div>
             </div>
-             <div class="mx-auto mt-4 text-center">
-               <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#contentModal" data-url="{% url 'refund_policy' %}">
-                  Our Refund Policy
+            <div class="mx-auto mt-4 text-center">
+                <button type="button" class="btn btn-lg btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal">
+                    {% trans "Our Refund Policy" %}
                 </button>
-             </div>
+            </div>
         </div>
     </section>
 
-        <div class="modal fade" id="contentModal" tabindex="-1" aria-labelledby="contentModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-xl modal-dialog-centered">
+    <div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-xl">
             <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="contentModalLabel">Refund Policy</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-            </div>
-            <div class="modal-body">
-                <p>Loading...</p>
-            </div>
+                <div class="modal-header">
+                    <h5 class="modal-title" id="exampleModalLabel">{% trans "Our Refund Policy" %}</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    {% include 'haikal_policy/refund_policy.html' %}
+                </div>
+                
             </div>
         </div>
-        </div>
-
-    {% include 'footer.html' %}
-    <script src="{% static 'js/phoenix.js' %}"></script>
+    </div>
+   
+        
 {% endblock content %}
+  
 {% block customJS %}
+        <script src="{% static 'js/phoenix.js' %}"></script>
     <script src="{% static 'js/main.js' %}"></script>
     <script src="{% static 'js/sweetalert2.all.min.js' %}"></script>
     <script type="module"
@@ -162,37 +164,5 @@
         }
 
 
-        //modal for policy
-
-document.addEventListener('DOMContentLoaded', function() {
-  const contentModal = document.getElementById('contentModal');
-  if (contentModal) {
-    contentModal.addEventListener('show.bs.modal', function(event) {
-      // Get the button that triggered the modal
-      const button = event.relatedTarget;
-      // Extract the URL from the button's data-url attribute
-      const url = button.getAttribute('data-url');
-
-      // Select the modal body element
-      const modalBody = contentModal.querySelector('.modal-body');
-
-      // Use the Fetch API to load content
-      fetch(url)
-        .then(response => {
-          if (!response.ok) {
-            throw new Error('Network response was not ok');
-          }
-          return response.text();
-        })
-        .then(html => {
-          // Insert the HTML content into the modal body
-          modalBody.innerHTML = html;
-        })
-        .catch(error => {
-          modalBody.innerHTML = `<p class="text-danger">Failed to load content: ${error.message}</p>`;
-        });
-    });
-  }
-});
     </script>
-{% endblock customJS %}
+{% endblock customJS %}
\ No newline at end of file
diff --git a/templates/footer.html b/templates/footer.html
index a5b2cbfb..52cdfd03 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -56,7 +56,7 @@
             /* Kept `position-absolute` and adjusted padding */
     position: absolute;
     bottom: 0;
-    width: 90%;
+    width: 96%;
     padding: 1.5rem;
 
 
diff --git a/templates/haikal_policy/refund_policy.html b/templates/haikal_policy/refund_policy.html
index 939cfeb2..c771bd21 100644
--- a/templates/haikal_policy/refund_policy.html
+++ b/templates/haikal_policy/refund_policy.html
@@ -1,16 +1,4 @@
 {% load i18n %}
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{% trans "Haikal Refund Policy" %}</title>
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;600;700&display=swap" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css">
-</head>
-<body>
 
 <div class="policy-container m-4">
     <div class="policy-header">
@@ -80,7 +68,3 @@
         </p>
     </section>
 </div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/templates/header.html b/templates/header.html
index 8b004492..ac3ba9e0 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -488,30 +488,15 @@
         {% if request.user.is_authenticated %}
             <div class="navbar-logo">
                 <div class="d-flex align-items-center">
-                    {% with name_to_display=request.user.staff.first_name|default:request.dealer.name %}
+                    {% with name_to_display=request.user.first_name|default:request.dealer.name %}
                         <h6 class="text-gray-600 ms-2 d-none d-sm-block fs-8"
                             data-bs-toggle="tooltip"
                             data-bs-placement="bottom"
                             title="{% trans 'Logged in as ' %}{{ request.user.username }}">
                             {% trans 'Hello,   ' %}{{ name_to_display }}
                         </h6>
-                       
                     {% endwith %}
                 </div>
-                
-            </div>
-            <div class="navbar-logo ">
-            
-                <div class="d-flex align-items-center">
-                   
-                        <small class="text-gray-600 ms-2 d-none d-sm-block fs-9"
-                            data-bs-toggle="tooltip"
-                            data-bs-placement="bottom"
-                           >
-                         {% now "l, F j, Y g:i A" %}
-                       </small>
-                   
-                </div>
             </div>
         {% endif %}
         <ul class="navbar-nav navbar-nav-icons flex-row gap-2" hx-boost="false">
@@ -665,19 +650,19 @@
                             </hr>
                             <div class="px-3">
                                 <a class="btn btn-sm btn-phoenix-danger d-flex flex-center w-100"
-                                   href="{% url 'account_logout' %}"> <i class="fa-solid fa-right-from-bracket me-2"></i></span>{% trans 'Sign Out' %}</a>
+                                   href="{% url 'account_logout' %}"> <span class="fas fa-power-off me-2"></span>{% trans 'Sign Out' %}</a>
                             </div>
                             <div class="my-2 text-center fw-bold fs-10 text-body-quaternary">
-                                <a class="text-body-quaternary me-1" href="">{% trans 'Privacy policy' %}</a>&bull;<a class="text-body-quaternary mx-1" href="">{% trans 'Terms' %}</a>&bull;<a class="text-body-quaternary ms-1" href="">{% trans "Cookies" %}</a>
+                                <a class="text-body-quaternary me-1" href="">{% trans 'Privacy policy' %}</a>&bull;<a class="text-body-quaternary mx-1" href="">{% trans 'Terms' %}</a>&bull;<a class="text-body-quaternary ms-1" href="">Cookies</a>
                             </div>
                         {% else %}
                             <div class="px-3">
                                 <a class="btn btn-phoenix-succes d-flex flex-center w-100"
-                                   href="{% url 'account_login' %}"> <i class="fa-solid fa-right-to-bracket me-2"></i>{% trans 'Sign In' %}</a>
+                                   href="{% url 'account_login' %}"> <span class="me-2" data-feather="log-in"></span>{% trans 'Sign In' %}</a>
                             </div>
                             <div class="px-3">
                                 <a class="btn btn-phoenix-primary d-flex flex-center w-100"
-                                   href="{% url 'account_signup' %}"> <i class="fa-solid fa-user-plus"></i>{% trans 'Sign Up' %}</a>
+                                   href="{% url 'account_signup' %}"> <span class="me-2" data-feather="user-plus"></span>{% trans 'Sign Up' %}</a>
                             </div>
                         {% endif %}
                     </div>
diff --git a/templates/welcome.html b/templates/welcome.html
index 55824764..30b303e5 100644
--- a/templates/welcome.html
+++ b/templates/welcome.html
@@ -10,7 +10,7 @@
     </style>
 {% endblock extraCSS %}
 {% block content %}
-    <div class="row">
+    <div class="row d-flex justify-content-center">
         <div class="booking-hero-header d-flex align-items-center">
             <div class="bg-holder overlay bg-opacity-75"
                  style="background-image:url({% static 'video/image-haikal-02.png' %})">
@@ -36,11 +36,10 @@
             </div>
         </div>
         <section class="pt-6 pt-md-10 pb-10" id="feature">
-            <div class="container-medium">
-                <div class="bg-holder d-none d-xl-block"
-                     style="background-image:url({% static 'images/bg/bg-left-27.png' %});
-                            background-size:auto;
-                            background-position:left"></div>
+            <div class="bg-holder d-none d-xl-block"
+                 style="background-image:url({% static 'images/bg/bg-left-27.png' %});
+                        background-size:auto;
+                        background-position:left"></div>
                 <div class="bg-holder d-none d-xl-block"
                      style="background-image:url({% static 'images/bg/bg-right-27.png' %});
                             background-size:auto;
@@ -128,9 +127,7 @@
                 <h2 class="mb-7">{{ _("Pricing") }}</h2>
                 <div class="row g-3 mb-7 mb-lg-11">
                     {% for plan in plan_list %}
-
                         <div class="col-lg-4" onclick="window.location='{% url "account_signup" %}';">
-
                             <input type="radio"
                                    class="btn-check"
                                    name="selected_plan"
@@ -158,9 +155,7 @@
                                     </div>
                                 </div>
                             </label>
-
                         </div>
-
                     {% endfor %}
                 </div>
             </div>
@@ -238,8 +233,6 @@
                 </div>
             </div>
         </section>
-        <section class="pt-lg-0 pt-xl-8">
-            {% include 'footer.html' %}
-        </section>
+        
     </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/welcome_base.html b/templates/welcome_base.html
index d8438b58..8a62667d 100644
--- a/templates/welcome_base.html
+++ b/templates/welcome_base.html
@@ -43,9 +43,7 @@
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin="">
         <link href="https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@300;400;600;700;800;900&display=swap"
               rel="stylesheet">
-        {% comment %} <link href="{% static 'vendors/simplebar/simplebar.min.css' %}" rel="stylesheet"> {% endcomment %}
-        {% comment %} <link href="{% static 'css/sweetalert2.min.css' %}" rel="stylesheet"> {% endcomment %}
-        {% comment %} <link rel="stylesheet" href="https://unicons.iconscout.com/release/v4.0.8/css/line.css"> {% endcomment %}
+        
         {% if LANGUAGE_CODE == 'ar' %}
             <link href="{% static 'css/theme-rtl.min.css' %}"
                   type="text/css"
@@ -67,23 +65,22 @@
         {% endif %}
         <script src="{% static 'vendors/simplebar/simplebar.min.js' %}"></script>
         <script src="{% static 'js/config.js' %}"></script>
-        {% comment %} <script src="{% static 'js/sweetalert2.all.min.js' %}"></script> {% endcomment %}
         <link href="{% static 'css/custom.css' %}" rel="stylesheet">
+       
+        {% block extraCSS %}
+        {% endblock extraCSS %}
     </head>
-    <body>
+    <body class="d-flex flex-column min-vh-100">
         {% include 'welcome_header.html' %}
-        {% block content %}
-        {% endblock content %}
-        {% comment %}
-    <script src="{% static 'vendors/anchorjs/anchor.min.js' %}"></script>
-    <script src="{% static 'vendors/is/is.min.js' %}"></script>
-    <script src="{% static 'vendors/list.js/list.min.js' %}"></script>
-    <script src="{% static 'vendors/dayjs/dayjs.min.js' %}"></script>
-    <script src="{% static 'vendors/echarts/echarts.min.js' %}"></script>
-    <script src="{% static 'js/travel-agency-dashboard.js' %}"></script>
-    <script src="{% static 'vendors/mapbox-gl/mapbox-gl.js' %}"></script>
-    <script src="https://unpkg.com/@turf/turf@6/turf.min.js"></script>
-        <script src="{% static 'vendors/swiper/swiper-bundle.min.js' %}"></script> {% endcomment %}
+        <main class="flex-grow-1">
+            {% block content %}
+            {% endblock content %}
+        </main>
+        
+        <div class="site-footer mt-auto">
+            {% include 'welcome_footer.html' %}
+        </div>
+        
         <script src="{% static 'vendors/popper/popper.min.js' %}"></script>
         <script src="{% static 'vendors/bootstrap/bootstrap.min.js' %}"></script>
         <script src="{% static 'vendors/fontawesome/all.min.js' %}"></script>
@@ -91,23 +88,8 @@
         <script src="{% static 'vendors/feather-icons/feather.min.js' %}"></script>
         <script src="{% static 'vendors/typed.js/typed.umd.js' %}"></script>
         <script src="{% static 'js/phoenix.js' %}"></script>
-        {% comment %} <script src="{% static 'vendors/popper/popper.min.js' %}"></script>
-                    <script src="{% static 'vendors/bootstrap/bootstrap.min.js' %}"></script>
-                    <script src="{% static 'vendors/anchorjs/anchor.min.js' %}"></script>
-                    <script src="{% static 'vendors/is/is.min.js' %}"></script>
-                    <script src="{% static 'vendors/fontawesome/all.min.js' %}"></script>
-                    <script src="{% static 'vendors/lodash/lodash.min.js' %}"></script>
-                    <script src="{% static 'vendors/list.js/list.min.js' %}"></script>
-                    <script src="{% static 'vendors/feather-icons/feather.min.js' %}"></script>
-                    <script src="{% static 'vendors/dayjs/dayjs.min.js' %}"></script>
-                    <script src="{% static 'js/phoenix.js' %}"></script>
-                    <script src="{% static 'vendors/echarts/echarts.min.js' %}"></script>
-                    <script src="{% static 'js/travel-agency-dashboard.js' %}"></script>
-                    <script src="{% static 'vendors/mapbox-gl/mapbox-gl.js' %}"></script>
-                    <script src="https://unpkg.com/@turf/turf@6/turf.min.js"></script>
-                    <script src="{% static 'vendors/swiper/swiper-bundle.min.js' %}"></script>
-        <script src="{% static 'vendors/typed.js/typed.umd.js' %}"></script> {% endcomment %}
+        
         {% block customJS %}
         {% endblock customJS %}
     </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/templates/welcome_footer.html b/templates/welcome_footer.html
index b2477c2a..3228a0d6 100644
--- a/templates/welcome_footer.html
+++ b/templates/welcome_footer.html
@@ -1,5 +1,5 @@
-<section class="footer pb-6 pb-md-11 pt-15">
-    <div class="container-medium">
+<section class="footer pb-6 pb-md-11 pt-5">
+    <div class="container-medium mt-3">
         <div class="row gy-3 justify-content-between">
             <div class="row g-0 justify-content-between align-items-center h-100">
                 <div class="col-12 col-sm-auto text-center">