diff --git a/website_sale_aplicoop/controllers/website_sale.py b/website_sale_aplicoop/controllers/website_sale.py
index 7fa0cee..9a8794d 100644
--- a/website_sale_aplicoop/controllers/website_sale.py
+++ b/website_sale_aplicoop/controllers/website_sale.py
@@ -155,9 +155,12 @@ class AplicoopWebsiteSale(WebsiteSale):
             "save_cart": env_lang._("Save Cart"),
             "reload_cart": env_lang._("Reload Cart"),
             "load_draft": env_lang._("Load Draft"),
+            "save_draft": env_lang._("Save Draft"),
+            "save_order_as_draft": env_lang._("Save order as draft"),
             "proceed_to_checkout": env_lang._("Proceed to Checkout"),
             "confirm_order": env_lang._("Confirm Order"),
             "back_to_cart": env_lang._("Back to Cart"),
+            "toggle_home_delivery": env_lang._("Toggle home delivery"),
             # ============ MODAL CONFIRMATION LABELS ============
             "confirmation": env_lang._("Confirmation"),
             "cancel": env_lang._("Cancel"),
@@ -168,6 +171,7 @@ class AplicoopWebsiteSale(WebsiteSale):
             "draft_replace_btn": env_lang._("Replace"),
             # ============ SUCCESS MESSAGES ============
             "draft_saved_success": env_lang._("Cart saved as draft successfully"),
+            "order_saved_as_draft": env_lang._("Order saved as draft"),
             "draft_loaded_success": env_lang._("Draft order loaded successfully"),
             "draft_merged_success": env_lang._("Draft merged successfully"),
             "draft_replaced_success": env_lang._("Draft replaced successfully"),
@@ -237,6 +241,7 @@ class AplicoopWebsiteSale(WebsiteSale):
             "load_in_cart": env_lang._("Load in Cart"),
             "consumer_group": env_lang._("Consumer Group"),
             "delivery_date": env_lang._("Delivery Date:"),
+            "pickup_day_label": env_lang._("Pickup Day"),
             "pickup_date": env_lang._("Pickup Date:"),
             "delivery_notice": env_lang._("Delivery Notice:"),
             "no_delivery_instructions": env_lang._("No special delivery instructions"),
diff --git a/website_sale_aplicoop/views/website_templates.xml b/website_sale_aplicoop/views/website_templates.xml
index 36f23ba..657fca0 100644
--- a/website_sale_aplicoop/views/website_templates.xml
+++ b/website_sale_aplicoop/views/website_templates.xml
@@ -107,10 +107,10 @@
             </t>
         </template>
         <template id="confirm_message_snippet" name="Confirm Message Snippet">
-            <t t-esc="_('Thank you! Your order has been confirmed.')" />
+            <t>Thank you! Your order has been confirmed.</t>
         </template>
         <template id="confirm_pickup_label_snippet" name="Confirm Pickup Label Snippet">
-            <t t-esc="_('Pickup Day')" />
+            <t>Pickup Day</t>
         </template>
         <template id="eskaera_order_card_meta" name="Order Card Metadata">
             <div class="card-meta-compact mt-3">
@@ -276,7 +276,7 @@
                                                 <i class="fa fa-save cart-icon-size" />
                                             </button>
                                             <t t-if="group_order.home_delivery and delivery_product_id">
-                                                    <button type="button" class="btn btn-outline-warning cart-btn-compact" id="home-delivery-btn" t-att-aria-label="_('Toggle home delivery')" t-att-data-bs-title="_('Home Delivery')" data-bs-toggle="tooltip">
+                                                    <button type="button" class="btn btn-outline-warning cart-btn-compact" id="home-delivery-btn" t-att-aria-label="labels.get('toggle_home_delivery', 'Toggle home delivery')" t-att-data-bs-title="labels.get('home_delivery', 'Home Delivery')" data-bs-toggle="tooltip">
                                                     <i class="fa fa-truck cart-icon-size" aria-hidden="true" />
                                                 </button>
                                             </t>
@@ -489,9 +489,9 @@
                                     </div>
                                 </div>
                                 <div class="checkout-actions d-grid gap-3" id="checkout-form-labels">
-                                    <button class="btn btn-success btn-lg" id="confirm-order-btn" t-attf-data-order-id="{{ group_order.id }}" t-att-data-confirmed-label="_('Order saved as draft')" t-att-data-pickup-label="_('Pickup Day')" t-att-aria-label="_('Save order as draft')" t-att-data-bs-title="_('Save Draft')" data-bs-toggle="tooltip">
+                                    <button class="btn btn-success btn-lg" id="confirm-order-btn" t-attf-data-order-id="{{ group_order.id }}" t-att-data-confirmed-label="labels.get('order_saved_as_draft', 'Order saved as draft')" t-att-data-pickup-label="labels.get('pickup_day_label', 'Pickup Day')" t-att-aria-label="labels.get('save_order_as_draft', 'Save order as draft')" t-att-data-bs-title="labels.get('save_draft', 'Save Draft')" data-bs-toggle="tooltip">
                                         <i class="fa fa-save" aria-hidden="true" t-translation="off" />
-                                        <span t-esc="_('Save Draft')" />
+                                        <span t-esc="labels.get('save_draft', 'Save Draft')" />
                                     </button>
                                     <a t-attf-href="/eskaera/{{ group_order.id }}" class="btn btn-outline-secondary btn-lg" aria-label="Back to cart page" data-bs-title="Back to Cart" data-bs-toggle="tooltip">
                                         <i class="fa fa-arrow-left" aria-hidden="true" t-translation="off" />