diff --git a/app/Http/Controllers/AppFunctionsController.php b/app/Http/Controllers/AppFunctionsController.php
index 6392494e..db57d909 100644
--- a/app/Http/Controllers/AppFunctionsController.php
+++ b/app/Http/Controllers/AppFunctionsController.php
@@ -26,6 +26,7 @@ class AppFunctionsController extends Controller
      * @var array
      */
     private $whitelist = [
+        'section_features',
         'footer_content',
         'get_started_description',
         'get_started_title',
diff --git a/app/Http/Controllers/FileFunctions/ShareController.php b/app/Http/Controllers/FileFunctions/ShareController.php
index 02864493..36c67542 100644
--- a/app/Http/Controllers/FileFunctions/ShareController.php
+++ b/app/Http/Controllers/FileFunctions/ShareController.php
@@ -64,7 +64,7 @@ class ShareController extends Controller
         $share = new ShareResource(Share::create($options));
 
         // Send shared link via email
-        if($request->has('emails')) {
+        if ($request->has('emails')) {
 
             foreach ($request->emails as $email) {
                 Notification::route('mail', $email)->notify(new SharedSendViaEmail($token));
@@ -109,7 +109,7 @@ class ShareController extends Controller
      */
     public function destroy(Request $request)
     {
-        foreach($request->input('tokens') as $token) {
+        foreach ($request->input('tokens') as $token) {
 
             // Get sharing record
             Share::where('token', $token)
@@ -135,9 +135,9 @@ class ShareController extends Controller
      * Send shared link via email to recipients
      *
      * @param $token
-     * @param $emails
+     * @param $request
      */
-    public function shared_send_via_email (Request $request, $token)
+    public function shared_send_via_email(Request $request, $token)
     {
         // Make validation of array of emails
         $validator = Validator::make($request->all(), [
@@ -149,17 +149,21 @@ class ShareController extends Controller
 
         // Get shared by token
         $share = Share::where('token', $token)
-        ->where('user_id', Auth::id())
-        ->first();
+            ->where('user_id', Auth::id())
+            ->first();
 
         // Demo preview
         if (env('APP_DEMO')) {
             return response('Done!', 204);
         }
 
-        // Send share link via email
-        $share->sendSharedLinkViaEmail($request->emails, $token);
-          
+        // Send shared link via email
+        if($request->has('emails')) {
+            foreach ($request->emails as $email) {
+                Notification::route('mail', $email)->notify(new SharedSendViaEmail($token));
+            }
+        }
+
         return response('Done!', 204);
     }
 }
diff --git a/config/content.php b/config/content.php
index 03dbd336..dd206c00 100644
--- a/config/content.php
+++ b/config/content.php
@@ -88,7 +88,7 @@ return [
         ],
         [
             'name'  => 'allow_homepage',
-            'value' => 0,
+            'value' => 1,
         ],
     ],
     'content_extended' => [
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index ee49b11f..f0875c51 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,65 +1,89 @@
 {
-    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=c8919a606e744f2fbc37",
-    "/js/main.js": "/js/main.js?id=60a19a5c7e57ef7bea94",
-    "/css/app.css": "/css/app.css?id=dfd52fc997b919cd3686",
-    "/chunks/admin.js": "/chunks/admin.js?id=7672646537b5813becf0",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=3f5a34aa8341af8d2b4c",
-    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=9ec9a42482cb302a05f6",
-    "/chunks/app-billings.js": "/chunks/app-billings.js?id=92903bd1d316b3db1dfa",
-    "/chunks/app-email.js": "/chunks/app-email.js?id=9d646578982ba61813b6",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=043af032ce49b2a79a78",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=b19a701cdfa06e4817ff",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=11c86d822269f1a1577e",
-    "/chunks/app-settings.js": "/chunks/app-settings.js?id=6784314933372fb1adf0",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=d304bcf7d4157e81f3e2",
-    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=b73a5b6f7d2a448cc5ab",
-    "/chunks/contact-us.js": "/chunks/contact-us.js?id=81906d205ba0107c5105",
-    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=004908727045abd0852e",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=08e4f7d923ce9e49dcc3",
-    "/chunks/database.js": "/chunks/database.js?id=b8d8269f77c52f78c784",
-    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=2e3af103d13536c50757",
-    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=106f81cefe76c62d476e",
-    "/chunks/files.js": "/chunks/files.js?id=b213d4fe15c2a9933f32",
-    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=95ce5e5685dc9315f515",
-    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=6db12008aa646ad5fb6f",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=83389adf0760820af6f5",
-    "/chunks/landing-page.js": "/chunks/landing-page.js?id=70b32067c32a554eb600",
-    "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=848666d6c49c613f7f99",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=bd41ae13951c2a5025c3",
-    "/chunks/pages.js": "/chunks/pages.js?id=df7245abef9e3b77a218",
-    "/chunks/plan.js": "/chunks/plan.js?id=cfd7b4ee7e21639a837d",
-    "/chunks/plan-create.js": "/chunks/plan-create.js?id=9bb62af36193ee9648d3",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=7b7601f044e0ef47720b",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=8d3e75ff9adb22a25d57",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=3b4a29497fc878f503db",
-    "/chunks/plans.js": "/chunks/plans.js?id=feb924949bffcdf3d9fb",
-    "/chunks/profile.js": "/chunks/profile.js?id=f990697f8d4ff45df434",
-    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=5d7406ecd84c676db8fb",
-    "/chunks/settings.js": "/chunks/settings.js?id=d16d9e2cda6aa3a3f6dc",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=b05e24dd8be60f62ee27",
-    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=72d317b39264987e6ed0",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=014597c63c94d3ac9f60",
-    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=2a0ea9cf661deba6fc13",
-    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=b3f25de02dd4ef072df0",
-    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=aa3d963f578d7bc5ff88",
-    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=47090233afc7b0cdf855",
-    "/chunks/shared-files.js": "/chunks/shared-files.js?id=ba10fd3f52a7b62d3092",
-    "/chunks/shared-page.js": "/chunks/shared-page.js?id=491c2440f10a7e7cbe04",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=c52ce81c3dad56d7a7d8",
-    "/chunks/sign-up.js": "/chunks/sign-up.js?id=2f12850d320b2413cf54",
-    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=6622381f1d96e8319999",
-    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=f1b093a3bcfebd5bc8a5",
-    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=e0e2f821aac16b32da34",
-    "/chunks/upgrade.js": "/chunks/upgrade.js?id=0c8d40bed72e86359529",
-    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=a8db2246f9326e5c5957",
-    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=f050f10627424b730dc2",
-    "/chunks/user.js": "/chunks/user.js?id=6f2ab796211a3ac8670f",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=0d630acda4552c315417",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=db041eae3aef3e45197a",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=8cf2fe554e8d67ac8677",
-    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=a0613909cb0c21817804",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=653bba3eb8d117c3a043",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=630b0ff649e16d3627af",
-    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=0b4226ba77f10b83de4a",
-    "/chunks/users.js": "/chunks/users.js?id=04ca09662595fae56488"
+    "/js/main.js": "/js/main.js",
+    "/css/app.css": "/css/app.css",
+    "/chunks/admin.js": "/chunks/admin.js?id=06067d0f4cff64abd1e4",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=fde37ee0820a1d2dc1f9",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js?id=1ad1b7b56512338223eb",
+    "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js?id=6c02fe91a2e167b63a98",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js?id=50155ecdafab2d18dda1",
+    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=ba3c9a7acbaacc20af9e",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=fd3c7242b5c765b469e4",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=60421d0349712350e866",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js?id=a8bd98f9f181d9ee68fd",
+    "/chunks/app-billings.js": "/chunks/app-billings.js?id=97f5c44884d8c2128c56",
+    "/chunks/app-email.js": "/chunks/app-email.js?id=59c27449f65145dc208e",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=a337e0f9b64590a88cc9",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=1655c151466b066ee1c5",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=cb8ea484a0e605ace175",
+    "/chunks/app-settings.js": "/chunks/app-settings.js?id=e8ee87b4fb155d3edb6b",
+    "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js": "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js?id=99eb5ed6af46738c97e0",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=777ebaef548d5b4c61be",
+    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=0eec974c6f0ee4e6ecab",
+    "/chunks/contact-us.js": "/chunks/contact-us.js?id=b243adc35233292f8ad6",
+    "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js?id=96ac1ede73f3fc9afa37",
+    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=00b75239db203720652c",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=887b8d232e3944beebdd",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js?id=d7795f20187163939276",
+    "/chunks/database.js": "/chunks/database.js?id=212e2d81f6f5c54c2dd2",
+    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1d8ee4bfbcde69c97021",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=374911110bca4e1b3f91",
+    "/chunks/files.js": "/chunks/files.js?id=d47d2964ef535ad5754c",
+    "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=e285e842f58178d681c4",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=5260cee98137a11c4e6e",
+    "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=539a5b88c5f32511449e",
+    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=f430110273d76b28906f",
+    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=94c75dac20c4ccf7bde0",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=02089f329654fbbc894d",
+    "/chunks/landing-page.js": "/chunks/landing-page.js?id=ddac17e6108c6f58f082",
+    "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=6666b81edc5ff6f60e82",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=7e6363b9a35e62dd560c",
+    "/chunks/pages.js": "/chunks/pages.js?id=ca712437ecc7e5aeee5c",
+    "/chunks/plan.js": "/chunks/plan.js?id=cc041fb9c2cb9ad8f0ff",
+    "/chunks/plan-create.js": "/chunks/plan-create.js?id=24bb1297c55fe70c1dd0",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=e06dc32848cf3bfb9e6b",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=242cb0706c986d08c484",
+    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=36a86cf6f3d8a2868504",
+    "/chunks/plans.js": "/chunks/plans.js?id=282268d939f8b52f6acd",
+    "/chunks/profile.js": "/chunks/profile.js?id=060bceb3f703969fb135",
+    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=a44394b1fa09f996a9fd",
+    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=8c1d40ff91c04fcefcfc",
+    "/chunks/settings.js": "/chunks/settings.js?id=463a3b35eb4020fdcc77",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=4d1a070566ee2069e1bd",
+    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=603b7f706f34d9c89a62",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=0df4bd46f1d3d90e360a",
+    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=37955b9e8262af7fe525",
+    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=013b6f15f907caaecd1e",
+    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=5d702de3662f601fccca",
+    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=99b4f321902fe6b0eb23",
+    "/chunks/shared-files.js": "/chunks/shared-files.js?id=1860b9031f41ed46d0e0",
+    "/chunks/shared-page.js": "/chunks/shared-page.js?id=da4c97784a340b3080c9",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=6b961e6324b09384dfd0",
+    "/chunks/sign-up.js": "/chunks/sign-up.js?id=a46f57a34f8f862a24a8",
+    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=080bade1ed512f512591",
+    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=5b2f00a9e19520adc31e",
+    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=1ac6b87f8797b491ef77",
+    "/chunks/upgrade.js": "/chunks/upgrade.js?id=ac1ff92a934e448ca6b4",
+    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=198bfc33644f85bfc075",
+    "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=7e805915ede7c330c6d1",
+    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=2811533956c0c185714d",
+    "/chunks/user.js": "/chunks/user.js?id=a400499012c6786a3652",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=d5066d3ff9d7625ba7f1",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=5d392a3df7b05cf93930",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=fbfe45c7762f7ae123e4",
+    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=97c78350b65914e4b16d",
+    "/chunks/user-password.js": "/chunks/user-password.js?id=ad772e769a8562c42c17",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=2c5f4cdd17574255ea05",
+    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=d6683735de17fd8c55c8",
+    "/chunks/users.js": "/chunks/users.js?id=f2359ae7c0c166001c33",
+    "/chunks/landing-page.2ce0220d3b35ecf366af.hot-update.js": "/chunks/landing-page.2ce0220d3b35ecf366af.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.502d6a6fff1d9a073b55.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.502d6a6fff1d9a073b55.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.056ab5d5ff186ffbf2cb.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.056ab5d5ff186ffbf2cb.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.d83033602644dc436597.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d83033602644dc436597.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.37d97baf73994b795e77.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.37d97baf73994b795e77.hot-update.js",
+    "/js/main.f868a5cd1cfa5a83b4e4.hot-update.js": "/js/main.f868a5cd1cfa5a83b4e4.hot-update.js",
+    "/js/main.5332101483f2964964a4.hot-update.js": "/js/main.5332101483f2964964a4.hot-update.js",
+    "/js/main.cf1d54bd1fdcd64e2e29.hot-update.js": "/js/main.cf1d54bd1fdcd64e2e29.hot-update.js",
+    "/js/main.3a9a793b213d9de6b828.hot-update.js": "/js/main.3a9a793b213d9de6b828.hot-update.js",
+    "/js/main.fd1b3b183180a28825df.hot-update.js": "/js/main.fd1b3b183180a28825df.hot-update.js",
+    "/js/main.6719e8de6ef9002d604a.hot-update.js": "/js/main.6719e8de6ef9002d604a.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/ContextMenu.vue b/resources/js/components/FilesView/ContextMenu.vue
index 529b4481..9330b94d 100644
--- a/resources/js/components/FilesView/ContextMenu.vue
+++ b/resources/js/components/FilesView/ContextMenu.vue
@@ -23,14 +23,13 @@
             <!-- Single options -->
             <OptionGroup v-if="multiSelectContextMenu">
                 <Option @click.native="restoreItem" v-if="item" :title="$t('context_menu.restore')" icon="restore"/>
-                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
+                <Option @click.native="deleteItem" v-if="item" :title="$t('context_menu.delete')" icon="trash"/>
                 <Option @click.native="emptyTrash" :title="$t('context_menu.empty_trash')" icon="empty-trash"/>
             </OptionGroup>
 
             <OptionGroup v-if="item && multiSelectContextMenu">
                 <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail"/>
                 <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download"/>
-                <Option @click.native="downloadFolder" :title="$t('context_menu.zip_folder')" icon="zip-folder"/>
             </OptionGroup>
 
             <!-- Multi options -->
diff --git a/resources/js/components/Others/RenameItem.vue b/resources/js/components/Others/RenameItem.vue
index ab4c0493..027efed0 100644
--- a/resources/js/components/Others/RenameItem.vue
+++ b/resources/js/components/Others/RenameItem.vue
@@ -1,7 +1,7 @@
 <template>
     <PopupWrapper name="rename-item">
         <!--Title-->
-        <PopupHeader :title="$t('popup_rename.title', {item: itemTypeTitle})" icon="edit" />
+        <PopupHeader :title="$t('popup_rename.title', {item: itemTypeTitle})" icon="edit"/>
 
         <!--Content-->
         <PopupContent>
@@ -30,184 +30,174 @@
 
             </ValidationObserver>
 
-            
-                
+
         </PopupContent>
 
         <!--Actions-->
         <PopupActions>
-            <ButtonBase
-                    class="popup-button"
-                    @click.native="$closePopup()"
-                    button-style="secondary"
-            >{{ $t('popup_move_item.cancel') }}
+            <ButtonBase class="popup-button" @click.native="$closePopup()" button-style="secondary">{{ $t('popup_move_item.cancel') }}
             </ButtonBase>
-            <ButtonBase
-                    class="popup-button"
-                    @click.native="changeName"
-                    button-style="theme"
-            >{{ $t('popup_share_edit.save') }}
+            <ButtonBase class="popup-button" @click.native="changeName" button-style="theme">{{ $t('popup_share_edit.save') }}
             </ButtonBase>
         </PopupActions>
     </PopupWrapper>
 </template>
 
 <script>
-    import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
-    import PopupWrapper from '@/components/Others/Popup/PopupWrapper'
-    import PopupActions from '@/components/Others/Popup/PopupActions'
-    import PopupContent from '@/components/Others/Popup/PopupContent'
-    import PopupHeader from '@/components/Others/Popup/PopupHeader'
-    import SetFolderIcon from '@/components/Others/SetFolderIcon'
-    import ThumbnailItem from '@/components/Others/ThumbnailItem'
-    import ActionButton from '@/components/Others/ActionButton'
-    import ButtonBase from '@/components/FilesView/ButtonBase'
-    import {XIcon} from 'vue-feather-icons'
-    import {required} from 'vee-validate/dist/rules'
-    import {events} from '@/bus'
-    import axios from 'axios'
+import { ValidationProvider, ValidationObserver } from 'vee-validate/dist/vee-validate.full'
+import PopupWrapper from '@/components/Others/Popup/PopupWrapper'
+import PopupActions from '@/components/Others/Popup/PopupActions'
+import PopupContent from '@/components/Others/Popup/PopupContent'
+import PopupHeader from '@/components/Others/Popup/PopupHeader'
+import SetFolderIcon from '@/components/Others/SetFolderIcon'
+import ThumbnailItem from '@/components/Others/ThumbnailItem'
+import ActionButton from '@/components/Others/ActionButton'
+import ButtonBase from '@/components/FilesView/ButtonBase'
+import { XIcon } from 'vue-feather-icons'
+import { required } from 'vee-validate/dist/rules'
+import { events } from '@/bus'
+import axios from 'axios'
 
-    export default {
-        name: 'RenameItem',
-        components: {
-            ValidationProvider,
-            ValidationObserver,
-            SetFolderIcon,
-            ThumbnailItem,
-            ActionButton,
-            PopupWrapper,
-            PopupActions,
-            PopupContent,
-            PopupHeader,
-            ButtonBase,
-            required,
-            XIcon,
+export default {
+    name: 'RenameItem',
+    components: {
+        ValidationProvider,
+        ValidationObserver,
+        SetFolderIcon,
+        ThumbnailItem,
+        ActionButton,
+        PopupWrapper,
+        PopupActions,
+        PopupContent,
+        PopupHeader,
+        ButtonBase,
+        required,
+        XIcon
+    },
+    computed: {
+        itemTypeTitle() {
+            return this.pickedItem && this.pickedItem.type === 'folder' ? this.$t('types.folder') : this.$t('types.file')
         },
-        computed: {
-            itemTypeTitle() {
-                return this.pickedItem && this.pickedItem.type === 'folder' ? this.$t('types.folder') : this.$t('types.file')
-            },
-             moreOptionsTitle() {
-                return this.isMoreOptions ? this.$t('shared_form.button_close_options') : this.$t('shared_form.button_folder_icon_open')
-            }
-        },
-        data() {
-            return {
-                pickedItem: undefined,
-                isMoreOptions:false,
-                setFolderIcon: undefined,
-            }
-        },
-        methods: {
-            moreOptions(){
-                this.isMoreOptions = ! this.isMoreOptions
-
-                this.setFolderIcon = undefined
-            },
-            changeName() {
-                if (this.pickedItem.name && this.pickedItem.name !== '') {
-
-                    let item = {
-                        unique_id: this.pickedItem.unique_id,
-                        type: this.pickedItem.type,
-                        name: this.pickedItem.name,
-                        folder_icon: this.setFolderIcon ? this.setFolderIcon : null
-                    }
-
-                    // Rename item request
-                    this.$store.dispatch('renameItem', item)
-
-                    // Rename item in view
-                    events.$emit('change:name', item)
-
-                    this.$closePopup()
-                }
-            },
-        },
-        mounted() {
-
-            // Show popup
-            events.$on('popup:open', args => {
-
-                if (args.name !== 'rename-item') return
-
-                this.$nextTick(() => {
-                    this.$refs.input.focus()
-                })
-
-                this.isMoreOptions = false
-
-                this.setFolderIcon = undefined
-
-                // Store picked item
-                this.pickedItem = args.item
-            })
-
-              events.$on('setFolderIcon', (icon) => {
-                this.setFolderIcon = ! icon ? undefined : icon.value
-            })
+        moreOptionsTitle() {
+            return this.isMoreOptions ? this.$t('shared_form.button_close_options') : this.$t('shared_form.button_folder_icon_open')
         }
+    },
+    data() {
+        return {
+            pickedItem: undefined,
+            isMoreOptions: false,
+            setFolderIcon: undefined
+        }
+    },
+    methods: {
+        moreOptions() {
+            this.isMoreOptions = !this.isMoreOptions
+
+            this.setFolderIcon = undefined
+        },
+        changeName() {
+            if (this.pickedItem.name && this.pickedItem.name !== '') {
+
+                let item = {
+                    unique_id: this.pickedItem.unique_id,
+                    type: this.pickedItem.type,
+                    name: this.pickedItem.name,
+                    folder_icon: this.setFolderIcon ? this.setFolderIcon : null
+                }
+
+                // Rename item request
+                this.$store.dispatch('renameItem', item)
+
+                // Rename item in view
+                events.$emit('change:name', item)
+
+                this.$closePopup()
+            }
+        }
+    },
+    mounted() {
+
+        // Show popup
+        events.$on('popup:open', args => {
+
+            if (args.name !== 'rename-item') return
+
+            this.$nextTick(() => {
+                this.$refs.input.focus()
+            })
+
+            this.isMoreOptions = false
+
+            this.setFolderIcon = undefined
+
+            // Store picked item
+            this.pickedItem = args.item
+        })
+
+        events.$on('setFolderIcon', (icon) => {
+            this.setFolderIcon = !icon ? undefined : icon.value
+        })
     }
+}
 </script>
 
 <style scoped lang="scss">
-    @import "@assets/vue-file-manager/_inapp-forms.scss";
-    @import '@assets/vue-file-manager/_forms';
+@import "@assets/vue-file-manager/_inapp-forms.scss";
+@import '@assets/vue-file-manager/_forms';
 
-    .input {
-        position: relative;
+.input {
+    position: relative;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+
+    .close-icon-wrapper {
+        width: 22px;
+        height: 22px;
+        position: absolute;
+        cursor: pointer;
+        right: 15px;
+        border-radius: 6px;
         display: flex;
-        justify-content: flex-end;
+        justify-content: center;
         align-items: center;
 
-        .close-icon-wrapper {
-            width: 22px;
-            height: 22px;
-            position: absolute;
-            cursor: pointer;
-            right: 21px;
-            border-radius: 6px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            &:hover {
-                background: $light_background;
-                .close-icon {
-                    line {
-                    stroke: $theme;
-                    }
-                }
-            }            
-
+        &:hover {
             .close-icon {
                 line {
-                stroke: rgba($text-muted, 0.3);
+                    stroke: $theme;
                 }
             }
         }
 
-        
-    }
-
-    .item-thumbnail {
-        margin-bottom: 20px;
-    }
-
-    @media (prefers-color-scheme: dark) {
-       .close-icon-wrapper {
-            &:hover {
-                background: rgba($theme, 0.1) !important;
-                .close-icon {
-                    line {
-                        stroke: $theme !important;
-                    }
-                }
+        .close-icon {
+            line {
+                stroke: rgba($text-muted, 0.3);
             }
+        }
+    }
+}
+
+.item-thumbnail {
+    margin-bottom: 20px;
+}
+
+@media (prefers-color-scheme: dark) {
+    .close-icon-wrapper {
+        &:hover {
+
             .close-icon {
                 line {
-                    stroke: rgba($dark_mode_text_primary, 0.3) !important;
+                    stroke: $theme !important;
                 }
-            }            
-       }
+            }
+        }
+
+        .close-icon {
+            line {
+                stroke: rgba($dark_mode_text_primary, 0.3) !important;
+            }
+        }
     }
+}
 </style>
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Index.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Index.vue
index 5645775f..a95a50cf 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Index.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Index.vue
@@ -1,7 +1,7 @@
 <template>
     <PageTab :is-loading="isLoading" class="form-fixed-width">
 
-        <PageTabGroup>
+        <PageTabGroup v-if="app">
             <div class="form block-form">
 
                 <FormLabel>Home Page</FormLabel>
@@ -17,12 +17,7 @@
                                     When this is turned on, your visitors can visit your default homepage.
                                 </small>
                             </div>
-                            <SwitchInput
-                                @input="$updateText('/settings', 'allow_homepage', allow_homepage)"
-                                v-model="allow_homepage"
-                                class="switch"
-                                :state="allow_homepage"
-                            />
+                            <SwitchInput @input="$updateText('/settings', 'allow_homepage', app.allow_homepage)" v-model="app.allow_homepage" class="switch" :state="app.allow_homepage"/>
                         </div>
                     </div>
                 </div>
@@ -38,9 +33,7 @@
                     <div class="block-wrapper">
                         <label>Title:</label>
                         <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Title" rules="required" v-slot="{ errors }">
-                            <input @input="$updateText('/settings', 'header_title', header_title)" v-model="header_title"
-                                   type="text"
-                                   :class="{'is-error': errors[0]}"/>
+                            <input @input="$updateText('/settings', 'header_title', app.header_title)" v-model="app.header_title" type="text" :class="{'is-error': errors[0]}"/>
                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                         </ValidationProvider>
                     </div>
@@ -48,8 +41,7 @@
                     <div class="block-wrapper">
                         <label>Description:</label>
                         <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Description" rules="required" v-slot="{ errors }">
-                            <textarea @input="$updateText('/settings', 'header_description', header_description)" rows="2" v-model="header_description"
-                                      :class="{'is-error': errors[0]}"></textarea>
+                            <textarea @input="$updateText('/settings', 'header_description', app.header_description)" rows="2" v-model="app.header_description" :class="{'is-error': errors[0]}"></textarea>
                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                         </ValidationProvider>
                     </div>
@@ -67,18 +59,13 @@
                                         Show section:
                                     </label>
                                 </div>
-                                <SwitchInput
-                                        @input="$updateText('/settings', 'section_features', section_features)"
-                                        v-model="section_features"
-                                        class="switch"
-                                        :state="section_features"
-                                />
+                                <SwitchInput @input="$updateText('/settings', 'section_features', app.section_features)" v-model="app.section_features" class="switch" :state="app.section_features"/>
                             </div>
                         </div>
                     </div>
 
 
-                    <div v-if="section_features">
+                    <div v-if="app.section_features">
                         <div class="block-wrapper">
                             <img src="/assets/images/admin/main-features.jpg" alt="Main Features" class="page-image">
                         </div>
@@ -86,9 +73,7 @@
                         <div class="block-wrapper">
                             <label>Title:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Title" rules="required" v-slot="{ errors }">
-                                <input @input="$updateText('/settings', 'features_title', features_title)" v-model="features_title"
-                                       type="text"
-                                       :class="{'is-error': errors[0]}"/>
+                                <input @input="$updateText('/settings', 'features_title', app.features_title)" v-model="app.features_title" type="text" :class="{'is-error': errors[0]}"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -96,8 +81,7 @@
                         <div class="block-wrapper">
                             <label>Description:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Description" rules="required" v-slot="{ errors }">
-                                <textarea @input="$updateText('/settings', 'features_description', features_description)" rows="2" v-model="features_description"
-                                          :class="{'is-error': errors[0]}"></textarea>
+                                <textarea @input="$updateText('/settings', 'features_description', app.features_description)" rows="2" v-model="app.features_description" :class="{'is-error': errors[0]}"></textarea>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -116,68 +100,54 @@
                                         Show section:
                                     </label>
                                 </div>
-                                <SwitchInput
-                                        @input="$updateText('/settings', 'section_feature_boxes', section_feature_boxes)"
-                                        v-model="section_feature_boxes"
-                                        class="switch"
-                                        :state="section_feature_boxes"
-                                />
+                                <SwitchInput @input="$updateText('/settings', 'section_feature_boxes', app.section_feature_boxes)" v-model="app.section_feature_boxes" class="switch" :state="app.section_feature_boxes"/>
                             </div>
                         </div>
                     </div>
 
-                    <div v-if="section_feature_boxes">
+                    <div v-if="app.section_feature_boxes">
                         <div class="block-wrapper">
                             <img src="/assets/images/admin/feature-boxes.jpg" alt="Main Features" class="page-image">
                         </div>
                         <div class="block-wrapper">
                             <label>First Box Title:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Feature Title 1" rules="required" v-slot="{ errors }">
-                                <input @input="$updateText('/settings', 'feature_title_1', feature_title_1)" v-model="feature_title_1"
-                                       type="text"
-                                       :class="{'is-error': errors[0]}"/>
+                                <input @input="$updateText('/settings', 'feature_title_1', app.feature_title_1)" v-model="app.feature_title_1" type="text" :class="{'is-error': errors[0]}"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
                         <div class="block-wrapper">
                             <label>First Box Description:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Feature Description 1" rules="required" v-slot="{ errors }">
-                                <textarea @input="$updateText('/settings', 'feature_description_1', feature_description_1)" rows="2" v-model="feature_description_1"
-                                          :class="{'is-error': errors[0]}"></textarea>
+                                <textarea @input="$updateText('/settings', 'feature_description_1', app.feature_description_1)" rows="2" v-model="app.feature_description_1" :class="{'is-error': errors[0]}"></textarea>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
                         <div class="block-wrapper">
                             <label>Second Box Title:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Feature Title 2" rules="required" v-slot="{ errors }">
-                                <input @input="$updateText('/settings', 'feature_title_2', feature_title_2)" v-model="feature_title_2"
-                                       type="text"
-                                       :class="{'is-error': errors[0]}"/>
+                                <input @input="$updateText('/settings', 'feature_title_2', app.feature_title_2)" v-model="app.feature_title_2" type="text" :class="{'is-error': errors[0]}"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
                         <div class="block-wrapper">
                             <label>Second Box Description:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Feature Description 2" rules="required" v-slot="{ errors }">
-                                <textarea @input="$updateText('/settings', 'feature_description_2', feature_description_2)" rows="2" v-model="feature_description_2"
-                                          :class="{'is-error': errors[0]}"></textarea>
+                                <textarea @input="$updateText('/settings', 'feature_description_2', app.feature_description_2)" rows="2" v-model="app.feature_description_2" :class="{'is-error': errors[0]}"></textarea>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
                         <div class="block-wrapper">
                             <label>Third Box Title:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Feature Title 3" rules="required" v-slot="{ errors }">
-                                <input @input="$updateText('/settings', 'feature_title_3', feature_title_3)" v-model="feature_title_3"
-                                       type="text"
-                                       :class="{'is-error': errors[0]}"/>
+                                <input @input="$updateText('/settings', 'feature_title_3', app.feature_title_3)" v-model="app.feature_title_3" type="text" :class="{'is-error': errors[0]}"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
                         <div class="block-wrapper">
                             <label>Third Box Description:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Feature Description 3" rules="required" v-slot="{ errors }">
-                                <textarea @input="$updateText('/settings', 'feature_description_3', feature_description_3)" rows="2" v-model="feature_description_3"
-                                          :class="{'is-error': errors[0]}"></textarea>
+                                <textarea @input="$updateText('/settings', 'feature_description_3', app.feature_description_3)" rows="2" v-model="app.feature_description_3" :class="{'is-error': errors[0]}"></textarea>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -196,26 +166,19 @@
                                         Show section:
                                     </label>
                                 </div>
-                                <SwitchInput
-                                        @input="$updateText('/settings', 'section_pricing_content', section_pricing_content)"
-                                        v-model="section_pricing_content"
-                                        class="switch"
-                                        :state="section_pricing_content"
-                                />
+                                <SwitchInput @input="$updateText('/settings', 'section_pricing_content', app.section_pricing_content)" v-model="app.section_pricing_content" class="switch" :state="app.section_pricing_content"/>
                             </div>
                         </div>
                     </div>
 
-                    <div v-if="section_pricing_content">
+                    <div v-if="app.section_pricing_content">
                         <div class="block-wrapper">
                             <img src="/assets/images/admin/pricing-content.jpg" alt="Main Features" class="page-image">
                         </div>
                         <div class="block-wrapper">
                             <label>Title:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Title" rules="required" v-slot="{ errors }">
-                                <input @input="$updateText('/settings', 'pricing_title', pricing_title)" v-model="pricing_title"
-                                       type="text"
-                                       :class="{'is-error': errors[0]}"/>
+                                <input @input="$updateText('/settings', 'pricing_title', app.pricing_title)" v-model="app.pricing_title" type="text" :class="{'is-error': errors[0]}"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -223,8 +186,7 @@
                         <div class="block-wrapper">
                             <label>Description:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Description" rules="required" v-slot="{ errors }">
-                            <textarea @input="$updateText('/settings', 'pricing_description', pricing_description)" rows="2" v-model="pricing_description"
-                                      :class="{'is-error': errors[0]}"></textarea>
+                            <textarea @input="$updateText('/settings', 'pricing_description', app.pricing_description)" rows="2" v-model="app.pricing_description" :class="{'is-error': errors[0]}"></textarea>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -243,27 +205,20 @@
                                         Show section:
                                     </label>
                                 </div>
-                                <SwitchInput
-                                        @input="$updateText('/settings', 'section_get_started', section_get_started)"
-                                        v-model="section_get_started"
-                                        class="switch"
-                                        :state="section_get_started"
-                                />
+                                <SwitchInput @input="$updateText('/settings', 'section_get_started', app.section_get_started)" v-model="app.section_get_started" class="switch" :state="app.section_get_started"/>
                             </div>
                         </div>
                     </div>
 
 
-                    <div v-if="section_get_started">
+                    <div v-if="app.section_get_started">
                         <div class="block-wrapper">
                             <img src="/assets/images/admin/get-started-content.jpg" alt="Main Features" class="page-image">
                         </div>
                         <div class="block-wrapper">
                             <label>Title:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Title" rules="required" v-slot="{ errors }">
-                                <input @input="$updateText('/settings', 'get_started_title', get_started_title)" v-model="get_started_title"
-                                       type="text"
-                                       :class="{'is-error': errors[0]}"/>
+                                <input @input="$updateText('/settings', 'get_started_title', app.get_started_title)" v-model="app.get_started_title" type="text" :class="{'is-error': errors[0]}"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -271,8 +226,7 @@
                         <div class="block-wrapper">
                             <label>Description:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Description" rules="required" v-slot="{ errors }">
-                            <textarea @input="$updateText('/settings', 'get_started_description', get_started_description)" rows="2" v-model="get_started_description"
-                                      :class="{'is-error': errors[0]}"></textarea>
+                            <textarea @input="$updateText('/settings', 'get_started_description', app.get_started_description)" rows="2" v-model="app.get_started_description" :class="{'is-error': errors[0]}"></textarea>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -286,9 +240,7 @@
                     <div class="block-wrapper">
                         <label>Footer content:</label>
                         <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Title" rules="required" v-slot="{ errors }">
-                            <input @input="$updateText('/settings', 'footer_content', footer_content)" v-model="footer_content"
-                                   type="text"
-                                   :class="{'is-error': errors[0]}"/>
+                            <input @input="$updateText('/settings', 'footer_content', app.footer_content)" v-model="app.footer_content" type="text" :class="{'is-error': errors[0]}"/>
                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                         </ValidationProvider>
                     </div>
@@ -299,131 +251,100 @@
 </template>
 
 <script>
-    import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
-    import StorageItemDetail from '@/components/Others/StorageItemDetail'
-    import PageTabGroup from '@/components/Others/Layout/PageTabGroup'
-    import SelectInput from '@/components/Others/Forms/SelectInput'
-    import SwitchInput from '@/components/Others/Forms/SwitchInput'
-    import ImageInput from '@/components/Others/Forms/ImageInput'
-    import FormLabel from '@/components/Others/Forms/FormLabel'
-    import ButtonBase from '@/components/FilesView/ButtonBase'
-    import SetupBox from '@/components/Others/Forms/SetupBox'
-    import PageTab from '@/components/Others/Layout/PageTab'
-    import InfoBox from '@/components/Others/Forms/InfoBox'
-    import {required} from 'vee-validate/dist/rules'
-    import axios from 'axios'
-    import { mapGetters } from 'vuex'
+import { ValidationProvider, ValidationObserver } from 'vee-validate/dist/vee-validate.full'
+import StorageItemDetail from '@/components/Others/StorageItemDetail'
+import PageTabGroup from '@/components/Others/Layout/PageTabGroup'
+import SelectInput from '@/components/Others/Forms/SelectInput'
+import SwitchInput from '@/components/Others/Forms/SwitchInput'
+import ImageInput from '@/components/Others/Forms/ImageInput'
+import FormLabel from '@/components/Others/Forms/FormLabel'
+import ButtonBase from '@/components/FilesView/ButtonBase'
+import SetupBox from '@/components/Others/Forms/SetupBox'
+import PageTab from '@/components/Others/Layout/PageTab'
+import InfoBox from '@/components/Others/Forms/InfoBox'
+import { required } from 'vee-validate/dist/rules'
+import axios from 'axios'
+import { mapGetters } from 'vuex'
 
-    export default {
-        name: 'AppIndex',
-        components: {
-            ValidationObserver,
-            ValidationProvider,
-            StorageItemDetail,
-            PageTabGroup,
-            SwitchInput,
-            SelectInput,
-            ImageInput,
-            ButtonBase,
-            FormLabel,
-            SetupBox,
-            required,
-            PageTab,
-            InfoBox,
-        },
-        computed: {
-            ...mapGetters(['config']),
-        },
-        data() {
-            return {
-                isLoading: true,
-                allow_homepage: 1,
-                section_features: 1,
-                section_feature_boxes: 1,
-                section_pricing_content: 1,
-                section_get_started: 1,
-
-                header_title: '',
-                header_description: '',
-
-                features_title: '',
-                features_description: '',
-
-                feature_title_1: '',
-                feature_description_1: '',
-
-                feature_title_2: '',
-                feature_description_2: '',
-
-                feature_title_3: '',
-                feature_description_3: '',
-
-                pricing_title: '',
-                pricing_description: '',
-
-                get_started_title: '',
-                get_started_description: '',
-
-                footer_content: '',
-            }
-        },
-        mounted() {
-            axios.get('/api/settings', {
-                params: {
-                    column: 'allow_homepage|footer_content|get_started_description|get_started_title|pricing_description|pricing_title|feature_description_3|feature_title_3|feature_description_2|feature_title_2|feature_description_1|feature_title_1|features_description|features_title|header_description|header_title|section_get_started|section_pricing_content|section_feature_boxes|section_features'
-                }
-            })
-                .then(response => {
-                    this.allow_homepage = parseInt(response.data.allow_homepage)
-                    this.section_features = parseInt(response.data.section_features)
-                    this.section_feature_boxes = parseInt(response.data.section_feature_boxes)
-                    this.section_pricing_content = parseInt(response.data.section_pricing_content)
-                    this.section_get_started = parseInt(response.data.section_get_started)
-
-                    this.header_title = response.data.header_title
-                    this.header_description = response.data.header_description
-
-                    this.features_title = response.data.features_title
-                    this.features_description = response.data.features_description
-
-                    this.feature_title_1 = response.data.feature_title_1
-                    this.feature_description_1 = response.data.feature_description_1
-
-                    this.feature_title_2 = response.data.feature_title_2
-                    this.feature_description_2 = response.data.feature_description_2
-
-                    this.feature_title_3 = response.data.feature_title_3
-                    this.feature_description_3 = response.data.feature_description_3
-
-                    this.pricing_title = response.data.pricing_title
-                    this.pricing_description = response.data.pricing_description
-
-                    this.get_started_title = response.data.get_started_title
-                    this.get_started_description = response.data.get_started_description
-
-                    this.footer_content = response.data.footer_content
-                })
-                .finally(() => {
-                    this.isLoading = false
-                })
+export default {
+    name: 'AppIndex',
+    components: {
+        ValidationObserver,
+        ValidationProvider,
+        StorageItemDetail,
+        PageTabGroup,
+        SwitchInput,
+        SelectInput,
+        ImageInput,
+        ButtonBase,
+        FormLabel,
+        SetupBox,
+        required,
+        PageTab,
+        InfoBox
+    },
+    computed: {
+        ...mapGetters(['config'])
+    },
+    data() {
+        return {
+            isLoading: true,
+            app: undefined
         }
+    },
+    mounted() {
+        axios.get('/api/settings', {
+            params: {
+                column: 'allow_homepage|footer_content|get_started_description|get_started_title|pricing_description|pricing_title|feature_description_3|feature_title_3|feature_description_2|feature_title_2|feature_description_1|feature_title_1|features_description|features_title|header_description|header_title|section_get_started|section_pricing_content|section_feature_boxes|section_features'
+            }
+        })
+            .then(response => {
+                this.app = {
+                    allow_homepage: parseInt(response.data.allow_homepage),
+                    section_features: parseInt(response.data.section_features),
+                    section_feature_boxes: parseInt(response.data.section_feature_boxes),
+                    section_pricing_content: parseInt(response.data.section_pricing_content),
+                    section_get_started: parseInt(response.data.section_get_started),
+                    header_title: response.data.header_title,
+                    header_description: response.data.header_description,
+                    features_title: response.data.features_title,
+                    features_description: response.data.features_description,
+                    feature_title_1: response.data.feature_title_1,
+                    feature_description_1: response.data.feature_description_1,
+                    feature_title_2: response.data.feature_title_2,
+                    feature_description_2: response.data.feature_description_2,
+                    feature_title_3: response.data.feature_title_3,
+                    feature_description_3: response.data.feature_description_3,
+                    pricing_title: response.data.pricing_title,
+                    pricing_description: response.data.pricing_description,
+                    get_started_title: response.data.get_started_title,
+                    get_started_description: response.data.get_started_description,
+                    footer_content: response.data.footer_content
+                }
+
+                console.log(this.app);
+            })
+            .finally(() => {
+                this.isLoading = false
+            })
     }
+}
 </script>
 
 <style lang="scss" scoped>
-    @import '@assets/vue-file-manager/_variables';
-    @import '@assets/vue-file-manager/_mixins';
-    @import '@assets/vue-file-manager/_forms';
+@import '@assets/vue-file-manager/_variables';
+@import '@assets/vue-file-manager/_mixins';
+@import '@assets/vue-file-manager/_forms';
 
-    .block-form {
-        max-width: 100%;
-    }
+.block-form {
+    max-width: 100%;
+}
 
-    .page-image {
-        width: 100%;
-        margin: 0 auto;
-        display: block;
-        border-radius: 8px;
-        border: 1px solid #ececec;
-    }
+.page-image {
+    width: 100%;
+    margin: 0 auto;
+    display: block;
+    border-radius: 8px;
+    border: 1px solid #ececec;
+}
 </style>
diff --git a/resources/js/views/Index/SaaSLandingPage.vue b/resources/js/views/Index/SaaSLandingPage.vue
index da8e52c4..a28423b0 100644
--- a/resources/js/views/Index/SaaSLandingPage.vue
+++ b/resources/js/views/Index/SaaSLandingPage.vue
@@ -68,7 +68,7 @@
             // Get page content
             axios.get('/api/content', {
                 params: {
-                    column: 'footer_content|get_started_description|get_started_title|pricing_description|pricing_title|feature_description_3|feature_title_3|feature_description_2|feature_title_2|feature_description_1|feature_title_1|features_description|features_title|header_description|header_title|section_get_started|section_pricing_content|section_feature_boxes|section_features'
+                    column: 'allow_homepage|footer_content|get_started_description|get_started_title|pricing_description|pricing_title|feature_description_3|feature_title_3|feature_description_2|feature_title_2|feature_description_1|feature_title_1|features_description|features_title|header_description|header_title|section_get_started|section_pricing_content|section_feature_boxes|section_features'
                 }
             })
                 .then(response => {
diff --git a/routes/web.php b/routes/web.php
index e5b59621..39cc3b1e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -39,8 +39,8 @@ Route::group(['middleware' => ['auth:api', 'auth.master', 'scope:master']], func
 });
 
 // Admin system tools
+Route::get('/service/upgrade', 'General\UpgradeAppController@upgrade');
 Route::group(['middleware' => ['auth:api', 'auth.master', 'auth.admin', 'scope:master'], 'prefix' => 'service'], function () {
-    Route::get('/upgrade', 'General\UpgradeAppController@upgrade');
     Route::get('/down', 'General\UpgradeAppController@down');
     Route::get('/up', 'General\UpgradeAppController@up');
 });