diff --git a/database/migrations/2017_03_29_000000_avored_framework_schema.php b/database/migrations/2017_03_29_000000_avored_framework_schema.php
index 9e916e71d..2b0aef43d 100644
--- a/database/migrations/2017_03_29_000000_avored_framework_schema.php
+++ b/database/migrations/2017_03_29_000000_avored_framework_schema.php
@@ -401,8 +401,8 @@ public function up()
 
         Schema::create('users', function(Blueprint $table) {
             $table->increments('id');
-            $table->string('first_name');
-            $table->string('last_name');
+            $table->string('first_name')->nullable()->default(null);
+            $table->string('last_name')->nullable()->default(null);
             $table->string('email')->unique();
             $table->string('password');
             $table->string('image_path')->nullable();
@@ -411,6 +411,7 @@ public function up()
             $table->enum('status', ['GUEST', 'LIVE'])->default('LIVE');
             $table->string('tax_no')->nullable()->default(null);
             $table->timestamp('email_verified_at')->nullable();
+            $table->enum('registered_channel', ['WEBSITE', 'FACEBOOK', 'TWITTER', 'GOOGLE'])->default('WEBSITE');
             $table->rememberToken();
             $table->timestamps();
         });
diff --git a/phpunit.xml b/phpunit.xml
index 38f42a2ce..25c505bcf 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -5,9 +5,8 @@
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-        
+         processIsolation="true"
+         stopOnFailure="true"
 >
     <testsuites>
         <testsuite name="AvoRed Framework Tests">
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 6cb8e0da2..817687f61 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -4,6 +4,7 @@
 @import 'spec/index';
 @import 'vendor/index';
 @import '~simplemde/dist/simplemde.min.css';
+@import "~select2/src/scss/core";
 
 .card-header {
     color: $white;
diff --git a/resources/sass/index.scss b/resources/sass/index.scss
index 6c7b16cfc..906714f62 100644
--- a/resources/sass/index.scss
+++ b/resources/sass/index.scss
@@ -3,4 +3,3 @@
 @import "~bootstrap/scss/bootstrap";
 @import 'spec/index';
 @import 'vendor/index';
-
diff --git a/resources/views/user/user/_fields.blade.php b/resources/views/user/user/_fields.blade.php
index d4fb757d3..57d9915b9 100644
--- a/resources/views/user/user/_fields.blade.php
+++ b/resources/views/user/user/_fields.blade.php
@@ -2,18 +2,35 @@
 @include('avored-framework::forms.text',['name' => 'first_name' ,'label' => __('avored-framework::user.first-name')])
 @include('avored-framework::forms.text',['name' => 'last_name' ,'label' => __('avored-framework::user.last-name')])
 
+@include('avored-framework::forms.text',['name' => 'email' ,'label' => __('avored-framework::user.email')])
 
-@include('avored-framework::forms.select2',[
-                        'name' => 'user_group_id[]' ,
-                        'label' => __('avored-framework::user.user-group-id'),
-                        'values' => [],
-                        'options'=> $userGroupOptions,
-                        'attributes' => [
-                                'multiple' => true,
-                                
-                                'class' => 'form-control select2',
-                                'id' => 'user_group_id'
-                            ]
-                        ])
+@if (!isset($model))
+
+    @include('avored-framework::forms.password',['name' => 'password' ,'label' => __('avored-framework::user.password')])
+    @include('avored-framework::forms.password',['name' => 'confirm_password' ,'label' => __('avored-framework::user.confirm-password')])
+
+@endif
+
+@php
+    if (isset($model)) {
+        $values = $model->userGroups->pluck('id')->toArray();
+    } else {
+        $values = [];
+    }
+@endphp
+@include(
+    'avored-framework::forms.select2',
+    [
+        'name' => 'user_group_id[]' ,
+        'label' => __('avored-framework::user.user-group-id'),
+        'values' => $values,
+        'options'=> $userGroupOptions,
+        'attributes' => [
+            'multiple' => true,
+            'class' => 'form-control select2',
+            'id' => 'user_group_id'
+        ]
+    ]
+)
 
 
diff --git a/src/AdminConfiguration/Provider.php b/src/AdminConfiguration/Provider.php
index a6d43b727..7a4ccce2d 100644
--- a/src/AdminConfiguration/Provider.php
+++ b/src/AdminConfiguration/Provider.php
@@ -35,7 +35,10 @@ public function boot()
     public function register()
     {
         $this->registerManager();
-        $this->app->singleton('adminconfiguration', \AvoRed\Framework\AdminConfiguration\Manager::class);
+        $this->app->singleton(
+            'adminconfiguration', 
+            \AvoRed\Framework\AdminConfiguration\Manager::class
+        );
     }
 
     /**
@@ -45,9 +48,12 @@ public function register()
      */
     protected function registerManager()
     {
-        $this->app->singleton('adminconfiguration', function () {
-            new Manager();
-        });
+        $this->app->singleton(
+            'adminconfiguration', 
+            function () {
+                new Manager();
+            }
+        );
     }
 
     /**
@@ -96,19 +102,22 @@ protected function registerAdminConfiguration()
             ->label('Term & Condition Page')
             ->type('select')
             ->name('general_term_condition_page')
-            ->options(function () {
-                $options = Page::all()->pluck('name', 'id');
-                return $options;
-            });
+            ->options(
+                function () {
+                    $options = Page::all()->pluck('name', 'id');
+                    return $options;
+                }
+            );
 
         $configurationGroup->addConfiguration('general_home_page')
             ->label('Home Page')
             ->type('select')
             ->name('general_home_page')
-            ->options(function () {
-                $options = Page::all()->pluck('name', 'id');
-                return $options;
-            });
+            ->options(
+                function () {
+                    return Page::all()->pluck('name', 'id');
+                }
+            );
 
         $userGroup = AdminConfigurationFacade::add('users')
             ->label('Users');
@@ -117,19 +126,21 @@ protected function registerAdminConfiguration()
             ->label('User Default Country')
             ->type('select')
             ->name('user_default_country')
-            ->options(function () {
-                $options = Country::all()->pluck('name', 'id');
-                return $options;
-            });
+            ->options(
+                function () {
+                    return Country::all()->pluck('name', 'id');
+                }
+            );
 
         $userGroup->addConfiguration('user_activation_required')
             ->label('User Activation Required')
             ->type('select')
             ->name('user_activation_required')
-            ->options(function () {
-                $options = [0 => 'No', 1 => 'Yes'];
-                return $options;
-            });
+            ->options(
+                function () {
+                    return [0 => 'No', 1 => 'Yes'];
+                }
+            );
 
         $shippingGroup = AdminConfigurationFacade::add('shipping')
             ->label('Shipping');
@@ -138,10 +149,11 @@ protected function registerAdminConfiguration()
             ->label('Is Free Shipping Enabled')
             ->type('select')
             ->name('shipping_free_shipping_enabled')
-            ->options(function () {
-                $options = [1 => 'Yes', 0 => 'No'];
-                return $options;
-            });
+            ->options(
+                function () {
+                    return [1 => 'Yes', 0 => 'No'];
+                }
+            );
 
         $paymentGroup = AdminConfigurationFacade::add('payment')
             ->label('Payment');
@@ -150,10 +162,11 @@ protected function registerAdminConfiguration()
             ->label('Payment Stripe Enabled')
             ->type('select')
             ->name('payment_stripe_enabled')
-            ->options(function () {
-                $options = [0 => 'No', 1 => 'Yes'];
-                return $options;
-            });
+            ->options(
+                function () {
+                    return [0 => 'No', 1 => 'Yes'];
+                }
+            );
 
         $paymentGroup->addConfiguration('payment_stripe_publishable_key')
             ->label('Payment Stripe Publishable Key')
@@ -172,10 +185,11 @@ protected function registerAdminConfiguration()
             ->label('Is Tax Enabled')
             ->type('select')
             ->name('tax_enabled')
-            ->options(function () {
-                $options = [1 => 'Yes', 0 => 'No'];
-                return $options;
-            });
+            ->options(
+                function () {
+                    return [1 => 'Yes', 0 => 'No'];
+                }
+            );
 
         $taxGroup->addConfiguration('tax_percentage')
             ->label('Tax Percentage')
@@ -186,9 +200,10 @@ protected function registerAdminConfiguration()
             ->label('Tax Default Country')
             ->type('select')
             ->name('tax_default_country')
-            ->options(function () {
-                $options = $options = Country::all()->pluck('name', 'id');
-                return $options;
-            });
+            ->options(
+                function () {
+                    return $options = Country::all()->pluck('name', 'id');
+                }
+            );
     }
 }
diff --git a/src/Cart/Manager.php b/src/Cart/Manager.php
index 7cf738275..0ff1ec610 100644
--- a/src/Cart/Manager.php
+++ b/src/Cart/Manager.php
@@ -45,23 +45,28 @@ public function add($slug, $qty, $attribute = null): Manager
         $attributes = null;
 
         if (null !== $attribute && count($attribute)) {
-            foreach ($attribute as $attributeId => $variationId) {
-                $variableProduct = Product::find($variationId);
+
+            foreach ($attribute as $attributeId => $attributeValueId) {
+                if ('variation_id' == $attributeId) {
+                    continue;
+                }
+                $variableProduct = Product::find($attribute['variation_id']);
                 $attributeModel = Attribute::find($attributeId);
 
                 $productAttributeIntValModel = ProductAttributeIntegerValue::
-                                                        whereAttributeId($attributeId)
-                                                        ->whereProductId($variableProduct->id)
-                                                        ->first();
+                    whereAttributeId($attributeId)
+                    ->whereProductId($variableProduct->id)
+                    ->first();
+
                 $optionModel = $attributeModel
-                                    ->AttributeDropdownOptions()
-                                    ->whereId($productAttributeIntValModel->value)
-                                    ->first();
+                    ->AttributeDropdownOptions()
+                    ->whereId($productAttributeIntValModel->value)
+                    ->first();
 
                 $price = $variableProduct->price;
                 $attributes[] = [
                     'attribute_id' => $attributeId,
-                    'variation_id' => $variationId,
+                    'variation_id' => $variableProduct->id,
                     'attribute_dropdown_option_id' => $optionModel->id,
                     'variation_display_text' => $attributeModel->name . ': ' . $optionModel->display_text
                 ];
@@ -97,11 +102,22 @@ public function canAddToCart($slug, $qty, $attribute = [])
         $cartProducts = $this->getSession();
         $cartProduct = $cartProducts->get($slug);
         $cartQty = $cartProduct ? $cartProduct->qty() : 0;
-
-        $checkQty = $qty + $cartQty;
+        $checkQty = $qty;
+        
         $product = Product::whereSlug($slug)->first();
+        if ($product->hasVariation()) {
 
-        $productQty = $product->qty;
+            $findVaritationId = false;
+            foreach ($attribute['attributes'] as $attributeId => $attributeInfo) {
+                if (false === $findVaritationId && (isset($attributeInfo['variation_id']))) {
+                    $variationId = $attributeInfo['variation_id'];
+                }
+
+            }
+            $product = Product::find($variationId);
+        }
+       
+        $productQty = $product->qty; 
         if ($productQty >= $checkQty) {
             return true;
         }
diff --git a/src/Cart/Product.php b/src/Cart/Product.php
index 0b793ab16..ecfd571ca 100644
--- a/src/Cart/Product.php
+++ b/src/Cart/Product.php
@@ -16,7 +16,7 @@ class Product implements CartContracts
     /**
      * Cart Product Qty.
      *
-     * @var int
+     * @var float
      */
     protected $qty;
 
@@ -42,10 +42,10 @@ class Product implements CartContracts
     protected $tax;
     
     /**
-    * Cart Product Attributes.
-    *
-    * @var array
-    */
+     * Cart Product Attributes.
+     *
+     * @var array
+     */
     protected $attributes;
 
     /**
@@ -65,7 +65,7 @@ class Product implements CartContracts
     /**
      * Set/Get Cart Product Name.
      *
-     * @param null|string $name
+     * @param string $name
      * @return $this|string
      */
     public function name($name = null)
@@ -81,8 +81,8 @@ public function name($name = null)
 
     /**
      * Set/Get Cart Product Qty.
-     * @param null|int $qty
-     * @return $this|int
+     * @param float $qty
+     * @return $this|float
      */
     public function qty($qty = null)
     {
@@ -97,7 +97,7 @@ public function qty($qty = null)
 
     /**
      * Set/Get Cart Product Slug.
-     * @param null|string $slug
+     * @param string $slug
      * @return $this|string
      */
     public function slug($slug = null)
@@ -113,7 +113,7 @@ public function slug($slug = null)
 
     /**
      * Set/Get Cart Product Price.
-     * @param null|float $price
+     * @param float $price
      * @return $this|float
      */
     public function price($price = null)
@@ -129,7 +129,7 @@ public function price($price = null)
 
     /**
      * Set/Get Cart Product Tax.
-     * @param null|double $amount
+     * @param double $amount
      * @return $this|double
      */
     public function tax($amount = null)
@@ -145,16 +145,16 @@ public function tax($amount = null)
 
     /**
      * Set/Get Cart Product Line Total.
-     * @param null|double $amount
+     * @param double $lineTotal
      * @return $this|double
      */
-    public function lineTotal($amount = null)
+    public function lineTotal($lineTotal = null)
     {
-        if (null === $amount) {
+        if (null === $lineTotal) {
             return $this->lineTotal;
         }
 
-        $this->lineTotal = $amount;
+        $this->lineTotal = $lineTotal;
 
         return $this;
     }
@@ -198,8 +198,8 @@ public function image($image = null)
 
     /**
      * To Check if Cart Product Has Attributes.
-     *
-     * @return bool
+     * @param array $attributes
+     * @return self|array
      */
     public function attributes($attributes = null)
     {
diff --git a/src/Cms/DataGrid/PageDataGrid.php b/src/Cms/DataGrid/PageDataGrid.php
index d7bded572..ac13e111f 100644
--- a/src/Cms/DataGrid/PageDataGrid.php
+++ b/src/Cms/DataGrid/PageDataGrid.php
@@ -9,14 +9,14 @@ class PageDataGrid
     /**
      * Page Model Builder
      *
-     * @var \Illuminate\Database\Schema\Builder $dataGrid
+     * @var \Illuminate\Database\Eloquent\Builder $dataGrid
      */
     public $dataGrid;
 
     /**
      * Construct to build a page datagrid
      *
-     * @param \Illuminate\Database\Schema\Builder $model
+     * @param \Illuminate\Database\Eloquent\Builder $model
      * @return void
      */
     public function __construct($model)
@@ -24,15 +24,23 @@ public function __construct($model)
         $dataGrid = DataGrid::make('admin_page_controller');
 
         $dataGrid->model($model)
-                ->column('id', ['sortable' => true])
-                ->column('name', ['sortable' => true])
-                ->column('slug')
-                ->column('meta_title', ['label' => 'Meta Title'])
-                ->linkColumn('edit', [], function ($model) {
+            ->column('id', ['sortable' => true])
+            ->column('name', ['sortable' => true])
+            ->column('slug')
+            ->column('meta_title', ['label' => 'Meta Title'])
+            ->linkColumn(
+                'edit',
+                [],
+                function ($model) {
                     return "<a href='" . route('admin.page.edit', $model->id) . "' >Edit</a>";
-                })->linkColumn('show', [], function ($model) {
+                }
+            )->linkColumn(
+                'show',
+                [], 
+                function ($model) {
                     return "<a href='" . route('admin.page.show', $model->id) . "' >Show</a>";
-                });
+                }
+            );
 
         $this->dataGrid = $dataGrid;
     }
diff --git a/src/DataGrid/Facade.php b/src/DataGrid/Facade.php
index 3848fa844..7b333bc5c 100644
--- a/src/DataGrid/Facade.php
+++ b/src/DataGrid/Facade.php
@@ -5,11 +5,9 @@
 use Illuminate\Support\Facades\Facade as LaravelFacade;
 
 /**
- *
  * @method \AvoRed\Framework\DataGrid\Manager make($name)
  * @method \AvoRed\Framework\DataGrid\Manager setPagination($item = 10)
  * @method \AvoRed\Framework\DataGrid\Manager render($dataGrid)
- *
  */
 class Facade extends LaravelFacade
 {
diff --git a/src/DataGrid/Manager.php b/src/DataGrid/Manager.php
index 938b70601..1b11e98ca 100644
--- a/src/DataGrid/Manager.php
+++ b/src/DataGrid/Manager.php
@@ -105,7 +105,11 @@ public function render($dataGrid)
 
         $options = ['path' => asset(request()->path())];
         if (!$dataGrid->model instanceof Collection) {
-            $dataGrid->data = $dataGrid->model->paginate($this->pageItem, ['*'], $dataGrid->pageName());
+            $dataGrid->data = $dataGrid->model->paginate(
+                $this->pageItem,
+                ['*'],
+                $dataGrid->pageName()
+            );
 
             if (null !== $this->request->get('asc')) {
                 $dataGrid->model->orderBy($this->request->get('asc'), 'asc');
@@ -114,7 +118,12 @@ public function render($dataGrid)
                 $dataGrid->model->orderBy($this->request->get('desc', 'id'), 'desc');
             }
         } else {
-            $dataGrid->data = $this->paginate($dataGrid->model, $this->pageItem, null, $options);
+            $dataGrid->data = $this->paginate(
+                $dataGrid->model,
+                $this->pageItem,
+                null,
+                $options
+            );
         }
 
         return view('avored-framework::datagrid.grid')->with('dataGrid', $dataGrid);
@@ -160,7 +169,6 @@ public function paginate($items, $perPage = 10, $page = null, $options = [])
     public function column($identifier, $options = [])
     {
         $column = new TextColumn($identifier, $options);
-
         $this->columns->put($identifier, $column);
 
         return $this;
diff --git a/src/Mail/OrderInvoicedMail.php b/src/Mail/OrderInvoicedMail.php
index 0229ec6a1..fd2db45e9 100644
--- a/src/Mail/OrderInvoicedMail.php
+++ b/src/Mail/OrderInvoicedMail.php
@@ -33,7 +33,10 @@ public function __construct(Order $order, $path)
     public function build()
     {
         return $this->view('avored-framework::mail.order-invoiced')
-                    ->attach($this->path, ['as' => 'invoiced.pdf', 'mime' => 'application/pdf']);
-        //->with('order', $this->order);
+            ->attach(
+                $this->path, 
+                ['as' => 'invoiced.pdf', 
+                'mime' => 'application/pdf']
+            );
     }
 }
diff --git a/src/Models/Contracts/UserInterface.php b/src/Models/Contracts/UserInterface.php
index 538be6961..a1ad09016 100644
--- a/src/Models/Contracts/UserInterface.php
+++ b/src/Models/Contracts/UserInterface.php
@@ -7,11 +7,18 @@ interface UserInterface
     /**
      * Find an  User by given Id which returns  User
      *
-     * @param $id
+     * @param int $id
      * @return \AvoRed\Framework\Models\User
      */
     public function find($id);
 
+    /**
+     * Find an User by given Email
+     * @param string $email
+     * @return \AvoRed\Framework\Models\User
+     */
+    public function findByEmail($email);
+
     /**
      * Find an All Users which returns Eloquent Collection
      *
diff --git a/src/Models/Database/Product.php b/src/Models/Database/Product.php
index fe37a5bfd..95a4760a4 100644
--- a/src/Models/Database/Product.php
+++ b/src/Models/Database/Product.php
@@ -16,7 +16,7 @@
 
 class Product extends BaseModel
 {
-    public static $VARIATION_TYPE = 'VARIATION';
+    const VARIATION_TYPE = 'VARIATION';
 
     protected $fillable = ['type', 'name', 'slug', 'sku',
         'description', 'status', 'in_stock', 'track_stock', 'price', 'cost_price',
@@ -43,9 +43,38 @@ public function getPropertiesAll()
         return $collections;
     }
 
+    /**
+     * Get the Product Variation Product Json Data
+     * @return array $jsonData
+     */
+    public function getProductVariationJsonData()
+    {
+        $jsonData = [];
+        $lists = ProductAttributeIntegerValue::whereIn(
+            'product_id',
+            $this->productVariations->pluck('variation_id')
+        )->get();
+        
+        foreach ($lists as $list) {
+            $variationModel = self::find($list->product_id);
+            if (array_has($jsonData, $list->product_id)) {
+                $data = array_get($jsonData, $list->product_id);
+                $data[$list->attribute_id] = [
+                    $list->value => ['qty' => $variationModel->qty, 'price' => $variationModel->price]
+                ];
+                $jsonData[$list->product_id] = $data;
+            } else {
+                $jsonData[$list->product_id] = [$list->attribute_id => [
+                    $list->value => ['qty' => $variationModel->qty, 'price' => $variationModel->price]]
+                ];
+            }
+        }
+        return $jsonData;
+    }
+
     public function hasVariation()
     {
-        if ($this->type == self::$VARIATION_TYPE) {
+        if ($this->type == self::VARIATION_TYPE) {
             return true;
         }
 
diff --git a/src/Models/Database/User.php b/src/Models/Database/User.php
index c78b6dcf3..9486c85e5 100644
--- a/src/Models/Database/User.php
+++ b/src/Models/Database/User.php
@@ -18,7 +18,7 @@ class User extends Authenticatable
     protected $fillable = [
         'first_name', 'last_name', 'email', 'password', 'phone',
         'company_name', 'image_path', 'status',
-        'language', 'activation_token', 'tax_no'
+        'language', 'activation_token', 'tax_no', 'registered_channel'
     ];
 
     /**
@@ -37,7 +37,7 @@ public function getFullNameAttribute()
 
     public function getImagePathAttribute()
     {
-        return (empty($this->attributes['image_path'])) ? '' : new LocalFile($this->attributes['image_path']);
+        return new LocalFile($this->attributes['image_path']);
     }
 
     /**
diff --git a/src/Models/Repository/UserRepository.php b/src/Models/Repository/UserRepository.php
index b4ce0f14e..32085d18c 100644
--- a/src/Models/Repository/UserRepository.php
+++ b/src/Models/Repository/UserRepository.php
@@ -10,13 +10,22 @@ class UserRepository implements UserInterface
     /**
      * Find an User by given Id
      *
-     * @param $id
+     * @param int $id
      * @return \AvoRed\Framework\Models\User
      */
     public function find($id)
     {
         return User::find($id);
     }
+    /**
+     * Find an User by given Email
+     * @param string $email
+     * @return \AvoRed\Framework\Models\User
+     */
+    public function findByEmail($email)
+    {
+        return User::whereEmail($email)->first();
+    }
 
     /**
      * Find an User by given Id
diff --git a/src/Product/Controllers/AttributeController.php b/src/Product/Controllers/AttributeController.php
index 9a22f8306..87f780250 100644
--- a/src/Product/Controllers/AttributeController.php
+++ b/src/Product/Controllers/AttributeController.php
@@ -129,17 +129,15 @@ public function getElementHtml(Request $request)
      * @param \AvoRed\Framework\Product\Requests\AttributeRequest $request
      * @return void
      */
-    private function saveDropdownOptions($attribute, $request)
+    protected function saveDropdownOptions($attribute, $request)
     {
         if (null !== $request->get('dropdown_options')) {
-            if (null != $attribute->attributeDropdownOptions()->get() &&
-                $attribute->attributeDropdownOptions()->get()->count() >= 0
-                ) {
+            if ($attribute->attributeDropdownOptions()->get() != null && $attribute->attributeDropdownOptions()->get()->count() >= 0) {
                 $attribute->attributeDropdownOptions()->delete();
             }
 
             foreach ($request->get('dropdown_options') as $key => $val) {
-                if ($key == '__RANDOM_STRING__') {
+                if ($key == '__RANDOM_STRING__' || empty($val['display_text'])) {
                     continue;
                 }
 
diff --git a/src/Product/DataGrid/PropertyDataGrid.php b/src/Product/DataGrid/PropertyDataGrid.php
index 7ecdbc878..089c490be 100644
--- a/src/Product/DataGrid/PropertyDataGrid.php
+++ b/src/Product/DataGrid/PropertyDataGrid.php
@@ -16,11 +16,19 @@ public function __construct($model)
             ->column('id', ['sortable' => true])
             ->column('name')
             ->column('identifier')
-            ->linkColumn('edit', [], function ($model) {
-                return "<a href='" . route('admin.property.edit', $model->id) . "' >Edit</a>";
-            })->linkColumn('show', [], function ($model) {
-                return "<a href='" . route('admin.property.show', $model->id) . "' >Show</a>";
-            });
+            ->linkColumn(
+                'edit',
+                [],
+                function ($model) {
+                    return "<a href='" . route('admin.property.edit', $model->id) . "' >Edit</a>";
+                }
+            )->linkColumn(
+                'show',
+                [],
+                function ($model) {
+                    return "<a href='" . route('admin.property.show', $model->id) . "' >Show</a>";
+                }
+            );
 
         $this->dataGrid = $dataGrid;
     }
diff --git a/src/User/Controllers/UserController.php b/src/User/Controllers/UserController.php
index a1c7b4610..2203beae2 100644
--- a/src/User/Controllers/UserController.php
+++ b/src/User/Controllers/UserController.php
@@ -35,7 +35,8 @@ public function index()
     {
         $dataGrid = new UserDataGrid($this->repository->query());
 
-        return view('avored-framework::user.user.index')->with('dataGrid', $dataGrid->dataGrid);
+        return view('avored-framework::user.user.index')
+            ->withDataGrid($dataGrid->dataGrid);
     }
 
     /**
@@ -58,7 +59,7 @@ public function create()
     public function store(UserRequest $request)
     {
         $this->repository->create($request->all());
-
+        $this->_syncUserGroups($user, $request->get('user_group_id'));
         return redirect()->route('admin.user.index');
     }
 
@@ -115,8 +116,8 @@ public function show(User $user)
         $userOrders = $orderRepository->query()->whereUserId($user->id);
         $dataGrid = new UserOrderDataGrid($userOrders);
         return view('avored-framework::user.user.show')
-                ->with('user', $user)
-                ->with('userOrderDataGrid', $dataGrid->dataGrid);
+            ->with('user', $user)
+            ->with('userOrderDataGrid', $dataGrid->dataGrid);
     }
 
     /**
diff --git a/tests/Controller/RoleTest.php b/tests/Controller/RoleTest.php
index 846c31e8a..74eef7770 100644
--- a/tests/Controller/RoleTest.php
+++ b/tests/Controller/RoleTest.php
@@ -9,7 +9,6 @@ class RoleTest extends BaseTestCase
 {
    /**
      * Test the Role Index Route
-     * @test
      */
     public function test_role_index_route()
     {
@@ -20,7 +19,6 @@ public function test_role_index_route()
     }
     /**
      * Test the Role Create Route
-     * @test
      */
     public function test_role_create_route()
     {
@@ -31,7 +29,6 @@ public function test_role_create_route()
     }
     /**
      * Test the Role Store Route
-     * @test
      */
     public function test_role_store_route()
     {
@@ -54,7 +51,6 @@ public function test_role_store_route()
     }
     /**
      * Test the Role Store Route
-     * @test
      */
     public function test_role_edit_route()
     {
@@ -69,7 +65,6 @@ public function test_role_edit_route()
     }
     /**
      * Test the Role Store Route
-     * @test
      */
     public function test_role_update_route()
     {
@@ -91,7 +86,6 @@ public function test_role_update_route()
     }
     /**
      * Test the Role Store Route
-     * @test
      */
     public function test_role_destroy_route()
     {
@@ -106,7 +100,5 @@ public function test_role_destroy_route()
         $this->assertDatabaseMissing('roles', [
                     'id' => $role->id
                 ]);
-    }
-
-   
+    }   
 }
diff --git a/tests/Controller/SiteCurrencyTest.php b/tests/Controller/SiteCurrencyTest.php
index 5bb28cca9..8421b9393 100644
--- a/tests/Controller/SiteCurrencyTest.php
+++ b/tests/Controller/SiteCurrencyTest.php
@@ -14,7 +14,6 @@ class SiteCurrencyTest extends BaseTestCase
 {
     /**
      * Test the Site Currency Index Route
-     * @test
      */
     public function test_site_currency_index_route()
     {
@@ -26,7 +25,6 @@ public function test_site_currency_index_route()
     }
     /**
      * Test the Site Currency Create Route
-     * @test
      */
     public function test_site_currency_create_route()
     {
@@ -38,7 +36,6 @@ public function test_site_currency_create_route()
     }
     /**
      * Test the Site Currency Store Route
-     * @test
      */
     public function test_site_currency_store_route()
     {
@@ -61,7 +58,6 @@ public function test_site_currency_store_route()
     }
     /**
      * Test the Site Currency Store Route
-     * @test
      */
     public function test_site_currency_edit_route()
     {
@@ -77,7 +73,6 @@ public function test_site_currency_edit_route()
     }
     /**
      * Test the Site Currency Store Route
-     * @test
      */
     public function test_site_currency_update_route()
     {
@@ -97,7 +92,6 @@ public function test_site_currency_update_route()
     }
     /**
      * Test the Site Currency Store Route
-     * @test
      */
     public function test_site_currency_destroy_route()
     {