diff --git a/app/Http/Controllers/EnvironmentController.php b/app/Http/Controllers/EnvironmentController.php
index 2ce919e9..3254b546 100755
--- a/app/Http/Controllers/EnvironmentController.php
+++ b/app/Http/Controllers/EnvironmentController.php
@@ -35,9 +35,7 @@ class EnvironmentController extends Controller
     {
         $results = $this->EnvironmentManager->saveDatabaseVariables($request);
 
-
         if(array_key_exists("success", $results)) {
-
             Artisan::call('config:clear');
             Artisan::call('migrate --seed');
             Artisan::call('migrate', ['--path' => 'vendor/laravel/passport/database/migrations']);
@@ -57,13 +55,30 @@ class EnvironmentController extends Controller
      */
     public function saveMailEnvironment(MailEnvironmentRequest $request)
     {
+        $setting = Setting::getSetting('profile_complete');
         $results = $this->EnvironmentManager->saveMailVariables($request);
 
-        Setting::setSetting('profile_complete', 4);
+        if ($setting !== 'COMPLETED')
+        {
+            Setting::setSetting('profile_complete', 4);
+        }
 
         return response()->json($results);
     }
 
+    public function getMailEnvironment()
+    {
+        $MailData = [
+            'mail_driver' => config('mail.driver'),
+            'mail_host' => config('mail.host'),
+            'mail_port' => config('mail.port'),
+            'mail_username' => config('mail.username'),
+            'mail_password' => config('mail.password'),
+            'mail_encryption' => config('mail.encryption')
+        ];
+
+        return response()->json($MailData);
+    }
 
     /**
      *
diff --git a/app/Http/Controllers/OnboardingController.php b/app/Http/Controllers/OnboardingController.php
index 18fd9686..49735975 100644
--- a/app/Http/Controllers/OnboardingController.php
+++ b/app/Http/Controllers/OnboardingController.php
@@ -203,7 +203,7 @@ class OnboardingController extends Controller
             );
         }
 
-        Setting::setSetting('version','1.0.0');
+        Setting::setSetting('version', config('crater.version'));
 
         Artisan::call('passport:install --force');
 
diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php
index 1fae5937..0fb13fd0 100755
--- a/app/Space/EnvironmentManager.php
+++ b/app/Space/EnvironmentManager.php
@@ -49,12 +49,20 @@ class EnvironmentManager
         'DB_PASSWORD='.$request->database_password."\n\n";
 
         if (! $this->checkDatabaseConnection($request)) {
+
             return [
                 'error' => 'connection_failed'
             ];
+        } else {
+            if(count(DB::connection()->select('SHOW TABLES'))) {
+                return [
+                    'error' => 'database_should_be_empty'
+                ];
+            }
         }
 
         try {
+
             file_put_contents($this->envPath, str_replace(
                 $oldDatabaseData,
                 $newDatabaseData,
@@ -101,7 +109,7 @@ class EnvironmentManager
         'MAIL_USERNAME='.$request->mail_username."\n".
         'MAIL_PASSWORD='.$request->mail_password."\n".
         'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n";
-        // dd($newMailData);
+
         try {
 
             file_put_contents($this->envPath, str_replace(
diff --git a/config/crater.php b/config/crater.php
new file mode 100644
index 00000000..0278efcf
--- /dev/null
+++ b/config/crater.php
@@ -0,0 +1,14 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Crater Requirements
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'version' => '1.0.0',
+
+];
diff --git a/resources/assets/js/components/base/BaseButton.vue b/resources/assets/js/components/base/BaseButton.vue
index 2bb758ba..d624d158 100644
--- a/resources/assets/js/components/base/BaseButton.vue
+++ b/resources/assets/js/components/base/BaseButton.vue
@@ -1,9 +1,29 @@
 <template>
-  <button :type="type" :class="btnClass" :disabled="disabled" @click="handleClick">
-    <font-awesome-icon v-if="icon && !loading && !rightIcon" :class="iconClass" :icon="icon" class="vue-icon icon-left" />
-    <font-awesome-icon v-if="loading" :class="iconClass" icon="spinner" class="fa-spin"/>
+  <button
+    :type="type"
+    :class="btnClass"
+    :disabled="disabled || loading"
+    @click="handleClick"
+  >
+    <font-awesome-icon
+      v-if="icon && !loading && !rightIcon"
+      :class="iconClass"
+      :icon="icon"
+      class="vue-icon icon-left"
+    />
+    <font-awesome-icon
+      v-if="loading"
+      :class="iconClass"
+      icon="spinner"
+      class="fa-spin"
+    />
     <slot />
-    <font-awesome-icon v-if="icon && !loading && rightIcon" :class="iconClass" :icon="icon" class="vue-icon icon-right" />
+    <font-awesome-icon
+      v-if="icon && !loading && rightIcon"
+      :class="iconClass"
+      :icon="icon"
+      class="vue-icon icon-right"
+    />
   </button>
 </template>
 
diff --git a/resources/assets/js/components/base/BaseInput.vue b/resources/assets/js/components/base/BaseInput.vue
index 08a85bfd..09936d55 100644
--- a/resources/assets/js/components/base/BaseInput.vue
+++ b/resources/assets/js/components/base/BaseInput.vue
@@ -4,7 +4,7 @@
     <input
       ref="baseInput"
       v-model="inputValue"
-      :type="type"
+      :type="toggleType"
       :disabled="disabled"
       :readonly="readOnly"
       :name="name"
@@ -19,6 +19,9 @@
       @keydown="handleKeyDownEnter"
       @blur="handleFocusOut"
     >
+    <div v-if="showPassword && isAlignLeftIcon" style="cursor: pointer" @click="showPass = !showPass" >
+      <font-awesome-icon :icon="!showPass ?'eye-slash': 'eye'" class="right-icon" />
+    </div>
     <font-awesome-icon v-if="icon && !isAlignLeftIcon" :icon="icon" class="right-icon" />
   </div>
 </template>
@@ -77,12 +80,17 @@ export default {
     autocomplete: {
       type: String,
       default: 'on'
+    },
+    showPassword: {
+      type: Boolean,
+      default: false
     }
   },
   data () {
     return {
       inputValue: this.value,
-      focus: false
+      focus: false,
+      showPass: false
     }
   },
   computed: {
@@ -94,6 +102,12 @@ export default {
         return true
       }
       return false
+    },
+    toggleType () {
+      if (this.showPass) {
+        return 'text'
+      }
+      return this.type
     }
   },
   watch: {
diff --git a/resources/assets/js/components/base/modal/CategoryModal.vue b/resources/assets/js/components/base/modal/CategoryModal.vue
index 81863ac8..609e1d85 100644
--- a/resources/assets/js/components/base/modal/CategoryModal.vue
+++ b/resources/assets/js/components/base/modal/CategoryModal.vue
@@ -3,7 +3,7 @@
     <form action="" @submit.prevent="submitCategoryData">
       <div class="card-body">
         <div class="form-group row">
-          <label class="col-sm-4 col-form-label">{{ $t('expenses.category') }}<span class="required text-danger">*</span></label>
+          <label class="col-sm-4 col-form-label input-label">{{ $t('expenses.category') }}<span class="required text-danger">*</span></label>
           <div class="col-sm-7">
             <base-input
               ref="name"
diff --git a/resources/assets/js/components/base/modal/CustomerModal.vue b/resources/assets/js/components/base/modal/CustomerModal.vue
index 5c27bfcf..dc2a03eb 100644
--- a/resources/assets/js/components/base/modal/CustomerModal.vue
+++ b/resources/assets/js/components/base/modal/CustomerModal.vue
@@ -7,7 +7,7 @@
           <tab id="basic-home" :name="$t('customers.basic_info')">
             <div class="basic-info">
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.display_name') }} <span class="required">*</span></label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.display_name') }} <span class="required">*</span></label>
                 <div class="col-sm-7">
                   <base-input
                     ref="name"
@@ -25,7 +25,7 @@
                 </div>
               </div>
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.primary_display_name') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.primary_display_name') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     v-model="formData.contact_name"
@@ -34,7 +34,7 @@
                 </div>
               </div>
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('login.email') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('login.email') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     :invalid="$v.formData.email.$error"
@@ -49,7 +49,7 @@
                 </div>
               </div>
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $tc('settings.currencies.currency') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $tc('settings.currencies.currency') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="currency"
@@ -64,7 +64,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.phone') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.phone') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     :invalid="$v.formData.phone.$error"
@@ -79,7 +79,7 @@
                 </div>
               </div>
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.website') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.website') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     v-model="formData.website"
@@ -100,7 +100,7 @@
           <tab id="basic-profile" :name="$t('customers.billing_address')">
             <div class="basic-info">
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.name') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.name') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     v-model="billing.name"
@@ -110,7 +110,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.phone') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.phone') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     :invalid="$v.billing.phone.$error"
@@ -126,7 +126,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.address') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.address') }}</label>
                 <div class="col-sm-7">
                   <base-text-area
                     v-model="billing.address_street_1"
@@ -155,7 +155,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.country') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.country') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="billingCountry"
@@ -171,7 +171,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.state') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.state') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="billingState"
@@ -187,7 +187,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.city') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.city') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="billingCity"
@@ -213,7 +213,7 @@
               </div> -->
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.zip_code') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.zip_code') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     v-model="billing.zip"
@@ -236,7 +236,7 @@
                 </div>
               </div>
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.name') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.name') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     v-model="shipping.name"
@@ -246,7 +246,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.phone') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.phone') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     :invalid="$v.shipping.phone.$error"
@@ -262,7 +262,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.address') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.address') }}</label>
                 <div class="col-sm-7">
                   <base-text-area
                     v-model="shipping.address_street_1"
@@ -291,7 +291,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.country') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.country') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="shippingCountry"
@@ -307,7 +307,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.state') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.state') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="shippingState"
@@ -323,7 +323,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.city') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.city') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="shippingCity"
@@ -339,7 +339,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.zip_code') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.zip_code') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     v-model="shipping.zip"
diff --git a/resources/assets/js/components/base/modal/ItemModal.vue b/resources/assets/js/components/base/modal/ItemModal.vue
index 17809aef..439f55bd 100644
--- a/resources/assets/js/components/base/modal/ItemModal.vue
+++ b/resources/assets/js/components/base/modal/ItemModal.vue
@@ -3,7 +3,7 @@
     <form action="" @submit.prevent="submitItemData">
       <div class="card-body">
         <div class="form-group row">
-          <label class="col-sm-4 col-form-label">
+          <label class="col-sm-4 col-form-label input-label">
             {{ $t('items.name') }}<span class="required">*</span>
           </label>
           <div class="col-sm-7">
@@ -22,7 +22,7 @@
           </div>
         </div>
         <div class="form-group row">
-          <label class="col-sm-4 col-form-label">{{ $t('items.price') }}<span class="required">*</span></label>
+          <label class="col-sm-4 col-form-label input-label">{{ $t('items.price') }}<span class="required">*</span></label>
           <div class="col-sm-7">
             <div class="base-input">
               <money
@@ -41,7 +41,7 @@
           </div>
         </div>
         <div class="form-group row">
-          <label class="col-sm-4 col-form-label">{{ $t('items.unit') }}</label>
+          <label class="col-sm-4 col-form-label input-label">{{ $t('items.unit') }}</label>
           <div class="col-sm-7">
             <base-select
               v-model="formData.unit"
@@ -54,7 +54,7 @@
         </div>
 
         <div class="form-group row">
-          <label class="col-sm-4 col-form-label">{{ $t('items.description') }}</label>
+          <label class="col-sm-4 col-form-label input-label">{{ $t('items.description') }}</label>
           <div class="col-sm-7">
             <base-text-area
               v-model="formData.description"
@@ -121,7 +121,8 @@ export default {
         { name: 'kg', value: 'kg' },
         { name: 'km', value: 'km' },
         { name: 'lb', value: 'lb' },
-        { name: 'mg', value: 'mg' }
+        { name: 'mg', value: 'mg' },
+        { name: 'pc', value: 'pc' }
       ],
       formData: {
         name: null,
diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index 404bebda..e82216ff 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -611,8 +611,6 @@ export default {
       estimate_viewed_desc: 'When your customer views the estimate sent via crater dashboard.',
       save: 'Save',
       email_save_message: 'Email saved successfully',
-      // invoice_viewed_message: 'Invoice viewed updated successfully',
-      // estimate_viewed_message: 'Estimate viewed updated successfully',
       please_enter_email: 'Please Enter Email'
     },
     tax_types: {
@@ -622,7 +620,6 @@ export default {
       add_new_tax: 'Add New Tax',
       tax_settings: 'Tax Settings',
       tax_per_item: 'Tax Per Item',
-      // tax_per_item_switch: 'Tax Per Item updated successfully',
       tax_name: 'Tax Name',
       compound_tax: 'Compound Tax',
       percent: 'Percent',
@@ -660,7 +657,6 @@ export default {
       preference: 'Preference | Preferences',
       general_settings: 'Default preferences for the system.',
       updated_message: 'Preferences updated successfully',
-      // set_discount_per_item_message: 'Discount set per item updated successfully',
       select_language: 'select language',
       select_time_zone: 'select Time Zone',
       select_date_formate: 'select Date Formate',
@@ -740,7 +736,8 @@ export default {
       migrate_failed: 'Migrate Failed',
       database_variables_save_error: 'Unable to connect to the DB with Provided Values.',
       mail_variables_save_error: 'Email configuration failed.',
-      connection_failed: 'Database Connection Failed'
+      connection_failed: 'Database connection failed',
+      database_should_be_empty: 'Database should be empty'
     },
     success: {
       mail_variables_save_successfully: 'Email configured successfully',
diff --git a/resources/assets/js/plugins/es.js b/resources/assets/js/plugins/es.js
index ec213c03..69ca6255 100644
--- a/resources/assets/js/plugins/es.js
+++ b/resources/assets/js/plugins/es.js
@@ -529,7 +529,8 @@ export default {
       preferences: 'Preferencias',
       notifications: 'Notificaciones',
       tax_types: 'Tipos de impuestos',
-      expense_category: 'Categorías de gastos'
+      expense_category: 'Categorías de gastos',
+      update_app: 'Actualizar aplicación'
     },
     title: 'Configuraciones',
     setting: 'Configuraciones | Configuraciones',
@@ -556,6 +557,16 @@ export default {
       action: 'Acción',
       add_currency: 'Agregar moneda'
     },
+    mail: {
+      host: 'Host de correo',
+      port: 'Puerto de correo',
+      driver: 'Conductor de correo',
+      password: 'Contraseña de correo',
+      username: 'Nombre de usuario de correo',
+      mail_config: 'Configuración de correo',
+      encryption: 'Cifrado de correo',
+      mail_config_desc: 'Los detalles a continuación se utilizarán para actualizar el entorno de correo. También puede cambiar los detalles en cualquier momento después de iniciar sesión.'
+    },
     pdf: {
       title: 'Configuración de PDF',
       footer_text: 'Texto de pie de página',
@@ -651,6 +662,11 @@ export default {
       select_time_zone: 'selecciona la zona horaria',
       select_date_formate: 'seleccione formato de fecha',
       select_financial_year: 'seleccione año financiero'
+    },
+    update_app: {
+      title: 'Actualizar aplicación',
+      description: 'actualizar la descripción de la aplicación',
+      update: 'Actualizar'
     }
   },
   wizard: {
@@ -749,7 +765,7 @@ export default {
     numbers_only: 'Solo numeros.',
     characters_only: 'Solo personajes.',
     password_incorrect: 'Las contraseñas deben ser idénticas',
-    password_length: 'La contraseña debe tener 6 caracteres de longitud.',
+    password_length: 'La contraseña debe tener 5 caracteres de longitud.',
     qty_must_greater_than_zero: 'La cantidad debe ser mayor que cero.',
     price_greater_than_zero: 'El precio debe ser mayor que cero.',
     payment_greater_than_zero: 'El pago debe ser mayor que cero.',
diff --git a/resources/assets/js/plugins/fr.js b/resources/assets/js/plugins/fr.js
index 8133c573..e55cc8fd 100644
--- a/resources/assets/js/plugins/fr.js
+++ b/resources/assets/js/plugins/fr.js
@@ -529,7 +529,8 @@ export default {
       preferences: 'Préférences',
       notifications: 'Les notifications',
       tax_types: 'Types de taxe',
-      expense_category: 'Catégories de dépenses'
+      expense_category: 'Catégories de dépenses',
+      update_app: "Mise à jour de l'application"
     },
     title: 'Paramètres',
     setting: 'Paramètres | Paramètres',
@@ -554,7 +555,17 @@ export default {
       right: 'Droite',
       left: 'La gauche',
       action: 'action',
-      add_currency: 'Ajouter une devise',
+      add_currency: 'Ajouter une devise'
+    },
+    mail: {
+      host: 'Mail Host',
+      port: 'Port mail',
+      driver: 'Pilote de courrier',
+      password: 'Mot de passe mail',
+      username: "Mail Nom d'utilisateur",
+      mail_config: 'Configuration du courrier',
+      encryption: 'Chiffrement du courrier',
+      mail_config_desc: "Les détails ci-dessous seront utilisés pour mettre à jour l'environnement de messagerie. Aussi, vous pouvez modifier les détails à tout moment après la connexion."
     },
     pdf: {
       title: 'Paramètre PDF',
@@ -654,6 +665,11 @@ export default {
       select_time_zone: 'sélectionnez le fuseau horaire',
       select_date_formate: 'sélectionnez Date Formate',
       select_financial_year: 'sélectionner lexercice'
+    },
+    update_app: {
+      title: "Mise à jour de l'application",
+      description: "mettre à jour la description de l'application",
+      update: 'Mise à jour'
     }
   },
   wizard: {
@@ -752,7 +768,7 @@ export default {
     numbers_only: 'Chiffres uniquement.',
     characters_only: 'Caractères seulement.',
     password_incorrect: 'Les mots de passe doivent être identiques',
-    password_length: 'Le mot de passe doit comporter 6 caractères.',
+    password_length: 'Le mot de passe doit comporter 5 caractères.',
     qty_must_greater_than_zero: 'La quantité doit être supérieure à zéro.',
     price_greater_than_zero: 'Le prix doit être supérieur à zéro.',
     payment_greater_than_zero: 'Le paiement doit être supérieur à zéro.',
diff --git a/resources/assets/js/views/auth/Login.vue b/resources/assets/js/views/auth/Login.vue
index 62cca10a..71f11758 100644
--- a/resources/assets/js/views/auth/Login.vue
+++ b/resources/assets/js/views/auth/Login.vue
@@ -98,7 +98,7 @@ export default {
       },
       password: {
         required,
-        minLength: minLength(8)
+        minLength: minLength(5)
       }
     }
   },
diff --git a/resources/assets/js/views/dashboard/Dashboard.vue b/resources/assets/js/views/dashboard/Dashboard.vue
index bca6d07b..59c1798b 100644
--- a/resources/assets/js/views/dashboard/Dashboard.vue
+++ b/resources/assets/js/views/dashboard/Dashboard.vue
@@ -168,7 +168,7 @@
           >
             <table-column :label="$t('dashboard.recent_invoices_card.due_on')" show="formattedDueDate" />
             <table-column :label="$t('dashboard.recent_invoices_card.customer')" show="user.name" />
-            <table-column :label="$t('dashboard.recent_invoices_card.amount_due')" sort-as="due_amount">
+            <table-column :label="$t('dashboard.recent_invoices_card.amount_due')" show="due_amount" sort-as="due_amount">
               <template slot-scope="row">
                 <span>{{ $t('dashboard.recent_invoices_card.amount_due') }}</span>
                 <div v-html="$utils.formatMoney(row.due_amount, row.user.currency)"/>
@@ -242,7 +242,7 @@
           >
             <table-column :label="$t('dashboard.recent_estimate_card.date')" show="formattedExpiryDate" />
             <table-column :label="$t('dashboard.recent_estimate_card.customer')" show="user.name" />
-            <table-column :label="$t('dashboard.recent_estimate_card.amount_due')" sort-as="total">
+            <table-column :label="$t('dashboard.recent_estimate_card.amount_due')" show="total" sort-as="total">
               <template slot-scope="row">
                 <span>{{ $t('dashboard.recent_estimate_card.amount_due') }}</span>
                 <div v-html="$utils.formatMoney(row.total, row.user.currency)"/>
diff --git a/resources/assets/js/views/estimates/Create.vue b/resources/assets/js/views/estimates/Create.vue
index 8ecbfc14..5f5a83ad 100644
--- a/resources/assets/js/views/estimates/Create.vue
+++ b/resources/assets/js/views/estimates/Create.vue
@@ -553,6 +553,8 @@ export default {
         if (response.data) {
           this.selectCustomer(response.data.estimate.user_id)
           this.newEstimate = response.data.estimate
+          this.newEstimate.estimate_date = moment(response.data.estimate.estimate_date, 'YYYY-MM-DD').toString()
+          this.newEstimate.expiry_date = moment(response.data.estimate.expiry_date, 'YYYY-MM-DD').toString()
           this.discountPerItem = response.data.discount_per_item
           this.taxPerItem = response.data.tax_per_item
           this.selectedCurrency = this.defaultCurrency
diff --git a/resources/assets/js/views/estimates/Index.vue b/resources/assets/js/views/estimates/Index.vue
index c52c9fea..29cb5574 100644
--- a/resources/assets/js/views/estimates/Index.vue
+++ b/resources/assets/js/views/estimates/Index.vue
@@ -261,13 +261,13 @@
                   {{ $t('estimates.send_estimate') }}
                 </a>
               </v-dropdown-item>
-              <v-dropdown-item v-if="row.status === 'DRAFT' || row.status === 'REJECTED'">
+              <v-dropdown-item v-if="row.status !== 'ACCEPTED'">
                 <a class="dropdown-item" href="#" @click.self="onMarkAsAccepted(row.id)">
                   <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
                   {{ $t('estimates.mark_as_accepted') }}
                 </a>
               </v-dropdown-item>
-              <v-dropdown-item v-if="row.status === 'ACCEPTED' || row.status === 'DRAFT'">
+              <v-dropdown-item v-if="row.status !== 'REJECTED'">
                 <a class="dropdown-item" href="#" @click.self="onMarkAsRejected(row.id)">
                   <font-awesome-icon icon="times-circle" class="dropdown-item-icon" />
                   {{ $t('estimates.mark_as_rejected') }}
@@ -514,8 +514,8 @@ export default {
         icon: '/assets/icon/envelope-solid.svg',
         buttons: true,
         dangerMode: true
-      }).then(async (willDelete) => {
-        if (willDelete) {
+      }).then(async (willConvertInToinvoice) => {
+        if (willConvertInToinvoice) {
           let res = await this.convertToInvoice(id)
           if (res.data) {
             window.toastr['success'](this.$t('estimates.conversion_message'))
@@ -562,8 +562,8 @@ export default {
         icon: '/assets/icon/check-circle-solid.svg',
         buttons: true,
         dangerMode: true
-      }).then(async (willDelete) => {
-        if (willDelete) {
+      }).then(async (willMarkAsSent) => {
+        if (willMarkAsSent) {
           const data = {
             id: id
           }
@@ -582,8 +582,8 @@ export default {
         icon: '/assets/icon/paper-plane-solid.svg',
         buttons: true,
         dangerMode: true
-      }).then(async (sendEstimate) => {
-        if (sendEstimate) {
+      }).then(async (willSendEstimate) => {
+        if (willSendEstimate) {
           const data = {
             id: id
           }
diff --git a/resources/assets/js/views/estimates/View.vue b/resources/assets/js/views/estimates/View.vue
index d02a346a..69f7817e 100644
--- a/resources/assets/js/views/estimates/View.vue
+++ b/resources/assets/js/views/estimates/View.vue
@@ -222,12 +222,22 @@ export default {
       return true
     },
     async onMarkAsSent () {
-      this.isRequestOnGoing = true
-      let response = await this.markAsSent({id: this.estimate.id})
-      this.isRequestOnGoing = false
-      if (response.data) {
-        window.toastr['success'](this.$tc('estimates.mark_as_sent'))
-      }
+      swal({
+        title: this.$t('general.are_you_sure'),
+        text: this.$t('estimates.confirm_mark_as_sent'),
+        icon: '/assets/icon/check-circle-solid.svg',
+        buttons: true,
+        dangerMode: true
+      }).then(async (willMarkAsSent) => {
+        if (willMarkAsSent) {
+          this.isRequestOnGoing = true
+          let response = await this.markAsSent({id: this.estimate.id})
+          this.isRequestOnGoing = false
+          if (response.data) {
+            window.toastr['success'](this.$tc('estimates.mark_as_sent'))
+          }
+        }
+      })
     },
     async removeEstimate (id) {
       this.selectEstimate([parseInt(id)])
@@ -235,7 +245,7 @@ export default {
       swal({
         title: 'Deleted',
         text: 'you will not be able to recover this estimate!',
-        icon: 'error',
+        icon: '/assets/icon/trash-solid.svg',
         buttons: true,
         dangerMode: true
       }).then(async (willDelete) => {
diff --git a/resources/assets/js/views/invoices/Create.vue b/resources/assets/js/views/invoices/Create.vue
index abe44796..e2e43ddd 100644
--- a/resources/assets/js/views/invoices/Create.vue
+++ b/resources/assets/js/views/invoices/Create.vue
@@ -554,6 +554,8 @@ export default {
         if (response.data) {
           this.selectCustomer(response.data.invoice.user_id)
           this.newInvoice = response.data.invoice
+          this.newInvoice.invoice_date = moment(response.data.invoice.invoice_date, 'YYYY-MM-DD').toString()
+          this.newInvoice.due_date = moment(response.data.invoice.due_date, 'YYYY-MM-DD').toString()
           this.discountPerItem = response.data.discount_per_item
           this.taxPerItem = response.data.tax_per_item
           this.selectedCurrency = this.defaultCurrency
diff --git a/resources/assets/js/views/invoices/View.vue b/resources/assets/js/views/invoices/View.vue
index a14d2373..f79052ef 100644
--- a/resources/assets/js/views/invoices/View.vue
+++ b/resources/assets/js/views/invoices/View.vue
@@ -229,12 +229,22 @@ export default {
       return true
     },
     async onMarkAsSent () {
-      this.isRequestOnGoing = true
-      let response = await this.markAsSent({id: this.invoice.id})
-      this.isRequestOnGoing = false
-      if (response.data) {
-        window.toastr['success'](this.$tc('invoices.marked_as_sent_message'))
-      }
+       swal({
+        title: this.$t('general.are_you_sure'),
+        text: this.$t('invoices.invoice_mark_as_sent'),
+        icon: '/assets/icon/check-circle-solid.svg',
+        buttons: true,
+        dangerMode: true
+      }).then(async (MarkAsSend_Invoice) => {
+        if (MarkAsSend_Invoice) {
+          this.isRequestOnGoing = true
+          let response = await this.markAsSent({id: this.invoice.id})
+          this.isRequestOnGoing = false
+          if (response.data) {
+            window.toastr['success'](this.$tc('invoices.marked_as_sent_message'))
+          }
+        }
+      })
     },
     async removeInvoice (id) {
       this.selectInvoice([parseInt(id)])
@@ -242,7 +252,7 @@ export default {
       swal({
         title: 'Deleted',
         text: 'you will not be able to recover this invoice!',
-        icon: 'error',
+        icon: '/assets/icon/trash-solid.svg',
         buttons: true,
         dangerMode: true
       }).then(async (willDelete) => {
diff --git a/resources/assets/js/views/items/Create.vue b/resources/assets/js/views/items/Create.vue
index 5d00a5b5..31e96798 100644
--- a/resources/assets/js/views/items/Create.vue
+++ b/resources/assets/js/views/items/Create.vue
@@ -112,7 +112,8 @@ export default {
         { name: 'kg', value: 'kg' },
         { name: 'km', value: 'km' },
         { name: 'lb', value: 'lb' },
-        { name: 'mg', value: 'mg' }
+        { name: 'mg', value: 'mg' },
+        { name: 'pc', value: 'pc' }
       ],
       formData: {
         name: '',
diff --git a/resources/assets/js/views/items/Index.vue b/resources/assets/js/views/items/Index.vue
index c2370607..2d9e2ea2 100644
--- a/resources/assets/js/views/items/Index.vue
+++ b/resources/assets/js/views/items/Index.vue
@@ -245,7 +245,8 @@ export default {
         { name: 'kg', value: 'kg' },
         { name: 'km', value: 'km' },
         { name: 'lb', value: 'lb' },
-        { name: 'mg', value: 'mg' }
+        { name: 'mg', value: 'mg' },
+        { name: 'pc', value: 'pc' }
       ],
       isRequestOngoing: true,
       filtersApplied: false,
diff --git a/resources/assets/js/views/settings/MailConfig.vue b/resources/assets/js/views/settings/MailConfig.vue
index d8277063..afbf481b 100644
--- a/resources/assets/js/views/settings/MailConfig.vue
+++ b/resources/assets/js/views/settings/MailConfig.vue
@@ -66,8 +66,9 @@
             <base-input
               :invalid="$v.mailConfigData.mail_password.$error"
               v-model.trim="mailConfigData.mail_password"
-              type="mail_password"
+              type="password"
               name="name"
+              show-password
               @input="$v.mailConfigData.mail_password.$touch()"
             />
             <div v-if="$v.mailConfigData.mail_password.$error">
@@ -141,12 +142,12 @@ export default {
   data () {
     return {
       mailConfigData: {
-        mail_driver: 'smtp',
-        mail_host: 'mailtrap.io',
-        mail_port: 2525,
-        mail_username: 'cc3c64516febd4',
-        mail_password: 'e6a0176301f587',
-        mail_encryption: 'tls'
+        mail_driver: '',
+        mail_host: '',
+        mail_port: null,
+        mail_username: '',
+        mail_password: '',
+        mail_encryption: ''
       },
       loading: false,
       mail_drivers: []
@@ -176,18 +177,22 @@ export default {
     }
   },
   mounted () {
-    // this.getMailDrivers()
+    this.loadData()
   },
   methods: {
-    async getMailDrivers () {
+    async loadData () {
       this.loading = true
 
-      let response = await window.axios.get('/api/admin/onboarding/environment/mail')
+      let mailDrivers = await window.axios.get('/api/settings/environment/mail')
+      let mailData = await window.axios.get('/api/settings/environment/mail-env')
 
-      if (response.data) {
-        this.mail_drivers = response.data
-        this.loading = false
+      if (mailDrivers.data) {
+        this.mail_drivers = mailDrivers.data
       }
+      if (mailData.data) {
+        this.mailConfigData = mailData.data
+      }
+      this.loading = false
     },
     async saveEmailConfig () {
       this.$v.mailConfigData.$touch()
@@ -196,7 +201,7 @@ export default {
       }
       this.loading = true
       try {
-        let response = await window.axios.post('/api/admin/onboarding/environment/mail', this.mailConfigData)
+        let response = await window.axios.post('/api/settings/environment/mail', this.mailConfigData)
         if (response.data.success) {
           window.toastr['success'](this.$t('wizard.success.' + response.data.success))
         } else {
diff --git a/resources/assets/js/views/settings/TaxTypes.vue b/resources/assets/js/views/settings/TaxTypes.vue
index 338b9b51..52eb5c48 100644
--- a/resources/assets/js/views/settings/TaxTypes.vue
+++ b/resources/assets/js/views/settings/TaxTypes.vue
@@ -29,16 +29,9 @@
       >
         <table-column
           :sortable="true"
-          :filterable="true"
           :label="$t('settings.tax_types.tax_name')"
-        >
-          <template slot-scope="row">
-            <span>{{ $t('settings.tax_types.tax_name') }}</span>
-            <span class="tax-name mt-3">
-              {{ row.name }}
-            </span>
-          </template>
-        </table-column>
+          show="name"
+        />
         <table-column
           :sortable="true"
           :filterable="true"
diff --git a/resources/assets/js/views/settings/UserProfile.vue b/resources/assets/js/views/settings/UserProfile.vue
index ce3df042..c90e0bad 100644
--- a/resources/assets/js/views/settings/UserProfile.vue
+++ b/resources/assets/js/views/settings/UserProfile.vue
@@ -106,7 +106,7 @@ export default {
         email
       },
       password: {
-        minLength: minLength(8)
+        minLength: minLength(5)
       },
       confirm_password: {
         required: requiredIf('isRequired'),
diff --git a/resources/assets/js/views/wizard/CompanyInfo.vue b/resources/assets/js/views/wizard/CompanyInfo.vue
index d86d8722..fd1f13c4 100644
--- a/resources/assets/js/views/wizard/CompanyInfo.vue
+++ b/resources/assets/js/views/wizard/CompanyInfo.vue
@@ -94,17 +94,27 @@
         <div class="col-md-6">
           <label class="form-label">{{ $t('wizard.address') }}</label>
           <base-text-area
+            :invalid="$v.companyData.address_street_1.$error"
             v-model.trim="companyData.address_street_1"
             :placeholder="$t('general.street_1')"
             name="billing_street1"
             rows="2"
+            @input="$v.companyData.address_street_1.$touch()"
           />
+          <div v-if="$v.companyData.address_street_1.$error">
+            <span v-if="!$v.companyData.address_street_1.maxLength" class="text-danger">{{ $t('validation.description_maxlength') }}</span>
+          </div>
           <base-text-area
+            :invalid="$v.companyData.address_street_2.$error"
             v-model="companyData.address_street_2"
             :placeholder="$t('general.street_2')"
             name="billing_street2"
             rows="2"
+            @input="$v.companyData.address_street_2.$touch()"
           />
+          <div v-if="$v.companyData.address_street_2.$error">
+            <span v-if="!$v.companyData.address_street_2.maxLength" class="text-danger">{{ $t('validation.description_maxlength') }}</span>
+          </div>
         </div>
         <div class="col-md-6">
           <div class="row">
@@ -146,7 +156,7 @@ import MultiSelect from 'vue-multiselect'
 import AvatarCropper from 'vue-avatar-cropper'
 import { validationMixin } from 'vuelidate'
 import Ls from '../../services/ls'
-const { required, minLength, email } = require('vuelidate/lib/validators')
+const { required, minLength, email, maxLength } = require('vuelidate/lib/validators')
 
 export default {
   components: {
@@ -197,6 +207,12 @@ export default {
       },
       country_id: {
         required
+      },
+      address_street_1: {
+        maxLength: maxLength(255)
+      },
+      address_street_2: {
+        maxLength: maxLength(255)
       }
     }
   },
diff --git a/resources/assets/js/views/wizard/Database.vue b/resources/assets/js/views/wizard/Database.vue
index 0f5d30c0..8f43550e 100644
--- a/resources/assets/js/views/wizard/Database.vue
+++ b/resources/assets/js/views/wizard/Database.vue
@@ -97,7 +97,6 @@
         </div>
         <div class="col-md-6">
           <label class="form-label">{{ $t('wizard.database.password') }}</label>
-          <span class="text-danger"> *</span>
           <base-input
             v-model.trim="databaseData.database_password"
             type="password"
@@ -154,7 +153,7 @@ export default {
         database_name: null,
         database_username: null,
         database_password: null,
-        app_url: null
+        app_url: window.location.origin
       },
       loading: false,
       connections: [
@@ -207,8 +206,8 @@ export default {
         }
         this.loading = false
       } catch (e) {
-        console.log(e)
-        window.toastr['error']('Something went wrong')
+        console.log(e.response)
+        window.toastr['error'](e.response.data.message)
       }
     }
   }
diff --git a/resources/assets/js/views/wizard/EmailConfiguration.vue b/resources/assets/js/views/wizard/EmailConfiguration.vue
index f90c6a04..ecc92ad5 100644
--- a/resources/assets/js/views/wizard/EmailConfiguration.vue
+++ b/resources/assets/js/views/wizard/EmailConfiguration.vue
@@ -61,7 +61,8 @@
           <base-input
             :invalid="$v.mailConfigData.mail_password.$error"
             v-model.trim="mailConfigData.mail_password"
-            type="mail_password"
+            type="password"
+            show-password
             name="name"
             @input="$v.mailConfigData.mail_password.$touch()"
           />
diff --git a/resources/assets/js/views/wizard/Index.vue b/resources/assets/js/views/wizard/Index.vue
index 8200c251..ecdedccd 100644
--- a/resources/assets/js/views/wizard/Index.vue
+++ b/resources/assets/js/views/wizard/Index.vue
@@ -67,8 +67,8 @@ export default {
   data () {
     return {
       loading: false,
-      tab: 'step_1',
-      step: 1
+      tab: 'step_3',
+      step: 3
     }
   },
   created () {
diff --git a/resources/assets/js/views/wizard/SystemRequirement.vue b/resources/assets/js/views/wizard/SystemRequirement.vue
index 844ed22b..13c0161d 100644
--- a/resources/assets/js/views/wizard/SystemRequirement.vue
+++ b/resources/assets/js/views/wizard/SystemRequirement.vue
@@ -35,7 +35,7 @@
       </div>
     </div>
     <base-button
-      v-if="requirements"
+      v-if="hasNext"
       :loading="loading"
       class="pull-right mt-4"
       icon="arrow-right"
@@ -46,7 +46,7 @@
       {{ $t('wizard.continue') }}
     </base-button>
     <base-button
-      v-else
+      v-if="!requirements"
       :loading="loading"
       class="pull-right mt-4"
       color="theme"
@@ -74,6 +74,20 @@ export default {
       isShow: true
     }
   },
+  computed: {
+    hasNext () {
+      if (this.requirements) {
+        let isRequired = true
+        for (const key in this.requirements) {
+          if (!this.requirements[key]) {
+            isRequired = false
+          }
+        }
+        return this.requirements && this.phpSupportInfo.supported && isRequired
+      }
+      return false
+    }
+  },
   methods: {
     listToggle  () {
       this.isShow = !this.isShow
diff --git a/resources/assets/js/views/wizard/UserProfile.vue b/resources/assets/js/views/wizard/UserProfile.vue
index 37d4c059..e65b3ea6 100644
--- a/resources/assets/js/views/wizard/UserProfile.vue
+++ b/resources/assets/js/views/wizard/UserProfile.vue
@@ -108,7 +108,7 @@ export default {
       },
       password: {
         required,
-        minLength: minLength(8)
+        minLength: minLength(5)
       },
       confirm_password: {
         required: requiredIf('isRequired'),
diff --git a/resources/assets/plugins/vue-font-awesome/index.js b/resources/assets/plugins/vue-font-awesome/index.js
index be90c9cd..3de7d44e 100644
--- a/resources/assets/plugins/vue-font-awesome/index.js
+++ b/resources/assets/plugins/vue-font-awesome/index.js
@@ -51,6 +51,7 @@ import {
   faEllipsisH,
   faCopy,
   faPaperPlane,
+  faEyeSlash,
   faSyncAlt
 } from '@fortawesome/free-solid-svg-icons'
 import { far } from '@fortawesome/free-regular-svg-icons'
@@ -109,6 +110,7 @@ library.add(
   faFilePdf,
   faEnvelope,
   faEye,
+  faEyeSlash,
   faShare,
   faEllipsisH,
   faCopy,
diff --git a/resources/assets/sass/components/category-modal.scss b/resources/assets/sass/components/category-modal.scss
index 2719c7e5..47aed933 100644
--- a/resources/assets/sass/components/category-modal.scss
+++ b/resources/assets/sass/components/category-modal.scss
@@ -19,3 +19,19 @@
     }
 
 }
+
+@media(max-width: $x-small-breakpoint ) {
+
+    .base-modal {
+
+        .category-modal {
+
+            .input-label {
+                text-align: left;
+            }
+
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/resources/assets/sass/components/customer-modal.scss b/resources/assets/sass/components/customer-modal.scss
index c7ecc271..76568b9a 100644
--- a/resources/assets/sass/components/customer-modal.scss
+++ b/resources/assets/sass/components/customer-modal.scss
@@ -34,3 +34,20 @@
     }
 
 }
+
+
+@media(max-width: $x-small-breakpoint ) {
+
+    .base-modal {
+
+        .customer-modal {
+
+            .input-label {
+                text-align: left;
+            }
+
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/resources/assets/sass/components/item-modal.scss b/resources/assets/sass/components/item-modal.scss
index 97b4c304..2bb210dc 100644
--- a/resources/assets/sass/components/item-modal.scss
+++ b/resources/assets/sass/components/item-modal.scss
@@ -19,3 +19,20 @@
     }
 
 }
+
+
+@media(max-width: $x-small-breakpoint ) {
+
+    .base-modal {
+
+        .item-modal {
+
+            .input-label {
+                text-align: left;
+            }
+
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/resources/assets/sass/pages/estimates/create.scss b/resources/assets/sass/pages/estimates/create.scss
index 3638dd1d..cf767f0f 100644
--- a/resources/assets/sass/pages/estimates/create.scss
+++ b/resources/assets/sass/pages/estimates/create.scss
@@ -58,6 +58,7 @@
 
         .content {
             display: flex;
+            flex:1;
             flex-direction: column;
 
             label {
@@ -445,6 +446,9 @@
                 .estimate-amount {
                     font-size: 18px;
                     color: #55547A;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
                 }
 
                 .total {
@@ -491,7 +495,6 @@
             font-weight: 300;
             font-size: 12px;
             padding-top: 2px;
-            padding-left: 10px;
 
             textarea {
 
diff --git a/resources/assets/sass/pages/invoices/create.scss b/resources/assets/sass/pages/invoices/create.scss
index 6cd9f81a..d7d1fffc 100644
--- a/resources/assets/sass/pages/invoices/create.scss
+++ b/resources/assets/sass/pages/invoices/create.scss
@@ -58,6 +58,7 @@
 
         .content {
             display: flex;
+            flex: 1;
             flex-direction: column;
 
             label {
@@ -445,6 +446,9 @@
                 .invoice-amount {
                     font-size: 18px;
                     color: #55547A;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
                 }
 
                 .total {
diff --git a/resources/assets/sass/pages/statuses.scss b/resources/assets/sass/pages/statuses.scss
index e1c304dd..6f98827e 100644
--- a/resources/assets/sass/pages/statuses.scss
+++ b/resources/assets/sass/pages/statuses.scss
@@ -1,6 +1,6 @@
 // Invoice statuses
 
-.inv-status-due {
+.inv-status-overdue {
     background: #FED7D7;
     font-size: 13px;
     color: #9B2C2C;
@@ -15,9 +15,9 @@
 }
 
 .inv-status-unpaid {
-    background: rgba(246, 208, 154, 0.4);
+    background: #F8EDCB;
     font-size: 13px;
-    color: #A96E1A;
+    color: #6C432E;
     padding: 5px 10px;
 }
 
@@ -50,9 +50,9 @@
 }
 
 .inv-status-partially_paid {
-    background: #E1E0EA;
+    background: #C9E3EC;
     font-size: 13px;
-    color: #312F57;
+    color: #1E576C;
     padding: 5px 10px;
 }
 
diff --git a/routes/api.php b/routes/api.php
index 4fa230ff..6fca466d 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -323,6 +323,21 @@ Route::group(['middleware' => 'api'], function () {
                 'uses' => 'CompanyController@updateSetting'
             ]);
 
+            Route::get('/environment/mail', [
+                'as' => 'admin.environment.mail',
+                'uses' => 'EnvironmentController@getMailDrivers'
+            ]);
+
+            Route::get('/environment/mail-env', [
+                'as' => 'admin.mail.env',
+                'uses' => 'EnvironmentController@getMailEnvironment'
+            ]);
+
+            Route::post('/environment/mail', [
+                'as' => 'admin.environment.mail.save',
+                'uses' => 'EnvironmentController@saveMailEnvironment'
+            ]);
+
         });
 
     });