diff --git a/composer.json b/composer.json
index 7d8d5294b..94a818a9b 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,6 @@
         "webkul/laravel-attribute": "self.version",
         "webkul/laravel-customer": "self.version",
         "webkul/laravel-category": "self.version",
-        "webkul/laravel-channel": "self.version",
         "webkul/laravel-product": "self.version",
         "webkul/laravel-shop": "self.version",
         "webkul/laravel-theme": "self.version"
@@ -54,7 +53,6 @@
             "Webkul\\Shop\\": "packages/Webkul/Shop/src",
             "Webkul\\Core\\": "packages/Webkul/Core/src",
             "Webkul\\Customer\\": "packages/Webkul/Customer/src",
-            "Webkul\\Channel\\": "packages/Webkul/Channel/src",
             "Webkul\\Inventory\\": "packages/Webkul/Inventory/src",
             "Webkul\\Product\\": "packages/Webkul/Product/src",
             "Webkul\\Theme\\": "packages/Webkul/Theme/src"
diff --git a/config/app.php b/config/app.php
index 6a19f4e87..ad6f471c4 100644
--- a/config/app.php
+++ b/config/app.php
@@ -182,7 +182,6 @@ return [
         Webkul\Core\Providers\CoreServiceProvider::class,
         Webkul\Shop\Providers\ShopServiceProvider::class,
         Webkul\Customer\Providers\CustomerServiceProvider::class,
-        Webkul\Channel\Providers\ChannelServiceProvider::class,
         Webkul\Inventory\Providers\InventoryServiceProvider::class,
         Webkul\Product\Providers\ProductServiceProvider::class,
         Webkul\Shop\Providers\ShopServiceProvider::class,
diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
index 46896e02f..63287c074 100644
--- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
@@ -55,6 +55,10 @@ class ProductDataGrid
                 ],
             ],
 
+            'attributeColumns' => [
+                'name', 'price'
+            ],
+
             'join' => [
 
                 //for getting name of attrib family.
@@ -73,11 +77,7 @@ class ProductDataGrid
                     'primaryKey' => 'prods.id',
                     'condition' => '=',
                     'secondaryKey' => 'pav.product_id',
-                    'where' => [
-                        'column1' => 'prods.id',
-                        'condition' => '=',
-                        'column2' => 'pav.product_id'
-                    ]
+                    'withAttributes' => true
                 ],
 
                 //for getting the inventory quantity of a product
@@ -111,9 +111,9 @@ class ProductDataGrid
                 ],
                 [
                     'name' => 'attfam.name',
-                    'alias' => 'attributeFamily',
+                    'alias' => 'FamilyName',
                     'type' => 'string',
-                    'label' => 'Attribute Family',
+                    'label' => 'Family Name',
                     'sortable' => true,
                 ],
                 [
@@ -123,35 +123,68 @@ class ProductDataGrid
                     'label' => 'Product Quatity',
                     'sortable' => false,
                 ],
-                [
-                    'name' => 'pav.product_id',
-                    'alias' => 'ProductID',
-                    'type' => 'string',
-                    'label' => 'Product ID',
-                    'sortable' => false,
+                // [
+                //     'name' => 'pav.attribute_id',
+                //     'alias' => 'AttributeID',
+                //     'type' => 'string',
+                //     'label' => 'Attribute ID',
+                //     'sortable' => false,
 
-                ],
+                // ],
             ],
 
-            //use this bag for fetching attributes as columns in product datagrid.
-            // 'attributes' => [
-            //     [
-            //         'name' => 'pi.qty',
-            //         'alias' => 'ProductQuantity',
-            //         'type' => 'string',
-            //         'label' => 'Product Quatity',
-            //         'sortable' => false,
-            //     ]
-            // ],
-
             'filterable' => [
-
+                //column, type, and label
+                [
+                    'name' => 'prods.id',
+                    'alias' => 'productID',
+                    'type' => 'number',
+                    'label' => 'ID',
+                ],
+                [
+                    'name' => 'prods.sku',
+                    'alias' => 'productCode',
+                    'type' => 'string',
+                    'label' => 'SKU',
+                ],
+                [
+                    'name' => 'attfam.name',
+                    'alias' => 'FamilyName',
+                    'type' => 'string',
+                    'label' => 'Family Name',
+                ],
+                [
+                    'name' => 'pi.qty',
+                    'alias' => 'ProductQuantity',
+                    'type' => 'string',
+                    'label' => 'Product Quatity',
+                ],
             ],
 
             //don't use aliasing in case of searchables
 
             'searchable' => [
                 //column, type and label
+                [
+                    'column' => 'prods.id',
+                    'type' => 'number',
+                    'label' => 'ID',
+                ],
+                [
+                    'column' => 'prods.sku',
+                    'type' => 'string',
+                    'label' => 'SKU',
+                ],
+                [
+                    'column' => 'attfam.name',
+                    'type' => 'string',
+                    'label' => 'Family Name',
+                ],
+                [
+                    'column' => 'pi.qty',
+                    'type' => 'string',
+                    'label' => 'Product Quatity',
+                ],
             ],
 
             //list of viable operators that will be used
diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php
index 879f9e4a9..ffa52dcad 100644
--- a/packages/Webkul/Admin/src/Http/routes.php
+++ b/packages/Webkul/Admin/src/Http/routes.php
@@ -271,23 +271,23 @@ Route::group(['middleware' => ['web']], function () {
 
 
             // Channel Routes
-            Route::get('/channels', 'Webkul\Channel\Http\Controllers\ChannelController@index')->defaults('_config', [
+            Route::get('/channels', 'Webkul\Core\Http\Controllers\ChannelController@index')->defaults('_config', [
                 'view' => 'admin::settings.channels.index'
             ])->name('admin.channels.index');
 
-            Route::get('/channels/create', 'Webkul\Channel\Http\Controllers\ChannelController@create')->defaults('_config', [
+            Route::get('/channels/create', 'Webkul\Core\Http\Controllers\ChannelController@create')->defaults('_config', [
                 'view' => 'admin::settings.channels.create'
             ])->name('admin.channels.create');
 
-            Route::post('/channels/create', 'Webkul\Channel\Http\Controllers\ChannelController@store')->defaults('_config', [
+            Route::post('/channels/create', 'Webkul\Core\Http\Controllers\ChannelController@store')->defaults('_config', [
                 'redirect' => 'admin.channels.index'
             ])->name('admin.channels.store');
 
-            Route::get('/channels/edit/{id}', 'Webkul\Channel\Http\Controllers\ChannelController@edit')->defaults('_config', [
+            Route::get('/channels/edit/{id}', 'Webkul\Core\Http\Controllers\ChannelController@edit')->defaults('_config', [
                 'view' => 'admin::settings.channels.edit'
             ])->name('admin.channels.edit');
 
-            Route::put('/channels/edit/{id}', 'Webkul\Channel\Http\Controllers\ChannelController@update')->defaults('_config', [
+            Route::put('/channels/edit/{id}', 'Webkul\Core\Http\Controllers\ChannelController@update')->defaults('_config', [
                 'redirect' => 'admin.channels.index'
             ])->name('admin.channels.update');
 
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php
index 4f2054f55..6f3ac7689 100644
--- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php
@@ -1,4 +1,5 @@
 @if ($product->type == 'configurable')
+
 @section('css')
     @parent
     <style>
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
index 1325ae9f7..77ad5064f 100644
--- a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
@@ -7,7 +7,7 @@
 @section('content')
     <div class="content">
         <?php $locale = request()->get('locale') ?: app()->getLocale(); ?>
-        <?php $channel = request()->get('channel') ?: channel()->getChannel(); ?>
+        <?php $channel = request()->get('channel') ?: core()->getCurrentChannelCode(); ?>
 
         <form method="POST" action="" @submit.prevent="onSubmit" enctype="multipart/form-data">
 
@@ -18,7 +18,7 @@
 
                     <div class="control-group">
                         <select class="control" id="channel-switcher" name="channel">
-                            @foreach(channel()->getAllChannels() as $channelModel)
+                            @foreach(core()->getAllChannels() as $channelModel)
                                 
                                 <option value="{{ $channelModel->code }}" {{ ($channelModel->code) == $channel ? 'selected' : '' }}>
                                     {{ $channelModel->name }}
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
index 2b959f537..a4401caf5 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
@@ -78,7 +78,7 @@
                             <div class="control-group" :class="[errors.has('currencies[]') ? 'has-error' : '']">
                                 <label for="currencies" class="required">{{ __('admin::app.settings.channels.currencies') }}</label>
                                 <select v-validate="'required'" class="control" id="currencies" name="currencies[]" multiple>
-                                    @foreach(core()->allCurrencies() as $currency)
+                                    @foreach(core()->getAllCurrencies() as $currency)
                                         <option value="{{ $currency->id }}" {{ old('currencies') && in_array($currency->id, old('currencies')) ? 'selected' : '' }}>
                                             {{ $currency->name }}
                                         </option>
@@ -90,7 +90,7 @@
                             <div class="control-group" :class="[errors.has('base_currency') ? 'has-error' : '']">
                                 <label for="base_currency" class="required">{{ __('admin::app.settings.channels.base-currency') }}</label>
                                 <select v-validate="'required'" class="control" id="base_currency" name="base_currency">
-                                    @foreach(core()->allCurrencies() as $currency)
+                                    @foreach(core()->getAllCurrencies() as $currency)
                                         <option value="{{ $currency->id }}" {{ old('base_currency') == $currency->id ? 'selected' : '' }}>
                                             {{ $currency->name }}
                                         </option>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
index de84c8d28..4081cc838 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
@@ -82,7 +82,7 @@
                                 <label for="currencies" class="required">{{ __('admin::app.settings.channels.currencies') }}</label>
                                 <?php $selectedOptionIds = old('currencies') ?: $channel->currencies->pluck('id')->toArray() ?>
                                 <select v-validate="'required'" class="control" id="currencies" name="currencies[]" multiple>
-                                    @foreach(core()->allCurrencies() as $currency)
+                                    @foreach(core()->geAllCurrencies() as $currency)
                                         <option value="{{ $currency->id }}" {{ in_array($currency->id, $selectedOptionIds) ? 'selected' : '' }}>
                                             {{ $currency->name }}
                                         </option>
@@ -95,7 +95,7 @@
                                 <label for="base_currency" class="required">{{ __('admin::app.settings.channels.base-currency') }}</label>
                                 <?php $selectedOption = old('base_currency') ?: $channel->base_currency ?>
                                 <select v-validate="'required'" class="control" id="base_currency" name="base_currency">
-                                    @foreach(core()->allCurrencies() as $currency)
+                                    @foreach(core()->geAllCurrencies() as $currency)
                                         <option value="{{ $currency->id }}" {{ $selectedOption == $currency->id ? 'selected' : '' }}>
                                             {{ $currency->name }}
                                         </option>
diff --git a/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php
index 6ad739c9d..1833eaa12 100644
--- a/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php
+++ b/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php
@@ -187,7 +187,7 @@ class AttributeTableSeeder extends Seeder
             'en' => [
                 'name' => 'Special Price From'
             ],
-            'type' => 'datetime',
+            'type' => 'date',
             'position' => 13,
             'is_required' => 0,
             'value_per_locale' => 0,
@@ -201,7 +201,7 @@ class AttributeTableSeeder extends Seeder
             'en' => [
                 'name' => 'Special Price To'
             ],
-            'type' => 'datetime',
+            'type' => 'date',
             'position' => 14,
             'is_required' => 0,
             'value_per_locale' => 0,
diff --git a/packages/Webkul/Category/src/Repositories/CategoryRepository.php b/packages/Webkul/Category/src/Repositories/CategoryRepository.php
index 8947b3eeb..da80cbcb4 100644
--- a/packages/Webkul/Category/src/Repositories/CategoryRepository.php
+++ b/packages/Webkul/Category/src/Repositories/CategoryRepository.php
@@ -6,6 +6,7 @@ use Webkul\Core\Eloquent\Repository;
 use Webkul\Category\Models\Category;
 use Illuminate\Container\Container as App;
 use Webkul\Category\Models\CategoryTranslation;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 /**
  * Category Reposotory
@@ -59,9 +60,11 @@ class CategoryRepository extends Repository
     /**
      * Specify category tree
      *
+     * @param integer $id
      * @return mixed
      */
-    public function getCategoryTree($id = null) {
+    public function getCategoryTree($id = null)
+    {
         return $id
             ? Category::orderBy('position', 'ASC')->where('id', '!=', $id)->get()->toTree()
             : Category::orderBy('position', 'ASC')->get()->toTree();
@@ -70,9 +73,30 @@ class CategoryRepository extends Repository
     /**
      * Checks slug is unique or not based on locale
      *
+     * @param integer $id
+     * @param string  $slug
      * @return boolean
      */
-    public function isSlugUnique($id, $slug) {
+    public function isSlugUnique($id, $slug)
+    {
         return CategoryTranslation::where('category_id', '!=', $id)->where('slug', '=', $slug)->first() ? false : true;
     }
+
+    /**
+     * Retrive category from slug
+     *
+     * @param string $slug
+     * @return mixed
+     */
+    public function findBySlugOrFail($slug)
+    {
+        $category = $this->model->whereTranslation('slug', $slug)->first();
+
+        if($category)
+            return $category;
+
+        throw (new ModelNotFoundException)->setModel(
+            get_class($this->model), $slug
+        );
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Channel/.gitignore b/packages/Webkul/Channel/.gitignore
deleted file mode 100644
index 30bc16279..000000000
--- a/packages/Webkul/Channel/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/node_modules
\ No newline at end of file
diff --git a/packages/Webkul/Channel/composer.json b/packages/Webkul/Channel/composer.json
deleted file mode 100644
index a3dce6314..000000000
--- a/packages/Webkul/Channel/composer.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "name": "webkul/laravel-channel",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Jitendra Singh",
-            "email": "jitendra@webkul.com"
-        }
-    ],
-    "require": {
-        "baum/baum": "~1.1"
-    },
-    "autoload": {
-        "psr-4": {
-            "Webkul\\Channel\\": "src/"
-        }
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "Webkul\\Channel\\Providers\\ChannelServiceProvider"
-            ],
-            "aliases": { }
-        }
-    },
-    "minimum-stability": "dev"
-}
diff --git a/packages/Webkul/Channel/src/Channel.php b/packages/Webkul/Channel/src/Channel.php
deleted file mode 100644
index 04281bd74..000000000
--- a/packages/Webkul/Channel/src/Channel.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Webkul\Channel;
-
-use Webkul\Channel\Models\Channel as ChannelModel;
-
-class Channel
-{
-    public function getAllChannels() {
-        return ChannelModel::all();
-    }
-
-    public function getChannel() {
-        $channel = ChannelModel::first();
-
-        if(!$channel)
-            return;
-
-        return $channel->code;
-    }
-
-    public function getCurrentChannel() {
-        //just retrieve only three columns id, name and code
-        $current_channel = collect(ChannelModel::select('id', 'name', 'code')->first());
-        return $current_channel;
-    }
-
-    public function getChannelModel() {
-        return ChannelModel::first();
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Channel/src/Facades/Channel.php b/packages/Webkul/Channel/src/Facades/Channel.php
deleted file mode 100644
index e8e7ec817..000000000
--- a/packages/Webkul/Channel/src/Facades/Channel.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Webkul\Channel\Facades;
-
-use Illuminate\Support\Facades\Facade;
-
-class Channel extends Facade
-{
-    /**
-     * Get the registered name of the component.
-     *
-     * @return string
-     */
-    protected static function getFacadeAccessor()
-    {
-        return 'channel';
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Channel/src/Http/Controllers/Controller.php b/packages/Webkul/Channel/src/Http/Controllers/Controller.php
deleted file mode 100644
index 302f9bdce..000000000
--- a/packages/Webkul/Channel/src/Http/Controllers/Controller.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Webkul\Channel\Http\Controllers;
-
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-
-class Controller extends BaseController
-{
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
-}
diff --git a/packages/Webkul/Channel/src/Http/helpers.php b/packages/Webkul/Channel/src/Http/helpers.php
deleted file mode 100644
index 45abc3f76..000000000
--- a/packages/Webkul/Channel/src/Http/helpers.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-    use Webkul\Channel\Channel;
-
-    if (! function_exists('channel')) {
-        function channel()
-        {
-            return new Channel;
-        }
-    }
-?>
\ No newline at end of file
diff --git a/packages/Webkul/Channel/src/Providers/ChannelServiceProvider.php b/packages/Webkul/Channel/src/Providers/ChannelServiceProvider.php
deleted file mode 100644
index 64e78a74f..000000000
--- a/packages/Webkul/Channel/src/Providers/ChannelServiceProvider.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Webkul\Channel\Providers;
-
-use Illuminate\Support\ServiceProvider;
-use Illuminate\Foundation\AliasLoader;
-use Illuminate\Routing\Router;
-use Webkul\Channel\Channel;
-use Webkul\Channel\Facades\ChannelFacade;
-
-class ChannelServiceProvider extends ServiceProvider
-{
-    /**
-     * Bootstrap services.
-     *
-     * @return void
-     */
-    public function boot(Router $router)
-    {
-        include __DIR__ . '/../Http/helpers.php';
-
-        $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
-    }
-
-    /**
-     * Register services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->registerChannelFacade();
-    }
-    
-    /**
-     * Register Bouncer as a singleton.
-     *
-     * @return void
-     */
-    protected function registerChannelFacade()
-    {
-        $loader = AliasLoader::getInstance();
-        $loader->alias('channel', ChannelFacade::class);
-
-        $this->app->singleton('channel', function () {
-            return new Channel();
-        });
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php
index f39192ada..e6b6c8f4a 100644
--- a/packages/Webkul/Core/src/Core.php
+++ b/packages/Webkul/Core/src/Core.php
@@ -2,16 +2,173 @@
 
 namespace Webkul\Core;
 
+use Webkul\Core\Models\Channel as ChannelModel;
 use Webkul\Core\Models\Locale as LocaleModel;
 use Webkul\Core\Models\Currency as CurrencyModel;
 
 class Core
 {
+    /**
+    * Returns all channels
+    *
+    *  @return Collection
+    */
+    public function getAllChannels() {
+        return ChannelModel::all();
+    }
+
+    /**
+    * Returns currenct channel models
+    *
+    *  @return mixed
+    */
+    public function getCurrentChannel() {
+        return ChannelModel::first();
+    }
+
+    /**
+    * Returns currenct channel code
+    *
+    *  @return string
+    */
+    public function getCurrentChannelCode() {
+        return ($channel = $this->getCurrentChannel()) ? $channel->code : '';
+    }
+
+    /**
+    * Returns all locales
+    *
+    *  @return Collection
+    */
     public function getAllLocales() {
         return LocaleModel::all();
     }
 
-    public function allCurrencies() {
+    /**
+    * Returns all currencies
+    *
+    *  @return Collection
+    */
+    public function getAllCurrencies()
+    {
         return CurrencyModel::all();
     }
+
+    /**
+    * Returns current channel's currency model
+    *
+    *  @return mixed
+    */
+    public function getCurrentCurrency()
+    {
+        $currency = CurrencyModel::first();
+
+        return $currency;
+    }
+
+    /**
+    * Returns current channel's currency code
+    *
+    *  @return string
+    */
+    public function getCurrentCurrencyCode()
+    {
+        return ($currency = $this->getCurrentCurrency()) ? $currency->code : '';
+    }
+
+    /**
+    * Returns current channel's currency symbol
+    *
+    *  @return string
+    */
+    public function getCurrentCurrencySymbol()
+    {
+        return $this->getCurrentCurrency()->symbol;
+    }
+
+    /**
+    * Format and convert price with currency symbol
+    *
+    * @param float $price
+    *  @return string
+    */
+    public function currency($price)
+    {
+        if(!$price)
+            $price = 0;
+
+        $channel = $this->getCurrentChannel();
+
+        $currencyCode = $channel->base_currency->code;
+        
+        return currency($price, $currencyCode);
+    }
+
+    /**
+     * Checks if current date of the given channel (in the channel timezone) is within the range
+     *
+     * @param int|string|Channel $channel
+     * @param string|null $dateFrom
+     * @param string|null $dateTo
+     * @return bool
+     */
+    public function isChannelDateInInterval($dateFrom = null, $dateTo = null)
+    {
+        $channel = $this->getCurrentChannel();
+
+        $channelTimeStamp = $this->channelTimeStamp($channel);
+
+        $fromTimeStamp  = strtotime($dateFrom);
+
+        $toTimeStamp    = strtotime($dateTo);
+
+        if ($dateTo) {
+            $toTimeStamp += 86400;
+        }
+
+        $result = false;
+
+        if (!$this->is_empty_date($dateFrom) && $channelTimeStamp < $fromTimeStamp) {
+        } elseif (!$this->is_empty_date($dateTo) && $channelTimeStamp > $toTimeStamp) {
+        } else {
+            $result = true;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get channel timestamp
+     * Timstamp will be builded with channel timezone settings
+     *
+     * @param   mixed $channel
+     * @return  int
+     */
+    public function channelTimeStamp($channel)
+    {
+        $timezone = $channel->timezone;
+
+        $currentTimezone = @date_default_timezone_get();
+
+        @date_default_timezone_set($timezone);
+
+        $date = date('Y-m-d H:i:s');
+
+        @date_default_timezone_set($currentTimezone);
+
+        return strtotime($date);
+    }
+
+    /**
+    * Check whether sql date is empty
+    *
+    * @param string $date
+    * @return boolean
+    */
+    function is_empty_date($date)
+    {
+        return preg_replace('#[ 0:-]#', '', $date) === '';
+    }
+
+    // $timezonelist = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL);
 }
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Currency.php b/packages/Webkul/Core/src/Currency.php
deleted file mode 100644
index 49a3a593c..000000000
--- a/packages/Webkul/Core/src/Currency.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Webkul\Core;
-
-use Webkul\Core\Models\Locale as LocaleModel;
-
-class Locale
-{
-    public function all() {
-        return LocaleModel::all();
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Channel/src/Database/Migrations/2018_07_20_064849_create_channels_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_064849_create_channels_table.php
similarity index 79%
rename from packages/Webkul/Channel/src/Database/Migrations/2018_07_20_064849_create_channels_table.php
rename to packages/Webkul/Core/src/Database/Migrations/2018_07_20_064849_create_channels_table.php
index fbce101a6..b86e33fbf 100644
--- a/packages/Webkul/Channel/src/Database/Migrations/2018_07_20_064849_create_channels_table.php
+++ b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_064849_create_channels_table.php
@@ -18,10 +18,12 @@ class CreateChannelsTable extends Migration
             $table->string('code');
             $table->string('name');
             $table->text('description')->nullable();
-            $table->integer('default_locale')->unsigned();
-            $table->integer('base_currency')->unsigned();
-            $table->foreign('default_locale')->references('id')->on('locales')->onDelete('cascade');
-            $table->foreign('base_currency')->references('id')->on('currencies')->onDelete('cascade');
+            $table->string('timezone')->nullable();
+            $table->string('theme')->nullable();
+            $table->integer('default_locale_id')->unsigned();
+            $table->integer('base_currency_id')->unsigned();
+            $table->foreign('default_locale_id')->references('id')->on('locales')->onDelete('cascade');
+            $table->foreign('base_currency_id')->references('id')->on('currencies')->onDelete('cascade');
             $table->timestamps();
         });
 
diff --git a/packages/Webkul/Core/src/Eloquent/Repository.php b/packages/Webkul/Core/src/Eloquent/Repository.php
index 080147f0c..0370b2dd2 100644
--- a/packages/Webkul/Core/src/Eloquent/Repository.php
+++ b/packages/Webkul/Core/src/Eloquent/Repository.php
@@ -167,4 +167,12 @@ abstract class Repository implements RepositoryInterface {
 
         return $this;
     }
+
+    /**
+     * @return mixed
+     */
+    public function getModel()
+    {
+        return $this->model;
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Eloquent/TranslatableModel.php b/packages/Webkul/Core/src/Eloquent/TranslatableModel.php
index cac7c8034..4f3e6d553 100644
--- a/packages/Webkul/Core/src/Eloquent/TranslatableModel.php
+++ b/packages/Webkul/Core/src/Eloquent/TranslatableModel.php
@@ -34,7 +34,7 @@ class TranslatableModel extends Model
     protected function locale()
     {
         if($this->isChannelBased()) {
-            return channel()->getDefaultChannelLocaleCode();
+            return core()->getDefaultChannelLocaleCode();
         } else {
             if ($this->defaultLocale) {
                 return $this->defaultLocale;
diff --git a/packages/Webkul/Channel/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
similarity index 94%
rename from packages/Webkul/Channel/src/Http/Controllers/ChannelController.php
rename to packages/Webkul/Core/src/Http/Controllers/ChannelController.php
index 2be29ffd1..801eb8e33 100644
--- a/packages/Webkul/Channel/src/Http/Controllers/ChannelController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Webkul\Channel\Http\Controllers;
+namespace Webkul\Core\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Webkul\Channel\Repositories\ChannelRepository as Channel;
+use Webkul\Core\Repositories\ChannelRepository as Channel;
 
 
 /**
@@ -32,7 +32,7 @@ class ChannelController extends Controller
     /**
      * Create a new controller instance.
      *
-     * @param  Webkul\Channel\Repositories\ChannelRepository  $channel
+     * @param  Webkul\Core\Repositories\ChannelRepository  $channel
      * @return void
      */
     public function __construct(Channel $channel)
diff --git a/packages/Webkul/Core/src/Http/helpers.php b/packages/Webkul/Core/src/Http/helpers.php
index 0312b5ce8..22b011aed 100644
--- a/packages/Webkul/Core/src/Http/helpers.php
+++ b/packages/Webkul/Core/src/Http/helpers.php
@@ -1,6 +1,6 @@
 <?php
     use Webkul\Core\Core;
-
+    
     if (! function_exists('core')) {
         function core()
         {
diff --git a/packages/Webkul/Channel/src/Models/Channel.php b/packages/Webkul/Core/src/Models/Channel.php
similarity index 92%
rename from packages/Webkul/Channel/src/Models/Channel.php
rename to packages/Webkul/Core/src/Models/Channel.php
index efe225855..14cc0d114 100644
--- a/packages/Webkul/Channel/src/Models/Channel.php
+++ b/packages/Webkul/Core/src/Models/Channel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Channel\Models;
+namespace Webkul\Core\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Webkul\Core\Models\Locale;
@@ -34,6 +34,8 @@ class Channel extends Model
         return $this->belongsToMany(Currency::class, 'channel_currencies');
     }
 
+
+    protected $with = ['base_currency'];
     /**
      * Get the base currency
      */
diff --git a/packages/Webkul/Core/src/Providers/CoreServiceProvider.php b/packages/Webkul/Core/src/Providers/CoreServiceProvider.php
index 5e110a4f2..08779f405 100644
--- a/packages/Webkul/Core/src/Providers/CoreServiceProvider.php
+++ b/packages/Webkul/Core/src/Providers/CoreServiceProvider.php
@@ -43,7 +43,7 @@ class CoreServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->registerCoreFacade();
+        $this->registerFacades();
     }
 
     /**
@@ -51,7 +51,7 @@ class CoreServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    protected function registerCoreFacade()
+    protected function registerFacades()
     {
         $loader = AliasLoader::getInstance();
         $loader->alias('core', CoreFacade::class);
diff --git a/packages/Webkul/Channel/src/Repositories/ChannelRepository.php b/packages/Webkul/Core/src/Repositories/ChannelRepository.php
similarity index 92%
rename from packages/Webkul/Channel/src/Repositories/ChannelRepository.php
rename to packages/Webkul/Core/src/Repositories/ChannelRepository.php
index 6bc856887..d1ecb0662 100644
--- a/packages/Webkul/Channel/src/Repositories/ChannelRepository.php
+++ b/packages/Webkul/Core/src/Repositories/ChannelRepository.php
@@ -1,6 +1,6 @@
 <?php 
 
-namespace Webkul\Channel\Repositories;
+namespace Webkul\Core\Repositories;
  
 use Webkul\Core\Eloquent\Repository;
 
@@ -19,7 +19,7 @@ class ChannelRepository extends Repository
      */
     function model()
     {
-        return 'Webkul\Channel\Models\Channel';
+        return 'Webkul\Core\Models\Channel';
     }
 
     /**
diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
index 1c435349c..4ab8e35ca 100644
--- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php
+++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
@@ -143,7 +143,7 @@ class ProductController extends Controller
      */
     public function edit($id)
     {
-        $product = $this->product->findOrFail($id);
+        $product = $this->product->findOrFail($id, ['*'], ['variants', 'inventories']);
 
         $categories = $this->category->getCategoryTree();
 
diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php
index 7e2e7fde1..befbfdf35 100644
--- a/packages/Webkul/Product/src/Models/Product.php
+++ b/packages/Webkul/Product/src/Models/Product.php
@@ -10,12 +10,13 @@ use Webkul\Product\Models\ProductAttributeValue;
 use Webkul\Product\Models\ProductInventory;
 use Webkul\Product\Models\ProductImage;
 use Webkul\Inventory\Models\InventorySource;
+use Webkul\Product\Models\ProductReview;
 
 class Product extends Model
 {
     protected $fillable = ['type', 'attribute_family_id', 'sku', 'parent_id'];
 
-    protected $with = ['attribute_family', 'attribute_values', 'variants', 'inventories'];
+    protected $with = ['attribute_family', 'attribute_values', 'inventories'];
 
     /**
      * Get the product attribute family that owns the product.
@@ -41,6 +42,14 @@ class Product extends Model
         return $this->hasMany(self::class, 'parent_id');
     }
 
+    /**
+     * Get the product reviews that owns the product.
+     */
+    public function reviews()
+    {
+        return $this->hasMany(ProductReview::class);
+    }
+
     /**
      * Get the product that owns the product.
      */
@@ -122,6 +131,14 @@ class Product extends Model
     {
         return $this->attribute_family->custom_attributes->pluck('code')->contains($attribute);
     }
+    
+    /**
+     * @return bool
+     */
+    public function getFinalPrice()
+    {
+        return 0.00;
+    }
 
     /**
      * Get an attribute from the model.
@@ -131,38 +148,34 @@ class Product extends Model
      */
     public function getAttribute($key)
     {
+
         if (!method_exists(self::class, $key) && !isset($this->attributes[$key])) {
+            $this->attributes[$key] = '';
+
             if ($this->isCustomAttribute($key)) {
                 $attributeModel = $this->attribute_family->custom_attributes()->where('attributes.code', $key)->first();
 
                 if($attributeModel) {
+                    $channel = request()->get('channel') ?: core()->getCurrentChannelCode();
+
+                    $locale = request()->get('locale') ?: app()->getLocale();
+
                     if($attributeModel->value_per_channel) {
-                        $channel = request()->get('channel') ?: channel()->getChannel();
                         if($attributeModel->value_per_locale) {
-                            $locale = request()->get('locale') ?: app()->getLocale();
                             $attributeValue = $this->attribute_values()->where('channel', $channel)->where('locale', $locale)->where('attribute_id', $attributeModel->id)->first();
                         } else {
                             $attributeValue = $this->attribute_values()->where('channel', $channel)->where('attribute_id', $attributeModel->id)->first();
                         }
                     } else {
                         if($attributeModel->value_per_locale) {
-                            $locale = request()->get('locale') ?: app()->getLocale();
                             $attributeValue = $this->attribute_values()->where('locale', $locale)->where('attribute_id', $attributeModel->id)->first();
                         } else {
                             $attributeValue = $this->attribute_values()->where('attribute_id', $attributeModel->id)->first();
                         }
                     }
 
-                    if ($this->hasGetMutator($key)) {
-                        $this->attributes[$key] = $attributeValue[ProductAttributeValue::$attributeTypeFields[$attributeModel->type]];
-
-                        return $this->getAttributeValue($key);
-                    }
-
-                    return $attributeValue[ProductAttributeValue::$attributeTypeFields[$attributeModel->type]];
+                    $this->attributes[$key] = $attributeValue[ProductAttributeValue::$attributeTypeFields[$attributeModel->type]];
                 }
-
-                return $this->getAttributeValue($key);
             }
 
             return $this->getAttributeValue($key);
@@ -180,31 +193,30 @@ class Product extends Model
 
         $hiddenAttributes = $this->getHidden();
 
+        $channel = request()->get('channel') ?: core()->getCurrentChannelCode();
+
+        $locale = request()->get('locale') ?: app()->getLocale();
+
         foreach ($this->attribute_family->custom_attributes as $attribute) {
             if (in_array($attribute->code, $hiddenAttributes)) {
                 continue;
             }
 
             if($attribute->value_per_channel) {
-                $channel = request()->get('channel') ?: channel()->getChannel();
                 if($attribute->value_per_locale) {
-                    $locale = request()->get('locale') ?: app()->getLocale();
                     $attributeValue = $this->attribute_values()->where('channel', $channel)->where('locale', $locale)->where('attribute_id', $attribute->id)->first();
                 } else {
                     $attributeValue = $this->attribute_values()->where('channel', $channel)->where('attribute_id', $attribute->id)->first();
                 }
             } else {
                 if($attribute->value_per_locale) {
-                    $locale = request()->get('locale') ?: app()->getLocale();
                     $attributeValue = $this->attribute_values()->where('locale', $locale)->where('attribute_id', $attribute->id)->first();
                 } else {
                     $attributeValue = $this->attribute_values()->where('attribute_id', $attribute->id)->first();
                 }
             }
 
-            if (!is_null($value = $attributeValue[ProductAttributeValue::$attributeTypeFields[$attribute->type]])) {
-                $attributes[$attribute->code] = $value;
-            }
+            $attributes[$attribute->code] = $attributeValue[ProductAttributeValue::$attributeTypeFields[$attribute->type]];
         }
 
         return $attributes;
diff --git a/packages/Webkul/Product/src/Models/ProductReview.php b/packages/Webkul/Product/src/Models/ProductReview.php
new file mode 100644
index 000000000..314fff1df
--- /dev/null
+++ b/packages/Webkul/Product/src/Models/ProductReview.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Webkul\Product\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ProductReview extends Model
+{
+    protected $fillable = [];
+}
\ No newline at end of file
diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index d253245d6..2c1a32ed0 100644
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -232,7 +232,7 @@ class ProductRepository extends Repository
 
             if($attribute->value_per_channel) {
                 if($attribute->value_per_locale) {
-                    foreach(channel()->getAllChannels() as $channel) {
+                    foreach(core()->getAllChannels() as $channel) {
                         foreach(core()->getAllLocales() as $locale) {
                             $this->attributeValue->create([
                                     'product_id' => $variant->id,
@@ -244,7 +244,7 @@ class ProductRepository extends Repository
                         }
                     }
                 } else {
-                    foreach(channel()->getAllChannels() as $channel) {
+                    foreach(core()->getAllChannels() as $channel) {
                         $this->attributeValue->create([
                                 'product_id' => $variant->id,
                                 'attribute_id' => $attribute->id,
diff --git a/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php b/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php
index 7bd645606..e1d02e5e3 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php
@@ -4,24 +4,65 @@ namespace Webkul\Shop\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Illuminate\Routing\Controller;
+use Webkul\Category\Repositories\CategoryRepository as Category;
+use Webkul\Product\Repositories\ProductRepository as Product;
 
 /**
- * Products Category controller
+ * Category controller
  *
- * @author    Prashant Singh <prashant.singh852@webkul.com>
+ * @author    Jitendra Singh <jitendra@webkul.com>
  * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
  */
-
-class CategoryController extends controller
+class CategoryController extends Controller
 {
 
-    public function __construct()
+    /**
+     * Contains route related configuration
+     *
+     * @var array
+     */
+    protected $_config;
+
+    /**
+     * CategoryRepository object
+     *
+     * @var array
+     */
+    protected $category;
+
+    /**
+     * ProductRepository object
+     *
+     * @var array
+     */
+    protected $product;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @param  Webkul\Category\Repositories\CategoryRepository $category
+     * @param  Webkul\Product\Repositories\ProductRepository $product
+     * @return void
+     */
+    public function __construct(Category $category, Product $product)
     {
+        $this->product = $product;
+
+        $this->category = $category;
+
         $this->_config = request('_config');
     }
-    public function index()
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param  string $slug
+     * @return \Illuminate\Http\Response
+     */
+    public function index($slug)
     {
-        return view($this->_config['view']);
+        $category = $this->category->findBySlugOrFail($slug);
+
+        return view($this->_config['view'], compact('category'));
     }
 }
diff --git a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php
index 2ae23eb58..bb90d24b7 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php
@@ -21,16 +21,15 @@ use Webkul\Channel\Channel as Channel;
     protected $sliders;
     protected $current_channel;
 
-    public function __construct(Sliders $s,Channel $c)
+    public function __construct(Sliders $s)
     {
         $this->_config = request('_config');
         $this->sliders = $s;
-        $this->current_channel = $c;
 
     }
     public function index() {
 
-        $current_channel = $this->current_channel->getCurrentChannel();
+        $current_channel = core()->getCurrentChannel();
 
         $all_sliders = $this->sliders->findWhere(['channel_id'=>$current_channel['id']]);
 
diff --git a/packages/Webkul/Shop/src/Http/Controllers/ProductController.php b/packages/Webkul/Shop/src/Http/Controllers/ProductController.php
deleted file mode 100644
index 4364c306d..000000000
--- a/packages/Webkul/Shop/src/Http/Controllers/ProductController.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Webkul\Shop\Http\Controllers;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-
-/**
- * Product controller
- *
- * @author    Jitendra Singh <jitendra@webkul.com>
- * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class ProductController extends Controller
-{
-
-    /**
-     * Contains route related configuration
-     *
-     * @var array
-     */
-    protected $_config;
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->_config = request('_config');
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('shop::products.index');
-        // return view($this->_config['view']);
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php
index fb43efd6f..c987bbc13 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php
@@ -5,7 +5,6 @@ namespace Webkul\Shop\Http\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Routing\Controller;
-use Webkul\Channel\Channel;
 use Webkul\Core\Repositories\SliderRepository as Slider;
 
 /**
@@ -44,8 +43,8 @@ class SliderController extends controller
      */
 
     public function create() {
-        $call = new Channel();
-        $channels = $call->getAllChannels();
+        $channels = core()->getAllChannels();
+
         return view($this->_config['view'])->with('channels',[$channels]);
     }
 
diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index daf0c32f0..4e2c6fc38 100644
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -3,10 +3,10 @@
 Route::group(['middleware' => ['web']], function () {
 
     Route::get('/', 'Webkul\Shop\Http\Controllers\HomeController@index')->defaults('_config', [
-        'view' => 'shop::store.home.index'
+        'view' => 'shop::home.index'
     ]);
 
-    Route::get('/categories/{slug}', 'Webkul\Shop\Http\Controllers\ProductController@index')->defaults('_config', [
+    Route::get('/categories/{slug}', 'Webkul\Shop\Http\Controllers\CategoryController@index')->defaults('_config', [
         'view' => 'shop::products.index'
     ]);
 });
diff --git a/packages/Webkul/Shop/src/Product/AbstractProduct.php b/packages/Webkul/Shop/src/Product/AbstractProduct.php
new file mode 100644
index 000000000..c3889b3eb
--- /dev/null
+++ b/packages/Webkul/Shop/src/Product/AbstractProduct.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Webkul\Shop\Product;
+
+abstract class AbstractProduct
+{
+}
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Product/Collection.php b/packages/Webkul/Shop/src/Product/Collection.php
new file mode 100644
index 000000000..6590aa3f1
--- /dev/null
+++ b/packages/Webkul/Shop/src/Product/Collection.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Webkul\Shop\Product;
+
+use Illuminate\Support\Facades\DB;
+use Webkul\Product\Repositories\ProductRepository as Product;
+use Webkul\Attribute\Repositories\AttributeRepository as Attribute;
+use Webkul\Product\Models\ProductAttributeValue;
+
+class Collection extends AbstractProduct
+{
+    /**
+     * ProductRepository object
+     *
+     * @var array
+     */
+    protected $product;
+    /**
+     * AttributeRepository object
+     *
+     * @var array
+     */
+    protected $attribute;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @param  Webkul\Product\Repositories\ProductRepository     $product
+     * @param  Webkul\Attribute\Repositories\AttributeRepository $attribute
+     * @return void
+     */
+    public function __construct(Product $product, Attribute $attribute)
+    {
+        $this->product = $product;
+
+        $this->attribute = $attribute;
+    }
+
+    /**
+     * @param integer $categoryId
+     * @return Collection
+     */
+    public function getProductCollection($categoryId = null, $attributeToSelect = '*')
+    {
+        $qb = $this->product->getModel()
+                ->select('products.*')
+                ->join('product_categories', 'products.id', '=', 'product_categories.product_id')
+                ->where('product_categories.category_id', $categoryId);
+
+        $channel = core()->getCurrentChannelCode();
+        $locale = app()->getLocale();
+
+        foreach (['name', 'description', 'short_description', 'price', 'special_price', 'special_price_from', 'special_price_to'] as $code) {
+            $attribute = $this->attribute->findBy('code', $code);
+            
+            $productValueAlias = 'pav_' . $attribute->code;
+
+            $qb->leftJoin('product_attribute_values as ' . $productValueAlias, function($leftJoin) use($channel, $locale, $attribute, $productValueAlias) {
+
+                $leftJoin->on('products.id', $productValueAlias . '.product_id');
+
+                if($attribute->value_per_channel) {
+                    if($attribute->value_per_locale) {
+                        $leftJoin->where($productValueAlias . '.channel', $channel)
+                            ->where($productValueAlias . '.locale', $locale);
+                    } else {
+                        $leftJoin->where($productValueAlias . '.channel', $channel);
+                    }
+                } else {
+                    if($attribute->value_per_locale) {
+                        $leftJoin->where($productValueAlias . '.locale', $locale);
+                    }
+                }
+
+                $leftJoin->where($productValueAlias . '.attribute_id', $attribute->id);
+            });
+
+
+            $qb->addSelect($productValueAlias . '.' . ProductAttributeValue::$attributeTypeFields[$attribute->type] . ' as ' . $code);
+
+
+            // if($code == 'name') {
+            //     $filterAlias = 'filter_' . $attribute->code;
+                
+            //     $qb->leftJoin('product_attribute_values as ' . $filterAlias, 'products.id', '=', $filterAlias . '.product_id');
+            //     $qb->where($filterAlias . '.' . ProductAttributeValue::$attributeTypeFields[$attribute->type], 'Product Name');
+            // }
+        }
+
+        // if(0) {
+        //     $qb->orderBy('id', 'desc');
+        // }
+        
+        return $qb->paginate(9);
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Product/Price.php b/packages/Webkul/Shop/src/Product/Price.php
new file mode 100644
index 000000000..46701ed93
--- /dev/null
+++ b/packages/Webkul/Shop/src/Product/Price.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Webkul\Shop\Product;
+
+class Price extends AbstractProduct
+{
+    /**
+     * Returns the product's minimal price
+     *
+     * @return float
+     */
+    public function getMinimalPrice($product)
+    {
+        // return 0;
+        if($product->type == 'configurable') {
+            return $product->variants->min('price');
+        } else {
+            if($this->haveSpecialPrice($product)) {
+                return $product->special_price;
+            } else {
+                return $product->price;
+            }
+        }
+    }
+
+    /**
+     * Returns the product's minimal price
+     *
+     * @return float
+     */
+    public function getSpecialPrice($product)
+    {
+        if($this->haveSpecialPrice($product)) {
+                return $product->special_price;
+        } else {
+            return $product->price;
+        }
+    }
+
+    /**
+     * @param Product $product
+     * @return boolean
+     */
+    public function haveSpecialPrice($product)
+    {
+        if(is_null($product->special_price) || !$product->special_price)
+            return false;
+
+        if (core()->isChannelDateInInterval($product->special_price_from, $product->special_price_to)) {
+            return true;
+        }
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Product/Review.php b/packages/Webkul/Shop/src/Product/Review.php
new file mode 100644
index 000000000..1c08e9b41
--- /dev/null
+++ b/packages/Webkul/Shop/src/Product/Review.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Webkul\Shop\Product;
+
+class Review extends AbstractProduct
+{
+    /**
+     * Returns the product's avg rating
+     *
+     * @return float
+     */
+    public function getAverageRating($product)
+    {
+        return round($product->reviews->average('rating'));
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/assets/images/404-image.svg b/packages/Webkul/Shop/src/Resources/assets/images/404-image.svg
new file mode 100644
index 000000000..8b7106715
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/assets/images/404-image.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="254px" height="236px" viewBox="0 0 254 236" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
+    <title>404-image</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Desktop" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.5">
+        <g id="404-page" transform="translate(-960.000000, -288.000000)">
+            <g id="404-image" transform="translate(961.000000, 289.000000)">
+                <polyline id="Path-3" stroke="#242424" stroke-width="3" points="0.626953125 0.990234375 34.3359375 26.4658203 34.6796875 73.1640625 34.3359375 186.773437 160.960938 215.992187 210.71875 130.375 34.3359375 72.71875"></polyline>
+                <g id="Group" transform="translate(46.000000, 190.000000)" fill="#FFFFFF" stroke="#242424" stroke-width="3">
+                    <circle id="Oval" cx="22.5" cy="22.5" r="21"></circle>
+                    <circle id="Oval" cx="23" cy="23" r="5.5"></circle>
+                </g>
+                <g id="Group" transform="translate(208.000000, 163.000000)" fill="#FFFFFF" stroke="#242424" stroke-width="3">
+                    <circle id="Oval" cx="22.5" cy="22.5" r="21"></circle>
+                    <circle id="Oval" cx="23" cy="23" r="5.5"></circle>
+                </g>
+                <path d="M178,205 L182,205 L182,208 L178,208 L178,205 Z M185,205 L206,205 L206,208 L185,208 L185,205 Z" id="Combined-Shape" fill="#242424" transform="translate(192.000000, 206.500000) rotate(-23.000000) translate(-192.000000, -206.500000) "></path>
+                <path d="M172.473165,218.350993 L176.473165,218.350993 L176.473165,221.350993 L172.473165,221.350993 L172.473165,218.350993 Z M179.473165,218.350993 L200.473165,218.350993 L200.473165,221.350993 L179.473165,221.350993 L179.473165,218.350993 Z" id="Combined-Shape" fill="#242424" transform="translate(186.473165, 219.850993) rotate(-23.000000) translate(-186.473165, -219.850993) "></path>
+                <path d="M198.610065,126.237911 L222.219028,78.9333292 L163.963322,59.4411726 L147.719875,109.950161 L198.610065,126.237911 Z" id="Path-4" stroke="#242424" stroke-width="3"></path>
+                <polyline id="Path-5" stroke="#242424" stroke-width="3" points="131.557617 105.489258 134.746094 71.9423828 157.437808 79.0096878"></polyline>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/assets/images/wishadd.svg b/packages/Webkul/Shop/src/Resources/assets/images/wishlist-added.svg
similarity index 100%
rename from packages/Webkul/Shop/src/Resources/assets/images/wishadd.svg
rename to packages/Webkul/Shop/src/Resources/assets/images/wishlist-added.svg
diff --git a/packages/Webkul/Shop/src/Resources/assets/images/wish.svg b/packages/Webkul/Shop/src/Resources/assets/images/wishlist.svg
similarity index 100%
rename from packages/Webkul/Shop/src/Resources/assets/images/wish.svg
rename to packages/Webkul/Shop/src/Resources/assets/images/wishlist.svg
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 0b6c6c41c..a438068c1 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -98,12 +98,14 @@ body {
                         height: 24px;
                         width: 24px;
                     }
+
                     .account {
                         cursor:  pointer;
                         padding-top: 3px;
                         padding-right: 5px;
                         margin-left: 8px;
                     }
+
                     .icon.arrow-down-icon {
                         cursor:  pointer;
                         margin-top: 10px;
@@ -128,11 +130,13 @@ body {
                     .cart {
                         padding-top: 3px;
                         padding-right: 5px;
+
                         .cart-count {
                             color: #0031f0;
                             padding-right: 3px;
                         }
                     }
+
                     .icon.arrow-down-icon {
                         margin-top: 10px;
                     }
@@ -142,6 +146,7 @@ body {
 
         .right-responsive {
             display: none;
+
             ul.right-wrapper {
                 display: flex;
                 flex-direction: row;
@@ -196,7 +201,7 @@ body {
             position: relative;
         }
 
-        .nav{
+        .nav {
             vertical-align: top;
             display: inline-block;
         }
@@ -343,48 +348,182 @@ section.slider-block {
     }
 }
 
+.layered-filter-wrapper {
+    width: 25%;
+    float: left;
+    margin-right: 20px;
+    min-height: 1px;
+
+    .filter-title {
+        border-bottom: 1px solid #E8E8E8;
+        font-size: 16px;
+        color: #242424;
+        padding: 10px 0;
+    }
+
+    .filter-attributes {
+        .filter-attributes-item {
+            border-bottom: 1px solid #E8E8E8;
+            padding-bottom: 10px;
+
+            .filter-attributes-title {
+                padding: 10px 40px 0 10px;
+                font-size: 16px;
+                color: #5E5E5E;
+                cursor: pointer;
+                position: relative;
+
+                .remove-filter-link {
+                    font-weight: 400;
+                    color: #0031F0;
+                    margin-right: 10px;
+                }
+
+                .icon {
+                    background-image: url('../images/arrow-down.svg') !important;
+                    width: 10px;
+                    height: 10px;
+                    position: absolute;
+                    right: 15px;
+                    top: 14px;
+                }
+            }
+
+            .filter-attributes-content {
+                padding: 10px;
+                display: none;
+
+                ol.items {
+                    padding: 0;
+                    margin: 0;
+                    list-style: none none;
+
+                    li.item {
+                        padding: 8px 0;
+                        font-size: 16px;
+                        color: #5E5E5E;
+
+                        .checkbox {
+                            margin: 0;
+
+                            .checkbox-view {
+                                height: 16px;
+                                width: 16px;
+                                background-image: url("../images/checkbox.svg");
+                            }
+
+                            input:checked + .checkbox-view {
+                                background-image: url("../images/checkbox-checked.svg");
+                            }
+                        }
+                    }
+                }
+
+                .price-range-wrapper {
+                    margin-top: 21px;
+                }
+            }
+
+            &.active {
+                .filter-attributes-content {
+                    display: block;
+                }
+
+                .filter-attributes-title .icon {
+                    background-image: url('../images//arrow-up.svg') !important;
+                }
+            }
+        }
+    }
+}
+
 .main-container-wrapper {
     margin-left: 10%;
     margin-right: 10%;
 
-    .product-card {
-        display: flex;
-        flex-flow: column;
-        justify-content: center;
+    .product-grid {
+        display: grid;
+        grid-gap: 30px;
 
-        .product-image img {
-            // order: -1;
-            align-self: center;
-            width: 100%;
-            margin-bottom: 14px;
+        &.max-2-col {
+            grid-template-columns: repeat(2, minmax(250px, 1fr));
         }
-        .product-name {
-            font-size: 16px;
-            margin-bottom: 14px;
-            width: 100%;
-        }
-        .product-price {
-            font-size: 16px;
-            margin-bottom: 14px;
-            width: 100%;
-        }
-        .product-ratings {
-            width: 100%;
-            margin-bottom: 14px;
-        }
-        .cart-fav-seg {
-            display: inline-flex;
-            width: 100%;
-            align-items: center;
 
-            .addtocart {
-                border-radius: 0px;
-                margin-right: 10px;
-                text-transform: uppercase;
+        &.max-3-col {
+            grid-template-columns: repeat(3, minmax(250px, 1fr));
+        }
+
+        &.max-4-col {
+            grid-template-columns: repeat(4, minmax(250px, 1fr));
+        }
+
+        .product-card {
+            display: flex;
+            flex-flow: column;
+            justify-content: center;
+
+            .product-image img {
+                align-self: center;
+                width: 100%;
+                margin-bottom: 14px;
+            }
+
+            .product-name {
+                font-size: 16px;
+                margin-bottom: 14px;
+                width: 100%;
+            }
+
+            .product-price {
+                font-size: 16px;
+                margin-bottom: 14px;
+                width: 100%;
+                font-weight: 600;
+
+                .price-label {
+                    font-size: 14px;
+                    font-weight: 400;
+                }
+
+                .regular-price {
+                    font-size: 16px;
+                    color: #A5A5A5;
+                    text-decoration: line-through;
+                    margin-right: 10px;
+                }
+
+                .special-price {
+                    font-size: 16px;
+                    color: #FF6472;
+                }
+            }
+
+            .product-ratings {
+                width: 100%;
+                margin-bottom: 14px;
+            }
+
+            .cart-fav-seg {
+                display: inline-flex;
+                width: 100%;
+                align-items: center;
+
+                .addtocart {
+                    border-radius: 0px;
+                    margin-right: 10px;
+                    text-transform: uppercase;
+                }
             }
         }
     }
 
+    .bottom-toolbar {
+        display: block;
+        margin-top: 40px;
+        margin-bottom: 40px;
+        text-align: center;
+    }
+
     section.featured-products {
         display: block;
         margin-bottom: 5%;
@@ -400,11 +539,6 @@ section.slider-block {
                 color: lightgray;
             }
         }
-        .featured-grid {
-            display: grid;
-            grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-            grid-gap: 10px;
-        }
     }
 
     section.news-update {
@@ -432,7 +566,6 @@ section.slider-block {
             .block2 {
                 display: block;
                 box-sizing: border-box;
-
                 display: grid;
                 grid-template-rows: repeat(2, minmax(50%, 1fr));
                 grid-row-gap: 20px;
@@ -554,6 +687,7 @@ section.slider-block {
         letter-spacing: -0.29px;
         text-align: center;
     }
+
     .login-form {
         margin-left: auto;
         margin-right: auto;
@@ -578,6 +712,7 @@ section.slider-block {
 
         .control-group {
             margin-bottom: 15px !important;
+
             .control {
                 width: 100% !important;
             }
@@ -638,12 +773,15 @@ section.slider-block {
             border-bottom: 1px solid $border-color;
             text-align: center;
         }
+
         li:first-child {
             border-top: none;
         }
+
         li:last-child {
             border-bottom: none;
         }
+
         li.active {
             color: $forgot-password-color;
         }
@@ -698,6 +836,7 @@ section.slider-block {
             }
         }
     }
+
     //edit form
     .edit-form-content {
         margin-left: 5.5%;
@@ -712,14 +851,10 @@ section.slider-block {
         }
 
         .edit-form {
-            // margin-left: auto;
-            // margin-right: auto;
             display: flex;
             background: $background-color;
             border: 1px solid $border-color;
             flex-direction: column;
-            // max-width: 530px;
-            // min-width: 380px;
             min-height: 345px;
             padding: 25px;
 
@@ -735,1526 +870,3 @@ section.slider-block {
     //edit form ends
 }
 //account ends here
-
-//customers page css ends here
-
-// product pages css starts here
-
-section.product-detail, section.product-review {
-    font-size: 16px;
-    color: $product-font-color;
-
-    div.category-breadcrumbs {
-        display: inline;
-    }
-
-    div.layouter {
-        display:flex;
-        flex-flow: row;
-        margin-top: 21px;
-
-        .mixed-group {
-
-            .single-image {
-                padding: 2px;
-
-                img {
-                    height: 280px;
-                    width: 280px;
-                }
-            }
-
-            .details {
-
-                .product-name {
-                    margin-top: 20px;
-                    font-size: 24px;
-                    margin-bottom: 20px;
-                }
-
-                .price {
-                    margin-bottom: 14px;
-
-                    .main-price {
-                        font-size: 24px;
-                        color: $product-price-color;
-                    }
-
-                    .real-price {
-                        color: $real-price;
-                        text-decoration-line: line-through;
-                    }
-                }
-            }
-        }
-
-        .rating-reviews {
-            margin-top: 30px;
-
-            .title-inline {
-                display: inline-flex;
-                align-items: center;
-                justify-content: space-between;
-                margin-bottom: 20px;
-                width: 100%;
-
-                button {
-                    float: right;
-                    border-radius: 0px !important;
-                }
-            }
-
-            .overall {
-                display: flex;
-                flex-direction: row;
-                align-items: center;
-                justify-content: space-between;
-                height: 150px;
-
-                .left-side {
-                    margin-bottom: 20px;
-
-                    .number{
-                        font-size: 34px;
-                    }
-                }
-
-                .right-side {
-                    display: block;
-
-                    .rater {
-                        display: inline-flex;
-                        align-items: center;
-
-                        .star {
-                            width: 50px;
-                            height: 20px;
-                            padding: 1px;
-                            margin-right: 8px;
-                        }
-
-                        .line-bar {
-                            height: 4px;
-                            width: 158px;
-                            margin-right: 12px;
-                            background: $bar-color;
-
-                            .line-value {
-                                height: 4px;
-                                width: 100px;
-                                background-color: $dark-blue-shade;
-                            }
-                        }
-                    }
-                }
-
-            }
-
-            .reviews {
-                margin-top: 34px;
-                margin-bottom: 90px;
-
-                .review {
-                    margin-bottom: 25px;
-
-                    .title {
-                        margin-bottom: 5px;
-                    }
-
-                    .stars {
-                        margin-bottom: 15px;
-                    }
-                    .message {
-                        margin-bottom: 10px;
-                    }
-                }
-                .view-all {
-                    margin-top:15px;
-                    color: $logo-color;
-                    margin-bottom:15px;
-                }
-            }
-        }
-
-        div.product-image-group {
-            display:flex;
-            flex-direction: row;
-            justify-content: flex-start;
-            margin-right: 2.5%;
-
-            .side-group {
-                display: flex;
-                flex-direction: column;
-                margin-right: 4px;
-            }
-
-            .product-hero-image {
-                display: block;
-                position: relative;
-
-                .wishlist {
-                    position: absolute;
-                    top: 10px;
-                    right: 12px;
-                }
-
-                .share {
-                    position: absolute;
-                    top: 10px;
-                    right: 45px;
-                }
-            }
-        }
-
-        .details {
-
-            .product-heading {
-                font-size: 24px;
-                color: $product-font-color;
-                margin-bottom: 14px;
-            }
-
-            .rating {
-                color: $product-font-color;
-                margin-bottom: 14px;
-            }
-
-            .price {
-                margin-bottom: 14px;
-
-                .main-price {
-                    font-size: 24px;
-                    color: $product-price-color;
-                }
-            }
-
-            .stock-status {
-                margin-bottom: 14px;
-            }
-
-            .description {
-                margin-bottom: 14px;
-            }
-
-            hr{
-                border-top: 1px solid $horizontal-rule-color;
-                margin-bottom: 17px;
-            }
-
-            .attributes {
-                display: block;
-                width: 100%;
-
-                .attribute {
-                    height: 39px;
-                    margin-bottom: 20px;
-
-                    .title {
-                        float: left;
-                        height: 100%;
-                        min-width: 130px;
-                        padding-top: 9px;
-                    }
-
-                    .values {
-                        display: inline-flex;
-
-                        .colors {
-                            margin-right:5px;
-                        }
-                        .colors:last-child {
-                            margin-right: 0;
-                        }
-
-                        .red {
-                            height: 37px;
-                            width: 37px;
-                            background: red;
-                            border: 1px solid $border-color;
-                            border-radius:  2px;
-                        }
-
-                        .blue {
-                            height: 37px;
-                            width: 37px;
-                            background: blue;
-                            border: 1px solid $border-color;
-                            border-radius:  2px;
-                        }
-
-                        .green {
-                            height: 37px;
-                            width: 37px;
-                            background: green;
-                            border: 1px solid $border-color;
-                            border-radius:  2px;
-                        }
-
-                        .size {
-                            margin-right:5px;
-                            line-height: 38px;
-                            height: 37px;
-                            width: 60px;
-                            border: 1px solid $border-color;
-                            border-radius:  2px;
-                            text-align: center;
-                            vertical-align: middle;
-                        }
-                        .size:last-child {
-                            margin-right: 0;
-                        }
-
-                        .quantity {
-                            .values {
-                                .control {
-                                    height: 37px !important;
-                                    width: 30px !important;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            .full-description {
-                font-size: 16px;
-            }
-
-            .full-specification{
-
-            }
-
-            .rating-reviews {
-                margin-top: 30px;
-
-                .title{
-                    margin-bottom: 15px;
-                }
-
-                .overall {
-
-                    .number{
-                        font-size: 34px;
-                    }
-
-                    button {
-                        float: right;
-                        border-radius: 0px !important;
-                    }
-
-                    margin-bottom: 5px;
-                }
-
-                .reviews {
-                    margin-top: 34px;
-                    margin-bottom: 80px;
-
-                    .review {
-                        margin-bottom: 25px;
-
-                        .stars {
-                            margin-bottom: 15px;
-                        }
-                        .message {
-                            margin-bottom: 10px;
-                        }
-                    }
-                    .view-all {
-                        margin-top:15px;
-                        color: $logo-color;
-                        margin-bottom:15px;
-                    }
-                }
-            }
-        }
-
-    }
-
-    // .related-products-wrapper {
-    //     margin-bottom: 80px;
-
-    //     .title{
-    //         margin-bottom: 22px;
-    //         text-align: center;
-    //     }
-
-    //     .horizontal-rule {
-    //         height: 1px;
-    //         background: $horizontal-rule-color;
-    //         width: 148px;
-    //         margin-bottom: 24px;
-    //         margin-left:auto;
-    //         margin-right:auto;
-    //     }
-
-    //     .related-products {
-    //         display: grid;
-    //         grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-    //         grid-gap: 10px;
-    //     }
-
-    // }
-}
-
-/* cart pages and elements css begins here */
-
-section.cart {
-    color: $product-font-color;
-    font-size: 16px;
-    margin-bottom: 80px;
-
-    .title {
-        font-size: 24px;
-    }
-
-    .cart-content {
-        margin-top: 21px;
-        padding: 1px;
-        display: flex;
-        flex-direction: row;
-
-        .left-side {
-            width: 68.6%;
-            margin-right: 2.4%;
-
-            .item {
-                padding: 1.1%;
-                margin-bottom: 20px;
-                display: flex;
-                flex-direction: row;
-
-                .item-image {
-                    height: 160px;
-                    width: 160px;
-                }
-
-                .item-details {
-                    display: flex;
-                    flex-direction: column;
-
-                    .item-title {
-                        font-size: 18px;
-                        margin-bottom: 10px;
-                    }
-
-                    .price {
-                        margin-bottom: 10px;
-
-                        .main-price {
-                            font-size: 18px;
-                            margin-right: 4px;
-                        }
-
-                        .real-price {
-                            margin-right: 4px;
-                            text-decoration-line: line-through;
-                        }
-
-                        .discount {
-                            color: $product-price-color;
-                        }
-                    }
-
-                    .summary {
-                        margin-bottom: 17px;
-                    }
-
-                    .misc {
-                        display: inline-flex;
-                        align-items: center;
-                        justify-content: flex-start;
-
-                        div.qty-text {
-                            color: $gray-shade;
-                            margin-right: 10px;
-                        }
-
-                        div.box {
-                            height: 38px;
-                            width: 60px;
-                            text-align: center;
-                            line-height: 38px;
-                            border: 1px solid $border-color;
-                            border-radius: 3px;
-                            margin-right: 30px;
-                        }
-
-                        .remove {
-                            color: $dark-blue-shade;
-                            margin-right: 30px;
-                        }
-
-                        .towishlist {
-                            color : $dark-blue-shade;
-                        }
-
-                    }
-                }
-            }
-
-            .misc-controls {
-                float: right;
-
-                span {
-                    margin-right: 15px;
-                }
-
-                button {
-                    border-radius: 0px;
-                }
-            }
-        }
-
-        .right-side {
-            width: 29%;
-            display: block;
-
-            .price-section {
-                width: 100%;
-                padding: 10px 10px 18px 18px;
-                margin-bottom: 20px;
-
-                .title {
-                    font-size: 16px;
-                    font-weight: bold;
-                    padding-bottom: 8px;
-                    margin-bottom: 10px;
-                }
-
-                .all-item-details {
-                    margin-bottom: 17px;
-
-                    .item-details {
-                        margin-bottom: 10px;
-
-                        .name {
-                        }
-
-                        .price {
-                            float: right;
-                        }
-                    }
-                }
-                .horizontal-rule {
-                    width: 100%;
-                    height: 1px;
-                    vertical-align: middle;
-                    background: #e8e8e8;
-                }
-
-                .total-details {
-                    margin-top: 10px;
-
-                    .amount {
-                        float: right;
-                    }
-                }
-            }
-
-            .coupon-section {
-                padding: 10px 10px 18px 18px;
-
-                .title {
-                    font-size: 16px;
-                    font-weight: bold;
-                    margin-bottom: 10px;
-                }
-
-                .control-group {
-                    margin-bottom: 12px !important;
-
-                    input.coupon-input::-moz-placeholder {
-                        font-family: "montserrat", sans-serif;
-                        font-size: 16px;
-                        color: $product-font-color;
-                    }
-
-                    input.coupon-input::-webkit-input-placeholder {
-                        font-family: "montserrat", sans-serif;
-                        font-size: 16px;
-                        color: $product-font-color;
-                    }
-
-                }
-
-                button {
-                    margin-bottom: 10px;
-                    background-color: $color-black;
-                    border-radius: 0px;
-                }
-
-                .coupon-details {
-
-                    .coupon {
-                        margin-bottom: 8px;
-
-                        .discount {
-                            float: right;
-                        }
-                    }
-                }
-
-                .horizontal-rule {
-                    width: 100%;
-                    height: 1px;
-                    vertical-align: middle;
-                    background: #e8e8e8;
-                    margin-bottom: 9px;
-                }
-
-                .after-coupon-amount {
-
-                    .name {
-                        font-weight: bold;
-                    }
-
-                    .amount {
-                        float: right;
-                        font-weight: bold;
-                    }
-
-                }
-
-            }
-
-        }
-    }
-
-}
-
-.related-products-wrapper {
-    margin-bottom: 80px;
-
-    .title{
-        margin-bottom: 22px;
-        font-size: 18px;
-        color: $product-font-color;
-        text-align: center;
-    }
-
-    .horizontal-rule {
-        height: 1px;
-        background: $horizontal-rule-color;
-        width: 148px;
-        margin-bottom: 24px;
-        margin-left:auto;
-        margin-right:auto;
-    }
-
-    .related-products {
-        display: grid;
-        grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-        grid-gap: 10px;
-    }
-
-}
-
-/* cart pages and elements css ends here */
-
-@media all and (max-width: 480px) {
-    .header {
-        // border: 1px solid black;
-        margin-top: 16px;
-        margin-bottom: 21px;
-
-        .header-top {
-            margin-bottom: 16px;
-            display: flex;
-            max-width: 92%;
-            width: 100%;
-            margin-left: auto;
-            margin-right: auto;
-            // border: 1px solid indigo;
-            align-items: center;
-            justify-content: space-between;
-
-            div.left-content {
-                display: flex;
-                flex-direction: row;
-                justify-content: flex-start;
-                align-items: center;
-
-                ul.logo-container {
-                    margin-right: 12px;
-
-                    li {
-                        display: flex;
-                    }
-                }
-
-                ul.search-container {
-                    li.search-group {
-                        display: inline-flex;
-                        justify-content: center;
-                        align-items: center;
-
-                        .search-field {
-                            height: 38px;
-                            border: 2px solid $border-color;
-                            border-radius: 3px;
-                            border-right: none;
-                            border-top-right-radius: 0px;
-                            border-bottom-right-radius: 0px;
-                        }
-
-                        input.search-field::-moz-placeholder {
-                            font-family: "montserrat", sans-serif;
-                            padding-left: 10px;
-                        }
-                        input.search-field::-webkit-input-placeholder {
-                            font-family: "montserrat", sans-serif;
-                            padding-left: 10px;
-                        }
-
-                        .search-icon-wrapper {
-                            box-sizing: border-box;
-                            height: 38px;
-                            width: 38px;
-                            border: 2px solid $border-color;
-                            border-top-right-radius: 3px;
-                            border-bottom-right-radius: 3px;
-
-                            .search-icon {
-                                margin-top: 4px;
-                                margin-left: 4px;
-                                height: 24px;
-                                width: 24px;
-                            }
-                        }
-                    }
-                }
-            }
-
-            div.right-content {
-                display: flex;
-                flex-direction: row;
-                justify-content: flex-end;
-                align-items: center;
-
-                ul.account-dropdown-container {
-                    float: right;
-                    border-right: 2px solid $border-color;
-
-                    li.account-dropdown {
-                        display: flex;
-                        flex-direction: row;
-
-                        .icon-account {
-                            margin: 0;
-                            height: 24px;
-                            width: 24px;
-                        }
-                        .account {
-                            padding-top: 3px;
-                        }
-                    }
-                }
-
-                ul.cart-dropdown {
-                    float: right;
-
-                    li.cart-summary {
-                        display: flex;
-                        flex-direction: row;
-
-                        .icon-cart {
-                            margin: 0;
-                            height: 24px;
-                            width: 24px;
-                        }
-                        .cart {
-                            padding-top: 3px;
-                        }
-                    }
-                }
-            }
-
-            .right-responsive {
-                display: none;
-                ul.right-wrapper {
-                    display: flex;
-                    flex-direction: row;
-                    justify-content: flex-end;
-                    align-items: center;
-
-                    li:not(:last-child) {
-                        margin-right: 7px;
-
-                        span.icon {
-                            margin: 0;
-                            height: 24px;
-                            width: 24px;
-                        }
-                    }
-                }
-            }
-        }
-
-        .header-bottom {
-            height: 48px;
-            margin-left: auto;
-            margin-right: auto;
-            border-top: 1px solid lightgrey;
-            border-bottom: 1px solid lightgrey;
-            display: block;
-
-            .menu-bar {
-                display: flex;
-                flex-direction: row;
-                justify-content: flex-start;
-                align-items: center;
-                height: 48px;
-                width: 80%;
-                margin-left: auto;
-                margin-right: auto;
-
-                li {
-                    display: flex;
-                    flex-direction: row;
-                    align-items: center;
-                    justify-content: center;
-                    // background-color: blue;
-                    height: 100%;
-                    margin: 2.5%;
-                }
-                li:last-child {
-                    margin-left: auto;
-                    color: $offer-color;
-                }
-            }
-        }
-    }
-
-    section.slider-block {
-
-        div.slider-content {
-            width:100%;
-
-            ul.slider-images {
-
-                li{
-                    position: absolute;
-                    display: none;
-                }
-
-                li.show {
-                    display:block;
-                    width: 100%;
-                }
-
-                li img {
-                    height: 500px;
-                    width:100%;
-                }
-            }
-
-            div.slider-control {
-                display: inline-block;
-                position: absolute;
-                user-select: none;
-                width: 100%;
-                right: 0;
-                bottom: 50%;
-
-                .dark-left-icon {
-                    background-color: $background-color;
-                    height: 48px;
-                    width: 48px;
-                    max-height: 100%;
-                    max-width: 100%;
-                    margin-left: 5%;
-                }
-
-                .light-right-icon {
-                    background-color: $color-black;
-                    float:right;
-                    height: 48px;
-                    width: 48px;
-                    max-height: 100%;
-                    max-width: 100%;
-                    margin-right: 5%;
-                }
-            }
-        }
-    }
-
-    .main-container-wrapper {
-        margin-left: 4%;
-        margin-right: 4%;
-
-        .product-card {
-            display: flex;
-            flex-flow: column;
-            justify-content: center;
-
-            .product-image img {
-                // order: -1;
-                align-self: center;
-                width: 100%;
-                margin-bottom: 14px;
-            }
-            .product-name {
-                font-size: 16px;
-                margin-bottom: 14px;
-                width: 100%;
-            }
-            .product-price {
-                font-size: 16px;
-                margin-bottom: 14px;
-                width: 100%;
-            }
-            .product-ratings {
-                width: 100%;
-                margin-bottom: 14px;
-            }
-            .cart-fav-seg {
-                display: inline-flex;
-                width: 100%;
-                align-items: center;
-
-                .addtocart {
-                    border-radius: 0px;
-                    margin-right: 10px;
-                    text-transform: uppercase;
-                }
-            }
-        }
-
-        section.featured-products {
-            display: block;
-            margin-bottom: 5%;
-
-            .featured-heading {
-                width: 100%;
-                text-align: center;
-                text-transform: uppercase;
-                font-size: 18px;
-                margin-bottom: 20px;
-
-                .featured-separator {
-                    color: lightgray;
-                }
-            }
-            .featured-grid {
-                display: grid;
-                grid-template-columns: 48% 48%;
-                grid-gap: 10px;
-            }
-        }
-
-        section.news-update {
-            display: block;
-            box-sizing: border-box;
-            width: 100%;
-            margin-bottom: 5%;
-
-            .news-update-grid {
-                display: grid;
-                grid-template-columns: 100%;
-                grid-template-rows: auto;
-                grid-gap: 20px;
-
-                .block1 {
-                    display: block;
-                    box-sizing: border-box;
-
-                    img {
-                        display: flex;
-                        height: 100%;
-                        width: 100%;
-                    }
-                }
-
-                .block2 {
-                    display: block;
-                    box-sizing: border-box;
-
-                    display: grid;
-                    grid-template-rows: repeat(2, minmax(50%, 1fr));
-                    grid-row-gap: 20px;
-
-                    .sub-block1 {
-                        display: block;
-                        box-sizing: border-box;
-
-                        img {
-                            width: 100%;
-                        }
-                    }
-
-                    .sub-block2 {
-                        display: block;
-                        box-sizing: border-box;
-
-                        img {
-                            width: 100%;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    .footer {
-        background-color: $background-color;
-        padding-left: 10%;
-        padding-right: 10%;
-
-        .footer-content {
-            .footer-list-container {
-                display: grid;
-                padding-top: 40px;
-                padding-bottom: 40px;
-                padding-left: 10px;
-                padding-right: 10px;
-                grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-                grid-auto-rows: auto;
-                grid-row-gap: 1vh;
-
-                .list-container {
-                    .list-heading {
-                        font-size: 16px;
-                        letter-spacing: -0.26px;
-                        text-transform: uppercase;
-                        color: $list-heading-color;
-                    }
-
-                    .list-group {
-                        padding-top: 25px;
-
-                        li {
-                            margin-bottom: 12px;
-                            color: $list-color;
-                            list-style-type: none;
-                            text-transform: uppercase;
-
-                            span.icon-wrapper {
-                                display: inline-block;
-                                vertical-align: middle;
-                                margin-right: 5px;
-                                height: 24px;
-                                width: 24px;
-
-                                span.icon {
-                                    height: 24px;
-                                    width: 24px;
-                                }
-                            }
-                        }
-                    }
-
-                    .form-container {
-                        padding-top: 10px;
-
-                        .control-group {
-                            margin: 0;
-
-                            .subscribe-field {
-                                width: 100%;
-                            }
-
-                            .subscribe-field::-webkit-input-placeholder {
-                                font-family: "montserrat", sans-serif;
-                            }
-
-                            .subscribe-field::-moz-placeholder {
-                                font-family: "montserrat", sans-serif;
-                            }
-
-                            .btn-primary {
-                                background-color: $subscribe-btn-color;
-                                border-radius: 0px;
-                                text-align: center;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-
-@media all and (min-width: 481px) and (max-width: 920px) {
-    .header {
-        // border: 1px solid black;
-        margin-top: 16px;
-        margin-bottom: 21px;
-
-        .header-top {
-            margin-bottom: 16px;
-            display: flex;
-            max-width: 92%;
-            width: 100%;
-            margin-left: auto;
-            margin-right: auto;
-            // border: 1px solid indigo;
-            align-items: center;
-            justify-content: space-between;
-
-            div.left-content {
-                display: flex;
-                flex-direction: row;
-                justify-content: flex-start;
-                align-items: center;
-
-                ul.logo-container {
-                    margin-right: 12px;
-
-                    li {
-                        display: flex;
-                    }
-                }
-
-                ul.search-container {
-                    li.search-group {
-                        display: inline-flex;
-                        justify-content: center;
-                        align-items: center;
-
-                        .search-field {
-                            height: 38px;
-                            border: 2px solid $border-color;
-                            border-radius: 3px;
-                            border-right: none;
-                            border-top-right-radius: 0px;
-                            border-bottom-right-radius: 0px;
-                        }
-
-                        input.search-field::-moz-placeholder {
-                            font-family: "montserrat", sans-serif;
-                            padding-left: 10px;
-                        }
-                        input.search-field::-webkit-input-placeholder {
-                            font-family: "montserrat", sans-serif;
-                            padding-left: 10px;
-                        }
-
-                        .search-icon-wrapper {
-                            box-sizing: border-box;
-                            height: 38px;
-                            width: 38px;
-                            border: 2px solid $border-color;
-                            border-top-right-radius: 3px;
-                            border-bottom-right-radius: 3px;
-
-                            .search-icon {
-                                margin-top: 4px;
-                                margin-left: 4px;
-                                height: 24px;
-                                width: 24px;
-                            }
-                        }
-                    }
-                }
-            }
-
-            div.right-content {
-                display: flex;
-                flex-direction: row;
-                justify-content: flex-end;
-                align-items: center;
-
-                ul.account-dropdown-container {
-                    float: right;
-                    border-right: 2px solid $border-color;
-
-                    li.account-dropdown {
-                        display: flex;
-                        flex-direction: row;
-
-                        .icon-account {
-                            margin: 0;
-                            height: 24px;
-                            width: 24px;
-                        }
-                        .account {
-                            padding-top: 3px;
-                        }
-                    }
-                }
-
-                ul.cart-dropdown {
-                    float: right;
-
-                    li.cart-summary {
-                        display: flex;
-                        flex-direction: row;
-
-                        .icon-cart {
-                            margin: 0;
-                            height: 24px;
-                            width: 24px;
-                        }
-                        .cart {
-                            padding-top: 3px;
-                        }
-                    }
-                }
-            }
-
-            .right-responsive {
-                display: none;
-                ul.right-wrapper {
-                    display: flex;
-                    flex-direction: row;
-                    justify-content: flex-end;
-                    align-items: center;
-
-                    li:not(:last-child) {
-                        margin-right: 7px;
-
-                        span.icon {
-                            margin: 0;
-                            height: 24px;
-                            width: 24px;
-                        }
-                    }
-                }
-            }
-        }
-
-        .header-bottom {
-            height: 48px;
-            margin-left: auto;
-            margin-right: auto;
-            border-top: 1px solid lightgrey;
-            border-bottom: 1px solid lightgrey;
-            display: block;
-
-            .menu-bar {
-                display: flex;
-                flex-direction: row;
-                justify-content: flex-start;
-                align-items: center;
-                height: 48px;
-                width: 80%;
-                margin-left: auto;
-                margin-right: auto;
-
-                li {
-                    display: flex;
-                    flex-direction: row;
-                    align-items: center;
-                    justify-content: center;
-                    // background-color: blue;
-                    height: 100%;
-                    margin: 2.5%;
-                }
-                li:last-child {
-                    margin-left: auto;
-                    color: $offer-color;
-                }
-            }
-        }
-    }
-
-    section.slider-block {
-
-        div.slider-content {
-            width:92%;
-
-            ul.slider-images {
-
-                li{
-                    position: absolute;
-                    display: none;
-                }
-
-                li.show {
-                    display:block;
-                    width: 92%;
-                }
-
-                li img {
-                    height: 500px;
-                    width:100%;
-                }
-            }
-
-            div.slider-control {
-                display: inline-block;
-                position: absolute;
-                user-select: none;
-                bottom: 1em;
-                right: 5.5%;
-            }
-        }
-    }
-
-    .main-container-wrapper {
-        margin-left: 4%;
-        margin-right: 4%;
-
-        .product-card {
-            display: flex;
-            flex-flow: column;
-            justify-content: center;
-
-            .product-image img {
-                // order: -1;
-                align-self: center;
-                width: 100%;
-                margin-bottom: 14px;
-            }
-            .product-name {
-                font-size: 16px;
-                margin-bottom: 14px;
-                width: 100%;
-            }
-            .product-price {
-                font-size: 16px;
-                margin-bottom: 14px;
-                width: 100%;
-            }
-            .product-ratings {
-                width: 100%;
-                margin-bottom: 14px;
-            }
-            .cart-fav-seg {
-                display: inline-flex;
-                width: 100%;
-                align-items: center;
-
-                .addtocart {
-                    border-radius: 0px;
-                    margin-right: 10px;
-                    text-transform: uppercase;
-                }
-            }
-        }
-
-        section.featured-products {
-            display: block;
-            margin-bottom: 5%;
-
-            .featured-heading {
-                width: 100%;
-                text-align: center;
-                text-transform: uppercase;
-                font-size: 18px;
-                margin-bottom: 20px;
-
-                .featured-separator {
-                    color: lightgray;
-                }
-            }
-            .featured-grid {
-                display: grid;
-                // grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-                grid-template-columns: 49% 49%;
-                grid-gap: 10px;
-            }
-        }
-
-        section.news-update {
-            display: block;
-            box-sizing: border-box;
-            width: 100%;
-            margin-bottom: 5%;
-
-            .news-update-grid {
-                display: grid;
-                grid-template-columns: 100%;
-                grid-template-rows: auto;
-                grid-gap: 20px;
-
-                .block1 {
-                    display: block;
-                    box-sizing: border-box;
-
-                    img {
-                        display: flex;
-                        height: 100%;
-                        width: 100%;
-                    }
-                }
-
-                .block2 {
-                    display: block;
-                    box-sizing: border-box;
-
-                    display: grid;
-                    grid-template-rows: repeat(2, minmax(50%, 1fr));
-                    grid-row-gap: 20px;
-
-                    .sub-block1 {
-                        display: block;
-                        box-sizing: border-box;
-
-                        img {
-                            width: 100%;
-                        }
-                    }
-
-                    .sub-block2 {
-                        display: block;
-                        box-sizing: border-box;
-
-                        img {
-                            width: 100%;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    .footer {
-        background-color: $background-color;
-        padding-left: 4%;
-        padding-right: 4%;
-
-        .footer-content {
-            .footer-list-container {
-                display: grid;
-                padding-top: 40px;
-                padding-bottom: 40px;
-                padding-left: 10px;
-                padding-right: 10px;
-                grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-                grid-auto-rows: auto;
-                grid-row-gap: 1vh;
-
-                .list-container {
-                    .list-heading {
-                        font-size: 16px;
-                        letter-spacing: -0.26px;
-                        text-transform: uppercase;
-                        color: $list-heading-color;
-                    }
-
-                    .list-group {
-                        padding-top: 25px;
-
-                        li {
-                            margin-bottom: 12px;
-                            color: $list-color;
-                            list-style-type: none;
-                            text-transform: uppercase;
-
-                            span.icon-wrapper {
-                                display: inline-block;
-                                vertical-align: middle;
-                                margin-right: 5px;
-                                height: 24px;
-                                width: 24px;
-
-                                span.icon {
-                                    height: 24px;
-                                    width: 24px;
-                                }
-                            }
-                        }
-                    }
-
-                    .form-container {
-                        padding-top: 10px;
-
-                        .control-group {
-                            margin: 0;
-
-                            .subscribe-field {
-                                width: 100%;
-                            }
-
-                            .subscribe-field::-webkit-input-placeholder {
-                                font-family: "montserrat", sans-serif;
-                            }
-
-                            .subscribe-field::-moz-placeholder {
-                                font-family: "montserrat", sans-serif;
-                            }
-
-                            .btn-primary {
-                                background-color: $subscribe-btn-color;
-                                border-radius: 0px;
-                                text-align: center;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-
-.layered-filter-wrapper {
-    width: 20%;
-
-    .filter-title {
-        border-bottom: 1px solid #E8E8E8;
-        font-size: 16px;
-        color: #242424;
-        padding: 10px 0;
-    }
-
-    .filter-attributes {
-        .filter-attributes-item {
-            border-bottom: 1px solid #E8E8E8;
-            padding-bottom: 10px;
-
-            .filter-attributes-title {
-                padding: 10px 40px 0 10px;
-                font-size: 16px;
-                color: #5E5E5E;
-                cursor: pointer;
-                position: relative;
-
-                .icon {
-                    background-image: url('../images/arrow-down.svg') !important;
-                    width: 10px;
-                    height: 10px;
-                    position: absolute;
-                    right: 15px;
-                    top: 14px;
-                }
-            }
-
-            .filter-attributes-content {
-                padding: 10px;
-                display: none;
-
-                ol.items {
-                    padding: 0;
-                    margin: 0;
-                    list-style: none none;
-
-                    li.item {
-                        padding: 8px 0;
-                        font-size: 16px;
-                        color: #5E5E5E;
-
-                        .checkbox {
-                            margin: 0;
-                            
-                            .checkbox-view {
-                                height: 16px;
-                                width: 16px;
-                                background-image: url("../images/checkbox.svg");
-                            }
-
-                            input:checked + .checkbox-view {
-                                background-image: url("../images/checkbox-checked.svg");
-                            }
-                        }
-                    }
-                }
-
-                .price-range-wrapper {
-                    margin-top: 21px;
-                }
-            }
-
-            &.active {
-                .filter-attributes-content {
-                    display: block;
-                }
-
-                .filter-attributes-title .icon {
-                    background-image: url('../images//arrow-up.svg') !important;
-                }
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 46d65e730..3ad47913a 100644
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -33,6 +33,8 @@ return [
     ],
 
     'products' => [
-        'layered-nav-title' => 'Shop By'
+        'layered-nav-title' => 'Shop By',
+        'price-label' => 'As low as',
+        'remove-filter-link-title' => 'Clear All'
     ]
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/grids/featured/featuredproductgrid.blade.php b/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php
similarity index 98%
rename from packages/Webkul/Shop/src/Resources/views/grids/featured/featuredproductgrid.blade.php
rename to packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php
index e53439f9e..31ea188d9 100644
--- a/packages/Webkul/Shop/src/Resources/views/grids/featured/featuredproductgrid.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php
@@ -4,7 +4,7 @@
         <span class="featured-seperator" style="color:lightgrey;">_____</span>
     </div>
 
-    <div class="featured-grid">
+    <div class="featured-grid product-grid max-4-col">
         <div class="product-card">
             <div class="product-image">
                 <img src="vendor/webkul/shop/assets/images/grid.png" />
diff --git a/packages/Webkul/Shop/src/Resources/views/home/index.blade.php b/packages/Webkul/Shop/src/Resources/views/home/index.blade.php
index 861ac8c97..1b87d248e 100644
--- a/packages/Webkul/Shop/src/Resources/views/home/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/home/index.blade.php
@@ -1,11 +1,13 @@
 @extends('shop::layouts.master')
 
 @section('slider')
-    @include('shop::layouts.slider')
+    @include('shop::home.slider')
 @endsection
 
 @section('content-wrapper')
-    @include('shop::grids.featured.featuredproductgrid')
-    @include('shop::grids.newproduct.newproductgrid')
-    @include('shop::grids.newsupdate.newsupdategrid')
+    @include('shop::home.featured-products')
+
+    @include('shop::home.new-products')
+    
+    @include('shop::home.news-updates')
 @endsection
diff --git a/packages/Webkul/Shop/src/Resources/views/grids/newproduct/newproductgrid.blade.php b/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php
similarity index 98%
rename from packages/Webkul/Shop/src/Resources/views/grids/newproduct/newproductgrid.blade.php
rename to packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php
index 8d3ce62db..e28c13eb4 100644
--- a/packages/Webkul/Shop/src/Resources/views/grids/newproduct/newproductgrid.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php
@@ -4,7 +4,7 @@
         <span class="featured-seperator" style="color:lightgrey;">_____</span>
     </div>
 
-    <div class="featured-grid">
+    <div class="new-product-grid product-grid max-4-col">
         <div class="product-card">
             <div class="product-image">
                 <img src="vendor/webkul/shop/assets/images/new.png" />
@@ -25,6 +25,7 @@
                 <span><img src="vendor/webkul/shop/assets/images/wishadd.svg" /></span>
             </div>
         </div>
+
         <div class="product-card">
             <div class="product-image">
                 <img src="vendor/webkul/shop/assets/images/new.png" />
@@ -45,6 +46,7 @@
                 <span><img src="vendor/webkul/shop/assets/images/wishadd.svg" /></span>
             </div>
         </div>
+
         <div class="product-card">
             <div class="product-image">
                 <img src="vendor/webkul/shop/assets/images/new.png" />
@@ -65,6 +67,7 @@
                 <span><img src="vendor/webkul/shop/assets/images/wishadd.svg" /></span>
             </div>
         </div>
+        
         <div class="product-card">
             <div class="product-image">
                 <img src="vendor/webkul/shop/assets/images/new.png" />
diff --git a/packages/Webkul/Shop/src/Resources/views/grids/newsupdate/newsupdategrid.blade.php b/packages/Webkul/Shop/src/Resources/views/home/news-updates.blade.php
similarity index 100%
rename from packages/Webkul/Shop/src/Resources/views/grids/newsupdate/newsupdategrid.blade.php
rename to packages/Webkul/Shop/src/Resources/views/home/news-updates.blade.php
diff --git a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php
new file mode 100644
index 000000000..5aa534dc9
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php
@@ -0,0 +1 @@
+<button class="btn btn-md btn-primary addtocart">Add to Cart</button>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/products/add-to.blade.php b/packages/Webkul/Shop/src/Resources/views/products/add-to.blade.php
new file mode 100644
index 000000000..1839cb16b
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/views/products/add-to.blade.php
@@ -0,0 +1,7 @@
+<div class="cart-fav-seg">
+    
+    @include ('shop::products.add-to-cart', ['product' => $product])
+
+    <span><img src="{{ bagisto_asset('images/wishlist.svg') }}" /></span>
+    
+</div>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/products/card.blade.php b/packages/Webkul/Shop/src/Resources/views/products/card.blade.php
new file mode 100644
index 000000000..451993e5e
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/views/products/card.blade.php
@@ -0,0 +1,20 @@
+<div class="product-card">
+    <div class="product-image">
+        <img src="{{ bagisto_asset('images/gogs.png') }}" />
+    </div>
+    
+    <div class="product-name">
+        <span>{{ $product->name }}</span>
+    </div>
+    
+    @include ('shop::products.price', ['product' => $product])
+
+    @if ($product->reviews->count())
+
+        @include ('shop::products.review', ['product' => $product])
+
+    @endif
+
+    @include ('shop::products.add-to', ['product' => $product])
+
+</div>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php
index 503639a2e..d7c5b30e4 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php
@@ -4,6 +4,30 @@
     
     @include ('shop::products.layered-navigation')
 
+    <div class="main" style="display: inline-block">
+
+        <div class="product-grid max-3-col">
+
+            @inject ('productHelper', 'Webkul\Shop\Product\Collection')
+            
+            <?php $products = $productHelper->getProductCollection($category->id); ?>
+            
+            @foreach ($products as $product)
+
+                @include ('shop::products.card', ['product' => $product])
+
+            @endforeach
+
+        </div>
+
+        <div class="bottom-toolbar">
+
+            {{ $products->appends(request()->input())->links() }}
+
+        </div>
+        
+    </div>
+
 @stop
 
 @push('scripts')
diff --git a/packages/Webkul/Shop/src/Resources/views/products/layered-navigation.blade.php b/packages/Webkul/Shop/src/Resources/views/products/layered-navigation.blade.php
index f3ee55a17..2ebce2670 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/layered-navigation.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/layered-navigation.blade.php
@@ -1,11 +1,13 @@
 @inject ('attributeRepository', 'Webkul\Attribute\Repositories\AttributeRepository')
 
-<layered-navigation></layered-navigation>
+<div class="layered-filter-wrapper">
+    <layered-navigation></layered-navigation>
+</div>
 
 @push('scripts')
     <script type="text/x-template" id="layered-navigation-template">
-        <div class="layered-filter-wrapper">
-
+        <div>
+        
             <div class="filter-title">
                 {{ __('shop::app.products.layered-nav-title') }}
             </div>
@@ -14,7 +16,8 @@
 
                 <div class="filter-attributes">
                     
-                    <filter-attribute-item v-for='(attribute, index) in attributes' :attribute="attribute" :key="index" :index="index" @onFilterAdded="addFilters(attribute.code, $event)"></filter-attribute-item>
+                    <filter-attribute-item v-for='(attribute, index) in attributes' :attribute="attribute" :key="index" :index="index" @onFilterAdded="addFilters(attribute.code, $event)" :appliedFilterValues="appliedFilters[attribute.code]">
+                    </filter-attribute-item>
 
                 </div>
 
@@ -29,7 +32,13 @@
             <div class="filter-attributes-title" @click="active = !active">
                 @{{ attribute.name }}
 
-                <i class="icon" :class="[active ? 'arrow-up-icon' : 'arrow-down-icon']"></i>
+                <div class="pull-right">
+                    <span class="remove-filter-link" v-if="appliedFilters.length" @click.stop="clearFilters()">
+                        {{ __('shop::app.products.remove-filter-link-title') }}
+                    </span>
+
+                    <i class="icon" :class="[active ? 'arrow-up-icon' : 'arrow-down-icon']"></i>
+                </div>
             </div>
 
             <div class="filter-attributes-content">
@@ -38,7 +47,7 @@
                     <li class="item" v-for='(option, index) in attribute.options'>
 
                         <span class="checkbox">
-                            <input type="checkbox" :id="option.id" :value="option.id" @change="addFilter($event)"/>
+                            <input type="checkbox" :id="option.id" v-bind:value="option.id" v-model="appliedFilters" @change="addFilter($event)"/>
                             <label class="checkbox-view" :for="option.id"></label>
                             @{{ option.label }}
                         </span>
@@ -73,6 +82,16 @@
                 appliedFilters: {}
             }),
 
+            created () {
+                var urlParams = new URLSearchParams(window.location.search);
+                
+                var entries = urlParams.entries();
+                
+                for(pair of entries) {
+                   this.appliedFilters[pair[0]] = pair[1].split(',');
+                }
+            },
+
             methods: {
                 addFilters (attributeCode, filters) {
                     if(filters.length) {
@@ -80,6 +99,18 @@
                     } else {
                         delete this.appliedFilters[attributeCode]; 
                     }
+
+                    this.applyFilter()
+                },
+
+                applyFilter () {
+                    var params = [];
+                    
+                    for(key in this.appliedFilters) {
+                        params.push(key + '=' + this.appliedFilters[key].join(','))
+                    }
+
+                    window.location.href = "?" + params.join('&');
                 }
             }
 
@@ -89,11 +120,13 @@
 
             template: '#filter-attribute-item-template',
 
-            props: ['index', 'attribute'],
+            props: ['index', 'attribute', 'appliedFilterValues'],
 
             data: () => ({
                 appliedFilters: [],
+
                 active: false,
+
                 sliderConfig: {
                     value: [
                         100,
@@ -113,23 +146,37 @@
             created () {
                 if(!this.index)
                     this.active = true;
+
+                if(this.appliedFilterValues && this.appliedFilterValues.length) {
+                    this.appliedFilters = this.appliedFilterValues;
+
+                    if(this.attribute.type == 'price') {
+                        this.sliderConfig.value = this.appliedFilterValues;
+                    }
+
+                    this.active = true;
+                }
             },
 
             methods: {
                 addFilter (e) {
-                    if(event.target.checked) {
-                        this.appliedFilters.push(event.target.value);
-                    } else {
-                        let index = this.appliedFilters.indexOf(event.target.value)
-
-                        this.appliedFilters.splice(index, 1)
-                    }
-
                     this.$emit('onFilterAdded', this.appliedFilters)
                 },
 
                 priceRangeUpdated (value) {
-                    console.log(value)
+                    this.appliedFilters = value;
+
+                    this.$emit('onFilterAdded', this.appliedFilters)
+                },
+
+                clearFilters () {
+                    if(this.attribute.type == 'price') {
+                        this.sliderConfig.value = [100, 250];
+                    }
+
+                    this.appliedFilters = [];
+
+                    this.$emit('onFilterAdded', this.appliedFilters)
                 }
             }
 
diff --git a/packages/Webkul/Shop/src/Resources/views/products/price.blade.php b/packages/Webkul/Shop/src/Resources/views/products/price.blade.php
new file mode 100644
index 000000000..66ae0416b
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/views/products/price.blade.php
@@ -0,0 +1,27 @@
+<div class="product-price">
+
+    @inject ('priceHelper', 'Webkul\Shop\Product\Price')
+
+    @if ($product->type == 'configurable')
+
+        <span class="price-label">{{ __('shop::app.products.price-label') }}</span>
+
+        <span>{{ core()->currency($priceHelper->getMinimalPrice($product)) }}</span>    
+
+    @else
+
+        @if ($priceHelper->haveSpecialPrice($product))
+
+            <span class="regular-price">{{ core()->currency($product->price) }}</span>
+
+            <span class="special-price">{{ core()->currency($priceHelper->getSpecialPrice($product)) }}</span>
+
+        @else
+
+            <span>{{ core()->currency($product->price) }}</span>
+
+        @endif
+
+    @endif
+
+</div>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/products/review.blade.php b/packages/Webkul/Shop/src/Resources/views/products/review.blade.php
new file mode 100644
index 000000000..12f303705
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/views/products/review.blade.php
@@ -0,0 +1,11 @@
+<div class="product-ratings">
+
+    @inject ('reviewHelper', 'Webkul\Shop\Product\Review')
+
+    @for ($i = 1; $i <= $reviewHelper->getAverageRating($product); $i++)
+
+        <span class="icon star-icon"></span>
+    
+    @endfor
+    
+</div>
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/DataGrid/ProductGrid.php b/packages/Webkul/Ui/src/DataGrid/ProductGrid.php
index f4dff7639..564f39669 100644
--- a/packages/Webkul/Ui/src/DataGrid/ProductGrid.php
+++ b/packages/Webkul/Ui/src/DataGrid/ProductGrid.php
@@ -11,6 +11,7 @@ use Webkul\Ui\DataGrid\Helpers\Pagination;
 use Webkul\Ui\DataGrid\Helpers\Css;
 use Webkul\Attribute\Repositories\AttributeRepository;
 use Webkul\Product\Repositories\ProductAttributeValueRepository;
+use Webkul\Product\Models\ProductAttributeValue;
 use URL;
 
 /**
@@ -151,6 +152,15 @@ class ProductGrid
 
     protected $actions;
 
+    /**
+     * Attribute Columns
+     * for columns which
+     * are attributes.
+     *
+     * @var $attributeColumns
+     */
+
+    protected $attributeColumns;
 
     /**
      * URL parse $parsed
@@ -165,9 +175,9 @@ class ProductGrid
         // list($name, $select, $table, $join, $columns) = array_values($args);
         $name = $select = $aliased = $table = false;
         $join = $columns = $filterable = $searchable =
-        $massoperations = $css = $operators = $actions = [];
+        $massoperations = $attributeColumns = $css = $operators = $actions = [];
         extract($args);
-        return $this->build($name, $select, $filterable, $searchable, $massoperations, $aliased, $perpage, $table, $join, $columns, $css, $operators,$actions);
+        return $this->build($name, $select, $filterable, $searchable, $massoperations, $attributeColumns , $aliased, $perpage, $table, $join, $columns, $css, $operators,$actions);
     }
 
     //contructor for getting the current locale and channel
@@ -176,14 +186,12 @@ class ProductGrid
     private $channel;
     private $attributes;
     private $allAttributes;
-    private $product_attribute_values;
 
-    public function __construct(AttributeRepository $attributes, ProductAttributeValueRepository $product_attribute_values) {
+    public function __construct(AttributeRepository $attributes) {
 
         $this->channel = request()->get('channel') ?: channel()->getChannel();
         $this->locale = request()->get('locale') ?: app()->getLocale();
         $this->attributes = $attributes;
-        $this->product_attribute_values = $product_attribute_values;
 
     }
 
@@ -194,6 +202,7 @@ class ProductGrid
         array $filterable = [],
         array $searchable = [],
         array $massoperations = [],
+        array $attributeColumns = [],
         bool $aliased = false,
         $perpage = 0,
         $table = null,
@@ -210,6 +219,7 @@ class ProductGrid
         $this->setFilterable($filterable);
         $this->setSearchable($filterable);
         $this->setMassOperations($massoperations);
+        $this->setAttributeColumns($attributeColumns);
         $this->setAlias($aliased);
         $this->setPerPage($perpage);
         $this->setTable($table);
@@ -344,6 +354,18 @@ class ProductGrid
         return $this->css;
     }
 
+    /**
+     * To set the attributes
+     * bag on product datagrid.
+     *
+     * @return $this
+     */
+
+    private function setAttributeColumns($attributes = []) {
+        $this->attributeColumns = $attributes;
+        return $this->attributeColumns;
+    }
+
     /**
      * setFilterableColumns
      * @return $this
@@ -544,6 +566,50 @@ class ProductGrid
         }
     }
 
+    public function getProducts() {
+        $qb = DB::table('products')->addSelect('products.*');
+
+        $channel = core()->getCurrentChannelCode();
+        $locale = app()->getLocale();
+
+        foreach (['name', 'description', 'short_description', 'price'] as $code) {
+        $attribute = $this->attributes->findBy('code', $code);
+
+        $productValueAlias = 'pav_' . $attribute->code;
+
+        $qb->leftJoin('product_attribute_values as ' . $productValueAlias, function($leftJoin) use($channel, $locale, $attribute, $productValueAlias) {
+
+        $leftJoin->on('products.id', $productValueAlias . '.product_id');
+
+        if($attribute->value_per_channel) {
+        if($attribute->value_per_locale) {
+        $leftJoin->where($productValueAlias . '.channel', $channel)
+        ->where($productValueAlias . '.locale', $locale);
+        } else {
+        $leftJoin->where($productValueAlias . '.channel', $channel);
+        }
+        } else {
+        if($attribute->value_per_locale) {
+        $leftJoin->where($productValueAlias . '.locale', $locale);
+        }
+        }
+
+        $leftJoin->where($productValueAlias . '.attribute_id', $attribute->id);
+        });
+
+
+        $qb->addSelect($productValueAlias . '.' . ProductAttributeValue::$attributeTypeFields[$attribute->type] . ' as ' . $code);
+
+
+        if($code == 'name') {
+        $filterAlias = 'filter_' . $attribute->code;
+
+        $qb->leftJoin('product_attribute_values as ' . $filterAlias, 'products.id', '=', $filterAlias . '.product_id');
+        $qb->where($filterAlias . '.' . ProductAttributeValue::$attributeTypeFields[$attribute->type], 'Product Name');
+        }
+        }
+    }
+
     /**
      * ->join('contacts', 'users.id', '=', 'contacts.user_id')
      * @return $this->query
@@ -551,9 +617,48 @@ class ProductGrid
 
     private function getQueryWithJoin()
     {
+
         foreach ($this->join as $join) {
-            $this->query->{$join['join']}($join['table'], $join['primaryKey'], $join['condition'], $join['secondaryKey']);
+
+            if(array_key_exists('withAttributes',$join)) {
+
+                $qb = $this->query;
+
+                $channel = $this->channel;
+                $locale = $this->locale;
+
+                foreach ($this->attributeColumns as $code) {
+                    $attribute = $this->attributes->findBy('code', $code);
+
+                    $productValueAlias = 'pav_' . $attribute->code;
+
+                    $qb->leftJoin('product_attribute_values as ' . $productValueAlias, function ($leftJoin) use ($channel, $locale, $attribute, $productValueAlias) {
+                        $leftJoin->on('prods.id', $productValueAlias . '.product_id');
+
+                        if ($attribute->value_per_channel) {
+                            if ($attribute->value_per_locale) {
+                                $leftJoin->where($productValueAlias . '.channel', $channel)->where($productValueAlias . '.locale', $locale);
+                            } else {
+                                $leftJoin->where($productValueAlias . '.channel', $channel);
+                            }
+                        } else {
+                            if ($attribute->value_per_locale) {
+                                $leftJoin->where($productValueAlias . '.locale', $locale);
+                            }
+                        }
+
+                        $leftJoin->where($productValueAlias . '.attribute_id', $attribute->id);
+                    });
+
+                    $qb->addSelect($productValueAlias . '.' . ProductAttributeValue::$attributeTypeFields[$attribute->type] . ' as ' . $code);
+                }
+
+            }
+            else
+                $this->query->{$join['join']}($join['table'], $join['primaryKey'], $join['condition'], $join['secondaryKey']);
+
         }
+
         $this->query->get();
 
     }
@@ -806,11 +911,7 @@ class ProductGrid
                 $this->getQueryWithFilters();
             }
 
-            // $this->results = $this->query->get();
-
-            // $this->results = $this->query->distinct()->paginate($this->perpage)->appends(request()->except('page'));
             $this->results = $this->query->paginate($this->perpage)->appends(request()->input());
-
             return $this->results;
 
         } else {
@@ -825,10 +926,7 @@ class ProductGrid
                 $this->getQueryWithFilters();
             }
 
-            // $this->results = $this->query->get();
-
-            $this->results = $this->query->distinct()->paginate($this->perpage)->appends(request()->except('page'));
-
+            $this->results = $this->query->distinct()->paginate($this->perpage)->appends(request()->input());
             return $this->results;
         }
     }
@@ -845,13 +943,13 @@ class ProductGrid
     {
 
         $this->allAttributes = $this->getAttributes();
-        // dump($this->channel, $this->locale);
         $this->getDbQueryResults();
-
+        // dd($this->results);
         return view('ui::datagrid.index', [
             'css' => $this->css,
             'results' => $this->results,
             'columns' => $this->columns,
+            'attribute_columns' => $this->attributeColumns,
             'filterable' =>$this->filterable,
             'operators' => $this->operators,
             'massoperations' => $this->massoperations,
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Star-Icon.svg b/packages/Webkul/Ui/src/Resources/assets/images/Star-Icon.svg
new file mode 100644
index 000000000..89c223721
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/images/Star-Icon.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
+    <title>star</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="star" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <polygon id="Star" fill="#242424" fill-rule="nonzero" points="7.99999999 13.2668737 3.05572808 16 4 10.2111456 0 6.11145618 5.52786404 5.26687371 7.99999999 0 10.472136 5.26687371 16 6.11145618 12 10.2111456 12.9442719 16"></polygon>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
index 56f31d6ec..289562d52 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
@@ -8,7 +8,6 @@
     box-sizing: border-box;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-    font-weight: 500;
 }
 
 *:focus {
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss
index 14b94bba6..75a8828e5 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss
@@ -158,6 +158,12 @@
     height: 24px;
 }
 
+.star-icon {
+    background-image: url("../images/Star-Icon.svg");
+    width: 24px;
+    height: 24px;
+}
+
 .active {
     .dashboard-icon {
         background-image: url("../images/Icon-Dashboard-Active.svg");
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table/default.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table/default.blade.php
index 11d012575..2a43676ef 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/table/default.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table/default.blade.php
@@ -89,21 +89,30 @@
                         <label class="checkbox-view" for="checkbox"></label>
                     </span>
                 </th>
-                @foreach ($columns as $column) @if($column->sortable == "true")
-                <th class="grid_head"
-                @if(strpos($column->alias, ' as '))
-                    <?php $exploded_name = explode(' as ',$column->name); ?>
-                    data-column-name="{{ $exploded_name[0] }}"
-                @else
-                    data-column-name="{{ $column->alias }}"
-                @endif
+                @foreach ($columns as $column)
+                    @if($column->sortable == "true")
+                        <th class="grid_head"
+                            @if(strpos($column->alias, ' as '))
+                                <?php $exploded_name = explode(' as ',$column->name); ?>
+                                data-column-name="{{ $exploded_name[0] }}"
+                            @else
+                                data-column-name="{{ $column->alias }}"
+                            @endif
 
-                data-column-label="{{ $column->label }}"
-                    data-column-sort="asc">{!! $column->sorting() !!}<span class="icon sort-down-icon"></span>
-                </th>
-                @else
-                <th class="grid_head" data-column-name="{{ $column->alias }}" data-column-label="{{ $column->label }}">{!! $column->sorting() !!}</th>
-                @endif @endforeach
+                            data-column-label="{{ $column->label }}"
+                                data-column-sort="asc">{!! $column->sorting() !!}<span class="icon sort-down-icon"></span>
+                        </th>
+                        @else
+                            <th class="grid_head" data-column-name="{{ $column->alias }}" data-column-label="{{ $column->label }}">{!! $column->sorting() !!}</th>
+                    @endif
+                @endforeach
+                @if(isset($attribute_columns))
+                    @foreach($attribute_columns as $key => $value)
+                        <th>
+                            {{ $value }}
+                        </th>
+                    @endforeach
+                @endif
                 <th>
                     Actions
                 </th>
@@ -112,6 +121,7 @@
         <tbody class="{{ $css->tbody }}">
             @foreach ($results as $result)
             <tr>
+
                 <td class="">
                     <span class="checkbox">
                         <input type="checkbox" class="indexers" id="{{ $result->id }}" name="checkbox[]">
@@ -119,12 +129,16 @@
                     </span>
                 </td>
                 @foreach ($columns as $column)
-                <td class="">{!! $column->render($result) !!}</td>
+                    <td class="">{!! $column->render($result) !!}</td>
+                @endforeach
+
+                @foreach ($attribute_columns as $atc)
+                    <td>{{ $result->{$atc} }}</td>
                 @endforeach
 
                 <td class="action">
                     @foreach($actions as $action)
-                        <a @if($action['type']=="Edit") href="{{ url()->current().'/edit/'.$result->id }}" @elseif($action['type']=="Delete") href="{{ url()->current().'/delete/'.$result->id }}" @endif  class="Action-{{ $action['type'] }}" id="{{ $result->id }}" onclick="return confirm_click('{{ $action['confirm_text'] }}');">
+                        <a @if($action['type'] == "Edit") href="{{ url()->current().'/edit/'.$result->id }}" @elseif($action['type']=="Delete") href="{{ url()->current().'/delete/'.$result->id }}" @endif  class="Action-{{ $action['type'] }}" id="{{ $result->id }}" onclick="return confirm_click('{{ $action['confirm_text'] }}');">
                             <i class="{{ $action['icon'] }}"></i>
                         </a>
                     @endforeach
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css
index b1bf3906c..6d8e1c2dd 100644
--- a/public/themes/default/assets/css/shop.css
+++ b/public/themes/default/assets/css/shop.css
@@ -387,12 +387,114 @@ body {
   max-width: 100%;
 }
 
+.layered-filter-wrapper {
+  width: 25%;
+  float: left;
+  margin-right: 20px;
+  min-height: 1px;
+}
+
+.layered-filter-wrapper .filter-title {
+  border-bottom: 1px solid #E8E8E8;
+  font-size: 16px;
+  color: #242424;
+  padding: 10px 0;
+}
+
+.layered-filter-wrapper .filter-attributes .filter-attributes-item {
+  border-bottom: 1px solid #E8E8E8;
+  padding-bottom: 10px;
+}
+
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title {
+  padding: 10px 40px 0 10px;
+  font-size: 16px;
+  color: #5E5E5E;
+  cursor: pointer;
+  position: relative;
+}
+
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link {
+  font-weight: 400;
+  color: #0031F0;
+  margin-right: 10px;
+}
+
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .icon {
+  background-image: url("../images/arrow-down.svg") !important;
+  width: 10px;
+  height: 10px;
+  position: absolute;
+  right: 15px;
+  top: 14px;
+}
+
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content {
+  padding: 10px;
+  display: none;
+}
+
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items {
+  padding: 0;
+  margin: 0;
+  list-style: none none;
+}
+
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item {
+  padding: 8px 0;
+  font-size: 16px;
+  color: #5E5E5E;
+}
+
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox {
+  margin: 0;
+}
+
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view {
+  height: 16px;
+  width: 16px;
+  background-image: url("../images/checkbox.svg");
+}
+
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked + .checkbox-view {
+  background-image: url("../images/checkbox-checked.svg");
+}
+
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper {
+  margin-top: 21px;
+}
+
+.layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-content {
+  display: block;
+}
+
+.layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon {
+  background-image: url("../images//arrow-up.svg") !important;
+}
+
 .main-container-wrapper {
   margin-left: 10%;
   margin-right: 10%;
 }
 
-.main-container-wrapper .product-card {
+.main-container-wrapper .product-grid {
+  display: grid;
+  grid-gap: 30px;
+}
+
+.main-container-wrapper .product-grid.max-2-col {
+  grid-template-columns: repeat(2, minmax(250px, 1fr));
+}
+
+.main-container-wrapper .product-grid.max-3-col {
+  grid-template-columns: repeat(3, minmax(250px, 1fr));
+}
+
+.main-container-wrapper .product-grid.max-4-col {
+  grid-template-columns: repeat(4, minmax(250px, 1fr));
+}
+
+.main-container-wrapper .product-grid .product-card {
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
@@ -405,31 +507,49 @@ body {
           justify-content: center;
 }
 
-.main-container-wrapper .product-card .product-image img {
+.main-container-wrapper .product-grid .product-card .product-image img {
   -ms-flex-item-align: center;
       align-self: center;
   width: 100%;
   margin-bottom: 14px;
 }
 
-.main-container-wrapper .product-card .product-name {
+.main-container-wrapper .product-grid .product-card .product-name {
   font-size: 16px;
   margin-bottom: 14px;
   width: 100%;
 }
 
-.main-container-wrapper .product-card .product-price {
+.main-container-wrapper .product-grid .product-card .product-price {
   font-size: 16px;
   margin-bottom: 14px;
   width: 100%;
+  font-weight: 600;
 }
 
-.main-container-wrapper .product-card .product-ratings {
+.main-container-wrapper .product-grid .product-card .product-price .price-label {
+  font-size: 14px;
+  font-weight: 400;
+}
+
+.main-container-wrapper .product-grid .product-card .product-price .regular-price {
+  font-size: 16px;
+  color: #A5A5A5;
+  text-decoration: line-through;
+  margin-right: 10px;
+}
+
+.main-container-wrapper .product-grid .product-card .product-price .special-price {
+  font-size: 16px;
+  color: #FF6472;
+}
+
+.main-container-wrapper .product-grid .product-card .product-ratings {
   width: 100%;
   margin-bottom: 14px;
 }
 
-.main-container-wrapper .product-card .cart-fav-seg {
+.main-container-wrapper .product-grid .product-card .cart-fav-seg {
   display: -webkit-inline-box;
   display: -ms-inline-flexbox;
   display: inline-flex;
@@ -439,12 +559,19 @@ body {
           align-items: center;
 }
 
-.main-container-wrapper .product-card .cart-fav-seg .addtocart {
+.main-container-wrapper .product-grid .product-card .cart-fav-seg .addtocart {
   border-radius: 0px;
   margin-right: 10px;
   text-transform: uppercase;
 }
 
+.main-container-wrapper .bottom-toolbar {
+  display: block;
+  margin-top: 40px;
+  margin-bottom: 40px;
+  text-align: center;
+}
+
 .main-container-wrapper section.featured-products {
   display: block;
   margin-bottom: 5%;
@@ -462,12 +589,6 @@ body {
   color: lightgray;
 }
 
-.main-container-wrapper section.featured-products .featured-grid {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-  grid-gap: 10px;
-}
-
 .main-container-wrapper section.news-update {
   display: block;
   -webkit-box-sizing: border-box;
@@ -817,895 +938,3 @@ body {
   font-family: "Montserrat", sans-serif;
   width: 100%;
 }
-
-@media all and (max-width: 480px) {
-  .header {
-    margin-top: 16px;
-    margin-bottom: 21px;
-  }
-  .header .header-top {
-    margin-bottom: 16px;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    max-width: 92%;
-    width: 100%;
-    margin-left: auto;
-    margin-right: auto;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-    -webkit-box-pack: justify;
-        -ms-flex-pack: justify;
-            justify-content: space-between;
-  }
-  .header .header-top div.left-content {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-    -webkit-box-pack: start;
-        -ms-flex-pack: start;
-            justify-content: flex-start;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-  }
-  .header .header-top div.left-content ul.logo-container {
-    margin-right: 12px;
-  }
-  .header .header-top div.left-content ul.logo-container li {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-  }
-  .header .header-top div.left-content ul.search-container li.search-group {
-    display: -webkit-inline-box;
-    display: -ms-inline-flexbox;
-    display: inline-flex;
-    -webkit-box-pack: center;
-        -ms-flex-pack: center;
-            justify-content: center;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-  }
-  .header .header-top div.left-content ul.search-container li.search-group .search-field {
-    height: 38px;
-    border: 2px solid #c7c7c7;
-    border-radius: 3px;
-    border-right: none;
-    border-top-right-radius: 0px;
-    border-bottom-right-radius: 0px;
-  }
-  .header .header-top div.left-content ul.search-container li.search-group input.search-field::-moz-placeholder {
-    font-family: "montserrat", sans-serif;
-    padding-left: 10px;
-  }
-  .header .header-top div.left-content ul.search-container li.search-group input.search-field::-webkit-input-placeholder {
-    font-family: "montserrat", sans-serif;
-    padding-left: 10px;
-  }
-  .header .header-top div.left-content ul.search-container li.search-group .q-c {
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-    height: 38px;
-    width: 38px;
-    border: 2px solid #c7c7c7;
-    border-top-right-radius: 3px;
-    border-bottom-right-radius: 3px;
-  }
-  .header .header-top div.left-content ul.search-container li.search-group .q-c .search-icon {
-    margin-top: 4px;
-    margin-left: 4px;
-    height: 24px;
-    width: 24px;
-  }
-  .header .header-top div.right-content {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-    -webkit-box-pack: end;
-        -ms-flex-pack: end;
-            justify-content: flex-end;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-  }
-  .header .header-top div.right-content ul.account-dropdown-container {
-    float: right;
-    border-right: 2px solid #c7c7c7;
-  }
-  .header .header-top div.right-content ul.account-dropdown-container li.account-dropdown {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-  }
-  .header .header-top div.right-content ul.account-dropdown-container li.account-dropdown .icon-account {
-    margin: 0;
-    height: 24px;
-    width: 24px;
-  }
-  .header .header-top div.right-content ul.account-dropdown-container li.account-dropdown .account {
-    padding-top: 3px;
-  }
-  .header .header-top div.right-content ul.product-dropdown-container {
-    float: right;
-  }
-  .header .header-top div.right-content ul.product-dropdown-container li.product-dropdown {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-  }
-  .header .header-top div.right-content ul.product-dropdown-container li.product-dropdown .icon-cart {
-    margin: 0;
-    height: 24px;
-    width: 24px;
-  }
-  .header .header-top div.right-content ul.product-dropdown-container li.product-dropdown .cart {
-    padding-top: 3px;
-  }
-  .header .header-top .right-responsive {
-    display: none;
-  }
-  .header .header-top .right-responsive ul.right-wrapper {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-    -webkit-box-pack: end;
-        -ms-flex-pack: end;
-            justify-content: flex-end;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-  }
-  .header .header-top .right-responsive ul.right-wrapper li:not(:last-child) {
-    margin-right: 7px;
-  }
-  .header .header-top .right-responsive ul.right-wrapper li:not(:last-child) span.icon {
-    margin: 0;
-    height: 24px;
-    width: 24px;
-  }
-  .header .header-bottom {
-    height: 48px;
-    margin-left: auto;
-    margin-right: auto;
-    border-top: 1px solid lightgrey;
-    border-bottom: 1px solid lightgrey;
-    display: block;
-  }
-  .header .header-bottom .menu-bar {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-    -webkit-box-pack: start;
-        -ms-flex-pack: start;
-            justify-content: flex-start;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-    height: 48px;
-    width: 80%;
-    margin-left: auto;
-    margin-right: auto;
-  }
-  .header .header-bottom .menu-bar li {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-    -webkit-box-pack: center;
-        -ms-flex-pack: center;
-            justify-content: center;
-    height: 100%;
-    margin: 2.5%;
-  }
-  .header .header-bottom .menu-bar li:last-child {
-    margin-left: auto;
-    color: #ff6472;
-  }
-  .slider-block {
-    display: block;
-    width: 100%;
-    margin-bottom: 5%;
-  }
-  .slider-block .slider-content ul.slider-images li img {
-    width: 100%;
-    -o-object-fit: fill;
-       object-fit: fill;
-  }
-  .main-container-wrapper {
-    margin-left: 4%;
-    margin-right: 4%;
-  }
-  .main-container-wrapper .product-card {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-        -ms-flex-flow: column;
-            flex-flow: column;
-    -webkit-box-pack: center;
-        -ms-flex-pack: center;
-            justify-content: center;
-  }
-  .main-container-wrapper .product-card .product-image img {
-    -ms-flex-item-align: center;
-        align-self: center;
-    width: 100%;
-    margin-bottom: 14px;
-  }
-  .main-container-wrapper .product-card .product-name {
-    font-size: 16px;
-    margin-bottom: 14px;
-    width: 100%;
-  }
-  .main-container-wrapper .product-card .product-price {
-    font-size: 16px;
-    margin-bottom: 14px;
-    width: 100%;
-  }
-  .main-container-wrapper .product-card .product-ratings {
-    width: 100%;
-    margin-bottom: 14px;
-  }
-  .main-container-wrapper .product-card .cart-fav-seg {
-    display: -webkit-inline-box;
-    display: -ms-inline-flexbox;
-    display: inline-flex;
-    width: 100%;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-  }
-  .main-container-wrapper .product-card .cart-fav-seg .addtocart {
-    border-radius: 0px;
-    margin-right: 10px;
-    text-transform: uppercase;
-  }
-  .main-container-wrapper section.featured-products {
-    display: block;
-    margin-bottom: 5%;
-  }
-  .main-container-wrapper section.featured-products .featured-heading {
-    width: 100%;
-    text-align: center;
-    text-transform: uppercase;
-    font-size: 18px;
-    margin-bottom: 20px;
-  }
-  .main-container-wrapper section.featured-products .featured-heading .featured-separator {
-    color: lightgray;
-  }
-  .main-container-wrapper section.featured-products .featured-grid {
-    display: grid;
-    grid-template-columns: 48% 48%;
-    grid-gap: 10px;
-  }
-  .main-container-wrapper section.news-update {
-    display: block;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-    width: 100%;
-    margin-bottom: 5%;
-  }
-  .main-container-wrapper section.news-update .news-update-grid {
-    display: grid;
-    grid-template-columns: 100%;
-    grid-template-rows: auto;
-    grid-gap: 20px;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block1 {
-    display: block;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block1 img {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    height: 100%;
-    width: 100%;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block2 {
-    display: block;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-    display: grid;
-    grid-template-rows: repeat(2, minmax(50%, 1fr));
-    grid-row-gap: 20px;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block2 .sub-block1 {
-    display: block;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block2 .sub-block1 img {
-    width: 100%;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block2 .sub-block2 {
-    display: block;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block2 .sub-block2 img {
-    width: 100%;
-  }
-  .footer {
-    background-color: #ffffff;
-    padding-left: 10%;
-    padding-right: 10%;
-  }
-  .footer .footer-content .footer-list-container {
-    display: grid;
-    padding-top: 40px;
-    padding-bottom: 40px;
-    padding-left: 10px;
-    padding-right: 10px;
-    grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-    grid-auto-rows: auto;
-    grid-row-gap: 1vh;
-  }
-  .footer .footer-content .footer-list-container .list-container .list-heading {
-    font-size: 16px;
-    letter-spacing: -0.26px;
-    text-transform: uppercase;
-    color: #a5a5a5;
-  }
-  .footer .footer-content .footer-list-container .list-container .list-group {
-    padding-top: 25px;
-  }
-  .footer .footer-content .footer-list-container .list-container .list-group li {
-    margin-bottom: 12px;
-    color: #242424;
-    list-style-type: none;
-    text-transform: uppercase;
-  }
-  .footer .footer-content .footer-list-container .list-container .list-group li span.icon-wrapper {
-    display: inline-block;
-    vertical-align: middle;
-    margin-right: 5px;
-    height: 24px;
-    width: 24px;
-  }
-  .footer .footer-content .footer-list-container .list-container .list-group li span.icon-wrapper span.icon {
-    height: 24px;
-    width: 24px;
-  }
-  .footer .footer-content .footer-list-container .list-container .form-container {
-    padding-top: 10px;
-  }
-  .footer .footer-content .footer-list-container .list-container .form-container .control-group {
-    margin: 0;
-  }
-  .footer .footer-content .footer-list-container .list-container .form-container .control-group .subscribe-field {
-    width: 100%;
-  }
-  .footer .footer-content .footer-list-container .list-container .form-container .control-group .subscribe-field::-webkit-input-placeholder {
-    font-family: "montserrat", sans-serif;
-  }
-  .footer .footer-content .footer-list-container .list-container .form-container .control-group .subscribe-field::-moz-placeholder {
-    font-family: "montserrat", sans-serif;
-  }
-  .footer .footer-content .footer-list-container .list-container .form-container .control-group .btn-primary {
-    background-color: black;
-    border-radius: 0px;
-    text-align: center;
-  }
-}
-
-@media all and (min-width: 481px) and (max-width: 920px) {
-  .header {
-    margin-top: 16px;
-    margin-bottom: 21px;
-  }
-  .header .header-top {
-    margin-bottom: 16px;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    max-width: 92%;
-    width: 100%;
-    margin-left: auto;
-    margin-right: auto;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-    -webkit-box-pack: justify;
-        -ms-flex-pack: justify;
-            justify-content: space-between;
-  }
-  .header .header-top div.left-content {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-    -webkit-box-pack: start;
-        -ms-flex-pack: start;
-            justify-content: flex-start;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-  }
-  .header .header-top div.left-content ul.logo-container {
-    margin-right: 12px;
-  }
-  .header .header-top div.left-content ul.logo-container li {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-  }
-  .header .header-top div.left-content ul.search-container li.search-group {
-    display: -webkit-inline-box;
-    display: -ms-inline-flexbox;
-    display: inline-flex;
-    -webkit-box-pack: center;
-        -ms-flex-pack: center;
-            justify-content: center;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-  }
-  .header .header-top div.left-content ul.search-container li.search-group .search-field {
-    height: 38px;
-    border: 2px solid #c7c7c7;
-    border-radius: 3px;
-    border-right: none;
-    border-top-right-radius: 0px;
-    border-bottom-right-radius: 0px;
-  }
-  .header .header-top div.left-content ul.search-container li.search-group input.search-field::-moz-placeholder {
-    font-family: "montserrat", sans-serif;
-    padding-left: 10px;
-  }
-  .header .header-top div.left-content ul.search-container li.search-group input.search-field::-webkit-input-placeholder {
-    font-family: "montserrat", sans-serif;
-    padding-left: 10px;
-  }
-  .header .header-top div.left-content ul.search-container li.search-group .q-c {
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-    height: 38px;
-    width: 38px;
-    border: 2px solid #c7c7c7;
-    border-top-right-radius: 3px;
-    border-bottom-right-radius: 3px;
-  }
-  .header .header-top div.left-content ul.search-container li.search-group .q-c .search-icon {
-    margin-top: 4px;
-    margin-left: 4px;
-    height: 24px;
-    width: 24px;
-  }
-  .header .header-top div.right-content {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-    -webkit-box-pack: end;
-        -ms-flex-pack: end;
-            justify-content: flex-end;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-  }
-  .header .header-top div.right-content ul.account-dropdown-container {
-    float: right;
-    border-right: 2px solid #c7c7c7;
-  }
-  .header .header-top div.right-content ul.account-dropdown-container li.account-dropdown {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-  }
-  .header .header-top div.right-content ul.account-dropdown-container li.account-dropdown .icon-account {
-    margin: 0;
-    height: 24px;
-    width: 24px;
-  }
-  .header .header-top div.right-content ul.account-dropdown-container li.account-dropdown .account {
-    padding-top: 3px;
-  }
-  .header .header-top div.right-content ul.product-dropdown-container {
-    float: right;
-  }
-  .header .header-top div.right-content ul.product-dropdown-container li.product-dropdown {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-  }
-  .header .header-top div.right-content ul.product-dropdown-container li.product-dropdown .icon-cart {
-    margin: 0;
-    height: 24px;
-    width: 24px;
-  }
-  .header .header-top div.right-content ul.product-dropdown-container li.product-dropdown .cart {
-    padding-top: 3px;
-  }
-  .header .header-top .right-responsive {
-    display: none;
-  }
-  .header .header-top .right-responsive ul.right-wrapper {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-    -webkit-box-pack: end;
-        -ms-flex-pack: end;
-            justify-content: flex-end;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-  }
-  .header .header-top .right-responsive ul.right-wrapper li:not(:last-child) {
-    margin-right: 7px;
-  }
-  .header .header-top .right-responsive ul.right-wrapper li:not(:last-child) span.icon {
-    margin: 0;
-    height: 24px;
-    width: 24px;
-  }
-  .header .header-bottom {
-    height: 48px;
-    margin-left: auto;
-    margin-right: auto;
-    border-top: 1px solid lightgrey;
-    border-bottom: 1px solid lightgrey;
-    display: block;
-  }
-  .header .header-bottom .menu-bar {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-    -webkit-box-pack: start;
-        -ms-flex-pack: start;
-            justify-content: flex-start;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-    height: 48px;
-    width: 80%;
-    margin-left: auto;
-    margin-right: auto;
-  }
-  .header .header-bottom .menu-bar li {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-    -webkit-box-pack: center;
-        -ms-flex-pack: center;
-            justify-content: center;
-    height: 100%;
-    margin: 2.5%;
-  }
-  .header .header-bottom .menu-bar li:last-child {
-    margin-left: auto;
-    color: #ff6472;
-  }
-  .slider-block {
-    display: block;
-    width: 92%;
-    margin-left: auto;
-    margin-right: auto;
-    margin-bottom: 5%;
-  }
-  .slider-block .slider-content ul.slider-images li img {
-    width: 100%;
-    -o-object-fit: fill;
-       object-fit: fill;
-  }
-  .main-container-wrapper {
-    margin-left: 4%;
-    margin-right: 4%;
-  }
-  .main-container-wrapper .product-card {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-        -ms-flex-flow: column;
-            flex-flow: column;
-    -webkit-box-pack: center;
-        -ms-flex-pack: center;
-            justify-content: center;
-  }
-  .main-container-wrapper .product-card .product-image img {
-    -ms-flex-item-align: center;
-        align-self: center;
-    width: 100%;
-    margin-bottom: 14px;
-  }
-  .main-container-wrapper .product-card .product-name {
-    font-size: 16px;
-    margin-bottom: 14px;
-    width: 100%;
-  }
-  .main-container-wrapper .product-card .product-price {
-    font-size: 16px;
-    margin-bottom: 14px;
-    width: 100%;
-  }
-  .main-container-wrapper .product-card .product-ratings {
-    width: 100%;
-    margin-bottom: 14px;
-  }
-  .main-container-wrapper .product-card .cart-fav-seg {
-    display: -webkit-inline-box;
-    display: -ms-inline-flexbox;
-    display: inline-flex;
-    width: 100%;
-    -webkit-box-align: center;
-        -ms-flex-align: center;
-            align-items: center;
-  }
-  .main-container-wrapper .product-card .cart-fav-seg .addtocart {
-    border-radius: 0px;
-    margin-right: 10px;
-    text-transform: uppercase;
-  }
-  .main-container-wrapper section.featured-products {
-    display: block;
-    margin-bottom: 5%;
-  }
-  .main-container-wrapper section.featured-products .featured-heading {
-    width: 100%;
-    text-align: center;
-    text-transform: uppercase;
-    font-size: 18px;
-    margin-bottom: 20px;
-  }
-  .main-container-wrapper section.featured-products .featured-heading .featured-separator {
-    color: lightgray;
-  }
-  .main-container-wrapper section.featured-products .featured-grid {
-    display: grid;
-    grid-template-columns: 49% 49%;
-    grid-gap: 10px;
-  }
-  .main-container-wrapper section.news-update {
-    display: block;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-    width: 100%;
-    margin-bottom: 5%;
-  }
-  .main-container-wrapper section.news-update .news-update-grid {
-    display: grid;
-    grid-template-columns: 100%;
-    grid-template-rows: auto;
-    grid-gap: 20px;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block1 {
-    display: block;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block1 img {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    height: 100%;
-    width: 100%;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block2 {
-    display: block;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-    display: grid;
-    grid-template-rows: repeat(2, minmax(50%, 1fr));
-    grid-row-gap: 20px;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block2 .sub-block1 {
-    display: block;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block2 .sub-block1 img {
-    width: 100%;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block2 .sub-block2 {
-    display: block;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .main-container-wrapper section.news-update .news-update-grid .block2 .sub-block2 img {
-    width: 100%;
-  }
-  .footer {
-    background-color: #ffffff;
-    padding-left: 4%;
-    padding-right: 4%;
-  }
-  .footer .footer-content .footer-list-container {
-    display: grid;
-    padding-top: 40px;
-    padding-bottom: 40px;
-    padding-left: 10px;
-    padding-right: 10px;
-    grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-    grid-auto-rows: auto;
-    grid-row-gap: 1vh;
-  }
-  .footer .footer-content .footer-list-container .list-container .list-heading {
-    font-size: 16px;
-    letter-spacing: -0.26px;
-    text-transform: uppercase;
-    color: #a5a5a5;
-  }
-  .footer .footer-content .footer-list-container .list-container .list-group {
-    padding-top: 25px;
-  }
-  .footer .footer-content .footer-list-container .list-container .list-group li {
-    margin-bottom: 12px;
-    color: #242424;
-    list-style-type: none;
-    text-transform: uppercase;
-  }
-  .footer .footer-content .footer-list-container .list-container .list-group li span.icon-wrapper {
-    display: inline-block;
-    vertical-align: middle;
-    margin-right: 5px;
-    height: 24px;
-    width: 24px;
-  }
-  .footer .footer-content .footer-list-container .list-container .list-group li span.icon-wrapper span.icon {
-    height: 24px;
-    width: 24px;
-  }
-  .footer .footer-content .footer-list-container .list-container .form-container {
-    padding-top: 10px;
-  }
-  .footer .footer-content .footer-list-container .list-container .form-container .control-group {
-    margin: 0;
-  }
-  .footer .footer-content .footer-list-container .list-container .form-container .control-group .subscribe-field {
-    width: 100%;
-  }
-  .footer .footer-content .footer-list-container .list-container .form-container .control-group .subscribe-field::-webkit-input-placeholder {
-    font-family: "montserrat", sans-serif;
-  }
-  .footer .footer-content .footer-list-container .list-container .form-container .control-group .subscribe-field::-moz-placeholder {
-    font-family: "montserrat", sans-serif;
-  }
-  .footer .footer-content .footer-list-container .list-container .form-container .control-group .btn-primary {
-    background-color: black;
-    border-radius: 0px;
-    text-align: center;
-  }
-}
-
-.layered-filter-wrapper {
-  width: 20%;
-}
-
-.layered-filter-wrapper .filter-title {
-  border-bottom: 1px solid #E8E8E8;
-  font-size: 16px;
-  color: #242424;
-  padding: 10px 0;
-}
-
-.layered-filter-wrapper .filter-attributes .filter-attributes-item {
-  border-bottom: 1px solid #E8E8E8;
-  padding-bottom: 10px;
-}
-
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title {
-  padding: 10px 40px 0 10px;
-  font-size: 16px;
-  color: #5E5E5E;
-  cursor: pointer;
-  position: relative;
-}
-
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .icon {
-  background-image: url("../images/arrow-down.svg") !important;
-  width: 10px;
-  height: 10px;
-  position: absolute;
-  right: 15px;
-  top: 14px;
-}
-
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content {
-  padding: 10px;
-  display: none;
-}
-
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items {
-  padding: 0;
-  margin: 0;
-  list-style: none none;
-}
-
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item {
-  padding: 8px 0;
-  font-size: 16px;
-  color: #5E5E5E;
-}
-
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox {
-  margin: 0;
-}
-
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view {
-  height: 16px;
-  width: 16px;
-  background-image: url("../images/checkbox.svg");
-}
-
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked + .checkbox-view {
-  background-image: url("../images/checkbox-checked.svg");
-}
-
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper {
-  margin-top: 21px;
-}
-
-.layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-content {
-  display: block;
-}
-
-.layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon {
-  background-image: url("../images//arrow-up.svg") !important;
-}
diff --git a/public/themes/default/assets/images/wishlist-added.svg b/public/themes/default/assets/images/wishlist-added.svg
new file mode 100644
index 000000000..fcd0ba228
--- /dev/null
+++ b/public/themes/default/assets/images/wishlist-added.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
+    <title>Wishlist-Add</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Wishlist-Add" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
+        <path d="M15.9962711,26 C15.9962711,26 3.82641602,21.6804199 5.05062701,11.3846154 C5.38182072,8.59922485 8.45774362,6 11.3052808,6 C13.3974625,6 15.1753096,7.5626878 15.9962711,9.07692308 C16.9857769,7.57771184 18.5950798,6 20.6872614,6 C23.5347986,6 26.6121993,8.59909844 26.9419152,11.3846154 C28.2089844,22.0891113 15.9962711,26 15.9962711,26 Z" id="heart" stroke="#FF6472" stroke-width="3" fill="#FF6472" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/public/themes/default/assets/images/wishlist.svg b/public/themes/default/assets/images/wishlist.svg
new file mode 100644
index 000000000..fa0012118
--- /dev/null
+++ b/public/themes/default/assets/images/wishlist.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
+    <title>Wishlist</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Wishlist" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
+        <path d="M15.9962711,26 C15.9962711,26 3.82641602,21.6804199 5.05062701,11.3846154 C5.38182072,8.59922485 8.45774362,6 11.3052808,6 C13.3974625,6 15.1753096,7.5626878 15.9962711,9.07692308 C16.9857769,7.57771184 18.5950798,6 20.6872614,6 C23.5347986,6 26.6121993,8.59909844 26.9419152,11.3846154 C28.2089844,22.0891113 15.9962711,26 15.9962711,26 Z" id="heart" stroke="#FF6472" stroke-width="3" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file