diff --git a/.env.example b/.env.example
index d054ece..d37fc33 100644
--- a/.env.example
+++ b/.env.example
@@ -3,6 +3,7 @@ APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
+APP_TAGLINE=Tagline
 
 APP_LOCALE=en
 APP_FALLBACK_LOCALE=en
diff --git a/app/Models/StoreCategory.php b/app/Models/StoreCategory.php
index 4d572f9..60f2c67 100644
--- a/app/Models/StoreCategory.php
+++ b/app/Models/StoreCategory.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Storage;
 
 class StoreCategory extends Model
 {
@@ -32,4 +33,11 @@ class StoreCategory extends Model
     {
         return $this->items()->count();
     }
+
+
+    public function getImageUrlAttribute()
+    {
+        return $this->image ? Storage::disk('wms')->url($this->image) : null;
+    }
+
 }
diff --git a/config/app.php b/config/app.php
index 423eed5..c5cb9d0 100644
--- a/config/app.php
+++ b/config/app.php
@@ -14,6 +14,7 @@ return [
     */
 
     'name' => env('APP_NAME', 'Laravel'),
+    'tagline' => env('APP_TAGLINE', 'Tagline'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/lang/en/home_popular_products.php b/lang/en/home_popular_products.php
index 5e87aca..1b8ed8c 100644
--- a/lang/en/home_popular_products.php
+++ b/lang/en/home_popular_products.php
@@ -2,4 +2,6 @@
 
 return [
     'title' => 'Popular Products',
+    'category' => 'Categories',
+    'view_all' => 'View All',
 ];
\ No newline at end of file
diff --git a/lang/en/special_product.php b/lang/en/special_product.php
new file mode 100644
index 0000000..eef3686
--- /dev/null
+++ b/lang/en/special_product.php
@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'title' => 'Special Products',
+    'view_all' => 'View All'
+];
\ No newline at end of file
diff --git a/lang/id/home_popular_products.php b/lang/id/home_popular_products.php
index eaaf1d6..3c4e831 100644
--- a/lang/id/home_popular_products.php
+++ b/lang/id/home_popular_products.php
@@ -2,4 +2,6 @@
 
 return [
     'title' => 'Produk Populer',
+    'category' => 'Kategori',
+    'view_all'  => 'Lihat Semua',
 ];
\ No newline at end of file
diff --git a/lang/id/special_product.php b/lang/id/special_product.php
new file mode 100644
index 0000000..cb7d997
--- /dev/null
+++ b/lang/id/special_product.php
@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'title' => 'Produk Spesial',
+    'view_all' => 'Lihat Semua'
+];
\ No newline at end of file
diff --git a/resources/views/checkout/v1-cart.blade.php b/resources/views/checkout/v1-cart.blade.php
index 5ed2592..3aee0c1 100644
--- a/resources/views/checkout/v1-cart.blade.php
+++ b/resources/views/checkout/v1-cart.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.landing', ['title' => 'Checkout v.1 - Shopping Cart'])
+@extends('layouts.landing', ['title' => 'Shopping Cart'])
 
 @section('content')
     <!-- Authentication offcanvas -->
diff --git a/resources/views/checkout/v1-delivery-1.blade.php b/resources/views/checkout/v1-delivery-1.blade.php
index e8807d8..1636d17 100644
--- a/resources/views/checkout/v1-delivery-1.blade.php
+++ b/resources/views/checkout/v1-delivery-1.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.landing', ['title' => 'Checkout v.1 - Delivery Info Step 1'])
+@extends('layouts.landing', ['title' => 'Checkout'])
 
 @section('content')
     <x-layout.header-grocery />
diff --git a/resources/views/checkout/v1-delivery-2.blade.php b/resources/views/checkout/v1-delivery-2.blade.php
index cf49c81..68be3f1 100644
--- a/resources/views/checkout/v1-delivery-2.blade.php
+++ b/resources/views/checkout/v1-delivery-2.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.landing', ['title' => 'Checkout v.1 - Delivery Info Step 2'])
+@extends('layouts.landing', ['title' => 'Checkout'])
 
 @section('content')
     <!-- Order preview offcanvas -->
diff --git a/resources/views/components/grocery/popular-products.blade.php b/resources/views/components/grocery/popular-products.blade.php
index ca2947e..059483b 100644
--- a/resources/views/components/grocery/popular-products.blade.php
+++ b/resources/views/components/grocery/popular-products.blade.php
@@ -3,7 +3,7 @@
 
         <!-- Categories list -->
         <div class="col-lg-3 pb-2 pb-sm-3 pb-md-4 mb-5 mb-lg-0">
-            <h2 class="h3 border-bottom pb-3 pb-md-4 mb-4">Categories</h2>
+            <h2 class="h3 border-bottom pb-3 pb-md-4 mb-4">{{ __('home_popular_products.category') }}</h2>
             <div class="row nav g-3 g-sm-4">
 
                 @foreach ($categories as $key => $value)
@@ -12,7 +12,7 @@
                             <div class="position-relative d-flex min-w-0 align-items-center">
                                 <div class="d-flex flex-shrink-0 align-items-center justify-content-center bg-body-tertiary rounded-circle"
                                     style="width: 56px; height: 56px">
-                                    <img src="{{ asset('logo/logo-app.png') }}" width="40" alt="Image">
+                                    <img src="{{ $value->image_url }}" width="40" alt="Image">
                                 </div>
                                 <div class="min-w-0 ps-3">
                                     <a class="nav-link animate-underline stretched-link fs-base fw-semibold p-0 mb-1"
@@ -34,10 +34,10 @@
 
         <div class="col-lg-9">
             <div class="d-flex align-items-center justify-content-between border-bottom pb-3 pb-md-4 mb-3 mb-lg-4">
-                <h2 class="h3 mb-0">Popular products</h2>
+                <h2 class="h3 mb-0">{{ __('home_popular_products.title') }}</h2>
                 <div class="nav ms-3">
                     <a class="nav-link animate-underline px-0 py-2" href="{{ route('product.index') }}">
-                        <span class="animate-target">View all</span>
+                        <span class="animate-target">{{ __('home_popular_products.view_all') }}</span>
                         <i class="ci-chevron-right fs-base ms-1"></i>
                     </a>
                 </div>
diff --git a/resources/views/components/grocery/special-products.blade.php b/resources/views/components/grocery/special-products.blade.php
index 8e459e0..6e2e00a 100644
--- a/resources/views/components/grocery/special-products.blade.php
+++ b/resources/views/components/grocery/special-products.blade.php
@@ -24,10 +24,10 @@
         <!-- Special products carousel -->
         <div class="col-sm-7 col-md-8 col-lg-9">
             <div class="d-flex align-items-center justify-content-between border-bottom pb-3 pb-md-4 mb-3 mb-lg-4">
-                <h2 class="h3 mb-0">Special products</h2>
+                <h2 class="h3 mb-0">{{ __('special_product.title') }}</h2>
                 <div class="nav ms-3">
                     <a class="nav-link animate-underline px-0 py-2" href="{{ route('product.index') }}">
-                        <span class="animate-target text-nowrap">View all</span>
+                        <span class="animate-target text-nowrap">{{ __('special_product.view_all') }}</span>
                         <i class="ci-chevron-right fs-base ms-1"></i>
                     </a>
                 </div>
diff --git a/resources/views/home/fashion-v1.blade.php b/resources/views/home/fashion-v1.blade.php
index 7bdb57c..4fda633 100644
--- a/resources/views/home/fashion-v1.blade.php
+++ b/resources/views/home/fashion-v1.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.landing', ['title' => 'AsiaGolf Store'])
+@extends('layouts.landing', ['title' => config('app.tagline')])
 
 @section('content')
     
diff --git a/resources/views/home/grocery.blade.php b/resources/views/home/grocery.blade.php
index 9505fa1..0b64b46 100644
--- a/resources/views/home/grocery.blade.php
+++ b/resources/views/home/grocery.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.landing', ['title' => 'Grocery Store'])
+@extends('layouts.landing', ['title' => config('app.tagline')])
 
 @section('content')
  
diff --git a/resources/views/shop/product-fashion.blade.php b/resources/views/shop/product-fashion.blade.php
index 9b3e82a..a373ea9 100644
--- a/resources/views/shop/product-fashion.blade.php
+++ b/resources/views/shop/product-fashion.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.landing', ['title' => 'Fashion Store - Product Page'])
+@extends('layouts.landing', ['title' => $product->name ?? 'Detail'])
 
 @section('content')