diff --git a/addons/dine360_dashboard/__manifest__.py b/addons/dine360_dashboard/__manifest__.py
index 8df86fc..62e7e1b 100644
--- a/addons/dine360_dashboard/__manifest__.py
+++ b/addons/dine360_dashboard/__manifest__.py
@@ -18,6 +18,7 @@
             'dine360_dashboard/static/src/css/theme_variables.css',
             'dine360_dashboard/static/src/css/home_menu.css',
             'dine360_dashboard/static/src/js/chennora_title.js',
+            'dine360_dashboard/static/src/xml/navbar_extension.xml',
         ],
         'web.assets_frontend': [
             'dine360_dashboard/static/src/css/theme_variables.css',
diff --git a/addons/dine360_dashboard/static/src/xml/navbar_extension.xml b/addons/dine360_dashboard/static/src/xml/navbar_extension.xml
new file mode 100644
index 0000000..b97435e
--- /dev/null
+++ b/addons/dine360_dashboard/static/src/xml/navbar_extension.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+    <t t-inherit="web.NavBar" t-inherit-mode="extension" owl="1">
+        <xpath expr="//t[@t-call='web.NavBar.AppsMenu']" position="after">
+            <a t-if="!env.services.user.isPublic" href="/" class="o_navbar_dashboard_btn d-none d-md-flex align-items-center px-4" 
+               style="background-color: #d61112; color: white !important; font-weight: bold; border-left: 1px solid rgba(255,255,255,0.2); text-decoration: none; height: 100%; -webkit-app-region: no-drag;"
+               title="Back to Main Dashboard">
+                <i class="fa fa-th-large me-2"></i>
+                <span>Dashboard</span>
+            </a>
+        </xpath>
+        <!-- Also add the floating button here to ENSURE it works in backend too -->
+        <xpath expr="//nav" position="after">
+            <a t-if="!env.services.user.isPublic" href="/" class="o_dashboard_floating_btn_fixed d-print-none d-flex align-items-center justify-content-center shadow-lg" 
+               style="position: fixed; bottom: 30px; right: 30px; z-index: 9999; 
+                      background-color: #d6111e; color: white !important; width: 65px; height: 65px; 
+                      border-radius: 50%; text-decoration: none; border: 3px solid white;">
+                <i class="fa fa-th-large" style="font-size: 28px;"></i>
+            </a>
+        </xpath>
+    </t>
+</templates>
diff --git a/addons/dine360_dashboard/views/web_title_template.xml b/addons/dine360_dashboard/views/web_title_template.xml
index 62773f9..8e7afb4 100644
--- a/addons/dine360_dashboard/views/web_title_template.xml
+++ b/addons/dine360_dashboard/views/web_title_template.xml
@@ -8,9 +8,8 @@
         </xpath>
 
         <xpath expr="//body" position="inside">
-            <!-- Use a simpler, non-JS approach to avoid OWL errors -->
-            <t t-set="is_editor_or_backend" t-value="request.params.get('enable_editor') or request.params.get('edit') or request.httprequest.path.startswith('/web')"/>
-            <t t-if="not request.env.user._is_public() and not is_editor_or_backend">
+            <t t-set="is_editor" t-value="request.params.get('enable_editor') or request.params.get('edit')"/>
+            <t t-if="not request.env.user._is_public() and not is_editor">
                 <a href="/" class="o_dashboard_return_btn d-print-none" title="Back to Dashboard" 
                    style="position: fixed; bottom: 20px; right: 20px; z-index: 9999; 
                           background-color: #d6111e; color: #ffff !important; padding: 12px 24px; 
diff --git a/addons/dine360_pos_navbar/static/src/xml/pos_navbar.xml b/addons/dine360_pos_navbar/static/src/xml/pos_navbar.xml
index ac63867..fa4a530 100644
--- a/addons/dine360_pos_navbar/static/src/xml/pos_navbar.xml
+++ b/addons/dine360_pos_navbar/static/src/xml/pos_navbar.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
-    <!-- Placeholder for custom navbar styling/elements -->
+    <t t-inherit="point_of_sale.Navbar" t-inherit-mode="extension" owl="1">
+        <xpath expr="//div[hasclass('pos-logo')]" position="after">
+            <a href="/" class="btn-dashboard ms-2 d-flex align-items-center justify-content-center text-white text-decoration-none" 
+               style="background-color: #d61112; border-radius: 4px; padding: 0 15px; height: 34px; font-weight: bold; border: 1px solid rgba(255,255,255,0.2);">
+                <i class="fa fa-th-large me-2"></i>
+                <span>Dashboard</span>
+            </a>
+        </xpath>
+    </t>
 </templates>
diff --git a/addons/dine360_theme_chennora/static/src/scss/shop.scss b/addons/dine360_theme_chennora/static/src/scss/shop.scss
index d4e2aed..aa8f609 100644
--- a/addons/dine360_theme_chennora/static/src/scss/shop.scss
+++ b/addons/dine360_theme_chennora/static/src/scss/shop.scss
@@ -610,4 +610,24 @@
         color: #000000 !important;
         border: none !important;
     }
+}
+
+/* Update "View cart" button color in toast notification */
+.o_wsale_toast .btn-primary,
+.o_wsale_add_to_cart_message a.btn-primary,
+#wsale_ajax_cart_msg a.btn-primary {
+    background-color: #FECD4F !important;
+    color: #000000 !important;
+    border-color: #FECD4F !important;
+    font-weight: 700 !important;
+    box-shadow: 0 4px 12px rgba(254, 205, 79, 0.2) !important;
+    transition: all 0.3s ease !important;
+}
+
+.o_wsale_toast .btn-primary:hover,
+.o_wsale_add_to_cart_message a.btn-primary:hover,
+#wsale_ajax_cart_msg a.btn-primary:hover {
+    background-color: #e5b945 !important;
+    border-color: #e5b945 !important;
+    transform: translateY(-1px) !important;
 }
\ No newline at end of file
diff --git a/addons/dine360_theme_chennora/static/src/scss/theme.scss b/addons/dine360_theme_chennora/static/src/scss/theme.scss
index 4a6f59c..b90fb8f 100644
--- a/addons/dine360_theme_chennora/static/src/scss/theme.scss
+++ b/addons/dine360_theme_chennora/static/src/scss/theme.scss
@@ -88,6 +88,24 @@ header {
                 transform: translateY(-2px);
                 box-shadow: 0 5px 15px rgba(254, 205, 79, 0.4);
             }
+
+            /* Cart Icon and Badge Fix */
+            .o_wsale_shopping_cart {
+                &:hover {
+                    color: #FECD4F !important;
+
+                    .fa-shopping-cart {
+                        color: white !important;
+                    }
+                }
+
+                .cart-badge {
+                    color: white !important;
+                    background-color: #d6111e !important;
+                    font-weight: 800 !important;
+                    z-index: 10;
+                }
+            }
         }
     }
 }
diff --git a/addons/dine360_theme_chennora/views/layout.xml b/addons/dine360_theme_chennora/views/layout.xml
index 7826980..e37bf51 100644
--- a/addons/dine360_theme_chennora/views/layout.xml
+++ b/addons/dine360_theme_chennora/views/layout.xml
@@ -75,11 +75,11 @@
                         <div class="top-right d-flex align-items-center">
                             <span class="small me-3 fw-bold">Follow Us:</span>
                             <div class="social-icons d-flex gap-3 me-3">
-                                <a href="#"><i class="fa fa-facebook"></i></a>
-                                <a href="#"><i class="fa fa-instagram"></i></a>
-                                <a href="#"><i class="fa fa-tiktok"></i></a>
-                                <a href="#"><i class="fa fa-youtube-play"></i></a>
-                                <a href="#"><i class="fa fa-twitter"></i></a>
+                                <a href="https://www.facebook.com/chennorabrampton/" target="_blank"><i class="fa fa-facebook"></i></a>
+                                <a href="https://www.instagram.com/chennora_brampton/" target="_blank"><i class="fa fa-instagram"></i></a>
+                                <a href="https://www.tiktok.com/@chennora_brampton" target="_blank"><i class="fa fa-tiktok"></i></a>
+                                <a href="https://www.youtube.com/@Chennora_brampton" target="_blank"><i class="fa fa-youtube"></i></a>
+                                <a href="https://x.com/Chennoradining" target="_blank"><i class="fa fa-twitter"></i></a>
                             </div>
                             <div class="top-bar-auth d-none d-lg-flex align-items-center border-start ps-3" style="border-color: rgba(4, 18, 29, 0.2) !important;">
                                 <a groups="base.group_public" href="/web/login" class="small fw-bold text-dark text-decoration-none">
@@ -146,8 +146,16 @@
                                     </t>
                                 </ul>
 
-                                <!-- CTA Button -->
-                                <div class="ms-lg-auto py-3 py-lg-0">
+                                <!-- CTA Button and Cart -->
+                                <div class="ms-lg-auto py-3 py-lg-0 d-flex align-items-center gap-3">
+                                    <t t-set="website_sale_order" t-value="website.sale_get_order()"/>
+                                    <a href="/shop/cart" class="nav-link o_wsale_shopping_cart position-relative d-inline-flex align-items-center" title="My Cart">
+                                        <i class="fa fa-shopping-cart fs-3 text-white"></i>
+                                        <span class="badge rounded-pill bg-danger position-absolute top-0 start-100 translate-middle cart-badge" 
+                                              t-if="website_sale_order and website_sale_order.cart_quantity &gt; 0" 
+                                              t-esc="website_sale_order.cart_quantity"
+                                              style="font-size: 0.75rem; padding: 0.35em 0.6em; border: 2px solid #171422;"/>
+                                    </a>
                                     <a href="/shop" class="btn btn-order-now px-4 py-2 d-inline-flex align-items-center">
                                         ORDER NOW
                                         <div class="arrow-icon ms-3">
@@ -212,11 +220,11 @@
                                     <h2 class="footer-brand-title fw-bold mb-4">Chennora</h2>
                                     <p class="footer-desc mb-4">Chennora brings Chennai's authentic flavors to Brampton where every dish tells a story of South Indian heritage.</p>
                                     <div class="footer-social-boxes d-flex gap-2">
-                                        <a href="#" class="social-box"><i class="fa fa-facebook"></i></a>
-                                        <a href="#" class="social-box"><i class="fa fa-instagram"></i></a>
-                                        <a href="#" class="social-box"><i class="fa fa-tiktok"></i></a>
-                                        <a href="#" class="social-box"><i class="fa fa-youtube-play"></i></a>
-                                        <a href="#" class="social-box"><i class="fa fa-twitter"></i></a>
+                                        <a href="https://www.facebook.com/chennorabrampton/" target="_blank" class="social-box"><i class="fa fa-facebook"></i></a>
+                                        <a href="https://www.instagram.com/chennora_brampton/" target="_blank" class="social-box"><i class="fa fa-instagram"></i></a>
+                                        <a href="https://www.tiktok.com/@chennora_brampton" target="_blank" class="social-box"><i class="fa fa-tiktok"></i></a>
+                                        <a href="https://www.youtube.com/@Chennora_brampton" target="_blank" class="social-box"><i class="fa fa-youtube"></i></a>
+                                        <a href="https://x.com/Chennoradining" target="_blank" class="social-box"><i class="fa fa-twitter"></i></a>
                                     </div>
                                 </div>
                                 <!-- Col 2: Hours -->