diff --git a/js/script.js b/js/script.js
index c7f008e..e15727f 100644
--- a/js/script.js
+++ b/js/script.js
@@ -58,7 +58,7 @@
         $('INPUT[name="select_all_sales_object"]').on('change', function(){
             $('INPUT[name="selected_objects[]"]').prop('checked', this.checked);
         });
-        $('INPUT[name="select_all_sales_object"]').prop('checked', true).trigger('change');
+        //$('INPUT[name="select_all_sales_object"]').prop('checked', true).trigger('change');
 
         //check/un-check review/rating objects
         $('INPUT[name="select_all_object"]').on('change', function(){
diff --git a/protected/components/views/userMenu.php b/protected/components/views/userMenu.php
index 3a68ebc..748f73f 100644
--- a/protected/components/views/userMenu.php
+++ b/protected/components/views/userMenu.php
@@ -1,7 +1,6 @@
 <ul class="nav nav-pills nav-stacked">
     <?php if (is_array($steps)): ?>
         <?php foreach ($steps as $step): ?>
-
             <?php
                 $action = Yii::app()->controller->action->id;
                 $class = ($action == $step->code) ? "active" : (($step->status != MigrateSteps::STATUS_DONE) ? "disabled" : "");
@@ -10,8 +9,7 @@
                     $title = '<span class="glyphicon glyphicon-ok-sign text-success"></span> '.$title;
                 }
             ?>
-
-            <li class="<?=$class?>">
+            <li class="<?php echo $class?>">
                 <?php echo CHtml::link($title, array("migrate/{$step->code}")); ?>
             </li>
         <?php endforeach; ?>
@@ -24,9 +22,9 @@
     $totalStepsFinished = MigrateSteps::model()->count("status = ".MigrateSteps::STATUS_DONE);
     $percent = round(($totalStepsFinished/$totalSteps)*100);
     ?>
-    <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?=$percent?>"
-         aria-valuemin="0" aria-valuemax="100" style="width:<?=$percent?>%">
-        <?=$percent?>% Completed
+    <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $percent?>"
+         aria-valuemin="0" aria-valuemax="100" style="width:<?php echo $percent?>%">
+        <?php echo $percent?>% Completed
     </div>
 </div>
 
@@ -38,5 +36,5 @@
             $class = "btn btn-danger disabled";
         }
     ?>
-    <a href="<?php echo Yii::app()->createUrl("migrate/resetAll"); ?>" title="<?php echo Yii::t('frontend', 'Click to reset all steps.'); ?>" class="<?php echo $class; ?>"><?php echo Yii::t('frontend', 'Reset All'); ?></a>
+    <a href="<?php echo Yii::app()->createUrl("migrate/resetAll"); ?>" title="<?php echo Yii::t('frontend', 'Click to reset all steps.'); ?>" class="<?php echo $class; ?>"><span class="glyphicon glyphicon-refresh"></span> <?php echo Yii::t('frontend', 'Reset All'); ?></a>
 </div>
\ No newline at end of file
diff --git a/protected/config/main.php b/protected/config/main.php
index 81dfe23..1893729 100644
--- a/protected/config/main.php
+++ b/protected/config/main.php
@@ -5,7 +5,7 @@
     require(dirname(__FILE__) . '/config.php'), array(
 
         'basePath'=>dirname(__FILE__).DIRECTORY_SEPARATOR.'..',
-        'name'=>'Migrate Data Tool: Allow migrate data from Magento community 1.x to Magento 2.x',
+        'name'=>'Migrate Data Tool: Allow migrate data from Magento CE 1.x to Magento CE 2.x',
 
         // preloading 'log' component
         'preload'=>array('log'),
diff --git a/protected/controllers/MigrateController.php b/protected/controllers/MigrateController.php
index 2530806..475446a 100644
--- a/protected/controllers/MigrateController.php
+++ b/protected/controllers/MigrateController.php
@@ -35,7 +35,8 @@ protected function beforeAction($action) {
         );
         $migratedObj = (object) $migrated_data;
         //update migrated data
-        $steps = MigrateSteps::model()->findAll("status = " . MigrateSteps::STATUS_DONE);
+        //$steps = MigrateSteps::model()->findAll("status = " . MigrateSteps::STATUS_DONE);
+        $steps = MigrateSteps::model()->findAll();
         if ($steps){
             foreach ($steps as $step) {
                 $migrated_data = json_decode($step->migrated_data);
@@ -2133,9 +2134,17 @@ public function actionStep7()
             );
 
             //variables to log
-            $migrated_sales_object_ids = array();
-            $migrated_order_ids = $migrated_quote_ids = $migrated_payment_ids = $migrated_invoice_ids = $migrated_shipment_ids = $migrated_credit_ids = array();
-            $migrated_order_statuses = $migrated_sales_rule_ids = $migrated_sales_coupon_ids = array();
+            $errors = array();
+            $migrated_sales_object_ids = isset(Yii::app()->session['migrated_sales_object_ids']) ? Yii::app()->session['migrated_sales_object_ids'] : array();
+            $migrated_order_ids = isset(Yii::app()->session['migrated_sales_order_ids']) ? Yii::app()->session['migrated_sales_order_ids'] : array();
+            $migrated_quote_ids = isset(Yii::app()->session['migrated_sales_quote_ids']) ? Yii::app()->session['migrated_sales_quote_ids'] : array();
+            $migrated_payment_ids = isset(Yii::app()->session['migrated_sales_payment_ids']) ? Yii::app()->session['migrated_sales_payment_ids'] : array();
+            $migrated_invoice_ids = isset(Yii::app()->session['migrated_sales_invoice_ids']) ? Yii::app()->session['migrated_sales_invoice_ids'] : array();
+            $migrated_shipment_ids = isset(Yii::app()->session['migrated_sales_shipment_ids']) ? Yii::app()->session['migrated_sales_shipment_ids'] : array();
+            $migrated_credit_ids = isset(Yii::app()->session['migrated_sales_credit_ids']) ? Yii::app()->session['migrated_sales_credit_ids'] : array();
+            $migrated_order_statuses = isset(Yii::app()->session['migrated_order_statuses']) ? Yii::app()->session['migrated_order_statuses'] : array();
+            $migrated_sales_rule_ids = isset(Yii::app()->session['migrated_sales_rule_ids']) ? Yii::app()->session['migrated_sales_rule_ids'] : array();
+            $migrated_sales_coupon_ids = isset(Yii::app()->session['migrated_sales_coupon_ids']) ? Yii::app()->session['migrated_sales_coupon_ids'] : array();
 
             if (Yii::app()->request->isPostRequest && $step->status == MigrateSteps::STATUS_NOT_DONE){
 
@@ -2159,7 +2168,7 @@ public function actionStep7()
                     $migrated_product_ids = isset(Yii::app()->session['migrated_product_ids']) ? Yii::app()->session['migrated_product_ids'] : array();
                     $str_product_ids = implode(',', $migrated_product_ids);
 
-                    if (in_array('order', $selected_objects)){
+                    if (in_array('order', $selected_objects) && !in_array('order', $migrated_sales_object_ids)){
                         //sales_order_status
                         $models = Mage1SalesOrderStatus::model()->findAll();
                         if ($models) {
@@ -2273,7 +2282,15 @@ public function actionStep7()
                                             $model2 = new Mage2SalesOrderItem();
                                             foreach ($model2->attributes as $key => $value){
                                                 if (isset($model->$key)){
-                                                    $model2->$key = $model->$key;
+                                                    $val = $model->$key;
+                                                    /**
+                                                     * Because Magento2 was change method to save weee_tax_applied to database:
+                                                     * So we have to make convert this
+                                                     */
+                                                    if ($key == 'weee_tax_applied'){
+                                                        $val = json_encode(unserialize($val));
+                                                    }
+                                                    $model2->$key = $val;
                                                 }
                                             }
                                             $model2->store_id = MigrateSteps::getMage2StoreId($model->store_id);
@@ -2368,8 +2385,8 @@ public function actionStep7()
                         $migrated_sales_object_ids[] = 'order';
                     }//end migrate orders
 
-                    //Sales Quote
-                    if (in_array('quote', $selected_objects)){
+                    //Sales quote
+                    if (in_array('quote', $selected_objects) && !in_array('quote', $migrated_sales_object_ids)){
                         //quote
                         //$condition = "( store_id IN ({$str_store_ids}) OR store_id IS NULL ) AND ( customer_id IN ({$str_customer_ids}) OR customer_id IS NULL )";
                         $condition = "( store_id IN ({$str_store_ids}) OR store_id IS NULL )";
@@ -2475,7 +2492,8 @@ public function actionStep7()
                         $migrated_sales_object_ids[] = 'quote';
                     }//end sales quote
 
-                    if (in_array('payment', $selected_objects)){
+                    //Sales payment
+                    if (in_array('payment', $selected_objects) && !in_array('payment', $migrated_sales_object_ids)){
                         if ($migrated_order_ids){
                             $str_order_ids = implode(',', $migrated_order_ids);
                             $condition = "parent_id IN ({$str_order_ids})";
@@ -2508,42 +2526,46 @@ public function actionStep7()
                                     }
                                 }
                             }
-                        }
-                        //sales_refunded_aggregated
-                        $condition = "store_id IN ({$str_store_ids}) OR store_id IS NULL";
-                        $models = Mage1SalesRefundedAggregated::model()->findAll($condition);
-                        if ($models){
-                            foreach ($models as $model){
-                                $model2 = new Mage2SalesRefundedAggregated();
-                                foreach ($model2->attributes as $key => $value){
-                                    if (isset($model->$key)){
-                                        $model2->$key = $model->$key;
+                            
+                            //sales_refunded_aggregated
+                            $condition = "store_id IN ({$str_store_ids}) OR store_id IS NULL";
+                            $models = Mage1SalesRefundedAggregated::model()->findAll($condition);
+                            if ($models){
+                                foreach ($models as $model){
+                                    $model2 = new Mage2SalesRefundedAggregated();
+                                    foreach ($model2->attributes as $key => $value){
+                                        if (isset($model->$key)){
+                                            $model2->$key = $model->$key;
+                                        }
                                     }
+                                    $model2->store_id = MigrateSteps::getMage2StoreId($model->store_id);
+                                    $model2->save();
                                 }
-                                $model2->store_id = MigrateSteps::getMage2StoreId($model->store_id);
-                                $model2->save();
                             }
-                        }
-                        //sales_refunded_aggregated_order
-                        $condition = "store_id IN ({$str_store_ids}) OR store_id IS NULL";
-                        $models = Mage1SalesRefundedAggregatedOrder::model()->findAll($condition);
-                        if ($models){
-                            foreach ($models as $model){
-                                $model2 = new Mage2SalesRefundedAggregatedOrder();
-                                foreach ($model2->attributes as $key => $value){
-                                    if (isset($model->$key)){
-                                        $model2->$key = $model->$key;
+                            //sales_refunded_aggregated_order
+                            $condition = "store_id IN ({$str_store_ids}) OR store_id IS NULL";
+                            $models = Mage1SalesRefundedAggregatedOrder::model()->findAll($condition);
+                            if ($models){
+                                foreach ($models as $model){
+                                    $model2 = new Mage2SalesRefundedAggregatedOrder();
+                                    foreach ($model2->attributes as $key => $value){
+                                        if (isset($model->$key)){
+                                            $model2->$key = $model->$key;
+                                        }
                                     }
+                                    $model2->store_id = MigrateSteps::getMage2StoreId($model->store_id);
+                                    $model2->save();
                                 }
-                                $model2->store_id = MigrateSteps::getMage2StoreId($model->store_id);
-                                $model2->save();
                             }
+                            
+                            $migrated_sales_object_ids[] = 'payment';
+                        } else {
+                            Yii::app()->user->setFlash('note', Yii::t('frontend', "Before migrate the Sales Payments, you have to migrate the Sales Orders first."));
                         }
-
-                        $migrated_sales_object_ids[] = 'payment';
                     }//end sales payment
 
-                    if (in_array('invoice', $selected_objects)){
+                    //Sales invoice
+                    if (in_array('invoice', $selected_objects) && !in_array('invoice', $migrated_sales_object_ids)){
                         if ($migrated_order_ids){
                             $condition = "( store_id IN ({$str_store_ids}) OR store_id IS NULL )";
                             $str_order_ids = implode(',', $migrated_order_ids);
@@ -2588,7 +2610,15 @@ public function actionStep7()
                                                 $model2 = new Mage2SalesInvoiceItem();
                                                 foreach ($model2->attributes as $key => $value){
                                                     if (isset($model->$key)){
-                                                        $model2->$key = $model->$key;
+                                                        $val = $model->$key;
+                                                        /**
+                                                         * Because Magento2 was change method to save weee_tax_applied to database:
+                                                         * So we have to make convert this
+                                                         */
+                                                        if ($key == 'weee_tax_applied'){
+                                                            $val = json_encode(unserialize($val));
+                                                        }
+                                                        $model2->$key = $val;
                                                     }
                                                 }
                                                 //this field was not exists in Magento1
@@ -2612,44 +2642,47 @@ public function actionStep7()
                                         }
                                     }
                                 }
-                            }
-                        }
-                        //sales_invoiced_aggregated
-                        $condition = "store_id IN ({$str_store_ids}) OR store_id IS NULL";
-                        $models = Mage1SalesInvoicedAggregated::model()->findAll($condition);
-                        if ($models){
-                            foreach ($models as $model){
-                                $model2 = new Mage2SalesInvoicedAggregated();
-                                foreach ($model2->attributes as $key => $value){
-                                    if (isset($model->$key)){
-                                        $model2->$key = $model->$key;
+                                
+                                //sales_invoiced_aggregated
+                                $condition = "store_id IN ({$str_store_ids}) OR store_id IS NULL";
+                                $models = Mage1SalesInvoicedAggregated::model()->findAll($condition);
+                                if ($models){
+                                    foreach ($models as $model){
+                                        $model2 = new Mage2SalesInvoicedAggregated();
+                                        foreach ($model2->attributes as $key => $value){
+                                            if (isset($model->$key)){
+                                                $model2->$key = $model->$key;
+                                            }
+                                        }
+                                        $model2->store_id = MigrateSteps::getMage2StoreId($model->store_id);
+                                        $model2->save();
                                     }
                                 }
-                                $model2->store_id = MigrateSteps::getMage2StoreId($model->store_id);
-                                $model2->save();
-                            }
-                        }
-                        //sales_invoiced_aggregated_order
-                        $condition = "store_id IN ({$str_store_ids}) OR store_id IS NULL";
-                        $models = Mage1SalesInvoicedAggregatedOrder::model()->findAll($condition);
-                        if ($models){
-                            foreach ($models as $model){
-                                $model2 = new Mage2SalesInvoicedAggregatedOrder();
-                                foreach ($model2->attributes as $key => $value){
-                                    if (isset($model->$key)){
-                                        $model2->$key = $model->$key;
+                                //sales_invoiced_aggregated_order
+                                $condition = "store_id IN ({$str_store_ids}) OR store_id IS NULL";
+                                $models = Mage1SalesInvoicedAggregatedOrder::model()->findAll($condition);
+                                if ($models){
+                                    foreach ($models as $model){
+                                        $model2 = new Mage2SalesInvoicedAggregatedOrder();
+                                        foreach ($model2->attributes as $key => $value){
+                                            if (isset($model->$key)){
+                                                $model2->$key = $model->$key;
+                                            }
+                                        }
+                                        $model2->store_id = MigrateSteps::getMage2StoreId($model->store_id);
+                                        $model2->save();
                                     }
                                 }
-                                $model2->store_id = MigrateSteps::getMage2StoreId($model->store_id);
-                                $model2->save();
                             }
+                            
+                            $migrated_sales_object_ids[] = 'invoice';    
+                        } else {
+                            Yii::app()->user->setFlash('note', Yii::t('frontend', "Before migrate the Sales Invoices, you have to migrate the Sales Orders first."));
                         }
-
-                        $migrated_sales_object_ids[] = 'invoice';
                     }//end sales invoice migration
 
-                    //Sales shipments migration
-                    if (in_array('shipment', $selected_objects)){
+                    //Sales shipment
+                    if (in_array('shipment', $selected_objects) && !in_array('shipment', $migrated_sales_object_ids)){
                         if ($migrated_order_ids){
                             $condition = "( store_id IN ({$str_store_ids}) OR store_id IS NULL )";
                             $str_order_ids = implode(',', $migrated_order_ids);
@@ -2680,9 +2713,12 @@ public function actionStep7()
                                                     }
                                                 }
                                                 $model2->store_id = MigrateSteps::getMage2StoreId($model->store_id);
-                                                //this field was not exists in Magento 1
+                                                //some new fields and required in Magento 2
                                                 $model2->updated_at = null;
-                                                $model2->save();
+                                                $model2->customer_name = $model->shipping_name;
+                                                if (!$model2->save()){
+                                                    $errors[] = MigrateSteps::getStringErrors($model2->getErrors());
+                                                }
                                             }
                                         }
                                         //sales_shipment_item
@@ -2695,7 +2731,9 @@ public function actionStep7()
                                                         $model2->$key = $model->$key;
                                                     }
                                                 }
-                                                $model2->save();
+                                                if (!$model2->save()){
+                                                    $errors[] = MigrateSteps::getStringErrors($model2->getErrors());
+                                                }
                                             }
                                         }
                                         //sales_shipment_track
@@ -2708,7 +2746,9 @@ public function actionStep7()
                                                         $model2->$key = $model->$key;
                                                     }
                                                 }
-                                                $model2->save();
+                                                if (!$model2->save()){
+                                                    $errors[] = MigrateSteps::getStringErrors($model2->getErrors());
+                                                }
                                             }
                                         }
                                         //sales_shipment_comment
@@ -2721,7 +2761,9 @@ public function actionStep7()
                                                         $model2->$key = $model->$key;
                                                     }
                                                 }
-                                                $model2->save();
+                                                if (!$model2->save()){
+                                                    $errors[] = MigrateSteps::getStringErrors($model2->getErrors());
+                                                }
                                             }
                                         }
                                     }
@@ -2739,7 +2781,9 @@ public function actionStep7()
                                         }
                                     }
                                     $model2->store_id = MigrateSteps::getMage2StoreId($model->store_id);
-                                    $model2->save();
+                                    if (!$model2->save()){
+                                        $errors[] = MigrateSteps::getStringErrors($model2->getErrors());
+                                    }
                                 }
                             }
                             //sales_shipping_aggregated_order
@@ -2754,16 +2798,19 @@ public function actionStep7()
                                         }
                                     }
                                     $model2->store_id = MigrateSteps::getMage2StoreId($model->store_id);
-                                    $model2->save();
+                                    if (!$model2->save()){
+                                        $errors[] = MigrateSteps::getStringErrors($model2->getErrors());
+                                    }
                                 }
                             }
+                            $migrated_sales_object_ids[] = 'shipment';
+                        }else {
+                            Yii::app()->user->setFlash('note', Yii::t('frontend', "Before migrate the Sales Shipments, you have to migrate the Sales Orders first."));
                         }
-
-                        $migrated_sales_object_ids[] = 'shipment';
                     }//end sales shipment migration
 
-                    //Sales credit memo migration
-                    if (in_array('credit', $selected_objects)){
+                    //Sales credit memo
+                    if (in_array('credit', $selected_objects) && !in_array('credit', $migrated_sales_object_ids)){
                         if ($migrated_order_ids){
                             $condition = "( store_id IN ({$str_store_ids}) OR store_id IS NULL )";
                             $str_order_ids = implode(',', $migrated_order_ids);
@@ -2794,10 +2841,12 @@ public function actionStep7()
                                                         $model2->$key = $model->$key;
                                                     }
                                                 }
-                                                $model2->store_id = MigrateSteps::getMage2StoreId($model->store_id);
-                                                //this field was not exists in Magento 1
+                                                //some new fields and required in Magento 2
                                                 $model2->updated_at = null;
-                                                $model2->save();
+                                                $model2->customer_name = $model->billing_name;
+                                                if (!$model2->save()){
+                                                    $errors[] = MigrateSteps::getStringErrors($model2->getErrors());
+                                                }
                                             }
                                         }
                                         //sales_creditmemo_item
@@ -2807,12 +2856,22 @@ public function actionStep7()
                                                 $model2 = new Mage2SalesCreditmemoItem();
                                                 foreach ($model2->attributes as $key => $value){
                                                     if (isset($model->$key)){
-                                                        $model2->$key = $model->$key;
+                                                        $val = $model->$key;
+                                                        /**
+                                                         * Because Magento2 was change method to save weee_tax_applied to database:
+                                                         * So we have to make convert this
+                                                         */
+                                                        if ($key == 'weee_tax_applied'){
+                                                            $val = json_encode(unserialize($val));
+                                                        }
+                                                        $model2->$key = $val;
                                                     }
                                                 }
                                                 //this field was not exists in Magento1
                                                 $model2->tax_ratio = null;
-                                                $model2->save();
+                                                if (!$model2->save()){
+                                                    $errors[] = MigrateSteps::getStringErrors($model2->getErrors());
+                                                }
                                             }
                                         }
                                         //sales_creditmemo_comment
@@ -2825,18 +2884,22 @@ public function actionStep7()
                                                         $model2->$key = $model->$key;
                                                     }
                                                 }
-                                                $model2->save();
+                                                if (!$model2->save()){
+                                                    $errors[] = MigrateSteps::getStringErrors($model2->getErrors());
+                                                }
                                             }
                                         }
                                     }
                                 }
                             }
+                            $migrated_sales_object_ids[] = 'credit';
+                        } else {
+                            Yii::app()->user->setFlash('note', Yii::t('frontend', "Before migrate the Sales Credit Memo, you have to migrate the Sales Orders first."));
                         }
-                        $migrated_sales_object_ids[] = 'credit';
                     }//End Sales credit memo migration
 
-                    //sales bestsellers
-                    if (in_array('bestseller', $selected_objects)){
+                    //Sales bestsellers
+                    if (in_array('bestseller', $selected_objects) && !in_array('bestseller', $migrated_sales_object_ids)){
                         if ($migrated_store_ids && $migrated_product_ids){
                             $condition = "store_id IN ({$str_store_ids}) AND product_id IN ({$str_product_ids})";
 
@@ -2884,13 +2947,12 @@ public function actionStep7()
                                     $model2->save();
                                 }
                             }
-
                             $migrated_sales_object_ids[] = 'bestseller';
                         }
                     }//end sales bestsellers
 
-                    //sales rules & coupons
-                    if (in_array('rule_coupon', $selected_objects)){
+                    //Sales rules & coupons
+                    if (in_array('rule_coupon', $selected_objects) && !in_array('rule_coupon', $migrated_sales_object_ids)){
                         if ($migrated_store_ids && $migrated_product_ids){
                             //salesrule
                             $models = Mage1Salesrule::model()->findAll();
@@ -3016,21 +3078,29 @@ public function actionStep7()
                             $migrated_sales_object_ids[] = 'rule_coupon';
                         }
                     }//end sales rules & coupons
-
                 }else{
-                    Yii::app()->user->setFlash('note', Yii::t('frontend', 'You have not selected any Object.'));
+                    Yii::app()->user->setFlash('note', Yii::t('frontend', 'You have not selected any Object yet.'));
                 }
 
                 //Update step status
-                if ($migrated_sales_object_ids){
-                    $step->status = MigrateSteps::STATUS_DONE;
+                if (sizeof($migrated_sales_object_ids) > sizeof(Yii::app()->session['migrated_sales_object_ids'])) {
+                    if (sizeof($migrated_sales_object_ids) == sizeof($sales_objects)){
+                        $step->status = MigrateSteps::STATUS_DONE;
+                    } else {
+                        $step->status = MigrateSteps::STATUS_NOT_DONE;
+                    }
+                    
                     $step->migrated_data = json_encode(array(
+                        'order_statuses' => $migrated_order_statuses,
                         'sales_object_ids' => $migrated_sales_object_ids,
                         'sales_order_ids' => $migrated_order_ids,
                         'sales_quote_ids' => $migrated_quote_ids,
+                        'sales_payment_ids' => $migrated_payment_ids,
                         'sales_invoice_ids' => $migrated_invoice_ids,
                         'sales_shipment_ids' => $migrated_shipment_ids,
-                        'sales_credit_ids' => $migrated_credit_ids
+                        'sales_credit_ids' => $migrated_credit_ids,
+                        'sales_rule_ids' => $migrated_sales_rule_ids,
+                        'sales_coupon_ids' => $migrated_sales_coupon_ids
                     ));
                     if ($step->update()) {
 
@@ -3038,24 +3108,46 @@ public function actionStep7()
                         Yii::app()->mage2->createCommand("SET FOREIGN_KEY_CHECKS=1")->execute();
 
                         //update session
+                        Yii::app()->session['migrated_order_statuses'] = $migrated_order_statuses;
                         Yii::app()->session['migrated_sales_object_ids'] = $migrated_sales_object_ids;
                         Yii::app()->session['migrated_sales_order_ids'] = $migrated_order_ids;
+                        Yii::app()->session['migrated_sales_quote_ids'] = $migrated_quote_ids;
+                        Yii::app()->session['migrated_sales_payment_ids'] = $migrated_payment_ids;
+                        Yii::app()->session['migrated_sales_invoice_ids'] = $migrated_invoice_ids;
+                        Yii::app()->session['migrated_sales_shipment_ids'] = $migrated_shipment_ids;
+                        Yii::app()->session['migrated_sales_credit_ids'] = $migrated_credit_ids;
+                        Yii::app()->session['migrated_sales_rule_ids'] = $migrated_sales_rule_ids;
+                        Yii::app()->session['migrated_sales_coupon_ids'] = $migrated_sales_coupon_ids;
 
                         $message = '<ul>';
                         $message .= '<li>'.Yii::t('frontend', 'Migrated successfully.').'</li>';
-                        $message .= '<li>'. Yii::t('frontend', "Total Sales Orders migrated: %s1.", array('%s1' => sizeof($migrated_order_ids))).'</li>';
-                        $message .= '<li>'. Yii::t('frontend', "Total Orders Statuses migrated: %s2.", array('%s2' => sizeof($migrated_order_statuses))).'</li>';
-                        $message .= '<li>'. Yii::t('frontend', "Total Sales Quote migrated: %s3.", array('%s3' => sizeof($migrated_quote_ids))).'</li>';
-                        $message .= '<li>'. Yii::t('frontend', "Total Sales Invoices migrated: %s4.", array('%s4' => sizeof($migrated_invoice_ids))).'</li>';
-                        $message .= '<li>'. Yii::t('frontend', "Total Sales Shipments migrated: %s5.", array('%s5' => sizeof($migrated_shipment_ids))).'</li>';
-                        $message .= '<li>'. Yii::t('frontend', "Total Sales Credit Memo migrated: %s6.", array('%s6' => sizeof($migrated_credit_ids))).'</li>';
-                        $message .= '<li>'. Yii::t('frontend', "Total Sales Rules migrated: %s7.", array('%s7' => sizeof($migrated_sales_rule_ids))).'</li>';
-                        $message .= '<li>'. Yii::t('frontend', "Total Sales Coupons migrated: %s8.", array('%s8' => sizeof($migrated_sales_coupon_ids))).'</li>';
+                        if ($migrated_order_statuses)
+                            $message .= '<li>'. Yii::t('frontend', "Total Orders Statuses migrated: %s2.", array('%s2' => sizeof($migrated_order_statuses))).'</li>';
+                        if ($migrated_order_ids)
+                            $message .= '<li>'. Yii::t('frontend', "Total Sales Orders migrated: %s1.", array('%s1' => sizeof($migrated_order_ids))).'</li>';
+                        if ($migrated_quote_ids)
+                            $message .= '<li>'. Yii::t('frontend', "Total Sales Quote migrated: %s3.", array('%s3' => sizeof($migrated_quote_ids))).'</li>';
+                        if ($migrated_invoice_ids)
+                            $message .= '<li>'. Yii::t('frontend', "Total Sales Invoices migrated: %s4.", array('%s4' => sizeof($migrated_invoice_ids))).'</li>';
+                        if ($migrated_shipment_ids)
+                            $message .= '<li>'. Yii::t('frontend', "Total Sales Shipments migrated: %s5.", array('%s5' => sizeof($migrated_shipment_ids))).'</li>';
+                        if ($migrated_credit_ids)
+                            $message .= '<li>'. Yii::t('frontend', "Total Sales Credit Memo migrated: %s6.", array('%s6' => sizeof($migrated_credit_ids))).'</li>';
+                        if ($migrated_sales_rule_ids)
+                            $message .= '<li>'. Yii::t('frontend', "Total Sales Rules migrated: %s7.", array('%s7' => sizeof($migrated_sales_rule_ids))).'</li>';
+                        if ($migrated_sales_coupon_ids)
+                            $message .= '<li>'. Yii::t('frontend', "Total Sales Coupons migrated: %s8.", array('%s8' => sizeof($migrated_sales_coupon_ids))).'</li>';
                         $message .= '</ul>';
 
                         Yii::app()->user->setFlash('success', $message);
                     }
                 }
+                
+                //alert errors if exists
+                if ($errors){
+                    $strErrors = implode('<br/>', $errors);
+                    Yii::app()->user->setFlash('error', $strErrors);
+                }
             }//end post request
             else{
                 if ($step->status == MigrateSteps::STATUS_DONE){
diff --git a/protected/views/layouts/main.php b/protected/views/layouts/main.php
index 747320e..99aac57 100644
--- a/protected/views/layouts/main.php
+++ b/protected/views/layouts/main.php
@@ -20,13 +20,15 @@
     <div class="row">
         <div id="header">
             <div id="logo"><?php echo CHtml::encode(Yii::app()->name); ?></div>
-        </div><!-- header -->
+        </div>
+        <!--// header -->
         <?php echo $content; ?>
+        
         <div id="footer">
             Copyright &copy; <?php echo date('Y'); ?> by <a href="http://www.ubertheme.com/" target="_blank">UberTheme</a>.<br/>
             All Rights Reserved.<br/>
             <?php echo Yii::powered(); ?>
-            <div id="report-bugs"><a target="_blank" href="https://github.com/ubertheme/magento2_data_migration/issues" title="<?php echo Yii::t('frontend', 'Report Bugs')?>"><?php echo Yii::t('frontend', 'Report Bugs')?></a></div>
+            <div id="report-bugs"><a target="_blank" href="https://bitbucket.org/ubertheme/module-ubdatamigration/issues" title="<?php echo Yii::t('frontend', 'Report Bugs')?>"><?php echo Yii::t('frontend', 'Report Bugs')?></a></div>
         </div><!-- footer -->
     </div>
 </div><!-- page -->
@@ -38,6 +40,7 @@
                 <div>
                     <img src="<?php echo Yii::app()->request->baseUrl; ?>/css/images/loading.gif"/>
                     <?php echo Yii::t('frontend', 'Data processing. Please wait…'); ?>
+                    <i>(<?php echo Yii::t('frontend', 'If your data up to 2000+ records, this task can take some hours to finished.'); ?>)</i>
                 </div>
             </div>
         </div>
diff --git a/protected/views/migrate/_frmButtons.php b/protected/views/migrate/_frmButtons.php
index ea28f80..ee3b7c8 100644
--- a/protected/views/migrate/_frmButtons.php
+++ b/protected/views/migrate/_frmButtons.php
@@ -1,11 +1,11 @@
 <!--  Form Buttons-->
 <div class="step-controls">
+    <a href="<?php echo Yii::app()->createUrl("migrate/reset/step/" . $step->sorder); ?>" class="btn btn-danger"><span class="glyphicon glyphicon-refresh"></span> <?php echo Yii::t('frontend', 'Reset'); ?></a>
     <?php if ($step->status == MigrateSteps::STATUS_NOT_DONE): ?>
-        <button type="submit" class="btn btn-primary"><?php echo Yii::t('frontend', 'Start'); ?></button>
+        <button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-play-circle"></span> <?php echo Yii::t('frontend', 'Start'); ?></button>
     <?php else: ?>
-        <a href="<?php echo Yii::app()->createUrl("migrate/reset/step/" . $step->sorder); ?>" class="btn btn-danger"><?php echo Yii::t('frontend', 'Reset'); ?></a>
         <?php if ($step->sorder <= 8): ?>
-            <a href="<?php echo Yii::app()->createUrl("migrate/step" . ($step->sorder+1)); ?>" class="btn btn-primary"><?php echo Yii::t('frontend', 'Next Step'); ?></a>
+            <a href="<?php echo Yii::app()->createUrl("migrate/step" . ($step->sorder+1)); ?>" class="btn btn-primary"><span class="glyphicon glyphicon-forward"></span> <?php echo Yii::t('frontend', 'Next Step'); ?></a>
         <?php endif; ?>
     <?php endif; ?>
 </div>
diff --git a/protected/views/migrate/step1.php b/protected/views/migrate/step1.php
index 7adfc48..ce14688 100644
--- a/protected/views/migrate/step1.php
+++ b/protected/views/migrate/step1.php
@@ -1,6 +1,6 @@
 <?php $this->pageTitle = $step->title . ' - ' . Yii::app()->name; ?>
 
-<h1 class="page-header"> Step <?=$step->sorder?>: <?=$step->title?> </h1>
+<h1 class="page-header"> Step <?php echo $step->sorder?>: <?php echo $step->title?> </h1>
 
 <form id="frm-settings" data-toggle="validator" role="form" method="post" action="<?php echo Yii::app()->createUrl("migrate/step{$step->sorder}"); ?>">
 
@@ -79,10 +79,10 @@
         <!-- Form Buttons-->
         <div class="step-controls">
             <?php if ($step->status == MigrateSteps::STATUS_NOT_DONE): ?>
-                <button type="submit" id="step-<?php echo $step->sorder; ?>" class="btn btn-primary need-validate-form"><?php echo Yii::t('frontend', 'Save'); ?></button>
+                <button type="submit" id="step-<?php echo $step->sorder; ?>" class="btn btn-primary need-validate-form"><span class="glyphicon glyphicon-save"></span> <?php echo Yii::t('frontend', 'Save'); ?></button>
             <?php else: ?>
-                <button type="submit" id="step-<?php echo $step->sorder; ?>" class="btn btn-danger need-validate-form"><?php echo Yii::t('frontend', 'Update'); ?></button>
-                <a href="<?php echo Yii::app()->createUrl("migrate/step" . ($step->sorder+1)); ?>" class="btn btn-primary"><?php echo Yii::t('frontend', 'Next Step'); ?></a>
+                <button type="submit" id="step-<?php echo $step->sorder; ?>" class="btn btn-danger need-validate-form"><span class="glyphicon glyphicon-save"></span> <?php echo Yii::t('frontend', 'Update'); ?></button>
+                <a href="<?php echo Yii::app()->createUrl("migrate/step" . ($step->sorder+1)); ?>" class="btn btn-primary"><span class="glyphicon glyphicon-forward"></span> <?php echo Yii::t('frontend', 'Next Step'); ?></a>
             <?php endif; ?>
         </div>
         <!--// Form Buttons-->
diff --git a/protected/views/migrate/step2.php b/protected/views/migrate/step2.php
index 9ebe06b..36e0156 100644
--- a/protected/views/migrate/step2.php
+++ b/protected/views/migrate/step2.php
@@ -1,6 +1,6 @@
 <?php $this->pageTitle = $step->title . ' - ' . Yii::app()->name; ?>
 
-<h1 class="page-header"> Step <?=$step->sorder?>: <?=$step->title?> </h1>
+<h1 class="page-header"> Step <?php echo $step->sorder?>: <?php echo $step->title?> </h1>
 
 <form role="form" method="post" action="<?php echo Yii::app()->createUrl("migrate/step{$step->sorder}"); ?>">
 
@@ -21,7 +21,7 @@
                     <span class="glyphicon glyphicon-ok-sign text-success"></span>
                 <?php endif; ?>
                 <label class="checkbox-inline">
-                    <input type="checkbox" id="website-<?php echo $website->website_id; ?>" <?php echo ($checked) ? "checked" : ''; ?> name="website_ids[]" value="<?=$website->website_id?>" />
+                    <input type="checkbox" id="website-<?php echo $website->website_id; ?>" <?php echo ($checked) ? "checked" : ''; ?> name="website_ids[]" value="<?php echo $website->website_id?>" />
                     <?php echo $website->name; ?>
                 </label>
             </h4>
@@ -42,7 +42,7 @@
                                 <span class="glyphicon glyphicon-ok-sign text-success"></span>
                             <?php endif; ?>
                             <label class="checkbox-inline">
-                                <input type="checkbox" id="store-group-<?php echo $storeGroup->group_id; ?>" <?php echo ($checked) ? "checked" : ''; ?> name="store_group_ids[<?php echo $website->website_id; ?>][]" class="store-group-<?php echo $website->website_id; ?>" value="<?=$storeGroup->group_id?>" />
+                                <input type="checkbox" id="store-group-<?php echo $storeGroup->group_id; ?>" <?php echo ($checked) ? "checked" : ''; ?> name="store_group_ids[<?php echo $website->website_id; ?>][]" class="store-group-<?php echo $website->website_id; ?>" value="<?php echo $storeGroup->group_id?>" />
                                 <?php echo $storeGroup->name; ?>
                             </label>
                         </h5>
@@ -61,7 +61,7 @@
                                             <span class="glyphicon glyphicon-ok-sign text-success"></span>
                                         <?php endif; ?>
                                         <label class="checkbox-inline">
-                                            <input type="checkbox" id="store-<?php echo $store->store_id; ?>" <?php echo ($checked) ? "checked" : ''; ?> name="store_ids[<?php echo $storeGroup->group_id; ?>][]" class="store-<?php echo $storeGroup->group_id; ?>" value="<?=$store->store_id?>" />
+                                            <input type="checkbox" id="store-<?php echo $store->store_id; ?>" <?php echo ($checked) ? "checked" : ''; ?> name="store_ids[<?php echo $storeGroup->group_id; ?>][]" class="store-<?php echo $storeGroup->group_id; ?>" value="<?php echo $store->store_id?>" />
                                             <?php echo $store->name; ?>
                                         </label>
                                     </li>
diff --git a/protected/views/migrate/step3.php b/protected/views/migrate/step3.php
index f437202..9c7b546 100644
--- a/protected/views/migrate/step3.php
+++ b/protected/views/migrate/step3.php
@@ -1,6 +1,6 @@
 <?php $this->pageTitle = $step->title . ' - ' . Yii::app()->name; ?>
 
-<h1 class="page-header"> Step <?=$step->sorder?>: <?=$step->title?> </h1>
+<h1 class="page-header"> Step <?php echo $step->sorder?>: <?php echo $step->title?> </h1>
 
 <form role="form" method="post" action="<?php echo Yii::app()->createUrl("migrate/step{$step->sorder}"); ?>">
 
@@ -51,7 +51,7 @@
                     <li class="list-group-item">
                         <h5 class="list-group-item-heading">
                             <label class="checkbox-inline">
-                                <input type="checkbox" id="attribute-group-<?php echo $attribute_group->attribute_group_id; ?>" name="attribute_group_ids[<?php echo $attribute_set->attribute_set_id; ?>][]" class="attribute-group-<?php echo $attribute_set->attribute_set_id; ?>" value="<?=$attribute_group->attribute_group_id?>" />
+                                <input type="checkbox" id="attribute-group-<?php echo $attribute_group->attribute_group_id; ?>" name="attribute_group_ids[<?php echo $attribute_set->attribute_set_id; ?>][]" class="attribute-group-<?php echo $attribute_set->attribute_set_id; ?>" value="<?php echo $attribute_group->attribute_group_id?>" />
                                 <?php echo $attribute_group->attribute_group_name; ?>
                             </label>
                         </h5>
diff --git a/protected/views/migrate/step4.php b/protected/views/migrate/step4.php
index b298fa5..e9422b6 100644
--- a/protected/views/migrate/step4.php
+++ b/protected/views/migrate/step4.php
@@ -1,6 +1,6 @@
 <?php $this->pageTitle = $step->title . ' - ' . Yii::app()->name; ?>
 
-<h1 class="page-header"> Step <?=$step->sorder?>: <?=$step->title?> </h1>
+<h1 class="page-header"> Step <?php echo $step->sorder?>: <?php echo $step->title?> </h1>
 
 <form role="form" method="post" action="<?php echo Yii::app()->createUrl("migrate/step{$step->sorder}"); ?>">
     <div id="step-content">
diff --git a/protected/views/migrate/step5.php b/protected/views/migrate/step5.php
index eb5cb13..684d6ea 100644
--- a/protected/views/migrate/step5.php
+++ b/protected/views/migrate/step5.php
@@ -1,6 +1,6 @@
 <?php $this->pageTitle = $step->title . ' - ' . Yii::app()->name; ?>
 
-<h1 class="page-header"> Step <?=$step->sorder?>: <?=$step->title?> </h1>
+<h1 class="page-header"> Step <?php echo $step->sorder?>: <?php echo $step->title?> </h1>
 
 <?php
 //get migrated category ids
diff --git a/protected/views/migrate/step6.php b/protected/views/migrate/step6.php
index 92f8b82..0415fd2 100644
--- a/protected/views/migrate/step6.php
+++ b/protected/views/migrate/step6.php
@@ -1,6 +1,6 @@
 <?php $this->pageTitle = $step->title . ' - ' . Yii::app()->name; ?>
 
-<h1 class="page-header"> Step <?=$step->sorder?>: <?=$step->title?> </h1>
+<h1 class="page-header"> Step <?php echo $step->sorder?>: <?php echo $step->title?> </h1>
 
 <?php
 //get migrated category ids
diff --git a/protected/views/migrate/step7.php b/protected/views/migrate/step7.php
index 4677dc6..c306db7 100644
--- a/protected/views/migrate/step7.php
+++ b/protected/views/migrate/step7.php
@@ -1,9 +1,9 @@
 <?php $this->pageTitle = $step->title . ' - ' . Yii::app()->name; ?>
 
-<h1 class="page-header"> Step <?=$step->sorder?>: <?=$step->title?> </h1>
+<h1 class="page-header"> Step <?php echo $step->sorder?>: <?php echo $step->title?> </h1>
 
 <?php
-//get migrated category ids
+//get migrated sales objects ids
 $migrated_sales_object_ids = isset(Yii::app()->session['migrated_sales_object_ids']) ? Yii::app()->session['migrated_sales_object_ids'] : array();
 ?>
 
@@ -16,9 +16,13 @@
         <ul class="list-group">
             <li class="list-group-item">
                 <h3 class="list-group-item-heading">
-                    <input type="checkbox" id="select-all" style="visibility: hidden;" name="select_all_sales_object" title="<?php echo Yii::t('frontend', 'Click here to select all sales objects.')?>" />
-                    <?php echo Yii::t('frontend', 'Sales Data Objects'); ?>
+                    <?php echo Yii::t('frontend', 'Sales Data Objects'); ?><br/>
                 </h3>
+                <h4>
+                    <?php $checked = (sizeof($migrated_sales_object_ids) == sizeof($sale_objects)) ? true : false; ?>
+                    <input type="checkbox" <?php echo ($checked) ? 'checked="checked"' : ''; ?> id="select-all" name="select_all_sales_object" title="<?php echo Yii::t('frontend', 'Click here to select all sales objects.')?>" />
+                    <label for="select-all">Select all</label>
+                </h4>
                 <?php if (isset($sale_objects) && $sale_objects): ?>
                 <ul class="list-group">
                     <?php foreach ($sale_objects as $id => $label): ?>
@@ -28,7 +32,7 @@
                                     <?php if ($checked = in_array($id, $migrated_sales_object_ids)): ?>
                                     <span class="glyphicon glyphicon-ok-sign text-success"></span>
                                     <?php endif; ?>
-                                    <input type="checkbox" style="<?php echo ($id != 'rule_coupon') ? 'visibility: hidden;' : ''; ?>" <?php echo ($checked) ? "checked" : ''; ?> id="sales_object_<?php echo $id; ?>" name="selected_objects[]" value="<?php echo $id; ?>" />
+                                    <input type="checkbox" <?php echo ($checked) ? "checked" : ''; ?> id="sales_object_<?php echo $id; ?>" name="selected_objects[]" value="<?php echo $id; ?>" />
                                     <span> <?php echo $label . " (". MigrateSteps::getTotalSalesChildObject($id) .")"; ?> </span>
                                 </h4>
                             </li>
diff --git a/protected/views/migrate/step8.php b/protected/views/migrate/step8.php
index 9313fec..8fc3830 100644
--- a/protected/views/migrate/step8.php
+++ b/protected/views/migrate/step8.php
@@ -1,6 +1,6 @@
 <?php $this->pageTitle = $step->title . ' - ' . Yii::app()->name; ?>
 
-<h1 class="page-header"> Step <?=$step->sorder?>: <?=$step->title?> </h1>
+<h1 class="page-header"> Step <?php echo $step->sorder?>: <?php echo $step->title?> </h1>
 
 <?php
 $migrated_object_ids = isset(Yii::app()->session['migrated_object_ids']) ? Yii::app()->session['migrated_object_ids'] : array();
diff --git a/protected/views/migrate/step9.php b/protected/views/migrate/step9.php
index a25e552..621e3da 100644
--- a/protected/views/migrate/step9.php
+++ b/protected/views/migrate/step9.php
@@ -1,6 +1,6 @@
 <?php $this->pageTitle = $step->title . ' - ' . Yii::app()->name; ?>
 
-<h1 class="page-header"> Step <?=$step->sorder?>: <?=$step->title?> </h1>
+<h1 class="page-header"> Step <?php echo $step->sorder?>: <?php echo $step->title?> </h1>
 
 <?php
 $migrated_object_ids = isset(Yii::app()->session['migrated_other_object_ids']) ? Yii::app()->session['migrated_other_object_ids'] : array();