diff --git a/.env.example b/.env.example
index 5f24f6d..9d0899c 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,4 @@
-APP_NAME=Laravel
+APP_NAME=AsiaGolf
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
@@ -71,3 +71,8 @@ WMS_ASSET_URL="https://dev.smgdev.top/api/storage"
 BITESHIP_URL=
 BITESHIP_KEY=
 BITESHIP_COURIER_ALL=grab,gojek,tiki,jnt,anteraja
+
+
+GOOGLE_CLIENT_ID=1023147148625-3igh5253tr1lkflmbfj76iopvp2n52od.apps.googleusercontent.com
+GOOGLE_CLIENT_SECRET=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
+GOOGLE_REDIRECT_URI=http://localhost:8000/login/google/callback
\ No newline at end of file
diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php
new file mode 100644
index 0000000..5c9c0b4
--- /dev/null
+++ b/app/Http/Controllers/HelpController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class HelpController extends Controller
+{
+    //
+
+    public function index()
+    {
+        return view('help.topics-v2');
+    }
+}
diff --git a/app/Http/Controllers/TncController.php b/app/Http/Controllers/TncController.php
new file mode 100644
index 0000000..5b065db
--- /dev/null
+++ b/app/Http/Controllers/TncController.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class TncController extends Controller
+{
+    public function index(Request $request)
+    {
+        return view('terms-and-conditions');
+    }
+}
diff --git a/app/Http/Middleware/SetLocale.php b/app/Http/Middleware/SetLocale.php
index 15c58bc..791d52b 100644
--- a/app/Http/Middleware/SetLocale.php
+++ b/app/Http/Middleware/SetLocale.php
@@ -31,13 +31,20 @@ class SetLocale
         
         // Check if locale is in session
         elseif (Session::has('locale')) {
-            $locale = Session::get('locale') ?? 'id';
+            $locale = Session::get('locale');
             
             if (in_array($locale, ['en', 'id'])) {
                 App::setLocale($locale);
             }
         }
         
+        // Set default locale to 'id' if not set
+        else {
+            $locale = 'id';
+            App::setLocale($locale);
+            Session::put('locale', $locale);
+        }
+        
         return $next($request);
     }
 }
diff --git a/lang/en/help.php b/lang/en/help.php
new file mode 100644
index 0000000..da73fb1
--- /dev/null
+++ b/lang/en/help.php
@@ -0,0 +1,45 @@
+<?php
+
+return [
+    'title' => 'Help Topics',
+    'hero_title' => 'How can we help?',
+    'search_placeholder' => 'What do you need help with?',
+    'search' => 'Search',
+    'common_topics' => 'Common topics:',
+    'payments' => 'payments',
+    'refunds' => 'refunds',
+    'delivery' => 'delivery',
+    'dashboard' => 'dashboard',
+    'help_topics' => 'Help topics',
+    'delivery_tab' => 'Delivery',
+    'returns_refunds' => 'Returns & refunds',
+    'payment_options' => 'Payment options',
+    'order_issues' => 'Order issues',
+    'products_stock' => 'Products & stock',
+    'managing_account' => 'Managing account',
+    'popular_articles' => 'Popular articles',
+    'delivery_questions' => [
+        'how_courier_work' => 'How does courier delivery work?',
+        'not_available' => 'What happens if I\'m not available to receive delivery?',
+        'track_order' => 'Can I track my order in real-time?',
+        'express_delivery' => 'Is there an option for express delivery?',
+        'customs_charges' => 'Will my parcel be charged customs charges?'
+    ],
+    'contact_us' => 'Contact us',
+    'popular_faqs' => 'Popular FAQs',
+    'still_have_questions' => 'Still have unanswered questions and need to get in touch?',
+    'faq_delivery_time' => 'How long will delivery take?',
+    'faq_delivery_time_answer' => 'Delivery times vary based on your location and chosen shipping method. Generally, our standard delivery takes up to 5 days, while our Express Delivery ensures your order reaches you within 1 day. Please note that these times may be subject to occasional variations due to unforeseen circumstances, but we do our best to meet these estimates.',
+    'faq_payment_methods' => 'What payment methods do you accept?',
+    'faq_payment_methods_answer' => 'We offer a range of secure payment options to provide you with flexibility and convenience. Accepted methods include major credit/debit cards, PayPal, and other secure online payment gateways. You can find the complete list of accepted payment methods during the checkout process.',
+    'faq_international_shipping' => 'Do you ship internationally?',
+    'faq_international_shipping_answer' => 'Yes, we proudly offer international shipping to cater to our global customer base. Shipping costs and delivery times will be automatically calculated at checkout based on your selected destination. Please note that any customs duties or taxes applicable in your country are the responsibility of the customer.',
+    'faq_account_needed' => 'Do I need an account to place an order?',
+    'faq_account_needed_answer' => 'While you can place an order as a guest, creating an account comes with added benefits. By having an account, you can easily track your orders, manage your preferences, and enjoy a quicker checkout process for future purchases. It also allows us to provide you with personalized recommendations and exclusive offers.',
+    'faq_track_order' => 'How can I track my order?',
+    'faq_track_order_answer' => 'Once your order is dispatched, you will receive a confirmation email containing a unique tracking number. You can use this tracking number on our website to monitor the real-time status of your shipment. Additionally, logging into your account will grant you access to a comprehensive order history, including tracking information.',
+    'faq_size_guide' => 'Where can I find your size guide?',
+    'faq_size_guide_answer' => 'Our comprehensive size guide is conveniently located on each product page to assist you in choosing the right fit. Additionally, you can find the size guide in the main menu under "Size Guide." We recommend referring to these resources to ensure your selected items match your preferred sizing.',
+    'faq_account_needed' => 'Do I need an account to shop with you?',
+    'faq_account_needed_answer' => 'While guest checkout is available for your convenience, creating an account enhances your overall shopping experience. With an account, you can easily track your order status, save multiple shipping addresses, and enjoy a streamlined checkout process for future purchases. Moreover, account holders receive early access to promotions and exclusive offers. Signing up is quick and hassle-free!'
+];
\ No newline at end of file
diff --git a/lang/en/navbar.php b/lang/en/navbar.php
new file mode 100644
index 0000000..114e838
--- /dev/null
+++ b/lang/en/navbar.php
@@ -0,0 +1,17 @@
+<?php
+
+return [
+    'home' => 'Home',
+    'account' => 'Account',
+    'order_history' => 'Order History',
+    'profile_settings' => 'Profile Settings',
+    'address_book' => 'Address Book',
+    'payment_methods' => 'Payment Methods',
+    'wishlist' => 'Wishlist',
+    'notifications' => 'Notifications',
+    'support_tickets' => 'Support Tickets',
+    'sign_in' => 'Sign In',
+    'sign_up' => 'Sign Up',
+    'contact' => 'Contact',
+    'terms_conditions' => 'Terms & Conditions'
+];
\ No newline at end of file
diff --git a/lang/en/tnc.php b/lang/en/tnc.php
new file mode 100644
index 0000000..81dfb14
--- /dev/null
+++ b/lang/en/tnc.php
@@ -0,0 +1,65 @@
+<?php
+
+return [
+    'title' => 'Terms and conditions',
+    'last_updated' => 'Last updated:',
+    'last_updated_date' => 'June 26, 2024',
+    'welcome' => 'Welcome to AsiaGolf! These Terms and Conditions ("Terms") govern your access to and use of the AsiaGolf website and mobile application (collectively referred to as the "Platform"). Please read these Terms carefully before using the Platform. By accessing or using the Platform, you agree to be bound by these Terms.',
+    
+    'overview_title' => '1. Overview',
+    'overview_content' => 'AsiaGolf provides an online platform that enables users to purchase groceries and other products from local stores and have them delivered to their designated location. By using the Platform, you acknowledge and agree that AsiaGolf is not a store or retailer but merely acts as an intermediary to facilitate transactions between users and participating stores.',
+    'overview_additional' => 'Welcome to the family of websites and applications provided by AsiaGolf. These Terms of Use govern your access to and use of all AsiaGolf Sites, among other things. By using the AsiaGolf Sites, you affirm that you are of legal age to enter into these Terms of Use, or, if you are not, that you have obtained parental or guardian consent to enter into these Terms of Use and your parent or guardian consents to these Terms of Use on your behalf. If you violate or do not agree to these Terms of Use, then your access to and use of the AsiaGolf Sites is unauthorized. Additional terms and conditions apply to some services offered on the AsiaGolf Sites (e.g., AsiaGolf Pharmacy, AsiaGolf +, and Gift Cards) or through other channels. Those terms and conditions can be found where the relevant service is offered on the AsiaGolf Sites or otherwise and are incorporated into these Terms of Use by reference.',
+    
+    'use_title' => '2. Your use of the AsiaGolf Sites',
+    'use_content' => 'You certify that the Content you provide on or through the AsiaGolf Sites is accurate and that the information you provide on or through the AsiaGolf Sites is complete. You are solely responsible for maintaining the confidentiality and security of your account including username, password, and PIN. AsiaGolf is not responsible for any losses arising out of the unauthorized use of your account. You agree that AsiaGolf does not have any responsibility if you lose or share access to your device. Any agreement between you and the issuer of your credit card, debit card, or other form of payment will continue to govern your use of such payment method on the AsiaGolf Sites. You agree that AsiaGolf is not a party to any such agreement, nor is AsiaGolf responsible for the content, accuracy, or unavailability of any method used for payment. Your account may be restricted or terminated for any reason, at our sole discretion. Except as otherwise provided by law, at any time without notice to you, we may (1) change, restrict access to, suspend, or discontinue the AsiaGolf Sites or any portion of the AsiaGolf Sites, and (2) charge, modify, or waive any fees required to use any services, functionality, or other content available through the AsiaGolf Sites or any portion of the AsiaGolf Sites.',
+    'use_restriction_title' => 'In connection with the AsiaGolf Sites, you will not:',
+    'use_restrictions' => [
+        'Make available any Content through or in connection with the AsiaGolf Sites that is or may be in violation of the content guidelines set forth in Section 3.C (Prohibited Content) below.',
+        'Make available through or in connection with the AsiaGolf Sites any virus, worm, Trojan horse, Easter egg, time bomb, spyware, or other computer code, file, or program that is or is potentially harmful or invasive or intended to damage or hijack the operation of, or to monitor the use of, any hardware, software, or equipment.',
+        'Use the AsiaGolf Sites for any commercial purpose, or for any purpose that is fraudulent or otherwise tortious or unlawful.',
+        'Harvest or collect information about users of the AsiaGolf Sites.',
+        'Interfere with or disrupt the operation of the AsiaGolf Sites or the systems, servers, or networks used to make the AsiaGolf Sites available, including by hacking or defacing any portion of the AsiaGolf Sites; or violate any requirement, procedure, or policy of such servers or networks.',
+        'Reproduce, modify, adapt, translate, create derivative works of, sell, rent, lease, loan, timeshare, distribute, or otherwise exploit any portion of (or any use of) the AsiaGolf Sites except as expressly authorized in these Terms of Use, without AsiaGolf\'s express prior written consent.',
+        'Reverse engineer, decompile, or disassemble any portion of the AsiaGolf Sites, except where such restriction is expressly prohibited by applicable law.',
+        'Remove any copyright, trademark, or other proprietary rights notice from the AsiaGolf Sites.',
+        'You will not attempt to do anything, or permit, encourage, assist, or allow any third party to do anything, prohibited in this Section, or attempt, permit, encourage, assist, or allow any other violation of these Terms of Use.'
+    ],
+    
+    'ordering_title' => '3. Ordering and delivery',
+    'ordering_content' => 'When placing an order through AsiaGolf, you are responsible for ensuring the accuracy of the items, quantities, and delivery details. AsiaGolf does not guarantee the availability of any specific product and reserves the right to substitute products based on availability. Delivery times provided are estimates and may vary due to various factors.',
+    'ordering_restrictions' => [
+        'Reverse engineer, decompile, or disassemble any portion of the AsiaGolf Sites, except where such restriction is expressly prohibited by applicable law.',
+        'Reproduce, modify, adapt, translate, create derivative works of, sell, rent, lease, loan, timeshare, distribute, or otherwise exploit any portion of (or any use of) the AsiaGolf Sites except as expressly authorized in these Terms of Use, without AsiaGolf\'s express prior written consent.',
+        'You will not attempt to do anything, or permit, encourage, assist, or allow any third party to'
+    ],
+    
+    'payments_title' => '4. Payments',
+    'payments_content' => 'AsiaGolf facilitates payments for orders made through the Platform. By using AsiaGolf\'s payment services, you agree to provide accurate payment information and authorize AsiaGolf to charge the applicable amount for your order. AsiaGolf may use third-party payment processors to process transactions and may store your payment information in accordance with its Privacy Policy.',
+    
+    'user_conduct_title' => '5. User conduct',
+    'user_conduct_content' => 'You agree to use the Platform in compliance with all applicable laws and regulations. You shall not engage in any unlawful, harmful, or abusive behavior while using the Platform. AsiaGolf reserves the right to suspend or terminate your account if you violate these Terms or engage in any prohibited activities.',
+    
+    'intellectual_property_title' => 'Intellectual property',
+    'intellectual_property_content' => 'All content on the AsiaGolf Platform, including but not limited to text, graphics, logos, and software, is the property of AsiaGolf or its licensors and is protected by intellectual property laws. You may not use, reproduce, modify, or distribute any content from the Platform without prior written consent from AsiaGolf.',
+    
+    'third_party_links_title' => 'Third-party links and content',
+    'third_party_links_content' => 'The Platform may contain links to third-party websites or resources. AsiaGolf does not endorse, control, or assume responsibility for any third-party content or websites. You acknowledge and agree that AsiaGolf is not liable for any loss or damage caused by your reliance on such content or websites.',
+    
+    'disclaimer_title' => 'Disclaimer of warranties',
+    'disclaimer_content' => 'The Platform is provided on an "as is" and "as available" basis, without warranties of any kind, either express or implied. AsiaGolf does not guarantee the accuracy, reliability, or availability of the Platform and disclaims all warranties to the fullest extent permitted by law.',
+    
+    'limitation_title' => 'Limitation of liability',
+    'limitation_content' => 'To the maximum extent permitted by law, AsiaGolf and its affiliates shall not be liable for any indirect, incidental, consequential, or punitive damages arising out of or in connection with the use of the Platform, even if advised of the possibility of such damages.',
+    
+    'agreement_title' => '6. Entire agreement and severability',
+    'agreement_content' => 'These Terms, subject to any amendments, modifications, or additional agreements you enter into with AsiaGolf, shall constitute the entire agreement between you and AsiaGolf with respect to the Services and any use of the Services. If any provision of these Terms is found to be invalid by a court of competent jurisdiction, that provision only will be limited to the minimum extent necessary, and the remaining provisions will remain in full force and effect.',
+    'agreement_additional' => 'AsiaGolf reserves the right to modify or update these Terms at any time without prior notice. Your continued use of the Platform after any changes to the Terms constitutes acceptance of those changes.',
+    
+    'contact_title' => '7. Contact information',
+    'contact_content' => 'If you have any questions, or comments about these Terms please contact AsiaGolf at:',
+    'help_text' => 'For customer service inquiries, please review Your Account Settings, visit AsiaGolf\'s',
+    'help_link' => 'Help Center.',
+    'helpful_question' => 'Was this information helpful?',
+    'yes_button' => 'Yes',
+    'no_button' => 'No'
+];
\ No newline at end of file
diff --git a/lang/id/help.php b/lang/id/help.php
new file mode 100644
index 0000000..2dc2f32
--- /dev/null
+++ b/lang/id/help.php
@@ -0,0 +1,45 @@
+<?php
+
+return [
+    'title' => 'Topik Bantuan v.2',
+    'hero_title' => 'Bagaimana kami bisa membantu?',
+    'search_placeholder' => 'Apa yang Anda butuhkan bantuan?',
+    'search' => 'Cari',
+    'common_topics' => 'Topik umum:',
+    'payments' => 'pembayaran',
+    'refunds' => 'pengembalian',
+    'delivery' => 'pengiriman',
+    'dashboard' => 'dasbor',
+    'help_topics' => 'Topik bantuan',
+    'delivery_tab' => 'Pengiriman',
+    'returns_refunds' => 'Pengembalian & pengembalian dana',
+    'payment_options' => 'Opsi pembayaran',
+    'order_issues' => 'Masalah pesanan',
+    'products_stock' => 'Produk & stok',
+    'managing_account' => 'Mengelola akun',
+    'popular_articles' => 'Artikel populer',
+    'delivery_questions' => [
+        'how_courier_work' => 'Bagaimana cara kerja pengiriman kurir?',
+        'not_available' => 'Apa yang terjadi jika saya tidak tersedia untuk menerima pengiriman?',
+        'track_order' => 'Bisakah saya melacak pesanan saya secara real-time?',
+        'express_delivery' => 'Apakah ada opsi untuk pengiriman ekspres?',
+        'customs_charges' => 'Akan paket saya dikenakan biaya bea cukai?'
+    ],
+    'contact_us' => 'Hubungi kami',
+    'popular_faqs' => 'FAQ Populer',
+    'still_have_questions' => 'Masih memiliki pertanyaan yang belum terjawab dan perlu menghubungi kami?',
+    'faq_delivery_time' => 'Berapa lama pengiriman akan berlangsung?',
+    'faq_delivery_time_answer' => 'Waktu pengiriman bervariasi berdasarkan lokasi dan metode pengiriman yang dipilih. Secara umum, pengiriman standar kami memakan waktu hingga 5 hari, sementara Pengiriman Ekspres kami memastikan pesanan Anda sampai dalam 1 hari. Harap dicatat bahwa waktu ini mungkin mengalami variasi sesekali waktu karena keadaan tak terduga, tetapi kami akan berusaha sebaik mungkin untuk memenuhi perkiraan ini.',
+    'faq_payment_methods' => 'Metode pembayaran apa yang Anda terima?',
+    'faq_payment_methods_answer' => 'Kami menawarkan berbagai opsi pembayaran yang aman untuk memberikan Anda fleksibilitas dan kenyamanan. Metode yang diterima termasuk kartu kredit/debit utama, PayPal, dan gerbang pembayaran online aman lainnya. Anda dapat menemukan daftar lengkap metode pembayaran yang diterima selama proses checkout.',
+    'faq_international_shipping' => 'Apakah Anda mengirim ke luar negeri?',
+    'faq_international_shipping_answer' => 'Ya, kami dengan bangga menawarkan pengiriman internasional untuk melayani pelanggan global kami. Biaya pengiriman dan waktu pengiriman akan dihitung secara otomatis saat checkout berdasarkan tujuan yang dipilih. Harap dicatat bahwa bea cukai atau pajak yang berlaku di negara Anda adalah tanggung jawab pelanggan.',
+    'faq_account_needed' => 'Apakah saya perlu akun untuk melakukan pesanan?',
+    'faq_account_needed_answer' => 'Meskipun Anda dapat melakukan pesanan sebagai tamu, membuat akun memiliki manfaat tambahan. Dengan memiliki akun, Anda dapat dengan mudah melacak pesanan, mengelola preferensi, dan menikmati proses checkout yang lebih cepat untuk pembelian masa depan. Ini juga memungkinkan kami memberikan Anda rekomendasi yang dipersonalisasikan dan penawaran eksklusif.',
+    'faq_track_order' => 'Bagaimana cara melacak pesanan saya?',
+    'faq_track_order_answer' => 'Setelah pesanan dikirim, Anda akan menerima email konfirmasi yang berisi nomor pelacakan unik. Anda dapat menggunakan nomor pelacakan ini di situs web kami untuk memantau status real-time pengiriman Anda. Selain itu, masuk ke akun Anda akan memberikan Anda akses ke riwayat pesanan lengkap, termasuk informasi pelacakan.',
+    'faq_size_guide' => 'Di mana saya dapat menemukan panduan ukuran?',
+    'faq_size_guide_answer' => 'Panduan ukuran lengkap kami secara nyaman terletak di halaman produk masing-masing untuk membantu Anda memilih ukuran yang tepat. Selain itu, Anda dapat menemukan panduan ukuran di menu utama di bawah "Panduan Ukuran". Kami sarankan untuk merujuk ke sumber daya ini untuk memastikan item yang Anda pilih sesuai dengan preferensi ukuran Anda.',
+    'faq_account_needed' => 'Apakah saya perlu akun untuk berbelanja dengan Anda?',
+    'faq_account_needed_answer' => 'Meskipun checkout tamu tersedia untuk kenyamanan Anda, membuat akun memiliki manfaat tambahan. Dengan memiliki akun, Anda dapat dengan mudah melacak status pesanan, menyimpan alamat pengiriman, dan menikmati proses checkout yang lebih cepat untuk pembelian masa depan. Ini juga memungkinkan kami memberikan Anda akses awal ke promosi dan penawaran eksklusif. Mendaftar cepat dan mudah!'
+];
diff --git a/lang/id/navbar.php b/lang/id/navbar.php
new file mode 100644
index 0000000..8133d23
--- /dev/null
+++ b/lang/id/navbar.php
@@ -0,0 +1,17 @@
+<?php
+
+return [
+    'home' => 'Beranda',
+    'account' => 'Akun',
+    'order_history' => 'Riwayat Pesanan',
+    'profile_settings' => 'Pengaturan Profil',
+    'address_book' => 'Buku Alamat',
+    'payment_methods' => 'Metode Pembayaran',
+    'wishlist' => 'Daftar Keinginan',
+    'notifications' => 'Notifikasi',
+    'support_tickets' => 'Tiket Dukungan',
+    'sign_in' => 'Masuk',
+    'sign_up' => 'Daftar',
+    'contact' => 'Kontak',
+    'terms_conditions' => 'Syarat & Ketentuan'
+];
diff --git a/lang/id/tnc.php b/lang/id/tnc.php
new file mode 100644
index 0000000..abb368d
--- /dev/null
+++ b/lang/id/tnc.php
@@ -0,0 +1,65 @@
+<?php
+
+return [
+    'title' => 'Syarat dan Ketentuan',
+    'last_updated' => 'Terakhir diperbarui:',
+    'last_updated_date' => '26 Juni 2024',
+    'welcome' => 'Selamat datang di AsiaGolf! Syarat dan Ketentuan ini ("Syarat") mengatur akses dan penggunaan Anda terhadap situs web dan aplikasi seluler AsiaGolf (secara kolektif disebut "Platform"). Harap baca Syarat ini dengan cermat sebelum menggunakan Platform. Dengan mengakses atau menggunakan Platform, Anda setuju untuk terikat oleh Syarat ini.',
+    
+    'overview_title' => '1. Gambaran Umum',
+    'overview_content' => 'AsiaGolf menyediakan platform online yang memungkinkan pengguna membeli bahan makanan dan produk lainnya dari toko lokal dan mengirimkannya ke lokasi yang ditentukan. Dengan menggunakan Platform, Anda mengakui dan setuju bahwa AsiaGolf bukan toko atau pengecer tetapi hanya bertindak sebagai perantara untuk memfasilitasi transaksi antara pengguna dan toko yang berpartisipasi.',
+    'overview_additional' => 'Selamat datang di keluarga situs web dan aplikasi yang disediakan oleh AsiaGolf. Syarat Penggunaan ini mengatur akses dan penggunaan Anda terhadap semua Situs AsiaGolf, antara lain. Dengan menggunakan Situs AsiaGolf, Anda menyatakan bahwa Anda berusia dewasa secara hukum untuk memasuki Syarat Penggunaan ini, atau, jika tidak, Anda telah mendapat persetujuan orang tua atau wali untuk memasuki Syarat Penggunaan ini dan orang tua atau wali Anda menyetujui Syarat Penggunaan ini atas nama Anda. Jika Anda melanggar atau tidak menyetujui Syarat Penggunaan ini, maka akses dan penggunaan Anda terhadap Situs AsiaGolf tidak sah. Syarat dan ketentuan tambahan berlaku untuk beberapa layanan yang ditawarkan di Situs AsiaGolf (misalnya AsiaGolf Pharmacy, AsiaGolf +, dan Gift Cards) atau melalui saluran lain. Syarat dan ketentuan tersebut dapat ditemukan di tempat layanan yang relevan ditawarkan di Situs AsiaGolf atau sebaliknya dan dimasukkan ke dalam Syarat Penggunaan ini dengan referensi.',
+    
+    'use_title' => '2. Penggunaan Anda terhadap Situs AsiaGolf',
+    'use_content' => 'Anda menyatakan bahwa Konten yang Anda berikan di atau melalui Situs AsiaGolf adalah akurat dan bahwa informasi yang Anda berikan di atau melalui Situs AsiaGolf adalah lengkap. Anda sepenuhnya bertanggung jawab untuk menjaga kerahasiaan dan keamanan akun Anda termasuk nama pengguna, kata sandi, dan PIN. AsiaGolf tidak bertanggung jawab atas kerugian apa pun yang timbul dari penggunaan akun Anda yang tidak sah. Anda setuju bahwa AsiaGolf tidak memiliki tanggung jawab apa pun jika Anda kehilangan atau membagikan akses ke perangkat Anda. Setiap perjanjian antara Anda dan penerbit kartu kredit, kartu debit, atau bentuk pembayaran lainnya akan terus mengatur penggunaan metode pembayaran tersebut di Situs AsiaGolf. Anda setuju bahwa AsiaGolf bukan pihak dalam perjanjian tersebut, juga AsiaGolf tidak bertanggung jawab atas konten, akurasi, atau ketidaktersediaan metode apa pun yang digunakan untuk pembayaran. Akun Anda dapat dibatasi atau dihentikan untuk alasan apa pun, atas kebijakan kami sepenuhnya. Kecuali sebagaimana diatur oleh hukum, setiap saat tanpa pemberitahuan kepada Anda, kami dapat (1) mengubah, membatasi akses, menangguhkan, atau menghentikan Situs AsiaGolf atau sebagian Situs AsiaGolf, dan (2) mengenakan, mengubah, atau membebaskan biaya apa pun yang diperlukan untuk menggunakan layanan, fungsionalitas, atau konten lain yang tersedia melalui Situs AsiaGolf atau sebagian Situs AsiaGolf.',
+    'use_restriction_title' => 'Sehubungan dengan Situs AsiaGolf, Anda tidak akan:',
+    'use_restrictions' => [
+        'Menyediakan Konten apa pun melalui atau sehubungan dengan Situs AsiaGolf yang melanggar atau mungkin melanggar pedoman konten yang ditetapkan dalam Bagian 3.C (Konten yang Dilarang) di bawah ini.',
+        'Menyediakan melalui atau sehubungan dengan Situs AsiaGolf virus, cacing, Trojan horse, Easter egg, time bomb, spyware, atau kode komputer, file, atau program lain yang berpotensi berbahaya atau invasif atau dimaksudkan untuk merusak atau membajak operasi, atau memantau penggunaan, perangkat keras, perangkat lunak, atau peralatan apa pun.',
+        'Menggunakan Situs AsiaGolf untuk tujuan komersial apa pun, atau untuk tujuan apa pun yang curang atau bertentangan dengan hukum.',
+        'Mengumpulkan atau mengumpulkan informasi tentang pengguna Situs AsiaGolf.',
+        'Mengganggu atau mengganggu operasi Situs AsiaGolf atau sistem, server, atau jaringan yang digunakan untuk membuat Situs AsiaGolf tersedia, termasuk dengan meretas atau merusak sebagian Situs AsiaGolf; atau melanggar persyaratan, prosedur, atau kebijakan server atau jaringan tersebut.',
+        'Mereproduksi, memodifikasi, beradaptasi, menerjemahkan, membuat karya turunan dari, menjual, menyewakan, meminjamkan, timeshare, mendistribusikan, atau mengeksploitasi sebagian dari (atau penggunaan apa pun dari) Situs AsiaGolf kecuali sebagaimana diizinkan secara tegas dalam Syarat Penggunaan ini, tanpa persetujuan tertulis sebelumnya dari AsiaGolf.',
+        'Melakukan reverse engineering, dekompilasi, atau membongkar sebagian Situs AsiaGolf, kecuali jika pembatasan tersebut secara tegas dilarang oleh hukum yang berlaku.',
+        'Menghapus hak cipta, merek dagang, atau pemberitahuan hak kepemilikan lainnya dari Situs AsiaGolf.',
+        'Anda tidak akan mencoba melakukan apa pun, atau mengizinkan, mendorong, membantu, atau memungkinkan pihak ketiga untuk melakukan apa pun yang dilarang dalam Bagian ini, atau mencoba, mengizinkan, mendorong, membantu, atau memungkinkan pelanggaran lain dari Syarat Penggunaan ini.'
+    ],
+    
+    'ordering_title' => '3. Pemesanan dan pengiriman',
+    'ordering_content' => 'Saat melakukan pemesanan melalui AsiaGolf, Anda bertanggung jawab untuk memastikan akurasi item, jumlah, dan detail pengiriman. AsiaGolf tidak menjamin ketersediaan produk tertentu dan berhak mengganti produk berdasarkan ketersediaan. Waktu pengiriman yang diberikan adalah perkiraan dan dapat bervariasi karena berbagai faktor.',
+    'ordering_restrictions' => [
+        'Melakukan reverse engineering, dekompilasi, atau membongkar sebagian Situs AsiaGolf, kecuali jika pembatasan tersebut secara tegas dilarang oleh hukum yang berlaku.',
+        'Mereproduksi, memodifikasi, beradaptasi, menerjemahkan, membuat karya turunan dari, menjual, menyewakan, meminjamkan, timeshare, mendistribusikan, atau mengeksploitasi sebagian dari (atau penggunaan apa pun dari) Situs AsiaGolf kecuali sebagaimana diizinkan secara tegas dalam Syarat Penggunaan ini, tanpa persetujuan tertulis sebelumnya dari AsiaGolf.',
+        'Anda tidak akan mencoba melakukan apa pun, atau mengizinkan, mendorong, membantu, atau memungkinkan pihak ketiga untuk'
+    ],
+    
+    'payments_title' => '4. Pembayaran',
+    'payments_content' => 'AsiaGolf memfasilitasi pembayaran untuk pesanan yang dilakukan melalui Platform. Dengan menggunakan layanan pembayaran AsiaGolf, Anda setuju untuk memberikan informasi pembayaran yang akurat dan mengizinkan AsiaGolf untuk membebankan jumlah yang berlaku untuk pesanan Anda. AsiaGolf dapat menggunakan pemroses pembayaran pihak ketiga untuk memproses transaksi dan dapat menyimpan informasi pembayaran Anda sesuai dengan Kebijakan Privasinya.',
+    
+    'user_conduct_title' => '5. Perilaku pengguna',
+    'user_conduct_content' => 'Anda setuju untuk menggunakan Platform sesuai dengan semua hukum dan peraturan yang berlaku. Anda tidak akan terlibat dalam perilaku yang melanggar hukum, berbahaya, atau kasar saat menggunakan Platform. AsiaGolf berhak menangguhkan atau menghentikan akun Anda jika Anda melanggar Syarat ini atau terlibat dalam aktivitas yang dilarang.',
+    
+    'intellectual_property_title' => 'Kekayaan intelektual',
+    'intellectual_property_content' => 'Semua konten di Platform AsiaGolf, termasuk namun tidak terbatas pada teks, grafik, logo, dan perangkat lunak, adalah milik AsiaGolf atau pemberi lisensinya dan dilindungi oleh hukum kekayaan intelektual. Anda tidak dapat menggunakan, mereproduksi, memodifikasi, atau mendistribusikan konten apa pun dari Platform tanpa persetujuan tertulis sebelumnya dari AsiaGolf.',
+    
+    'third_party_links_title' => 'Tautan dan konten pihak ketiga',
+    'third_party_links_content' => 'Platform mungkin berisi tautan ke situs web atau sumber daya pihak ketiga. AsiaGolf tidak mendukung, mengontrol, atau bertanggung jawab atas konten atau situs web pihak ketiga. Anda mengakui dan setuju bahwa AsiaGolf tidak bertanggung jawab atas kerugian atau kerusakan apa pun yang disebabkan oleh kepercayaan Anda pada konten atau situs web tersebut.',
+    
+    'disclaimer_title' => 'Penafian jaminan',
+    'disclaimer_content' => 'Platform disediakan "apa adanya" dan "sebagaimana tersedia", tanpa jaminan apa pun, baik tersurat maupun tersirat. AsiaGolf tidak menjamin akurasi, keandalan, atau ketersediaan Platform dan menolak semua jaminan sejauh yang diizinkan oleh hukum.',
+    
+    'limitation_title' => 'Pembatasan tanggung jawab',
+    'limitation_content' => 'Sejauh yang diizinkan oleh hukum, AsiaGolf dan afiliasinya tidak akan bertanggung jawab atas kerusakan tidak langsung, insidental, konsekuensial, atau punitive yang timbul dari atau sehubungan dengan penggunaan Platform, bahkan jika telah diberitahu tentang kemungkinan kerusakan tersebut.',
+    
+    'agreement_title' => '6. Perjanjian keseluruhan dan pemisahan',
+    'agreement_content' => 'Syarat ini, tunduk pada amendemen, modifikasi, atau perjanjian tambahan yang Anda buat dengan AsiaGolf, akan merupakan keseluruhan perjanjian antara Anda dan AsiaGolf sehubungan dengan Layanan dan penggunaan apa pun dari Layanan. Jika ketentuan apa pun dari Syarat ini ditemukan tidak sah oleh pengadilan yurisdiksi yang kompeten, ketentuan tersebut hanya akan dibatasi sejauh minimum yang diperlukan, dan ketentuan yang tersisa akan tetap berlaku penuh.',
+    'agreement_additional' => 'AsiaGolf berhak mengubah atau memperbarui Syarat ini kapan saja tanpa pemberitahuan sebelumnya. Penggunaan Platform Anda yang berkelanjutan setelah perubahan Syarat merupakan penerimaan terhadap perubahan tersebut.',
+    
+    'contact_title' => '7. Informasi kontak',
+    'contact_content' => 'Jika Anda memiliki pertanyaan, atau komentar tentang Syarat ini, silakan hubungi AsiaGolf di:',
+    'help_text' => 'Untuk pertanyaan layanan pelanggan, harap tinjau Pengaturan Akun Anda, kunjungi',
+    'help_link' => 'Pusat Bantuan AsiaGolf.',
+    'helpful_question' => 'Apakah informasi ini membantu?',
+    'yes_button' => 'Ya',
+    'no_button' => 'Tidak'
+];
\ No newline at end of file
diff --git a/public/img/home/banner.png b/public/img/home/banner.png
new file mode 100644
index 0000000..f582ea6
Binary files /dev/null and b/public/img/home/banner.png differ
diff --git a/public/img/home/stick.png b/public/img/home/stick.png
new file mode 100644
index 0000000..65efdb8
Binary files /dev/null and b/public/img/home/stick.png differ
diff --git a/public/img/side-view-man-playing-golf-field-with-club-copy-space.jpg b/public/img/side-view-man-playing-golf-field-with-club-copy-space.jpg
new file mode 100644
index 0000000..96e5e11
Binary files /dev/null and b/public/img/side-view-man-playing-golf-field-with-club-copy-space.jpg differ
diff --git a/resources/views/components/help/article-carousel.blade.php b/resources/views/components/help/article-carousel.blade.php
new file mode 100644
index 0000000..ef1f26b
--- /dev/null
+++ b/resources/views/components/help/article-carousel.blade.php
@@ -0,0 +1,88 @@
+<!-- Carousel -->
+                <div class="position-relative mx-2 mx-sm-0">
+                    <div class="swiper"
+                        data-swiper='{
+              "slidesPerView": 1,
+              "spaceBetween": 24,
+              "loop": true,
+              "autoHeight": true,
+              "navigation": {
+                "prevEl": ".btn-prev",
+                "nextEl": ".btn-next"
+              },
+              "breakpoints": {
+                "500": {
+                  "slidesPerView": 2
+                },
+                "992": {
+                  "slidesPerView": 3
+                }
+              }
+            }'>
+                        <div class="swiper-wrapper">
+                            <!-- Article -->
+                            <article class="swiper-slide">
+                                <a class="ratio d-flex hover-effect-scale rounded overflow-hidden"
+                                    href="{{ route('second', ['help', 'single-article-v2']) }}" style="--cz-aspect-ratio: calc(306 / 416 * 100%)">
+                                    <img src="/img/help/article01.jpg" class="hover-effect-target" alt="Image">
+                                </a>
+                                <div class="pt-4">
+                                    <div class="text-body-tertiary fs-xs pb-2 mt-n1 mb-1">October 2, 2024</div>
+                                <h3 class="h5 mb-2">How to Choose the Right Golf Ball</h3>
+                                <p class="mb-3">Selecting the perfect golf ball can significantly impact your game. Our comprehensive
+                                    guide covers everything from compression and cover material to dimple patterns and
+                                    swing weight considerations.</p>
+                                <a class="btn btn-sm btn-primary" href="#">Read More</a>
+                            </div>
+                            </article>
+
+                            <!-- Article -->
+                            <article class="swiper-slide">
+                                <a class="ratio d-flex hover-effect-scale rounded overflow-hidden"
+                                    href="{{ route('second', ['help', 'single-article-v2']) }}" style="--cz-aspect-ratio: calc(306 / 416 * 100%)">
+                                    <img src="/img/help/article02.jpg" class="hover-effect-target" alt="Image">
+                                </a>
+                                <div class="pt-4">
+                                    <div class="text-body-tertiary fs-xs pb-2 mt-n1 mb-1">October 2, 2024</div>
+                                    <h3 class="h5 mb-2">Golf Club Membership Benefits</h3>
+                                    <p class="mb-3">Join our exclusive golf club for premium benefits including early access
+                                    to new products, member-only tournaments, and special discounts throughout the
+                                    year.</p>
+                                    <a class="btn btn-sm btn-primary" href="#">Learn More</a>
+                            </div>
+                            </article>
+
+                            <!-- Article -->
+                            <article class="swiper-slide">
+                                <a class="ratio d-flex hover-effect-scale rounded overflow-hidden"
+                                    href="{{ route('second', ['help', 'single-article-v2']) }}" style="--cz-aspect-ratio: calc(306 / 416 * 100%)">
+                                    <img src="/img/help/article03.jpg" class="hover-effect-target" alt="Image">
+                                </a>
+                                <div class="pt-4">
+                                    <div class="text-body-tertiary fs-xs pb-2 mt-n1 mb-1">October 2, 2024</div>
+                                    <h3 class="h5 mb-2">Understanding Golf Course Ratings</h3>
+                                    <p class="mb-3">Learn how to interpret golf course difficulty ratings and slope
+                                    ratings to choose courses that match your skill level perfectly.</p>
+                                    <a class="btn btn-sm btn-primary" href="#">Explore Courses</a>
+                            </div>
+                            </article>
+                        </div>
+
+                        <!-- Prev button -->
+                        <div class="position-absolute top-50 start-0 z-2 translate-middle hover-effect-target mt-n5">
+                            <button type="button"
+                                class="btn btn-prev btn-icon btn-outline-secondary bg-body rounded-circle animate-slide-start"
+                                aria-label="Prev">
+                                <i class="ci-chevron-left fs-lg animate-target"></i>
+                            </button>
+                        </div>
+
+                        <!-- Next button -->
+                        <div class="position-absolute top-50 start-100 z-2 translate-middle hover-effect-target mt-n5">
+                            <button type="button"
+                                class="btn btn-next btn-icon btn-outline-secondary bg-body rounded-circle animate-slide-end"
+                                aria-label="Next">
+                                <i class="ci-chevron-right fs-lg animate-target"></i>
+                            </button>
+                        </div>
+                    </div>
diff --git a/resources/views/components/help/faq-section.blade.php b/resources/views/components/help/faq-section.blade.php
new file mode 100644
index 0000000..673b801
--- /dev/null
+++ b/resources/views/components/help/faq-section.blade.php
@@ -0,0 +1,91 @@
+<section class="container py-5">
+    <div class="row py-1 py-sm-2 py-md-3 py-lg-4 py-xl-5">
+        <div class="col-md-4 col-xl-3 mb-4 mb-md-0" style="margin-top: -120px;">
+            <div class="sticky-md-top text-center text-md-start pe-md-4 pe-lg-5 pe-xl-0"
+                style="padding-top: 120px;">
+                <h2>{{ __('help.popular_faqs') }}</h2>
+                <p class="pb-2 pb-md-3">{{ __('help.still_have_questions') }}</p>
+                <a class="btn btn-lg btn-primary" href="#!">{{ __('help.contact_us') }}</a>
+            </div>
+        </div>
+        <div class="col-md-8 offset-xl-1">
+            <!-- Accordion of questions -->
+            <div class="accordion" id="faq">
+                <!-- Question -->
+                <div class="accordion-item">
+                    <h3 class="accordion-header" id="faqHeading-1">
+                        <button type="button" class="accordion-button hover-effect-underline collapsed"
+                            data-bs-toggle="collapse" data-bs-target="#faqCollapse-1" aria-expanded="false"
+                            aria-controls="faqCollapse-1">
+                            <span class="me-2">{{ __('help.faq_delivery_time') }}</span>
+                        </button>
+                    </h3>
+                    <div class="accordion-collapse collapse" id="faqCollapse-1" aria-labelledby="faqHeading-1"
+                        data-bs-parent="#faq">
+                        <div class="accordion-body">{{ __('help.faq_delivery_time_answer') }}</div>
+                    </div>
+                </div>
+
+                <!-- Question -->
+                <div class="accordion-item">
+                    <h3 class="accordion-header" id="faqHeading-2">
+                        <button type="button" class="accordion-button hover-effect-underline collapsed"
+                            data-bs-toggle="collapse" data-bs-target="#faqCollapse-2" aria-expanded="false"
+                            aria-controls="faqCollapse-2">
+                            <span class="me-2">{{ __('help.faq_payment_methods') }}</span>
+                        </button>
+                    </h3>
+                    <div class="accordion-collapse collapse" id="faqCollapse-2" aria-labelledby="faqHeading-2"
+                        data-bs-parent="#faq">
+                        <div class="accordion-body">{{ __('help.faq_payment_methods_answer') }}</div>
+                    </div>
+                </div>
+
+                <!-- Question -->
+                <div class="accordion-item">
+                    <h3 class="accordion-header" id="faqHeading-3">
+                        <button type="button" class="accordion-button hover-effect-underline collapsed"
+                            data-bs-toggle="collapse" data-bs-target="#faqCollapse-3" aria-expanded="false"
+                            aria-controls="faqCollapse-3">
+                            <span class="me-2">{{ __('help.faq_international_shipping') }}</span>
+                        </button>
+                    </h3>
+                    <div class="accordion-collapse collapse" id="faqCollapse-3" aria-labelledby="faqHeading-3"
+                        data-bs-parent="#faq">
+                        <div class="accordion-body">{{ __('help.faq_international_shipping_answer') }}</div>
+                    </div>
+                </div>
+
+                <!-- Question -->
+                <div class="accordion-item">
+                    <h3 class="accordion-header" id="faqHeading-4">
+                        <button type="button" class="accordion-button hover-effect-underline collapsed"
+                            data-bs-toggle="collapse" data-bs-target="#faqCollapse-4" aria-expanded="false"
+                            aria-controls="faqCollapse-4">
+                            <span class="me-2">{{ __('help.faq_account_needed') }}</span>
+                        </button>
+                    </h3>
+                    <div class="accordion-collapse collapse" id="faqCollapse-4" aria-labelledby="faqHeading-4"
+                        data-bs-parent="#faq">
+                        <div class="accordion-body">{{ __('help.faq_account_needed_answer') }}</div>
+                    </div>
+                </div>
+
+                <!-- Question -->
+                <div class="accordion-item">
+                    <h3 class="accordion-header" id="faqHeading-5">
+                        <button type="button" class="accordion-button hover-effect-underline collapsed"
+                            data-bs-toggle="collapse" data-bs-target="#faqCollapse-5" aria-expanded="false"
+                            aria-controls="faqCollapse-5">
+                            <span class="me-2">{{ __('help.faq_track_order') }}</span>
+                        </button>
+                    </h3>
+                    <div class="accordion-collapse collapse" id="faqCollapse-5" aria-labelledby="faqHeading-5"
+                        data-bs-parent="#faq">
+                        <div class="accordion-body">{{ __('help.faq_track_order_answer') }}</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/resources/views/components/home/home-popular-products.blade.php b/resources/views/components/home/home-popular-products.blade.php
index 94e4199..f7f5d03 100644
--- a/resources/views/components/home/home-popular-products.blade.php
+++ b/resources/views/components/home/home-popular-products.blade.php
@@ -212,8 +212,9 @@ document.addEventListener('DOMContentLoaded', function() {
     function loadPopularImages() {
         // Load images for the slider
         const images = [
-            '/img/home/fashion/v1/popular/01.jpg',
-            '/img/home/fashion/v1/popular/02.jpg'
+            '{{ asset("img/side-view-man-playing-golf-field-with-club-copy-space.jpg") }}',
+            '{{ asset("img/side-view-man-playing-golf-field-with-club-copy-space.jpg") }}',
+            
         ];
         
         imagesContainer.innerHTML = '';
diff --git a/resources/views/components/home/home-slider.blade.php b/resources/views/components/home/home-slider.blade.php
index 5420346..48ac0ef 100644
--- a/resources/views/components/home/home-slider.blade.php
+++ b/resources/views/components/home/home-slider.blade.php
@@ -43,15 +43,6 @@
                                 </a>
                             </div>
 
-                            <!-- Item -->
-                            <div class="swiper-slide text-center text-md-start">
-                                <p class="fs-xl mb-2 mb-lg-3 mb-xl-4">Shades of gray for your look</p>
-                                <h2 class="display-4 text-uppercase mb-4 mb-xl-5">-50% on gray Collection</h2>
-                                <a class="btn btn-lg btn-outline-dark" href="{{ route('second', ['shop', 'catalog-fashion']) }}">
-                                    Shop now
-                                    <i class="ci-arrow-up-right fs-lg ms-2 me-n1"></i>
-                                </a>
-                            </div>
                         </div>
                     </div>
                 </div>
@@ -79,17 +70,14 @@
             }'>
                         <div class="swiper-wrapper">
                             <div class="swiper-slide">
-                                <img src="/img/home/fashion/v1/hero-slider/01.png" class="rtl-flip"
+                                <img src="{{ asset('img/home/banner.png') }}" class="rtl-flip"
                                     alt="Image">
                             </div>
                             <div class="swiper-slide">
-                                <img src="/img/home/fashion/v1/hero-slider/02.png" class="rtl-flip"
-                                    alt="Image">
-                            </div>
-                            <div class="swiper-slide">
-                                <img src="/img/home/fashion/v1/hero-slider/03.png" class="rtl-flip"
+                                <img src="{{ asset('img/home/stick.png') }}" class="rtl-flip"
                                     alt="Image">
                             </div>
+                         
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/components/home/instagram-feed.blade.php b/resources/views/components/home/instagram-feed.blade.php
new file mode 100644
index 0000000..ecea69e
--- /dev/null
+++ b/resources/views/components/home/instagram-feed.blade.php
@@ -0,0 +1,65 @@
+<!-- Instagram feed -->
+<section class="container pt-5 mt-1 mt-sm-2 mt-md-3 mt-lg-4 mt-xl-5">
+    <div class="text-center pt-xxl-3 pb-2 pb-md-3">
+        <h2 class="pb-2 mb-1">
+            <span class="animate-underline">
+                <a class="animate-target text-dark-emphasis text-decoration-none" href="#!">#AsiaGolf</a>
+            </span>
+        </h2>
+        <p>Find more inspiration on our Instagram</p>
+    </div>
+    <div class="overflow-x-auto pb-3 mb-n3" data-simplebar>
+        <div class="d-flex gap-2 gap-md-3 gap-lg-4" style="min-width: 700px">
+            <a class="hover-effect-scale hover-effect-opacity position-relative w-100 overflow-hidden"
+                href="#!">
+                <span
+                    class="hover-effect-target position-absolute top-0 start-0 w-100 h-100 bg-black bg-opacity-25 opacity-0 z-1"></span>
+                <i
+                    class="ci-instagram hover-effect-target fs-4 text-white position-absolute top-50 start-50 translate-middle opacity-0 z-2"></i>
+                <div class="hover-effect-target ratio ratio-1x1">
+                    <img src="https://dev.smgdev.top/api/storage/thumbnail_demo.png?id=40144" alt="Instagram image">
+                </div>
+            </a>
+            <a class="hover-effect-scale hover-effect-opacity position-relative w-100 overflow-hidden"
+                href="#!">
+                <span
+                    class="hover-effect-target position-absolute top-0 start-0 w-100 h-100 bg-black bg-opacity-25 opacity-0 z-1"></span>
+                <i
+                    class="ci-instagram hover-effect-target fs-4 text-white position-absolute top-50 start-50 translate-middle opacity-0 z-2"></i>
+                <div class="hover-effect-target ratio ratio-1x1">
+                    <img src="https://dev.smgdev.top/api/storage/thumbnail_demo.png?id=40144" alt="Instagram image">
+                </div>
+            </a>
+            <a class="hover-effect-scale hover-effect-opacity position-relative w-100 overflow-hidden"
+                href="#!">
+                <span
+                    class="hover-effect-target position-absolute top-0 start-0 w-100 h-100 bg-black bg-opacity-25 opacity-0 z-1"></span>
+                <i
+                    class="ci-instagram hover-effect-target fs-4 text-white position-absolute top-50 start-50 translate-middle opacity-0 z-2"></i>
+                <div class="hover-effect-target ratio ratio-1x1">
+                    <img src="https://dev.smgdev.top/api/storage/thumbnail_demo.png?id=40144" alt="Instagram image">
+                </div>
+            </a>
+            <a class="hover-effect-scale hover-effect-opacity position-relative w-100 overflow-hidden"
+                href="#!">
+                <span
+                    class="hover-effect-target position-absolute top-0 start-0 w-100 h-100 bg-black bg-opacity-25 opacity-0 z-1"></span>
+                <i
+                    class="ci-instagram hover-effect-target fs-4 text-white position-absolute top-50 start-50 translate-middle opacity-0 z-2"></i>
+                <div class="hover-effect-target ratio ratio-1x1">
+                    <img src="https://dev.smgdev.top/api/storage/thumbnail_demo.png?id=40144" alt="Instagram image">
+                </div>
+            </a>
+            <a class="hover-effect-scale hover-effect-opacity position-relative w-100 overflow-hidden"
+                href="#!">
+                <span
+                    class="hover-effect-target position-absolute top-0 start-0 w-100 h-100 bg-black bg-opacity-25 opacity-0 z-1"></span>
+                <i
+                    class="ci-instagram hover-effect-target fs-4 text-white position-absolute top-50 start-50 translate-middle opacity-0 z-2"></i>
+                <div class="hover-effect-target ratio ratio-1x1">
+                    <img src="https://dev.smgdev.top/api/storage/thumbnail_demo.png?id=40144" alt="Instagram image">
+                </div>
+            </a>
+        </div>
+    </div>
+</section>
diff --git a/resources/views/components/home/product-card.blade.php b/resources/views/components/home/product-card.blade.php
index f1f9170..6d03d12 100644
--- a/resources/views/components/home/product-card.blade.php
+++ b/resources/views/components/home/product-card.blade.php
@@ -37,7 +37,14 @@
                 <span class="text-truncate">{{ $product->name ?? '' }}</span>
             </a>
         </div>
-        <div class="h6 mb-2">Rp {{ number_format($product->display_price,0,",",".") }} @if ($product->display_discount_price > 0)<del class="fs-sm fw-normal text-body-tertiary">Rp {{ number_format($product->display_discount_price,0,",",".") }}</del>@endif</div>
+        <div class="h6 mb-2">
+            @if ($product->display_discount_price > 0)
+                Rp {{ number_format($product->display_discount_price,0,",",".") }}
+                <del class="fs-sm fw-normal text-body-tertiary">Rp {{ number_format($product->display_price,0,",",".") }}</del>
+            @else
+                Rp {{ number_format($product->display_price,0,",",".") }}
+            @endif
+        </div>
         <div class="position-relative">
             @if ($product->variants->count() > 1)
             <div class=" fs-xs text-body-secondary opacity-100">+{{ $product->variants->count() - 1  }} Varian</div>
diff --git a/resources/views/components/language-selector.blade.php b/resources/views/components/language-selector.blade.php
index 0a2356f..3cb7be2 100644
--- a/resources/views/components/language-selector.blade.php
+++ b/resources/views/components/language-selector.blade.php
@@ -1,20 +1,20 @@
 <!-- Country selector visible on screens > 768px wide (md breakpoint) -->
 <div class="dropdown d-none d-md-block nav">
-    <a class="nav-link dropdown-toggle py-1 px-0" href="#" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="{{ __('locale.' . session('locale')) }}">
+    <a class="nav-link dropdown-toggle py-1 px-0" href="#" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="{{ __('locale.' . (session('locale') ?? 'id')) }}">
         <div class="ratio ratio-1x1" style="width: 20px">
-            <img src="/img/flags/{{ session('locale') === 'en' ? 'en-us' : 'id' }}.png" alt="{{ __('locale.' . session('locale')) }}">
+            <img src="/img/flags/{{ (session('locale') ?? 'id') === 'en' ? 'en-us' : 'id' }}.png" alt="{{ __('locale.' . (session('locale') ?? 'id')) }}">
         </div>
     </a>
     <ul class="dropdown-menu fs-sm" style="--cz-dropdown-spacer: .5rem">
         <li>
-            <a class="dropdown-item {{ session('locale') === 'en' ? 'active' : '' }}" href="#" onclick="switchLanguage('en')">
+            <a class="dropdown-item {{ (session('locale') ?? 'id') === 'en' ? 'active' : '' }}" href="#" onclick="switchLanguage('en')">
                 <img src="/img/flags/en-us.png" class="flex-shrink-0 me-2" width="20" alt="United States">
                 {{ __('languages.en') }}
             </a>
         </li>
     
         <li>
-            <a class="dropdown-item {{ session('locale') === 'id' ? 'active' : '' }}" href="#" onclick="switchLanguage('id')">
+            <a class="dropdown-item {{ (session('locale') ?? 'id') === 'id' ? 'active' : '' }}" href="#" onclick="switchLanguage('id')">
                 <img src="/img/flags/id.png" class="flex-shrink-0 me-2" width="20" alt="Indonesia">
                 {{ __('languages.id') }}
             </a>
diff --git a/resources/views/components/layout/navbar-menu.blade.php b/resources/views/components/layout/navbar-menu.blade.php
index ecb2a12..2146bcc 100644
--- a/resources/views/components/layout/navbar-menu.blade.php
+++ b/resources/views/components/layout/navbar-menu.blade.php
@@ -1,7 +1,7 @@
 <!-- Navbar nav -->
 <ul class="navbar-nav position-relative me-xl-n5">
     <li class="nav-item dropdown pb-lg-2 me-lg-n1 me-xl-0">
-        <a class="nav-link" href="{{ route('home') }}">Home</a>
+        <a class="nav-link" href="{{ route('home') }}">{{ __('navbar.home') }}</a>
     </li>
     {{-- <li class="nav-item dropdown pb-lg-2 me-lg-n1 me-xl-0">
         <a class="nav-link dropdown-toggle active" aria-current="page" href="#" role="button" data-bs-toggle="dropdown" data-bs-trigger="hover" aria-expanded="false">Home</a>
@@ -80,7 +80,7 @@
             </li>
         </ul>
     </li> --}}
-    <li class="nav-item dropdown position-static pb-lg-2 me-lg-n1 me-xl-0">
+    {{-- <li class="nav-item dropdown position-static pb-lg-2 me-lg-n1 me-xl-0">
         <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-trigger="hover" aria-expanded="false">Shop</a>
         <div class="dropdown-menu p-4" style="--cz-dropdown-spacer: .75rem">
             <div class="row g-4">
@@ -120,22 +120,35 @@
                 </div>
             </div>
         </div>
-    </li>
+    </li> --}}
     <li class="nav-item dropdown pb-lg-2 me-lg-n1 me-xl-0">
-        <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-trigger="hover" aria-expanded="false">Account</a>
+        <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-trigger="hover" aria-expanded="false">{{ __('navbar.account') }}</a>
         <ul class="dropdown-menu" style="--cz-dropdown-spacer: .75rem">
-            <li><a class="dropdown-item" href="{{ route('second', ['account', 'signin']) }}">Sign In</a></li>
-            <li><a class="dropdown-item" href="{{ route('second', ['account', 'signup']) }}">Sign Up</a></li>
-            <li><a class="dropdown-item" href="{{ route('second', ['account', 'orders']) }}">Order History</a></li>
-            <li><a class="dropdown-item" href="{{ route('second', ['account', 'profile']) }}">Profile Settings</a></li>
-            <li><a class="dropdown-item" href="{{ route('second', ['account', 'addresses']) }}">Address Book</a></li>
-            <li><a class="dropdown-item" href="{{ route('second', ['account', 'payment']) }}">Payment Methods</a></li>
-            <li><a class="dropdown-item" href="{{ route('second', ['account', 'wishlist']) }}">Wishlist</a></li>
-            <li><a class="dropdown-item" href="{{ route('second', ['account', 'notifications']) }}">Notifications</a></li>
-            <li><a class="dropdown-item" href="{{ route('second', ['account', 'tickets']) }}">Support Tickets</a></li>
+            @if (auth()->check())
+  
+                <li><a class="dropdown-item" href="{{ route('orders') }}">{{ __('navbar.order_history') }}</a></li>
+                <li><a class="dropdown-item" href="{{ route('profile') }}">{{ __('navbar.profile_settings') }}</a></li>
+                <li><a class="dropdown-item" href="{{ route('addresses') }}">{{ __('navbar.address_book') }}</a></li>
+                <li><a class="dropdown-item" href="#">{{ __('navbar.payment_methods') }}</a></li>
+                <li><a class="dropdown-item" href="#">{{ __('navbar.wishlist') }}</a></li>
+                <li><a class="dropdown-item" href="#">{{ __('navbar.notifications') }}</a></li>
+                <li><a class="dropdown-item" href="#">{{ __('navbar.support_tickets') }}</a></li>
+            @else
+                <li><a class="dropdown-item" href="{{ route('login') }}">{{ __('navbar.sign_in') }}</a></li>
+                <li><a class="dropdown-item" href="{{ route('register') }}">{{ __('navbar.sign_up') }}</a></li>
+            @endif
         </ul>
     </li>
+
     <li class="nav-item dropdown pb-lg-2 me-lg-n1 me-xl-0">
+        <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-trigger="hover" aria-expanded="false">{{ __('navbar.contact') }}</a>
+        <ul class="dropdown-menu" style="--cz-dropdown-spacer: .75rem">
+            
+            <li><a class="dropdown-item" href="{{ route('any', 'terms-and-conditions')}}">{{ __('navbar.terms_conditions') }}</a></li>
+        </ul>
+    </li>
+
+    {{-- <li class="nav-item dropdown pb-lg-2 me-lg-n1 me-xl-0">
         <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-trigger="hover" aria-expanded="false">Pages</a>
         <ul class="dropdown-menu" style="--cz-dropdown-spacer: .75rem">
             <li class="dropdown">
@@ -218,5 +231,5 @@
             </li>
             <li><a class="dropdown-item" href="{{ route('any', 'terms-and-conditions')}}">Terms &amp; Conditions</a></li>
         </ul>
-    </li>
+    </li> --}}
 </ul>
diff --git a/resources/views/help/topics-v2.blade.php b/resources/views/help/topics-v2.blade.php
index 4306694..da08049 100644
--- a/resources/views/help/topics-v2.blade.php
+++ b/resources/views/help/topics-v2.blade.php
@@ -1,9 +1,8 @@
-@extends('layouts.landing', ['title' => 'Help Topics v.2'])
+@extends('layouts.landing', ['title' => __('help.title')])
 
 @section('content')
-    @include('layouts.partials/offcanvas')
 
-    @include('layouts.partials/navbar', ['wishlist' => true])
+     <x-layout.header />
 
     <main class="content-wrapper">
 
@@ -17,25 +16,25 @@
                 <div class="row align-items-center position-relative z-1">
                     <div class="col-lg-7 col-xl-5 offset-xl-1 py-5">
                         <div class="px-4 px-sm-5 px-xl-0 pe-lg-4">
-                            <h1 class="text-center text-sm-start mb-4">How can we help?</h1>
+                            <h1 class="text-center text-sm-start mb-4">{{ __('help.hero_title') }}</h1>
                             <form class="d-flex flex-column flex-sm-row gap-2">
                                 <input type="search" class="form-control form-control-lg"
-                                    placeholder="What do you need help with?" aria-label="Search field">
+                                    placeholder="{{ __('help.search_placeholder') }}" aria-label="Search field">
                                 <button type="submit" class="btn btn-lg btn-primary px-3">
                                     <i class="ci-search fs-lg ms-n2 ms-sm-0"></i>
-                                    <span class="ms-2 d-sm-none">Search</span>
+                                    <span class="ms-2 d-sm-none">{{ __('help.search') }}</span>
                                 </button>
                             </form>
                             <div class="nav gap-2 pt-3 pt-sm-4 mt-1 mt-sm-0">
-                                <span class="nav-link text-body-secondary pe-none p-0 me-1">Common topics:</span>
+                                <span class="nav-link text-body-secondary pe-none p-0 me-1">{{ __('help.common_topics') }}:</span>
                                 <a class="nav-link text-body-emphasis text-decoration-underline p-0 me-1"
-                                    href="{{ route('second', ['help', 'single-article-v2']) }}">payments</a>
+                                    href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.payments') }}</a>
                                 <a class="nav-link text-body-emphasis text-decoration-underline p-0 me-1"
-                                    href="{{ route('second', ['help', 'single-article-v2']) }}">refunds</a>
+                                    href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.refunds') }}</a>
                                 <a class="nav-link text-body-emphasis text-decoration-underline p-0 me-1"
-                                    href="{{ route('second', ['help', 'single-article-v2']) }}">delivery</a>
+                                    href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.delivery') }}</a>
                                 <a class="nav-link text-body-emphasis text-decoration-underline p-0 me-1"
-                                    href="{{ route('second', ['help', 'single-article-v2']) }}">dashboard</a>
+                                    href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.dashboard') }}</a>
                             </div>
                         </div>
                     </div>
@@ -54,7 +53,7 @@
         <section class="container py-5">
             <div class="row g-0 pt-md-2 pt-xl-4">
                 <div class="col-md-4 col-lg-3 pb-2 pb-sm-3 pb-md-0 mb-4 mb-md-0">
-                    <h2 class="h5 border-bottom pb-3 pb-sm-4 mb-0">Help topics</h2>
+                    <h2 class="h5 border-bottom pb-3 pb-sm-4 mb-0">{{ __('help.help_topics') }}</h2>
 
                     <!-- Nav tabs in format of list group -->
                     <div class="list-group list-group-borderless pt-4 pe-md-4" role="tablist">
@@ -62,37 +61,37 @@
                             data-bs-toggle="list" role="tab" aria-controls="delivery" id="delivery-tab"
                             aria-selected="true">
                             <i class="ci-delivery fs-base opacity-75 me-2"></i>
-                            Delivery
+                            {{ __('help.delivery_tab') }}
                         </a>
                         <a class="list-group-item list-group-item-action d-flex align-items-center" href="#returns"
                             data-bs-toggle="list" role="tab" aria-controls="returns" id="returns-tab"
                             aria-selected="false" tabindex="-1">
                             <i class="ci-refresh-cw fs-base opacity-75 me-2"></i>
-                            Returns &amp; refunds
+                            {{ __('help.returns_refunds') }}
                         </a>
                         <a class="list-group-item list-group-item-action d-flex align-items-center" href="#payment"
                             data-bs-toggle="list" role="tab" aria-controls="payment" id="payment-tab"
                             aria-selected="false" tabindex="-1">
                             <i class="ci-credit-card fs-base opacity-75 me-2"></i>
-                            Payment options
+                            {{ __('help.payment_options') }}
                         </a>
                         <a class="list-group-item list-group-item-action d-flex align-items-center" href="#order"
                             data-bs-toggle="list" role="tab" aria-controls="order" id="order-tab" aria-selected="false"
                             tabindex="-1">
                             <i class="ci-shopping-bag fs-base opacity-75 me-2"></i>
-                            Order issues
+                            {{ __('help.order_issues') }}
                         </a>
                         <a class="list-group-item list-group-item-action d-flex align-items-center" href="#stock"
                             data-bs-toggle="list" role="tab" aria-controls="stock" id="stock-tab" aria-selected="false"
                             tabindex="-1">
                             <i class="ci-archive fs-base opacity-75 me-2"></i>
-                            Products &amp; stock
+                            {{ __('help.products_stock') }}
                         </a>
                         <a class="list-group-item list-group-item-action d-flex align-items-center" href="#account"
                             data-bs-toggle="list" role="tab" aria-controls="account" id="account-tab"
                             aria-selected="false" tabindex="-1">
                             <i class="ci-settings fs-base opacity-75 me-2"></i>
-                            Managing account
+                            {{ __('help.managing_account') }}
                         </a>
                     </div>
 
@@ -105,32 +104,30 @@
                         <!-- Delivery tab -->
                         <div class="tab-pane show active" id="delivery" role="tabpanel" aria-labelledby="delivery-tab">
                             <div class="d-flex border-bottom ps-md-4 pb-3 pb-sm-4">
-                                <h2 class="h5 mb-0">Delivery</h2>
+                                <h2 class="h5 mb-0">{{ __('help.delivery_tab') }}</h2>
                             </div>
                             <div class="position-relative">
                                 <div class="position-absolute top-0 start-0 h-100 border-start d-none d-md-block"></div>
                                 <ul class="nav flex-column gap-3 pt-4 ps-md-4">
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">How does courier delivery work?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.delivery_questions.how_courier_work') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">What happens if I'm not available to receive
-                                            the delivery?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.delivery_questions.not_available') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">Can I track my order in real-time?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.delivery_questions.track_order') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">Is there an option for express delivery?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.delivery_questions.express_delivery') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">Will my parcel be charged customs
-                                            charges?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.delivery_questions.customs_charges') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
@@ -527,352 +524,18 @@
             <!-- Contact CTA -->
             <div class="pt-4 pb-1 pb-sm-3 pb-md-4 pb-xl-5 mt-2 mt-sm-3">
                 <h3 class="fs-sm pb-sm-1">Can't find an answer to your question?</h3>
-                <a class="btn btn-lg btn-primary" href="#!">Contact us</a>
+                <a class="btn btn-lg btn-primary" href="#!">{{ __('help.contact_us') }}</a>
             </div>
         </section>
 
 
         <!-- Popular articles (Carousel) -->
-        <section class="bg-body-tertiary py-5">
-            <div class="container py-1 py-sm-2 py-md-3 py-lg-4 py-xl-5">
-                <h2 class="text-center pb-2 pb-sm-3 pb-lg-4">Popular articles</h2>
-
-                <!-- Nav pills -->
-                <div class="row g-0 overflow-x-auto pb-3 mb-2 mb-md-3 mb-lg-4">
-                    <div class="col-auto mx-auto">
-                        <ul class="nav nav-pills flex-nowrap text-nowrap">
-                            <li class="nav-item">
-                                <a class="nav-link rounded active" aria-current="page" href="#!">Delivery</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link rounded" href="#!">Returns &amp; refunds</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link rounded" href="#!">Payment</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link rounded" href="#!">Order issues</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link rounded" href="#!">Products &amp; stock</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link rounded" href="#!">Account</a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-
-                <!-- Carousel -->
-                <div class="position-relative mx-2 mx-sm-0">
-                    <div class="swiper"
-                        data-swiper='{
-              "slidesPerView": 1,
-              "spaceBetween": 24,
-              "loop": true,
-              "autoHeight": true,
-              "navigation": {
-                "prevEl": ".btn-prev",
-                "nextEl": ".btn-next"
-              },
-              "breakpoints": {
-                "500": {
-                  "slidesPerView": 2
-                },
-                "992": {
-                  "slidesPerView": 3
-                }
-              }
-            }'>
-                        <div class="swiper-wrapper">
-
-                            <!-- Article -->
-                            <article class="swiper-slide">
-                                <a class="ratio d-flex hover-effect-scale rounded overflow-hidden"
-                                    href="{{ route('second', ['help', 'single-article-v2']) }}" style="--cz-aspect-ratio: calc(306 / 416 * 100%)">
-                                    <img src="/img/help/article01.jpg" class="hover-effect-target" alt="Image">
-                                </a>
-                                <div class="pt-4">
-                                    <div class="text-body-tertiary fs-xs pb-2 mt-n1 mb-1">October 2, 2024</div>
-                                    <h3 class="h5 mb-0">
-                                        <a class="hover-effect-underline" href="{{ route('second', ['help', 'single-article-v2']) }}">When should I
-                                            place an order to ensure Express Delivery?</a>
-                                    </h3>
-                                </div>
-                            </article>
-
-                            <!-- Article -->
-                            <article class="swiper-slide">
-                                <a class="ratio d-flex hover-effect-scale rounded overflow-hidden"
-                                    href="{{ route('second', ['help', 'single-article-v2']) }}" style="--cz-aspect-ratio: calc(306 / 416 * 100%)">
-                                    <img src="/img/help/article02.jpg" class="hover-effect-target" alt="Image">
-                                </a>
-                                <div class="pt-4">
-                                    <div class="text-body-tertiary fs-xs pb-2 mt-n1 mb-1">July 17, 2024</div>
-                                    <h3 class="h5 mb-0">
-                                        <a class="hover-effect-underline" href="{{ route('second', ['help', 'single-article-v2']) }}">Why does my
-                                            statement have a recurring delivery charge?</a>
-                                    </h3>
-                                </div>
-                            </article>
-
-                            <!-- Article -->
-                            <article class="swiper-slide">
-                                <a class="ratio d-flex hover-effect-scale rounded overflow-hidden"
-                                    href="{{ route('second', ['help', 'single-article-v2']) }}" style="--cz-aspect-ratio: calc(306 / 416 * 100%)">
-                                    <img src="/img/help/article03.jpg" class="hover-effect-target" alt="Image">
-                                </a>
-                                <div class="pt-4">
-                                    <div class="text-body-tertiary fs-xs pb-2 mt-n1 mb-1">June 13, 2024</div>
-                                    <h3 class="h5 mb-0">
-                                        <a class="hover-effect-underline" href="{{ route('second', ['help', 'single-article-v2']) }}">How can I
-                                            find information about your international delivery?</a>
-                                    </h3>
-                                </div>
-                            </article>
-
-                            <!-- Article -->
-                            <article class="swiper-slide">
-                                <a class="ratio d-flex hover-effect-scale rounded overflow-hidden"
-                                    href="{{ route('second', ['help', 'single-article-v2']) }}" style="--cz-aspect-ratio: calc(306 / 416 * 100%)">
-                                    <img src="/img/help/article04.jpg" class="hover-effect-target" alt="Image">
-                                </a>
-                                <div class="pt-4">
-                                    <div class="text-body-tertiary fs-xs pb-2 mt-n1 mb-1">May 30, 2024</div>
-                                    <h3 class="h5 mb-0">
-                                        <a class="hover-effect-underline" href="{{ route('second', ['help', 'single-article-v2']) }}">Will my
-                                            parcel be charged additional customs charges?</a>
-                                    </h3>
-                                </div>
-                            </article>
-                        </div>
-                    </div>
-
-                    <!-- Prev button -->
-                    <div class="position-absolute top-50 start-0 z-2 translate-middle hover-effect-target mt-n5">
-                        <button type="button"
-                            class="btn btn-prev btn-icon btn-outline-secondary bg-body rounded-circle animate-slide-start"
-                            aria-label="Prev">
-                            <i class="ci-chevron-left fs-lg animate-target"></i>
-                        </button>
-                    </div>
-
-                    <!-- Next button -->
-                    <div class="position-absolute top-50 start-100 z-2 translate-middle hover-effect-target mt-n5">
-                        <button type="button"
-                            class="btn btn-next btn-icon btn-outline-secondary bg-body rounded-circle animate-slide-end"
-                            aria-label="Next">
-                            <i class="ci-chevron-right fs-lg animate-target"></i>
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </section>
-
+        <div class="container">
+            <x-help.article-carousel />
+        </div>
 
         <!-- FAQ (Accordion) -->
-        <section class="container py-5">
-            <div class="row py-1 py-sm-2 py-md-3 py-lg-4 py-xl-5">
-                <div class="col-md-4 col-xl-3 mb-4 mb-md-0" style="margin-top: -120px">
-                    <div class="sticky-md-top text-center text-md-start pe-md-4 pe-lg-5 pe-xl-0"
-                        style="padding-top: 120px;">
-                        <h2>Popular FAQs</h2>
-                        <p class="pb-2 pb-md-3">Still have unanswered questions and need to get in touch?</p>
-                        <a class="btn btn-lg btn-primary" href="#!">Contact us</a>
-                    </div>
-                </div>
-                <div class="col-md-8 offset-xl-1">
-
-                    <!-- Accordion of questions -->
-                    <div class="accordion" id="faq">
-
-                        <!-- Question -->
-                        <div class="accordion-item">
-                            <h3 class="accordion-header" id="faqHeading-1">
-                                <button type="button" class="accordion-button hover-effect-underline collapsed"
-                                    data-bs-toggle="collapse" data-bs-target="#faqCollapse-1" aria-expanded="false"
-                                    aria-controls="faqCollapse-1">
-                                    <span class="me-2">How long will delivery take?</span>
-                                </button>
-                            </h3>
-                            <div class="accordion-collapse collapse" id="faqCollapse-1" aria-labelledby="faqHeading-1"
-                                data-bs-parent="#faq">
-                                <div class="accordion-body">Delivery times vary based on your location and the chosen
-                                    shipping method. Generally, our standard delivery takes up to 5 days, while our Express
-                                    Delivery ensures your order reaches you within 1 day. Please note that these times may
-                                    be subject to occasional variations due to unforeseen circumstances, but we do our best
-                                    to meet these estimates.</div>
-                            </div>
-                        </div>
-
-                        <!-- Question -->
-                        <div class="accordion-item">
-                            <h3 class="accordion-header" id="faqHeading-2">
-                                <button type="button" class="accordion-button hover-effect-underline collapsed"
-                                    data-bs-toggle="collapse" data-bs-target="#faqCollapse-2" aria-expanded="false"
-                                    aria-controls="faqCollapse-2">
-                                    <span class="me-2">What payment methods do you accept?</span>
-                                </button>
-                            </h3>
-                            <div class="accordion-collapse collapse" id="faqCollapse-2" aria-labelledby="faqHeading-2"
-                                data-bs-parent="#faq">
-                                <div class="accordion-body">We offer a range of secure payment options to provide you with
-                                    flexibility and convenience. Accepted methods include major credit/debit cards, PayPal,
-                                    and other secure online payment gateways. You can find the complete list of accepted
-                                    payment methods during the checkout process.</div>
-                            </div>
-                        </div>
-
-                        <!-- Question -->
-                        <div class="accordion-item">
-                            <h3 class="accordion-header" id="faqHeading-3">
-                                <button type="button" class="accordion-button hover-effect-underline collapsed"
-                                    data-bs-toggle="collapse" data-bs-target="#faqCollapse-3" aria-expanded="false"
-                                    aria-controls="faqCollapse-3">
-                                    <span class="me-2">Do you ship internationally?</span>
-                                </button>
-                            </h3>
-                            <div class="accordion-collapse collapse" id="faqCollapse-3" aria-labelledby="faqHeading-3"
-                                data-bs-parent="#faq">
-                                <div class="accordion-body">Yes, we proudly offer international shipping to cater to our
-                                    global customer base. Shipping costs and delivery times will be automatically calculated
-                                    at the checkout based on your selected destination. Please note that any customs duties
-                                    or taxes applicable in your country are the responsibility of the customer.</div>
-                            </div>
-                        </div>
-
-                        <!-- Question -->
-                        <div class="accordion-item">
-                            <h3 class="accordion-header" id="faqHeading-4">
-                                <button type="button" class="accordion-button hover-effect-underline collapsed"
-                                    data-bs-toggle="collapse" data-bs-target="#faqCollapse-4" aria-expanded="false"
-                                    aria-controls="faqCollapse-4">
-                                    <span class="me-2">Do I need an account to place an order?</span>
-                                </button>
-                            </h3>
-                            <div class="accordion-collapse collapse" id="faqCollapse-4" aria-labelledby="faqHeading-4"
-                                data-bs-parent="#faq">
-                                <div class="accordion-body">While you can place an order as a guest, creating an account
-                                    comes with added benefits. By having an account, you can easily track your orders,
-                                    manage your preferences, and enjoy a quicker checkout process for future purchases. It
-                                    also allows us to provide you with personalized recommendations and exclusive offers.
-                                </div>
-                            </div>
-                        </div>
-
-                        <!-- Question -->
-                        <div class="accordion-item">
-                            <h3 class="accordion-header" id="faqHeading-5">
-                                <button type="button" class="accordion-button hover-effect-underline collapsed"
-                                    data-bs-toggle="collapse" data-bs-target="#faqCollapse-5" aria-expanded="false"
-                                    aria-controls="faqCollapse-5">
-                                    <span class="me-2">How can I track my order?</span>
-                                </button>
-                            </h3>
-                            <div class="accordion-collapse collapse" id="faqCollapse-5" aria-labelledby="faqHeading-5"
-                                data-bs-parent="#faq">
-                                <div class="accordion-body">Once your order is dispatched, you will receive a confirmation
-                                    email containing a unique tracking number. You can use this tracking number on our
-                                    website to monitor the real-time status of your shipment. Additionally, logging into
-                                    your account will grant you access to a comprehensive order history, including tracking
-                                    information.</div>
-                            </div>
-                        </div>
-
-                        <!-- Question -->
-                        <div class="accordion-item">
-                            <h3 class="accordion-header" id="faqHeading-6">
-                                <button type="button" class="accordion-button hover-effect-underline collapsed"
-                                    data-bs-toggle="collapse" data-bs-target="#faqCollapse-6" aria-expanded="false"
-                                    aria-controls="faqCollapse-6">
-                                    <span class="me-2">What are the product refund conditions?</span>
-                                </button>
-                            </h3>
-                            <div class="accordion-collapse collapse" id="faqCollapse-6" aria-labelledby="faqHeading-6"
-                                data-bs-parent="#faq">
-                                <div class="accordion-body">Our refund policy is designed to ensure customer satisfaction.
-                                    Details can be found in our [refund policy page](insert link). In essence, we accept
-                                    returns within [insert number] days of receiving the product, provided it is in its
-                                    original condition with all tags and packaging intact. Refunds are processed promptly
-                                    once the returned item is inspected and approved.</div>
-                            </div>
-                        </div>
-
-                        <!-- Question -->
-                        <div class="accordion-item">
-                            <h3 class="accordion-header" id="faqHeading-7">
-                                <button type="button" class="accordion-button hover-effect-underline collapsed"
-                                    data-bs-toggle="collapse" data-bs-target="#faqCollapse-7" aria-expanded="false"
-                                    aria-controls="faqCollapse-7">
-                                    <span class="me-2">Where can I find your size guide?</span>
-                                </button>
-                            </h3>
-                            <div class="accordion-collapse collapse" id="faqCollapse-7" aria-labelledby="faqHeading-7"
-                                data-bs-parent="#faq">
-                                <div class="accordion-body">Our comprehensive size guide is conveniently located on each
-                                    product page to assist you in choosing the right fit. Additionally, you can find the
-                                    size guide in the main menu under "Size Guide." We recommend referring to these
-                                    resources to ensure your selected items match your preferred sizing.</div>
-                            </div>
-                        </div>
-
-                        <!-- Question -->
-                        <div class="accordion-item">
-                            <h3 class="accordion-header" id="faqHeading-8">
-                                <button type="button" class="accordion-button hover-effect-underline collapsed"
-                                    data-bs-toggle="collapse" data-bs-target="#faqCollapse-8" aria-expanded="false"
-                                    aria-controls="faqCollapse-8">
-                                    <span class="me-2">Do I need to create an account to shop with you?</span>
-                                </button>
-                            </h3>
-                            <div class="accordion-collapse collapse" id="faqCollapse-8" aria-labelledby="faqHeading-8"
-                                data-bs-parent="#faq">
-                                <div class="accordion-body">While guest checkout is available for your convenience,
-                                    creating an account enhances your overall shopping experience. With an account, you can
-                                    easily track your order status, save multiple shipping addresses, and enjoy a
-                                    streamlined checkout process. Moreover, account holders receive early access to
-                                    promotions and exclusive offers. Signing up is quick and hassle-free!</div>
-                            </div>
-                        </div>
-
-                        <!-- Question -->
-                        <div class="accordion-item">
-                            <h3 class="accordion-header" id="faqHeading-9">
-                                <button type="button" class="accordion-button hover-effect-underline collapsed"
-                                    data-bs-toggle="collapse" data-bs-target="#faqCollapse-9" aria-expanded="false"
-                                    aria-controls="faqCollapse-9">
-                                    <span class="me-2">Is there a minimum order value for free shipping?</span>
-                                </button>
-                            </h3>
-                            <div class="accordion-collapse collapse" id="faqCollapse-9" aria-labelledby="faqHeading-9"
-                                data-bs-parent="#faq">
-                                <div class="accordion-body">Yes, we offer free shipping on orders exceeding $250. Orders
-                                    below this threshold are subject to standard shipping fees, which will be displayed
-                                    during the checkout process.</div>
-                            </div>
-                        </div>
-
-                        <!-- Question -->
-                        <div class="accordion-item">
-                            <h3 class="accordion-header" id="faqHeading-10">
-                                <button type="button" class="accordion-button hover-effect-underline collapsed"
-                                    data-bs-toggle="collapse" data-bs-target="#faqCollapse-10" aria-expanded="false"
-                                    aria-controls="faqCollapse-10">
-                                    <span class="me-2">Can I modify or cancel my order after placing it?</span>
-                                </button>
-                            </h3>
-                            <div class="accordion-collapse collapse" id="faqCollapse-10" aria-labelledby="faqHeading-10"
-                                data-bs-parent="#faq">
-                                <div class="accordion-body">Once an order is confirmed, our system processes it promptly to
-                                    ensure timely dispatch. Therefore, modifications or cancellations are challenging after
-                                    this point. However, please contact our customer support as soon as possible, and we
-                                    will do our best to assist you based on the order status.</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>
+        <x-help.faq-section />
     </main>
 
     @include('layouts.partials/footer')
diff --git a/resources/views/home/fashion-v1.blade.php b/resources/views/home/fashion-v1.blade.php
index c0c307c..d12844e 100644
--- a/resources/views/home/fashion-v1.blade.php
+++ b/resources/views/home/fashion-v1.blade.php
@@ -211,71 +211,7 @@
         </section>
 
 
-        <!-- Instagram feed -->
-        <section class="container pt-5 mt-1 mt-sm-2 mt-md-3 mt-lg-4 mt-xl-5">
-            <div class="text-center pt-xxl-3 pb-2 pb-md-3">
-                <h2 class="pb-2 mb-1">
-                    <span class="animate-underline">
-                        <a class="animate-target text-dark-emphasis text-decoration-none" href="#!">#AsiaGolf</a>
-                    </span>
-                </h2>
-                <p>Find more inspiration on our Instagram</p>
-            </div>
-            <div class="overflow-x-auto pb-3 mb-n3" data-simplebar>
-                <div class="d-flex gap-2 gap-md-3 gap-lg-4" style="min-width: 700px">
-                    <a class="hover-effect-scale hover-effect-opacity position-relative w-100 overflow-hidden"
-                        href="#!">
-                        <span
-                            class="hover-effect-target position-absolute top-0 start-0 w-100 h-100 bg-black bg-opacity-25 opacity-0 z-1"></span>
-                        <i
-                            class="ci-instagram hover-effect-target fs-4 text-white position-absolute top-50 start-50 translate-middle opacity-0 z-2"></i>
-                        <div class="hover-effect-target ratio ratio-1x1">
-                            <img src="/img/instagram/01.jpg" alt="Instagram image">
-                        </div>
-                    </a>
-                    <a class="hover-effect-scale hover-effect-opacity position-relative w-100 overflow-hidden"
-                        href="#!">
-                        <span
-                            class="hover-effect-target position-absolute top-0 start-0 w-100 h-100 bg-black bg-opacity-25 opacity-0 z-1"></span>
-                        <i
-                            class="ci-instagram hover-effect-target fs-4 text-white position-absolute top-50 start-50 translate-middle opacity-0 z-2"></i>
-                        <div class="hover-effect-target ratio ratio-1x1">
-                            <img src="/img/instagram/02.jpg" alt="Instagram image">
-                        </div>
-                    </a>
-                    <a class="hover-effect-scale hover-effect-opacity position-relative w-100 overflow-hidden"
-                        href="#!">
-                        <span
-                            class="hover-effect-target position-absolute top-0 start-0 w-100 h-100 bg-black bg-opacity-25 opacity-0 z-1"></span>
-                        <i
-                            class="ci-instagram hover-effect-target fs-4 text-white position-absolute top-50 start-50 translate-middle opacity-0 z-2"></i>
-                        <div class="hover-effect-target ratio ratio-1x1">
-                            <img src="/img/instagram/03.jpg" alt="Instagram image">
-                        </div>
-                    </a>
-                    <a class="hover-effect-scale hover-effect-opacity position-relative w-100 overflow-hidden"
-                        href="#!">
-                        <span
-                            class="hover-effect-target position-absolute top-0 start-0 w-100 h-100 bg-black bg-opacity-25 opacity-0 z-1"></span>
-                        <i
-                            class="ci-instagram hover-effect-target fs-4 text-white position-absolute top-50 start-50 translate-middle opacity-0 z-2"></i>
-                        <div class="hover-effect-target ratio ratio-1x1">
-                            <img src="/img/instagram/04.jpg" alt="Instagram image">
-                        </div>
-                    </a>
-                    <a class="hover-effect-scale hover-effect-opacity position-relative w-100 overflow-hidden"
-                        href="#!">
-                        <span
-                            class="hover-effect-target position-absolute top-0 start-0 w-100 h-100 bg-black bg-opacity-25 opacity-0 z-1"></span>
-                        <i
-                            class="ci-instagram hover-effect-target fs-4 text-white position-absolute top-50 start-50 translate-middle opacity-0 z-2"></i>
-                        <div class="hover-effect-target ratio ratio-1x1">
-                            <img src="/img/instagram/05.jpg" alt="Instagram image">
-                        </div>
-                    </a>
-                </div>
-            </div>
-        </section>
+        <x-home.instagram-feed />
     </main>
 
     @include('layouts.partials/footer2')
diff --git a/resources/views/layouts/partials/account-sidebar.blade.php b/resources/views/layouts/partials/account-sidebar.blade.php
index 7802776..9fc14c3 100644
--- a/resources/views/layouts/partials/account-sidebar.blade.php
+++ b/resources/views/layouts/partials/account-sidebar.blade.php
@@ -91,7 +91,7 @@
                     {{ __('account_sidebar.help_center') }}
                 </a>
                 <a class="list-group-item list-group-item-action d-flex align-items-center"
-                    href="{{ route('any', 'terms-and-conditions') }}">
+                    href="{{ route('terms-and-conditions') }}">
                     <i class="ci-info fs-base opacity-75 me-2"></i>
                     {{ __('account_sidebar.terms_and_conditions') }}
                 </a>
diff --git a/resources/views/shop/product-fashion.blade.php b/resources/views/shop/product-fashion.blade.php
index ffd8aec..4d722d0 100644
--- a/resources/views/shop/product-fashion.blade.php
+++ b/resources/views/shop/product-fashion.blade.php
@@ -1,407 +1,6 @@
 @extends('layouts.landing', ['title' => 'Fashion Store - Product Page'])
 
 @section('content')
-    <div class="modal fade" id="reviewForm" data-bs-backdrop="static" tabindex="-1" aria-labelledby="reviewFormLabel"
-        aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable">
-            <form class="modal-content needs-validation" novalidate>
-                <div class="modal-header border-0">
-                    <h5 class="modal-title" id="reviewFormLabel">Leave a review</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body pb-3 pt-0">
-                    <div class="mb-3">
-                        <label for="review-name" class="form-label">Your name <span class="text-danger">*</span></label>
-                        <input type="text" class="form-control" id="review-name" required>
-                        <div class="invalid-feedback">Please enter your name!</div>
-                        <small class="form-text">Will be displayed on the comment.</small>
-                    </div>
-                    <div class="mb-3">
-                        <label for="review-email" class="form-label">Your email <span class="text-danger">*</span></label>
-                        <input type="email" class="form-control" id="review-email" required>
-                        <div class="invalid-feedback">Please provide a valid email address!</div>
-                        <small class="form-text">Authentication only - we won't spam you.</small>
-                    </div>
-                    <div class="mb-3">
-                        <label class="form-label">Rating <span class="text-danger">*</span></label>
-                        <select class="form-select"
-                            data-select='{
-                "classNames": {
-                  "containerInner": "form-select"
-                },
-                "placeholderValue": "Choose rating",
-                "choices": [
-                  {
-                    "value": "",
-                    "label": "Choose rating",
-                    "placeholder": true
-                  },
-                  {
-                    "value": "1",
-                    "label": "<span class=\"visually-hidden\">1 star</span>",
-                    "customProperties": {
-                      "icon": "<span class=\"d-flex gap-1 py-1\"><i class=\"ci-star-filled text-warning\"></i></span>",
-                      "selected": "1 star"
-                    }
-                  },
-                  {
-                    "value": "2",
-                    "label": "<span class=\"visually-hidden\">2 stars</span>",
-                    "customProperties": {
-                      "icon": "<span class=\"d-flex gap-1 py-1\"><i class=\"ci-star-filled text-warning\"></i><i class=\"ci-star-filled text-warning\"></i></span>",
-                      "selected": "2 stars"
-                    }
-                  },
-                  {
-                    "value": "3",
-                    "label": "<span class=\"visually-hidden\">3 stars</span>",
-                    "customProperties": {
-                      "icon": "<span class=\"d-flex gap-1 py-1\"><i class=\"ci-star-filled text-warning\"></i><i class=\"ci-star-filled text-warning\"></i><i class=\"ci-star-filled text-warning\"></i></span>",
-                      "selected": "3 stars"
-                    }
-                  },
-                  {
-                    "value": "4",
-                    "label": "<span class=\"visually-hidden\">4 stars</span>",
-                    "customProperties": {
-                      "icon": "<span class=\"d-flex gap-1 py-1\"><i class=\"ci-star-filled text-warning\"></i><i class=\"ci-star-filled text-warning\"></i><i class=\"ci-star-filled text-warning\"></i><i class=\"ci-star-filled text-warning\"></i></span>",
-                      "selected": "4 stars"
-                    }
-                  },
-                  {
-                    "value": "5",
-                    "label": "<span class=\"visually-hidden\">5 stars</span>",
-                    "customProperties": {
-                      "icon": "<span class=\"d-flex gap-1 py-1\"><i class=\"ci-star-filled text-warning\"></i><i class=\"ci-star-filled text-warning\"></i><i class=\"ci-star-filled text-warning\"></i><i class=\"ci-star-filled text-warning\"></i><i class=\"ci-star-filled text-warning\"></i></span>",
-                      "selected": "5 stars"
-                    }
-                  }
-                ]
-              }'
-                            data-select-template="true" required></select>
-                        <div class="invalid-feedback">Please choose your rating!</div>
-                    </div>
-                    <div class="mb-3">
-                        <label class="form-label" for="review-text">Review <span class="text-danger">*</span></label>
-                        <textarea class="form-control" rows="4" id="review-text" required></textarea>
-                        <div class="invalid-feedback">Please write a review!</div>
-                        <small class="form-text">Your review must be at least 50 characters.</small>
-                    </div>
-                    <div>
-                        <div class="form-check form-check-inline">
-                            <input type="radio" class="form-check-input" id="yes" name="recommend" checked>
-                            <label for="yes" class="form-check-label">Yes, I recommend</label>
-                        </div>
-                        <div class="form-check form-check-inline">
-                            <input type="radio" class="form-check-input" id="no" name="recommend">
-                            <label for="no" class="form-check-label">No, I don't recommend</label>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer flex-nowrap gap-3 border-0 px-4">
-                    <button type="reset" class="btn btn-secondary w-100 m-0" data-bs-dismiss="modal">Cancel</button>
-                    <button type="submit" class="btn btn-dark w-100 m-0">Submit review</button>
-                </div>
-            </form>
-        </div>
-    </div>
-
-    <div class="modal fade" id="sizeGuide" tabindex="-1" aria-labelledby="reviewFormLabel" aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable">
-            <div class="modal-content">
-                <div class="modal-header bg-body-tertiary border-0 py-2 ps-2 pe-4">
-                    <ul class="nav nav-tabs flex-nowrap text-nowrap py-2" role="tablist">
-                        <li class="nav-item" role="presentation">
-                            <a class="nav-link active" href="#womens" id="womens-sizes" data-bs-toggle="tab" role="tab"
-                                aria-controls="mens" aria-selected="true">Women's sizes</a>
-                        </li>
-                        <li class="nav-item" role="presentation">
-                            <a class="nav-link" href="#mens" id="mens-sizes" data-bs-toggle="tab" role="tab"
-                                aria-controls="womens" aria-selected="false" tabindex="-1">Men's sizes</a>
-                        </li>
-                    </ul>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body p-0">
-                    <div class="tab-content">
-                        <div class="tab-pane fade show active" id="womens" role="tabpanel"
-                            aria-labelledby="womens-sizes">
-                            <div class="table-responsive">
-                                <table class="table fs-sm text-center mb-0">
-                                    <thead>
-                                        <tr>
-                                            <th scope="col" class="align-middle">US<br>Sizes</th>
-                                            <th scope="col" class="align-middle">Euro<br>Sizes</th>
-                                            <th scope="col" class="align-middle">UK<br>Sizes</th>
-                                            <th scope="col" class="align-middle">Inches</th>
-                                            <th scope="col" class="align-middle">CM</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <tr>
-                                            <td class="fw-medium">4</td>
-                                            <td>35</td>
-                                            <td>2</td>
-                                            <td>8.1875"</td>
-                                            <td>20.8</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">4.5</td>
-                                            <td>35</td>
-                                            <td>2.5</td>
-                                            <td>8.375"</td>
-                                            <td>21.3</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">5</td>
-                                            <td>35-36</td>
-                                            <td>3</td>
-                                            <td>8.5"</td>
-                                            <td>21.6</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">5.5</td>
-                                            <td>36</td>
-                                            <td>3.5</td>
-                                            <td>8.75"</td>
-                                            <td>22.2</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">6</td>
-                                            <td>36-37</td>
-                                            <td>4</td>
-                                            <td>8.875"</td>
-                                            <td>22.5</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">6.5</td>
-                                            <td>37</td>
-                                            <td>4.5</td>
-                                            <td>9.0625"</td>
-                                            <td>23</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">7</td>
-                                            <td>37-38</td>
-                                            <td>5</td>
-                                            <td>9.25"</td>
-                                            <td>23.5</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">7.5</td>
-                                            <td>38</td>
-                                            <td>5.5</td>
-                                            <td>9.375"</td>
-                                            <td>23.8</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">8</td>
-                                            <td>38-39</td>
-                                            <td>6</td>
-                                            <td>9.5"</td>
-                                            <td>24.1</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">8.5</td>
-                                            <td>39</td>
-                                            <td>6.5</td>
-                                            <td>9.6875"</td>
-                                            <td>24.6</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">9</td>
-                                            <td>39-40</td>
-                                            <td>7</td>
-                                            <td>9.875"</td>
-                                            <td>25.1</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">9.5</td>
-                                            <td>40</td>
-                                            <td>7.5</td>
-                                            <td>10"</td>
-                                            <td>25.4</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">10</td>
-                                            <td>40-41</td>
-                                            <td>8</td>
-                                            <td>10.1875"</td>
-                                            <td>25.9</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">10.5</td>
-                                            <td>41</td>
-                                            <td>8.5</td>
-                                            <td>10.3125"</td>
-                                            <td>26.2</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">11</td>
-                                            <td>41-42</td>
-                                            <td>9</td>
-                                            <td>10.5"</td>
-                                            <td>26.7</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">11.5</td>
-                                            <td>42</td>
-                                            <td>9.5</td>
-                                            <td>10.6875"</td>
-                                            <td>27.1</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">12</td>
-                                            <td>42-43</td>
-                                            <td>10</td>
-                                            <td>10.875"</td>
-                                            <td>27.6</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                        <div class="tab-pane fade" id="mens" role="tabpanel" aria-labelledby="mens-sizes">
-                            <div class="table-responsive">
-                                <table class="table fs-sm text-center mb-0">
-                                    <thead>
-                                        <tr>
-                                            <th scope="col" class="align-middle">US<br>Sizes</th>
-                                            <th scope="col" class="align-middle">Euro<br>Sizes</th>
-                                            <th scope="col" class="align-middle">UK<br>Sizes</th>
-                                            <th scope="col" class="align-middle">Inches</th>
-                                            <th scope="col" class="align-middle">CM</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <tr>
-                                            <td class="fw-medium">6</td>
-                                            <td>39</td>
-                                            <td>5.5</td>
-                                            <td>9.25"</td>
-                                            <td>23.5</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">6.5</td>
-                                            <td>39</td>
-                                            <td>6</td>
-                                            <td>9.5"</td>
-                                            <td>24.1</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">7</td>
-                                            <td>40</td>
-                                            <td>6.5</td>
-                                            <td>9.625"</td>
-                                            <td>24.4</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">7.5</td>
-                                            <td>40-41</td>
-                                            <td>7</td>
-                                            <td>9.75"</td>
-                                            <td>24.8</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">8</td>
-                                            <td>41</td>
-                                            <td>7.5</td>
-                                            <td>9.9375"</td>
-                                            <td>25.4</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">8.5</td>
-                                            <td>41-42</td>
-                                            <td>8</td>
-                                            <td>10.125"</td>
-                                            <td>25.7</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">9</td>
-                                            <td>42</td>
-                                            <td>8.5</td>
-                                            <td>10.25"</td>
-                                            <td>26</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">9.5</td>
-                                            <td>42-43</td>
-                                            <td>9</td>
-                                            <td>10.4375"</td>
-                                            <td>26.7</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">10</td>
-                                            <td>43</td>
-                                            <td>9.5</td>
-                                            <td>10.5625"</td>
-                                            <td>27</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">10.5</td>
-                                            <td>43-44</td>
-                                            <td>10</td>
-                                            <td>10.75"</td>
-                                            <td>27.3</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">11</td>
-                                            <td>44</td>
-                                            <td>10.5</td>
-                                            <td>10.9375"</td>
-                                            <td>27.9</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">11.5</td>
-                                            <td>44-45</td>
-                                            <td>11</td>
-                                            <td>11.125"</td>
-                                            <td>28.3</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">12</td>
-                                            <td>45</td>
-                                            <td>11.5</td>
-                                            <td>11.25"</td>
-                                            <td>28.6</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">13</td>
-                                            <td>46</td>
-                                            <td>12.5</td>
-                                            <td>11.5625"</td>
-                                            <td>29.4</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">14</td>
-                                            <td>47</td>
-                                            <td>13.5</td>
-                                            <td>11.875"</td>
-                                            <td>30.2</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">15</td>
-                                            <td>48</td>
-                                            <td>14.5</td>
-                                            <td>12.1875"</td>
-                                            <td>31</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="fw-medium">16</td>
-                                            <td>49</td>
-                                            <td>15.5</td>
-                                            <td>12.5"</td>
-                                            <td>31.8</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 
 
 
@@ -552,6 +151,14 @@
                             </div>
                         </div>
 
+                        {{-- <button type="button" class="btn btn-outline-secondary gap-2">
+                            <i class="ci-heart"></i>
+                            Add to wishlist
+                        </button>
+
+                        <br>
+                        <br> --}}
+
                         <!-- Size select -->
                         {{-- <div class="mb-3">
                             <div class="d-flex align-items-center justify-content-between mb-1">
@@ -611,6 +218,9 @@
                             aria-valuemin="0" aria-valuemax="100" style="height: 4px">
                             <div class="progress-bar rounded-pill" style="width: 25%"></div>
                         </div> --}}
+
+                        {{-- add button wishlist --}}
+                       
                     </div>
                 </div>
             </div>
diff --git a/resources/views/terms-and-conditions.blade.php b/resources/views/terms-and-conditions.blade.php
index ec1a26c..52889aa 100644
--- a/resources/views/terms-and-conditions.blade.php
+++ b/resources/views/terms-and-conditions.blade.php
@@ -1,144 +1,55 @@
-@extends('layouts.landing', ['title' => 'Terms and Conditions'])
+@extends('layouts.account', ['title' => __('tnc.title')])
 
 @section('content')
-    @include('layouts.partials/offcanvas')
 
-    @include('layouts.partials/navbar', ['wishlist' => true])
-
-    <main class="content-wrapper">
-        <div class="container py-5 mb-2 mt-n2 mt-sm-1 my-md-3 my-lg-4 mb-xl-5">
-            <div class="row justify-content-center">
                 <div class="col-lg-11 col-xl-10 col-xxl-9">
-                    <h1 class="h2 pb-2 pb-sm-3 pb-lg-4">Terms and conditions</h1>
+                    <h1 class="h2 pb-2 pb-sm-3 pb-lg-4">{{ __('tnc.title') }}</h1>
                     <hr class="mt-0">
 
-                    <div class="h6 pt-2 pt-lg-3"><span class="text-body-secondary fw-medium">Last updated:</span> June 26,
-                        2024</div>
-                    <p>Welcome to AsiaGolf! These Terms and Conditions ("Terms") govern your access to and use of the
-                        AsiaGolf website and mobile application (collectively referred to as the "Platform"). Please read
-                        these Terms carefully before using the Platform. By accessing or using the Platform, you agree to be
-                        bound by these Terms.</p>
+                    <div class="h6 pt-2 pt-lg-3"><span class="text-body-secondary fw-medium">{{ __('tnc.last_updated') }}</span> {{ __('tnc.last_updated_date') }}</div>
+                    <p>{{ __('tnc.welcome') }}</p>
 
-                    <h2 class="h4 pt-3 pt-lg-4">1. Overview</h2>
-                    <p>AsiaGolf provides an online platform that enables users to purchase groceries and other products
-                        from local stores and have them delivered to their designated location. By using the Platform, you
-                        acknowledge and agree that AsiaGolf is not a store or retailer but merely acts as an intermediary
-                        to facilitate transactions between users and participating stores.</p>
-                    <p>Welcome to the family of websites and applications provided by AsiaGolf. These Terms of Use govern
-                        your access to and use of all AsiaGolf Sites, among other things. By using the AsiaGolf Sites, you
-                        affirm that you are of legal age to enter into these Terms of Use, or, if you are not, that you have
-                        obtained parental or guardian consent to enter into these Terms of Use and your parent or guardian
-                        consents to these Terms of Use on your behalf. If you violate or do not agree to these Terms of Use,
-                        then your access to and use of the AsiaGolf Sites is unauthorized. Additional terms and conditions
-                        apply to some services offered on the AsiaGolf Sites (e.g., AsiaGolf Pharmacy, AsiaGolf +, and
-                        Gift Cards) or through other channels. Those terms and conditions can be found where the relevant
-                        service is offered on the AsiaGolf Sites or otherwise and are incorporated into these Terms of Use
-                        by reference.</p>
+                    <h2 class="h4 pt-3 pt-lg-4">{{ __('tnc.overview_title') }}</h2>
+                    <p>{{ __('tnc.overview_content') }}</p>
+                    <p>{{ __('tnc.overview_additional') }}</p>
 
-                    <h2 class="h4 pt-3 pt-lg-4">2. Your use of the AsiaGolf Sites</h2>
-                    <p>You certify that the Content you provide on or through the AsiaGolf Sites is accurate and that the
-                        information you provide on or through the AsiaGolf Sites is complete. You are solely responsible
-                        for maintaining the confidentiality and security of your account including username, password, and
-                        PIN. AsiaGolf is not responsible for any losses arising out of the unauthorized use of your
-                        account. You agree that AsiaGolf does not have any responsibility if you lose or share access to
-                        your device. Any agreement between you and the issuer of your credit card, debit card, or other form
-                        of payment will continue to govern your use of such payment method on the AsiaGolf Sites. You agree
-                        that AsiaGolf is not a party to any such agreement, nor is AsiaGolf responsible for the content,
-                        accuracy, or unavailability of any method used for payment. Your account may be restricted or
-                        terminated for any reason, at our sole discretion. Except as otherwise provided by law, at any time
-                        without notice to you, we may (1) change, restrict access to, suspend, or discontinue the AsiaGolf
-                        Sites or any portion of the AsiaGolf Sites, and (2) charge, modify, or waive any fees required to
-                        use any services, functionality, or other content available through the AsiaGolf Sites or any
-                        portion of the AsiaGolf Sites.</p>
-                    <h3 class="h6">In connection with the AsiaGolf Sites, you will not:</h3>
+                    <h2 class="h4 pt-3 pt-lg-4">{{ __('tnc.use_title') }}</h2>
+                    <p>{{ __('tnc.use_content') }}</p>
+                    <h3 class="h6">{{ __('tnc.use_restriction_title') }}</h3>
                     <ul class="gap-3">
-                        <li>Make available any Content through or in connection with the AsiaGolf Sites that is or may be
-                            in violation of the content guidelines set forth in Section 3.C (Prohibited Content) below.</li>
-                        <li>Make available through or in connection with the AsiaGolf Sites any virus, worm, Trojan horse,
-                            Easter egg, time bomb, spyware, or other computer code, file, or program that is or is
-                            potentially harmful or invasive or intended to damage or hijack the operation of, or to monitor
-                            the use of, any hardware, software, or equipment.</li>
-                        <li>Use the AsiaGolf Sites for any commercial purpose, or for any purpose that is fraudulent or
-                            otherwise tortious or unlawful.</li>
-                        <li>Harvest or collect information about users of the AsiaGolf Sites.</li>
-                        <li>Interfere with or disrupt the operation of the AsiaGolf Sites or the systems, servers, or
-                            networks used to make the AsiaGolf Sites available, including by hacking or defacing any
-                            portion of the AsiaGolf Sites; or violate any requirement, procedure, or policy of such servers
-                            or networks.</li>
-                        <li>Reproduce, modify, adapt, translate, create derivative works of, sell, rent, lease, loan,
-                            timeshare, distribute, or otherwise exploit any portion of (or any use of) the AsiaGolf Sites
-                            except as expressly authorized in these Terms of Use, without AsiaGolf's express prior written
-                            consent.</li>
-                        <li>Reverse engineer, decompile, or disassemble any portion of the AsiaGolf Sites, except where
-                            such restriction is expressly prohibited by applicable law.</li>
-                        <li>Remove any copyright, trademark, or other proprietary rights notice from the AsiaGolf Sites.
-                        </li>
-                        <li>You will not attempt to do anything, or permit, encourage, assist, or allow any third party to
-                            do anything, prohibited in this Section, or attempt, permit, encourage, assist, or allow any
-                            other violation of these Terms of Use.</li>
+                        @foreach(__('tnc.use_restrictions') as $restriction)
+                        <li>{{ $restriction }}</li>
+                        @endforeach
                     </ul>
 
-                    <h2 class="h4 pt-3 pt-lg-4">3. Ordering and delivery</h2>
-                    <p>When placing an order through AsiaGolf, you are responsible for ensuring the accuracy of the items,
-                        quantities, and delivery details. AsiaGolf does not guarantee the availability of any specific
-                        product and reserves the right to substitute products based on availability. Delivery times provided
-                        are estimates and may vary due to various factors.</p>
+                    <h2 class="h4 pt-3 pt-lg-4">{{ __('tnc.ordering_title') }}</h2>
+                    <p>{{ __('tnc.ordering_content') }}</p>
                     <ul class="gap-3">
-                        <li>Reverse engineer, decompile, or disassemble any portion of the AsiaGolf Sites, except where
-                            such restriction is expressly prohibited by applicable law.</li>
-                        <li>Reproduce, modify, adapt, translate, create derivative works of, sell, rent, lease, loan,
-                            timeshare, distribute, or otherwise exploit any portion of (or any use of) the AsiaGolf Sites
-                            except as expressly authorized in these Terms of Use, without AsiaGolf's express prior written
-                            consent.</li>
-                        <li>You will not attempt to do anything, or permit, encourage, assist, or allow any third party to
-                            do anything, prohibited in this Section, or attempt, permit, encourage, assist, or allow any
-                            other violation of these Terms of Use.</li>
-                        <li>Remove any copyright, trademark, or other proprietary rights notice from the AsiaGolf Sites.
-                        </li>
+                        @foreach(__('tnc.ordering_restrictions') as $restriction)
+                        <li>{{ $restriction }}</li>
+                        @endforeach
                     </ul>
 
-                    <h2 class="h4 pt-3 pt-lg-4">4. Payments</h2>
-                    <p>AsiaGolf facilitates payments for orders made through the Platform. By using AsiaGolf's payment
-                        services, you agree to provide accurate payment information and authorize AsiaGolf to charge the
-                        applicable amount for your order. AsiaGolf may use third-party payment processors to process
-                        transactions and may store your payment information in accordance with its Privacy Policy.</p>
+                    <h2 class="h4 pt-3 pt-lg-4">{{ __('tnc.payments_title') }}</h2>
+                    <p>{{ __('tnc.payments_content') }}</p>
 
-                    <h2 class="h4 pt-3 pt-lg-4">5. User conduct</h2>
-                    <p>You agree to use the Platform in compliance with all applicable laws and regulations. You shall not
-                        engage in any unlawful, harmful, or abusive behavior while using the Platform. AsiaGolf reserves
-                        the right to suspend or terminate your account if you violate these Terms or engage in any
-                        prohibited activities.</p>
-                    <h3 class="h6 pt-2">Intellectual property</h3>
-                    <p>All content on the AsiaGolf Platform, including but not limited to text, graphics, logos, and
-                        software, is the property of AsiaGolf or its licensors and is protected by intellectual property
-                        laws. You may not use, reproduce, modify, or distribute any content from the Platform without prior
-                        written consent from AsiaGolf.</p>
-                    <h3 class="h6 pt-2">Third-party links and content</h3>
-                    <p>The Platform may contain links to third-party websites or resources. AsiaGolf does not endorse,
-                        control, or assume responsibility for any third-party content or websites. You acknowledge and agree
-                        that AsiaGolf is not liable for any loss or damage caused by your reliance on such content or
-                        websites.</p>
-                    <h3 class="h6 pt-2">Disclaimer of warranties</h3>
-                    <p>The Platform is provided on an "as is" and "as available" basis, without warranties of any kind,
-                        either express or implied. AsiaGolf does not guarantee the accuracy, reliability, or availability
-                        of the Platform and disclaims all warranties to the fullest extent permitted by law.</p>
-                    <h3 class="h6 pt-2">Limitation of liability</h3>
-                    <p>To the maximum extent permitted by law, AsiaGolf and its affiliates shall not be liable for any
-                        indirect, incidental, consequential, or punitive damages arising out of or in connection with the
-                        use of the Platform, even if advised of the possibility of such damages.</p>
+                    <h2 class="h4 pt-3 pt-lg-4">{{ __('tnc.user_conduct_title') }}</h2>
+                    <p>{{ __('tnc.user_conduct_content') }}</p>
+                    <h3 class="h6 pt-2">{{ __('tnc.intellectual_property_title') }}</h3>
+                    <p>{{ __('tnc.intellectual_property_content') }}</p>
+                    <h3 class="h6 pt-2">{{ __('tnc.third_party_links_title') }}</h3>
+                    <p>{{ __('tnc.third_party_links_content') }}</p>
+                    <h3 class="h6 pt-2">{{ __('tnc.disclaimer_title') }}</h3>
+                    <p>{{ __('tnc.disclaimer_content') }}</p>
+                    <h3 class="h6 pt-2">{{ __('tnc.limitation_title') }}</h3>
+                    <p>{{ __('tnc.limitation_content') }}</p>
 
-                    <h2 class="h4 pt-3 pt-lg-4">6. Entire agreement and severability</h2>
-                    <p>These Terms, subject to any amendments, modifications, or additional agreements you enter into with
-                        AsiaGolf, shall constitute the entire agreement between you and AsiaGolf with respect to the
-                        Services and any use of the Services. If any provision of these Terms is found to be invalid by a
-                        court of competent jurisdiction, that provision only will be limited to the minimum extent
-                        necessary, and the remaining provisions will remain in full force and effect.</p>
-                    <p>AsiaGolf reserves the right to modify or update these Terms at any time without prior notice. Your
-                        continued use of the Platform after any changes to the Terms constitutes acceptance of those
-                        changes.</p>
+                    <h2 class="h4 pt-3 pt-lg-4">{{ __('tnc.agreement_title') }}</h2>
+                    <p>{{ __('tnc.agreement_content') }}</p>
+                    <p>{{ __('tnc.agreement_additional') }}</p>
 
-                    <h2 class="h4 pt-3 pt-lg-4">7. Contact information</h2>
-                    <p>If you have any questions, or comments about these Terms please contact AsiaGolf at:</p>
+                    <h2 class="h4 pt-3 pt-lg-4">{{ __('tnc.contact_title') }}</h2>
+                    <p>{{ __('tnc.contact_content') }}</p>
                     <ul class="list-unstyled pb-1">
                         <li class="nav pt-1">
                             <a class="nav-link align-items-start fs-base p-0" href="tel:+15053753082">
@@ -159,28 +70,25 @@
                             </a>
                         </li>
                     </ul>
-                    <p class="pb-3 mb-0">For customer service inquiries, please review Your Account Settings, visit
-                        AsiaGolf's <a class="fw-medium" href="{{ route('second', ['help', 'topics-v1'])}}">Help Center.</a></p>
+                    <p class="pb-3 mb-0">{{ __('tnc.help_text') }} <a class="fw-medium" href="{{ route('second', ['help', 'topics-v1'])}}">{{ __('tnc.help_link') }}</a></p>
 
                     <hr class="my-3 my-lg-4">
 
-                    <h2 class="h5 pt-3 mb-lg-4">Was this information helpful?</h2>
+                    <h2 class="h5 pt-3 mb-lg-4">{{ __('tnc.helpful_question') }}</h2>
                     <div class="d-flex gap-3">
                         <button type="button" class="btn btn-outline-secondary">
                             <i class="ci-thumbs-up fs-base me-2 ms-n1"></i>
-                            Yes
+                            {{ __('tnc.yes_button') }}
                         </button>
                         <button type="button" class="btn btn-outline-secondary">
                             <i class="ci-thumbs-down fs-base me-2 ms-n1"></i>
-                            No
+                            {{ __('tnc.no_button') }}
                         </button>
                     </div>
                 </div>
             </div>
         </div>
-    </main>
 
-    @include('layouts.partials/footer')
 @endsection
 
 @section('scripts')
diff --git a/routes/web.php b/routes/web.php
index 5976544..2f656e8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -15,6 +15,8 @@ use App\Http\Controllers\OrderController;
 use App\Http\Controllers\ProductController;
 use App\Http\Controllers\RoutingController;
 use App\Http\Controllers\SearchController;
+use App\Http\Controllers\TncController;
+use App\Http\Controllers\HelpController;
 use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => '/dummy'], function () {
@@ -113,3 +115,6 @@ Route::middleware(['auth'])->prefix('/orders')->group(function () {
     Route::get('/', [OrderController::class, 'index'])->name('orders');
 
 });
+
+Route::get('/terms-and-conditions', [TncController::class, 'index'])->name('terms-and-conditions');
+Route::get('/help', [HelpController::class, 'index'])->name('help');