diff --git a/app/FileManagerFile.php b/app/FileManagerFile.php
index d9b9d631..1e7a38dc 100644
--- a/app/FileManagerFile.php
+++ b/app/FileManagerFile.php
@@ -68,7 +68,7 @@ class FileManagerFile extends Model
     ];
 
     protected $casts = [
-        'meta_data' => 'array',
+        'metadata' => 'array',
     ];
 
     /**
diff --git a/app/Http/Helpers/helpers.php b/app/Http/Helpers/helpers.php
index b27a6387..4228a685 100644
--- a/app/Http/Helpers/helpers.php
+++ b/app/Http/Helpers/helpers.php
@@ -529,6 +529,7 @@ function get_pretty_name($basename, $name, $mimetype)
 
     return $name . '.' . $mimetype;
 }
+
 function get_image_meta_data($file)
 {
     if(get_file_type_from_mimetype($file->getMimeType()) === 'jpeg') {
diff --git a/app/Http/Tools/Editor.php b/app/Http/Tools/Editor.php
index 11b05154..5e02a17d 100644
--- a/app/Http/Tools/Editor.php
+++ b/app/Http/Tools/Editor.php
@@ -257,8 +257,8 @@ class Editor
         // If last then process file
         if ($request->boolean('is_last')) {
 
-            $meta_data = get_image_meta_data($file);
-            
+            $metadata = get_image_meta_data($file);
+
             $disk_local = Storage::disk('local');
             $unique_id = get_unique_id();
 
@@ -294,7 +294,7 @@ class Editor
                 'mimetype'   => get_file_type_from_mimetype($file_mimetype),
                 'type'       => get_file_type($file_mimetype),
                 'folder_id'  => $request->parent_id,
-                'meta_data'  => $meta_data,
+                'metadata'   => $metadata,
                 'name'       => $user_file_name,
                 'unique_id'  => $unique_id,
                 'basename'   => $disk_file_name,
diff --git a/database/migrations/2020_09_04_085714_add_exif_data_to_file_manager_files_table.php b/database/migrations/2020_09_04_085714_add_exif_data_to_file_manager_files_table.php
index a99ef2c9..41f2e956 100644
--- a/database/migrations/2020_09_04_085714_add_exif_data_to_file_manager_files_table.php
+++ b/database/migrations/2020_09_04_085714_add_exif_data_to_file_manager_files_table.php
@@ -14,7 +14,7 @@ class AddExifDataToFileManagerFilesTable extends Migration
     public function up()
     {
         Schema::table('file_manager_files', function (Blueprint $table) {
-            $table->longText('meta_data')->after('type')->nullable();
+            $table->longText('metadata')->after('type')->nullable();
         });
     }
 
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 1c96b06c..9f85d907 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,98 +1,144 @@
 {
     "/js/main.js": "/js/main.js",
     "/css/app.css": "/css/app.css",
-    "/chunks/admin.js": "/chunks/admin.js?id=83654a90239b4ff0369d",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=40c3abfc5b7f1e84bbc3",
-    "/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=18461a3f7da1919af163",
-    "/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=43f11d91304a7dd04839",
-    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js?id=2f9c8b68fa653eaf13ca",
-    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=497795d9c5e0d50f089b",
-    "/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=49508dc86c4d72423bb1",
-    "/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=a4d4ba4b5462f9c723f2",
-    "/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=587cb18ed3ae1fe000d1",
-    "/chunks/app-billings.js": "/chunks/app-billings.js?id=6c650617de9a9d9c39c7",
-    "/chunks/app-email.js": "/chunks/app-email.js?id=324500e85f9b53781f62",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=9ed86c7809567aa885b6",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=6c8afa8bf48d259e990f",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=f6e8f05e5f661d4db749",
-    "/chunks/app-settings.js": "/chunks/app-settings.js?id=8500906b76122dcad0c1",
-    "/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=64784710d5a92cb7765b",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=bdbc3a2b23a5012eb5a2",
-    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=1a124cf4479a55c5f054",
-    "/chunks/contact-us.js": "/chunks/contact-us.js?id=2863188461bc27d27d21",
-    "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js?id=1836b64f9d8e5a572718",
-    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=9378c886326c1b809481",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=acd3e78f6ba2f659600f",
-    "/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=3f60fef388fc2833ccdf",
-    "/chunks/database.js": "/chunks/database.js?id=cfab86a911b0615c19b6",
-    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=808307bd1366ee6d449c",
-    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=29245bb6b6cfa0b7a4f7",
-    "/chunks/files.js": "/chunks/files.js?id=fe2b877a0b5abf8a0715",
-    "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js?id=265b706d22b4a3f7c006",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=e7951f3d60b60b2cdc6c",
-    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=47f8fbf3399065d40b4d",
-    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=0f5690fbf38da682f0e9",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=c2e9dc841cc1c7cf42cf",
-    "/chunks/landing-page.js": "/chunks/landing-page.js?id=59ae201664474792a28f",
-    "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=ab293b4a32998cf5ee15",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=1323320b7a4ebbcf5c41",
-    "/chunks/pages.js": "/chunks/pages.js?id=310b14127e288ab16e24",
-    "/chunks/plan.js": "/chunks/plan.js?id=6f6b5c04b7c085a9bb49",
-    "/chunks/plan-create.js": "/chunks/plan-create.js?id=b16154f77930c4bb34ff",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=51186df96727f701ebc4",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=576e41df973b07fb11a1",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=c8775cd5bbebf78e9263",
-    "/chunks/plans.js": "/chunks/plans.js?id=e07de95c6bec0b8e628b",
-    "/chunks/profile.js": "/chunks/profile.js?id=37f5d436afc0e78b0435",
-    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=7d6ba61413f3080d4979",
-    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=e8eaa54e728057a20d89",
-    "/chunks/settings.js": "/chunks/settings.js?id=5b19275a5b2b2a3926d1",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=b54acd8526d5ab352aea",
-    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=be3524963c3d88f2322b",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=8aaa1951a7f7d74aaa87",
-    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=5eaf9216db044890af03",
-    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=e1c862190c029a57070c",
-    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=35bf0c0a4ffe7892247d",
-    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=159b4b228f06eed0f412",
-    "/chunks/shared-files.js": "/chunks/shared-files.js?id=a4819b420126d7ace70b",
-    "/chunks/shared-page.js": "/chunks/shared-page.js?id=291c9da610e3863dc2c2",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=7ffa6dd2d60793d56076",
-    "/chunks/sign-up.js": "/chunks/sign-up.js?id=6ae298c6242d518b2e30",
-    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=8b2ccd24367b453d5259",
-    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=88abffc4fe5c9add0629",
-    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=cd7f58dab68d4f293591",
-    "/chunks/trash.js": "/chunks/trash.js?id=b09a9826e3b0818fecd6",
-    "/chunks/upgrade.js": "/chunks/upgrade.js?id=a02958f5900f2cefc136",
-    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=415a74c25d09037c30ef",
-    "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=82a1af659094bc69255b",
-    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=f973482ec1912e3f1715",
-    "/chunks/user.js": "/chunks/user.js?id=c05f5bb430af37df3c2e",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=5b928b478959a28cf72e",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=1ba982a192e9da8cb878",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=29b590f9122daaeffc89",
-    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=4ae99029e07ff474ae03",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=3d5631dafd453afe736c",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=b3d2101b0d95ede2d504",
-    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=df3b919b96061f49df6b",
-    "/chunks/users.js": "/chunks/users.js?id=74c47d22c0bd00148f31",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.bf413fb842a944178f2b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.bf413fb842a944178f2b.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.b030278c3d6102d1c19c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.b030278c3d6102d1c19c.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.d42144b5b4684f129c1f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.d42144b5b4684f129c1f.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.761db08fedc3e78b5bb3.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.761db08fedc3e78b5bb3.hot-update.js",
-    "/js/main.be8d2c76fc8704be7e65.hot-update.js": "/js/main.be8d2c76fc8704be7e65.hot-update.js",
-    "/js/main.feb41b5ad64d16511bf3.hot-update.js": "/js/main.feb41b5ad64d16511bf3.hot-update.js",
-    "/js/main.46d71fd6db97ab4c368c.hot-update.js": "/js/main.46d71fd6db97ab4c368c.hot-update.js",
-    "/js/main.acc5f4b7b449020c79f1.hot-update.js": "/js/main.acc5f4b7b449020c79f1.hot-update.js",
-    "/js/main.398daff8ec9716542105.hot-update.js": "/js/main.398daff8ec9716542105.hot-update.js",
-    "/js/main.53a7e27d90389ec86cc0.hot-update.js": "/js/main.53a7e27d90389ec86cc0.hot-update.js",
-    "/js/main.a1f2823faf747959770e.hot-update.js": "/js/main.a1f2823faf747959770e.hot-update.js",
-    "/js/main.537a8ab399925eabe36b.hot-update.js": "/js/main.537a8ab399925eabe36b.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.537a8ab399925eabe36b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.537a8ab399925eabe36b.hot-update.js",
-    "/js/main.4cde92fcca3d5ae15496.hot-update.js": "/js/main.4cde92fcca3d5ae15496.hot-update.js",
-    "/chunks/app-others.4cde92fcca3d5ae15496.hot-update.js": "/chunks/app-others.4cde92fcca3d5ae15496.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.4cde92fcca3d5ae15496.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.4cde92fcca3d5ae15496.hot-update.js",
-    "/js/main.f1801b95e09af61aa622.hot-update.js": "/js/main.f1801b95e09af61aa622.hot-update.js",
-    "/js/main.a84ada8e7556926daab8.hot-update.js": "/js/main.a84ada8e7556926daab8.hot-update.js",
-    "/js/main.178053c64f42d053e260.hot-update.js": "/js/main.178053c64f42d053e260.hot-update.js",
-    "/js/main.db22096be1fc4bb40afd.hot-update.js": "/js/main.db22096be1fc4bb40afd.hot-update.js"
+    "/chunks/admin.js": "/chunks/admin.js?id=5807ec412746448047f9",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=5746b19173ec13c3deec",
+    "/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=ac72621206dad357a4a5",
+    "/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=a9bee156de75062a1925",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js?id=0b4966a15f5749046c2e",
+    "/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=660a37dc97cd5fe64367",
+    "/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=9df028786df5d3279ab9",
+    "/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=4dd6aabee84d167d1a8c",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=8d827cb97a985abd829e",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=e6a3952809f231045242",
+    "/chunks/app-settings.js": "/chunks/app-settings.js?id=b85ce942737e25c37b8a",
+    "/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=52561e7bfe3acdf4a314",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=8e3bbcb904b69582c205",
+    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=feba23a9d5572819983b",
+    "/chunks/contact-us.js": "/chunks/contact-us.js?id=091eca8660ad4b54542b",
+    "/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=db491f5049d722d5c80f",
+    "/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=e6cdbe1969cfc82bb38f",
+    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1d8ee4bfbcde69c97021",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=ea5b79171e63757bda0f",
+    "/chunks/files.js": "/chunks/files.js?id=5e0fcc6e5f356c89344c",
+    "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js?id=335030ccf561b022c47f",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=4c1acbe1463ff4300929",
+    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=f430110273d76b28906f",
+    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=4fb4c089ddd76db676d9",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=196a4666d5a7438d5f12",
+    "/chunks/landing-page.js": "/chunks/landing-page.js?id=5a4a8d199e09d5cb1aa8",
+    "/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=00581ea5208a366ecbb9",
+    "/chunks/plan.js": "/chunks/plan.js?id=cc041fb9c2cb9ad8f0ff",
+    "/chunks/plan-create.js": "/chunks/plan-create.js?id=60cdce84060771ae8d15",
+    "/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=951d731f8fdb8237bb5e",
+    "/chunks/plans.js": "/chunks/plans.js?id=b34a871b737c1986375e",
+    "/chunks/profile.js": "/chunks/profile.js?id=208bdb72bd3c463874ae",
+    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=11ccc9d93afce5289210",
+    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=01b159e488e7034ea19c",
+    "/chunks/settings.js": "/chunks/settings.js?id=d8f9f83be3aa004f6dd3",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=56631ff52566a2ea800b",
+    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=bb30fe0e2a6a266513dc",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=0df4bd46f1d3d90e360a",
+    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=9c555c71f2452ff5c69d",
+    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=013b6f15f907caaecd1e",
+    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=6172a89afe3b27cb76cd",
+    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=99b4f321902fe6b0eb23",
+    "/chunks/shared-files.js": "/chunks/shared-files.js?id=a1262ec81010fb16f1e8",
+    "/chunks/shared-page.js": "/chunks/shared-page.js?id=ca83c1b55cf7f9734d8c",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=ce7bb181aaa816f073b4",
+    "/chunks/sign-up.js": "/chunks/sign-up.js?id=75749ad472f195ebc53d",
+    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=a4f4b0c9a789abcb1407",
+    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=419030a6f3244e5ed321",
+    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=3bd2086ebb32f34934ee",
+    "/chunks/trash.js": "/chunks/trash.js?id=23a7513cb5cf933ac4ae",
+    "/chunks/upgrade.js": "/chunks/upgrade.js?id=cc9c9114c59ecdc93e08",
+    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=9ae21fd55ae4914ce411",
+    "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=e912e466f43f90392e50",
+    "/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=975a1aea64ef999aa704",
+    "/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=e9528debb38dc1654cef",
+    "/chunks/users.js": "/chunks/users.js?id=696286be6e3cebc58b61",
+    "/js/main.e247eb673728aec3a902.hot-update.js": "/js/main.e247eb673728aec3a902.hot-update.js",
+    "/chunks/app-others.e247eb673728aec3a902.hot-update.js": "/chunks/app-others.e247eb673728aec3a902.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.e247eb673728aec3a902.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.e247eb673728aec3a902.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.f7ac0772a2e449f2e8db.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.f7ac0772a2e449f2e8db.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.6d0d8da5246602c0fb56.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.6d0d8da5246602c0fb56.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.5992d1cb518b7fea50f2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.5992d1cb518b7fea50f2.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.ce0633d3f4cb731cc861.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.ce0633d3f4cb731cc861.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.77dad319e6455660c485.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.77dad319e6455660c485.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.f4b67020bf191875ea61.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.f4b67020bf191875ea61.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.394f188f70eb4f0718af.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.394f188f70eb4f0718af.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.26e0ac24aa1c209553d3.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.26e0ac24aa1c209553d3.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.585dbe2dcb834a492630.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.585dbe2dcb834a492630.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.171023ad185a732741ed.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.171023ad185a732741ed.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.0bc81d1bf508846bba30.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.0bc81d1bf508846bba30.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.10d540f06f209dc7fc28.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.10d540f06f209dc7fc28.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.686c9db64d19de7d6381.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.686c9db64d19de7d6381.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.04926cdadf35a8c650dc.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.04926cdadf35a8c650dc.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.7553fed9ff4e2565a2eb.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.7553fed9ff4e2565a2eb.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.b82e2864ce4e6ce6a59b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.b82e2864ce4e6ce6a59b.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.17762f6d6b2da0a05709.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.17762f6d6b2da0a05709.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.8d2907e71a4ae792806d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.8d2907e71a4ae792806d.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.7b04130219d8712dab34.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.7b04130219d8712dab34.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.0d66c8723728b8cdcff6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.0d66c8723728b8cdcff6.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.956d470d7b5e6280e3c7.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.956d470d7b5e6280e3c7.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.6b1a6dd0a45f5bdf7981.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.6b1a6dd0a45f5bdf7981.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.0a893fa5e22eb9dc7253.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.0a893fa5e22eb9dc7253.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.f18db154b12a7ac80786.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.f18db154b12a7ac80786.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.d3d9ec0507e102df22ec.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.d3d9ec0507e102df22ec.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.201dbb6238c5b48d9867.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.201dbb6238c5b48d9867.hot-update.js",
+    "/js/main.acc491693f1c481248bf.hot-update.js": "/js/main.acc491693f1c481248bf.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.e09c521481268de302c1.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.e09c521481268de302c1.hot-update.js",
+    "/js/main.b01f6fb88e211c83be5f.hot-update.js": "/js/main.b01f6fb88e211c83be5f.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.ec272fc84af2a46fd6b2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.ec272fc84af2a46fd6b2.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.601a3dcc398db572e153.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.601a3dcc398db572e153.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.bef04192532e117a759a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.bef04192532e117a759a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.2fbe556fcd9561f42b88.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.2fbe556fcd9561f42b88.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.96f90a55b3b5b9ed8662.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.96f90a55b3b5b9ed8662.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.e400a384ee24c7ac91e5.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.e400a384ee24c7ac91e5.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.58bdb96ec7bdbf566376.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.58bdb96ec7bdbf566376.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.6a2c8330f77038ca414b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.6a2c8330f77038ca414b.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.5e8bc04b500bfddb95fc.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.5e8bc04b500bfddb95fc.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.c7537d5fd375b53ed1fb.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.c7537d5fd375b53ed1fb.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.6b4c05166b8a8c383a1e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.6b4c05166b8a8c383a1e.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.f2dfcb7d529057e2e3fe.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.f2dfcb7d529057e2e3fe.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.11842a27d43d68167f56.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.11842a27d43d68167f56.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.b59b16046007c29f6015.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.b59b16046007c29f6015.hot-update.js",
+    "/js/main.e4011fbeaa92fbb76657.hot-update.js": "/js/main.e4011fbeaa92fbb76657.hot-update.js",
+    "/js/main.fa1f220bd492cf3a66d9.hot-update.js": "/js/main.fa1f220bd492cf3a66d9.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.fa1f220bd492cf3a66d9.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.fa1f220bd492cf3a66d9.hot-update.js",
+    "/js/main.b142c914b3a3894cad76.hot-update.js": "/js/main.b142c914b3a3894cad76.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.57340641e4419c43ccdb.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.57340641e4419c43ccdb.hot-update.js",
+    "/js/main.d76d4ff83fd0b0dbcb5a.hot-update.js": "/js/main.d76d4ff83fd0b0dbcb5a.hot-update.js",
+    "/js/main.403f83c834fe8eb960d6.hot-update.js": "/js/main.403f83c834fe8eb960d6.hot-update.js",
+    "/js/main.e643c4b184bb01f284f1.hot-update.js": "/js/main.e643c4b184bb01f284f1.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.24489c77e297e2094a52.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.24489c77e297e2094a52.hot-update.js",
+    "/js/main.c8a52ce4093dfa1aca74.hot-update.js": "/js/main.c8a52ce4093dfa1aca74.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.c8a52ce4093dfa1aca74.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.c8a52ce4093dfa1aca74.hot-update.js",
+    "/chunks/settings-subscription.c8a52ce4093dfa1aca74.hot-update.js": "/chunks/settings-subscription.c8a52ce4093dfa1aca74.hot-update.js",
+    "/chunks/settings-subscription~chunks/user-subscription.js": "/chunks/settings-subscription~chunks/user-subscription.js?id=b4d3db18edce8c497877",
+    "/chunks/user-subscription.c8a52ce4093dfa1aca74.hot-update.js": "/chunks/user-subscription.c8a52ce4093dfa1aca74.hot-update.js",
+    "/js/main.0e4983cd2849297a2827.hot-update.js": "/js/main.0e4983cd2849297a2827.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.0e4983cd2849297a2827.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.0e4983cd2849297a2827.hot-update.js",
+    "/js/main.9f9ce18a97070342f7ef.hot-update.js": "/js/main.9f9ce18a97070342f7ef.hot-update.js",
+    "/js/main.ce56165786df0f625c39.hot-update.js": "/js/main.ce56165786df0f625c39.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.6ba8e3be9fcfc0b96ed6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.6ba8e3be9fcfc0b96ed6.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.5f20e8febf94927cc405.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.5f20e8febf94927cc405.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/ContextMenu.vue b/resources/js/components/FilesView/ContextMenu.vue
index 971e9c5d..e78bfb16 100644
--- a/resources/js/components/FilesView/ContextMenu.vue
+++ b/resources/js/components/FilesView/ContextMenu.vue
@@ -1,375 +1,312 @@
 <template>
-  <div>
-    <div
-      class="contextmenu filePreviewFixed"
-      v-if="showFromPreview"
-      ref="contextmenu"
-      :style="{ top: positionY + 'px', left: positionX + 'px' }"
-    >
-      <!-- ContextMenu for File Preview -->
-      <div class="menu-options" id="menu-list">
-          <ul class="menu-option-group">
-              <li class="menu-option" @click="moveItem">
-                  <div class="icon">
-                      <corner-down-right-icon size="17"></corner-down-right-icon>
-                  </div>
-                  <div class="text-label">
-                      {{ $t("context_menu.move") }}
-                  </div>
-              </li>
-              <li class="menu-option" @click="shareItem">
-                  <div class="icon">
-                      <link-icon size="17"></link-icon>
-                  </div>
-                  <div class="text-label">
-                      {{
-                          item.shared
-                              ? $t("context_menu.share_edit")
-                              : $t("context_menu.share")
-                      }}
-                  </div>
-              </li>
-              <li class="menu-option" @click="deleteItem">
-                  <div class="icon">
-                      <trash-2-icon size="17"></trash-2-icon>
-                  </div>
-                  <div class="text-label">
-                      {{ $t("context_menu.delete") }}
-                  </div>
-              </li>
-          </ul>
-          <ul class="menu-option-group">
-              <li class="menu-option" @click="downloadItem" v-if="!isFolder">
-                  <div class="icon">
-                      <download-cloud-icon size="17"></download-cloud-icon>
-                  </div>
-                  <div class="text-label">
-                      {{ $t("context_menu.download") }}
-                  </div>
-              </li>
-          </ul>
-      </div>
-    </div>
+    <div :style="{ top: positionY + 'px', left: positionX + 'px' }" @click="closeAndResetContextMenu" class="contextmenu" v-show="isVisible || showFromPreview" ref="contextmenu" :class="{ 'filePreviewFixed' : showFromPreview}">
+        <!-- ContextMenu for File Preview -->
+        <div class="menu-options" id="menu-list" v-if="showFromPreview">
+            <ul class="menu-option-group">
+                <li class="menu-option" @click="moveItem">
+                    <div class="icon">
+                        <corner-down-right-icon size="17"></corner-down-right-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.move') }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="shareItem">
+                    <div class="icon">
+                        <link-icon size="17"></link-icon>
+                    </div>
+                    <div class="text-label">
+                        {{
+                            item.shared
+                                ? $t('context_menu.share_edit')
+                                : $t('context_menu.share')
+                        }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="deleteItem">
+                    <div class="icon">
+                        <trash-2-icon size="17"></trash-2-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.delete') }}
+                    </div>
+                </li>
+            </ul>
+            <ul class="menu-option-group">
+                <li class="menu-option" @click="downloadItem" v-if="!isFolder">
+                    <div class="icon">
+                        <download-cloud-icon size="17"></download-cloud-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.download') }}
+                    </div>
+                </li>
+            </ul>
+        </div>
 
-    <div
-      :style="{ top: positionY + 'px', left: positionX + 'px' }"
-      @click="closeAndResetContextMenu"
-      class="contextmenu"
-      v-show="isVisible && !showFromPreview"
-      ref="contextmenu"
-    >
-      <!--ContextMenu for trash location-->
-      <div
-        v-if="
-          $isThisLocation(['trash', 'trash-root']) && $checkPermission('master')
-        "
-        id="menu-list"
-        class="menu-options"
-      >
-        <ul class="menu-option-group">
-          <li
-            class="menu-option"
-            @click="$store.dispatch('restoreItem', item)"
-            v-if="item"
-          >
-            <div class="icon">
-              <life-buoy-icon size="17"></life-buoy-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.restore") }}
-            </div>
-          </li>
-          <li class="menu-option" @click="deleteItem" v-if="item">
-            <div class="icon">
-              <trash-2-icon size="17"></trash-2-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.delete") }}
-            </div>
-          </li>
-          <li class="menu-option" @click="$store.dispatch('emptyTrash')">
-            <div class="icon">
-              <trash-icon size="17"></trash-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.empty_trash") }}
-            </div>
-          </li>
-        </ul>
-        <ul class="menu-option-group" v-if="item">
-          <li class="menu-option" @click="ItemDetail">
-            <div class="icon">
-              <eye-icon size="17"></eye-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.detail") }}
-            </div>
-          </li>
-          <li class="menu-option" @click="downloadItem" v-if="!isFolder">
-            <div class="icon">
-              <download-cloud-icon size="17"></download-cloud-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.download") }}
-            </div>
-          </li>
-        </ul>
-      </div>
+        <!--ContextMenu for trash location-->
+        <div v-if="
+          $isThisLocation(['trash', 'trash-root']) && $checkPermission('master') && !showFromPreview
+        " id="menu-list" class="menu-options">
+            <ul class="menu-option-group">
+                <li class="menu-option" @click="$store.dispatch('restoreItem', item)" v-if="item">
+                    <div class="icon">
+                        <life-buoy-icon size="17"></life-buoy-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.restore') }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="deleteItem" v-if="item">
+                    <div class="icon">
+                        <trash-2-icon size="17"></trash-2-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.delete') }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="$store.dispatch('emptyTrash')">
+                    <div class="icon">
+                        <trash-icon size="17"></trash-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.empty_trash') }}
+                    </div>
+                </li>
+            </ul>
+            <ul class="menu-option-group" v-if="item">
+                <li class="menu-option" @click="ItemDetail">
+                    <div class="icon">
+                        <eye-icon size="17"></eye-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.detail') }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="downloadItem" v-if="!isFolder">
+                    <div class="icon">
+                        <download-cloud-icon size="17"></download-cloud-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.download') }}
+                    </div>
+                </li>
+            </ul>
+        </div>
 
-      <!--ContextMenu for Base location with MASTER permission-->
-      <div
-        v-if="$isThisLocation(['shared']) && $checkPermission('master')"
-        id="menu-list"
-        class="menu-options"
-      >
-        <ul class="menu-option-group" v-if="item && isFolder">
-          <li class="menu-option" @click="addToFavourites">
-            <div class="icon">
-              <star-icon size="17"></star-icon>
-            </div>
-            <div class="text-label">
-              {{
-                isInFavourites
-                  ? $t("context_menu.remove_from_favourites")
-                  : $t("context_menu.add_to_favourites")
-              }}
-            </div>
-          </li>
-        </ul>
-        <ul class="menu-option-group" v-if="item">
-          <li class="menu-option" @click="shareItem">
-            <div class="icon">
-              <link-icon size="17"></link-icon>
-            </div>
-            <div class="text-label">
-              {{
-                item.shared
-                  ? $t("context_menu.share_edit")
-                  : $t("context_menu.share")
-              }}
-            </div>
-          </li>
-          <li class="menu-option" @click="deleteItem">
-            <div class="icon">
-              <trash-2-icon size="17"></trash-2-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.delete") }}
-            </div>
-          </li>
-        </ul>
-        <ul class="menu-option-group" v-if="item">
-          <li class="menu-option" @click="ItemDetail" v-if="item">
-            <div class="icon">
-              <eye-icon size="17"></eye-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.detail") }}
-            </div>
-          </li>
-          <li class="menu-option" @click="downloadItem" v-if="!isFolder">
-            <div class="icon">
-              <download-cloud-icon size="17"></download-cloud-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.download") }}
-            </div>
-          </li>
-        </ul>
-      </div>
+        <!--ContextMenu for Base location with MASTER permission-->
+        <div v-if="$isThisLocation(['shared']) && $checkPermission('master') && !showFromPreview" id="menu-list" class="menu-options">
+            <ul class="menu-option-group" v-if="item && isFolder">
+                <li class="menu-option" @click="addToFavourites">
+                    <div class="icon">
+                        <star-icon size="17"></star-icon>
+                    </div>
+                    <div class="text-label">
+                        {{
+                            isInFavourites
+                                ? $t('context_menu.remove_from_favourites')
+                                : $t('context_menu.add_to_favourites')
+                        }}
+                    </div>
+                </li>
+            </ul>
+            <ul class="menu-option-group" v-if="item">
+                <li class="menu-option" @click="shareItem">
+                    <div class="icon">
+                        <link-icon size="17"></link-icon>
+                    </div>
+                    <div class="text-label">
+                        {{
+                            item.shared
+                                ? $t('context_menu.share_edit')
+                                : $t('context_menu.share')
+                        }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="deleteItem">
+                    <div class="icon">
+                        <trash-2-icon size="17"></trash-2-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.delete') }}
+                    </div>
+                </li>
+            </ul>
+            <ul class="menu-option-group" v-if="item">
+                <li class="menu-option" @click="ItemDetail" v-if="item">
+                    <div class="icon">
+                        <eye-icon size="17"></eye-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.detail') }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="downloadItem" v-if="!isFolder">
+                    <div class="icon">
+                        <download-cloud-icon size="17"></download-cloud-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.download') }}
+                    </div>
+                </li>
+            </ul>
+        </div>
 
-      <!--ContextMenu for Base location with MASTER permission-->
-      <div
-        v-if="
+        <!--ContextMenu for Base location with MASTER permission-->
+        <div v-if="
           $isThisLocation(['base', 'participant_uploads', 'latest']) &&
-          $checkPermission('master')
-        "
-        id="menu-list"
-        class="menu-options"
-      >
-        <ul
-          class="menu-option-group"
-          v-if="!$isThisLocation(['participant_uploads', 'latest'])"
-        >
-          <li
-            class="menu-option"
-            @click="addToFavourites"
-            v-if="item && isFolder"
-          >
-            <div class="icon">
-              <star-icon size="17"></star-icon>
-            </div>
-            <div class="text-label">
-              {{
-                isInFavourites
-                  ? $t("context_menu.remove_from_favourites")
-                  : $t("context_menu.add_to_favourites")
-              }}
-            </div>
-          </li>
-          <li class="menu-option" @click="createFolder">
-            <div class="icon">
-              <folder-plus-icon size="17"></folder-plus-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.create_folder") }}
-            </div>
-          </li>
-        </ul>
-        <ul class="menu-option-group" v-if="item">
-          <li class="menu-option" @click="moveItem">
-            <div class="icon">
-              <corner-down-right-icon size="17"></corner-down-right-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.move") }}
-            </div>
-          </li>
-          <li class="menu-option" @click="shareItem">
-            <div class="icon">
-              <link-icon size="17"></link-icon>
-            </div>
-            <div class="text-label">
-              {{
-                item.shared
-                  ? $t("context_menu.share_edit")
-                  : $t("context_menu.share")
-              }}
-            </div>
-          </li>
-          <li class="menu-option" @click="deleteItem">
-            <div class="icon">
-              <trash-2-icon size="17"></trash-2-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.delete") }}
-            </div>
-          </li>
-        </ul>
-        <ul class="menu-option-group" v-if="item">
-          <li class="menu-option" @click="ItemDetail">
-            <div class="icon">
-              <eye-icon size="17"></eye-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.detail") }}
-            </div>
-          </li>
-          <li class="menu-option" @click="downloadItem" v-if="!isFolder">
-            <div class="icon">
-              <download-cloud-icon size="17"></download-cloud-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.download") }}
-            </div>
-          </li>
-        </ul>
-      </div>
+          $checkPermission('master') && !showFromPreview
+        " id="menu-list" class="menu-options">
+            <ul class="menu-option-group" v-if="!$isThisLocation(['participant_uploads', 'latest'])">
+                <li class="menu-option" @click="addToFavourites" v-if="item && isFolder">
+                    <div class="icon">
+                        <star-icon size="17"></star-icon>
+                    </div>
+                    <div class="text-label">
+                        {{
+                            isInFavourites
+                                ? $t('context_menu.remove_from_favourites')
+                                : $t('context_menu.add_to_favourites')
+                        }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="createFolder">
+                    <div class="icon">
+                        <folder-plus-icon size="17"></folder-plus-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.create_folder') }}
+                    </div>
+                </li>
+            </ul>
+            <ul class="menu-option-group" v-if="item">
+                <li class="menu-option" @click="moveItem">
+                    <div class="icon">
+                        <corner-down-right-icon size="17"></corner-down-right-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.move') }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="shareItem">
+                    <div class="icon">
+                        <link-icon size="17"></link-icon>
+                    </div>
+                    <div class="text-label">
+                        {{
+                            item.shared
+                                ? $t('context_menu.share_edit')
+                                : $t('context_menu.share')
+                        }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="deleteItem">
+                    <div class="icon">
+                        <trash-2-icon size="17"></trash-2-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.delete') }}
+                    </div>
+                </li>
+            </ul>
+            <ul class="menu-option-group" v-if="item">
+                <li class="menu-option" @click="ItemDetail">
+                    <div class="icon">
+                        <eye-icon size="17"></eye-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.detail') }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="downloadItem" v-if="!isFolder">
+                    <div class="icon">
+                        <download-cloud-icon size="17"></download-cloud-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.download') }}
+                    </div>
+                </li>
+            </ul>
+        </div>
 
-      <!--ContextMenu for Base location with EDITOR permission-->
-      <div
-        v-if="$isThisLocation(['base', 'public']) && $checkPermission('editor')"
-        id="menu-list"
-        class="menu-options"
-      >
-        <ul class="menu-option-group">
-          <li class="menu-option" @click="createFolder">
-            <div class="icon">
-              <folder-plus-icon size="17"></folder-plus-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.create_folder") }}
-            </div>
-          </li>
-        </ul>
-        <ul class="menu-option-group" v-if="item">
-          <li class="menu-option" @click="moveItem">
-            <div class="icon">
-              <corner-down-right-icon size="17"></corner-down-right-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.move") }}
-            </div>
-          </li>
-          <li class="menu-option" @click="deleteItem">
-            <div class="icon">
-              <trash-2-icon size="17"></trash-2-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.delete") }}
-            </div>
-          </li>
-        </ul>
-        <ul class="menu-option-group" v-if="item">
-          <li class="menu-option" @click="ItemDetail">
-            <div class="icon">
-              <eye-icon size="17"></eye-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.detail") }}
-            </div>
-          </li>
-          <li class="menu-option" @click="downloadItem" v-if="!isFolder">
-            <div class="icon">
-              <download-cloud-icon size="17"></download-cloud-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.download") }}
-            </div>
-          </li>
-        </ul>
-      </div>
+        <!--ContextMenu for Base location with EDITOR permission-->
+        <div v-if="$isThisLocation(['base', 'public']) && $checkPermission('editor') && !showFromPreview" id="menu-list" class="menu-options">
+            <ul class="menu-option-group">
+                <li class="menu-option" @click="createFolder">
+                    <div class="icon">
+                        <folder-plus-icon size="17"></folder-plus-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.create_folder') }}
+                    </div>
+                </li>
+            </ul>
+            <ul class="menu-option-group" v-if="item">
+                <li class="menu-option" @click="moveItem">
+                    <div class="icon">
+                        <corner-down-right-icon size="17"></corner-down-right-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.move') }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="deleteItem">
+                    <div class="icon">
+                        <trash-2-icon size="17"></trash-2-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.delete') }}
+                    </div>
+                </li>
+            </ul>
+            <ul class="menu-option-group" v-if="item">
+                <li class="menu-option" @click="ItemDetail">
+                    <div class="icon">
+                        <eye-icon size="17"></eye-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.detail') }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="downloadItem" v-if="!isFolder">
+                    <div class="icon">
+                        <download-cloud-icon size="17"></download-cloud-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.download') }}
+                    </div>
+                </li>
+            </ul>
+        </div>
 
-      <!--ContextMenu for Base location with VISITOR permission-->
-      <div
-        v-if="
-          $isThisLocation(['base', 'public']) && $checkPermission('visitor')
-        "
-        id="menu-list"
-        class="menu-options"
-      >
-        <ul class="menu-option-group" v-if="item">
-          <li class="menu-option" @click="ItemDetail">
-            <div class="icon">
-              <eye-icon size="17"></eye-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.detail") }}
-            </div>
-          </li>
-          <li class="menu-option" @click="downloadItem" v-if="!isFolder">
-            <div class="icon">
-              <download-cloud-icon size="17"></download-cloud-icon>
-            </div>
-            <div class="text-label">
-              {{ $t("context_menu.download") }}
-            </div>
-          </li>
-        </ul>
-      </div>
+        <!--ContextMenu for Base location with VISITOR permission-->
+        <div v-if="
+          $isThisLocation(['base', 'public']) && $checkPermission('visitor') && !showFromPreview
+        " id="menu-list" class="menu-options">
+            <ul class="menu-option-group" v-if="item">
+                <li class="menu-option" @click="ItemDetail">
+                    <div class="icon">
+                        <eye-icon size="17"></eye-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.detail') }}
+                    </div>
+                </li>
+                <li class="menu-option" @click="downloadItem" v-if="!isFolder">
+                    <div class="icon">
+                        <download-cloud-icon size="17"></download-cloud-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.download') }}
+                    </div>
+                </li>
+            </ul>
+        </div>
     </div>
-  </div>
 </template>
 
 <script>
 import {
-  CornerDownRightIcon,
-  DownloadCloudIcon,
-  FolderPlusIcon,
-  LifeBuoyIcon,
-  Trash2Icon,
-  Edit2Icon,
-  TrashIcon,
-  StarIcon,
-  LinkIcon,
-  EyeIcon,
-} from "vue-feather-icons";
-import { mapGetters } from "vuex";
-import { events } from "@/bus";
-
-export default {
-  name: "ContextMenu",
-  components: {
     CornerDownRightIcon,
     DownloadCloudIcon,
     FolderPlusIcon,
@@ -377,215 +314,232 @@ export default {
     Trash2Icon,
     Edit2Icon,
     TrashIcon,
-    LinkIcon,
     StarIcon,
-    EyeIcon,
-  },
-  computed: {
-    ...mapGetters(["user"]),
-    favourites() {
-      return this.user.relationships.favourites.data.attributes.folders;
-    },
-    isFolder() {
-      return this.item && this.item.type === "folder";
-    },
-    isFile() {
-      return (
-        this.item &&
-        this.item.type !== "folder" &&
-        this.item &&
-        this.item.type !== "image"
-      );
-    },
-    isImage() {
-      return this.item && this.item.type === "image";
-    },
-    isInFavourites() {
-      return this.favourites.find((el) => el.unique_id == this.item.unique_id);
-    },
-  },
-  data() {
-    return {
-      showFromPreview: false,
-      item: undefined,
-      isVisible: false,
-      positionX: 0,
-      positionY: 0,
-    };
-  },
+    LinkIcon,
+    EyeIcon
+} from 'vue-feather-icons'
+import { mapGetters } from 'vuex'
+import { events } from '@/bus'
 
-  methods: {
-    renameItem() {
-      let itemName = prompt(this.$t("popup_rename.title"), this.item.name);
-
-      if (itemName && itemName !== "") {
-        let item = {
-          unique_id: this.item.unique_id,
-          type: this.item.type,
-          name: itemName,
-        };
-
-        this.$store.dispatch("renameItem", item);
-
-        // Change item name if is mobile device or prompted
-        if (this.$isMobile()) {
-          events.$emit("change:name", item);
+export default {
+    name: 'ContextMenu',
+    components: {
+        CornerDownRightIcon,
+        DownloadCloudIcon,
+        FolderPlusIcon,
+        LifeBuoyIcon,
+        Trash2Icon,
+        Edit2Icon,
+        TrashIcon,
+        LinkIcon,
+        StarIcon,
+        EyeIcon
+    },
+    computed: {
+        ...mapGetters(['user']),
+        favourites() {
+            return this.user.relationships.favourites.data.attributes.folders
+        },
+        isFolder() {
+            return this.item && this.item.type === 'folder'
+        },
+        isFile() {
+            return (
+                this.item &&
+                this.item.type !== 'folder' &&
+                this.item &&
+                this.item.type !== 'image'
+            )
+        },
+        isImage() {
+            return this.item && this.item.type === 'image'
+        },
+        isInFavourites() {
+            return this.favourites.find((el) => el.unique_id == this.item.unique_id)
         }
-      }
     },
-    moveItem() {
-      // Open move item popup
-      events.$emit("popup:open", { name: "move", item: this.item });
-    },
-    shareItem() {
-      if (this.item.shared) {
-        // Open share item popup
-        events.$emit("popup:open", { name: "share-edit", item: this.item });
-      } else {
-        // Open share item popup
-        events.$emit("popup:open", { name: "share-create", item: this.item });
-      }
-    },
-    addToFavourites() {
-      // Check if folder is in favourites and then add/remove from favourites
-      if (
-        this.favourites &&
-        !this.favourites.find((el) => el.unique_id == this.item.unique_id)
-      ) {
-        this.$store.dispatch("addToFavourites", this.item);
-      } else {
-        this.$store.dispatch("removeFromFavourites", this.item);
-      }
-    },
-    downloadItem() {
-      // Download file
-      this.$downloadFile(
-        this.item.file_url,
-        this.item.name + "." + this.item.mimetype
-      );
-    },
-    ItemDetail() {
-      // Dispatch load file info detail
-      this.$store.commit("GET_FILEINFO_DETAIL", this.item);
-
-      // Show panel if is not open
-      this.$store.dispatch("fileInfoToggle", true);
-    },
-    deleteItem() {
-      // Dispatch remove item
-      this.$store.dispatch("deleteItem", this.item);
-    },
-    createFolder() {
-      // Create folder
-      this.$createFolder(this.$t("popup_create_folder.folder_default_name"));
-    },
-    closeAndResetContextMenu() {
-      // Close context menu
-      this.isVisible = false;
-
-      // Reset item container
-      this.item = undefined;
-    },
-    showFolderActionsMenu() {
-      let container = document.getElementById("folder-actions");
-
-      this.positionX = container.offsetLeft + 16;
-      this.positionY = container.offsetTop + 30;
-
-      // Show context menu
-      this.isVisible = true;
-    },
-    showContextMenu(event) {
-      let parent = document.getElementById("menu-list");
-      let nodesSameClass = parent.getElementsByClassName("menu-option");
-
-      let VerticalOffsetArea = nodesSameClass.length * 50;
-      let HorizontalOffsetArea = 190;
-
-      let container = document.getElementById("files-view");
-
-      var offset = container.getClientRects()[0];
-
-      let x = event.clientX - offset.left;
-      let y = event.clientY - offset.top;
-
-      // Set position Y
-      if (container.offsetHeight - y < VerticalOffsetArea) {
-        this.positionY = y - VerticalOffsetArea;
-      } else {
-        this.positionY = y;
-      }
-
-      // Set position X
-      if (container.offsetWidth - x < HorizontalOffsetArea) {
-        this.positionX = x - HorizontalOffsetArea;
-      } else {
-        this.positionX = x;
-      }
-
-      // Show context menu
-      this.isVisible = true;
-    },
-    showFilePreviewMenu() {
-      let container = document.getElementById("fast-preview-menu");
-      if (container) {
-        this.positionX = container.offsetLeft + 16;
-        this.positionY = container.offsetTop + 51;
-      }
+    data() {
+        return {
+            showFromPreview: false,
+            item: undefined,
+            isVisible: false,
+            positionX: 0,
+            positionY: 0
+        }
     },
 
-  },
-  watch: {
-    item(newValue, oldValue) {
-      if (oldValue != undefined && this.showFromPreview) {
-        this.showFromPreview = false;
-      }
+    methods: {
+        renameItem() {
+            let itemName = prompt(this.$t('popup_rename.title'), this.item.name)
+
+            if (itemName && itemName !== '') {
+                let item = {
+                    unique_id: this.item.unique_id,
+                    type: this.item.type,
+                    name: itemName
+                }
+
+                this.$store.dispatch('renameItem', item)
+
+                // Change item name if is mobile device or prompted
+                if (this.$isMobile()) {
+                    events.$emit('change:name', item)
+                }
+            }
+        },
+        moveItem() {
+            // Open move item popup
+            events.$emit('popup:open', { name: 'move', item: this.item })
+        },
+        shareItem() {
+            if (this.item.shared) {
+                // Open share item popup
+                events.$emit('popup:open', { name: 'share-edit', item: this.item })
+            } else {
+                // Open share item popup
+                events.$emit('popup:open', { name: 'share-create', item: this.item })
+            }
+        },
+        addToFavourites() {
+            // Check if folder is in favourites and then add/remove from favourites
+            if (
+                this.favourites &&
+                !this.favourites.find((el) => el.unique_id == this.item.unique_id)
+            ) {
+                this.$store.dispatch('addToFavourites', this.item)
+            } else {
+                this.$store.dispatch('removeFromFavourites', this.item)
+            }
+        },
+        downloadItem() {
+            // Download file
+            this.$downloadFile(
+                this.item.file_url,
+                this.item.name + '.' + this.item.mimetype
+            )
+        },
+        ItemDetail() {
+            // Dispatch load file info detail
+            this.$store.commit('GET_FILEINFO_DETAIL', this.item)
+
+            // Show panel if is not open
+            this.$store.dispatch('fileInfoToggle', true)
+        },
+        deleteItem() {
+            // Dispatch remove item
+            this.$store.dispatch('deleteItem', this.item)
+        },
+        createFolder() {
+            // Create folder
+            this.$createFolder(this.$t('popup_create_folder.folder_default_name'))
+        },
+        closeAndResetContextMenu() {
+            // Close context menu
+            this.isVisible = false
+
+            // Reset item container
+            this.item = undefined
+        },
+        showFolderActionsMenu() {
+            let container = document.getElementById('folder-actions')
+
+            this.positionX = container.offsetLeft + 16
+            this.positionY = container.offsetTop + 30
+
+            // Show context menu
+            this.isVisible = true
+        },
+        showContextMenu(event) {
+            let parent = document.getElementById('menu-list')
+            let nodesSameClass = parent.getElementsByClassName('menu-option')
+
+            let VerticalOffsetArea = nodesSameClass.length * 50
+            let HorizontalOffsetArea = 190
+
+            let container = document.getElementById('files-view')
+
+            var offset = container.getClientRects()[0]
+
+            let x = event.clientX - offset.left
+            let y = event.clientY - offset.top
+
+            // Set position Y
+            if (container.offsetHeight - y < VerticalOffsetArea) {
+                this.positionY = y - VerticalOffsetArea
+            } else {
+                this.positionY = y
+            }
+
+            // Set position X
+            if (container.offsetWidth - x < HorizontalOffsetArea) {
+                this.positionX = x - HorizontalOffsetArea
+            } else {
+                this.positionX = x
+            }
+
+            // Show context menu
+            this.isVisible = true
+        },
+        showFilePreviewMenu() {
+            let container = document.getElementById('fast-preview-menu')
+            if (container) {
+                this.positionX = container.offsetLeft + 16
+                this.positionY = container.offsetTop + 51
+            }
+        }
+
+    },
+    watch: {
+        item(newValue, oldValue) {
+            if (oldValue != undefined && this.showFromPreview) {
+                this.showFromPreview = false
+            }
+        }
     },
-  },
- 
-  mounted() {
-    events.$on("actualShowingImage:ContextMenu", (item) => {
-      this.item = item;
-    });
-  },
-  created() {
-    events.$on("showContextMenuPreview:show", (item) => {
-      if (!this.showFromPreview) {
-        this.item = item;
-        this.showFromPreview = true;
-        this.showFilePreviewMenu();
-      } else if (this.showFromPreview) {
-        this.showFromPreview = false;
-        this.item = undefined;
-      }
-    });
 
-    events.$on('showContextMenuPreview:hide', () => {
+    mounted() {
+        events.$on('actualShowingImage:ContextMenu', (item) => {
+            this.item = item
+        })
+    },
+    created() {
+        events.$on('showContextMenuPreview:show', (item) => {
+            if (!this.showFromPreview) {
+                this.item = item
+                this.showFromPreview = true
+                this.showFilePreviewMenu()
+            } else if (this.showFromPreview) {
+                this.showFromPreview = false
+                this.item = undefined
+            }
+        })
 
-      this.showFromPreview = false;
-       this.item = undefined;
-   
-    }) 
-   
+        events.$on('showContextMenuPreview:hide', () => {
+            this.isVisible = false
+            this.showFromPreview = false
+            this.item = undefined
 
-    events.$on("contextMenu:show", (event, item) => {
-      // Store item
-      this.item = item;
+        })
 
-      // Show context menu
-      setTimeout(() => this.showContextMenu(event, item), 10);
-    });
 
-    events.$on("contextMenu:hide", () => this.closeAndResetContextMenu());
+        events.$on('contextMenu:show', (event, item) => {
+            // Store item
+            this.item = item
 
-    events.$on("folder:actions", (folder) => {
-      // Store item
-      this.item = folder;
+            // Show context menu
+            setTimeout(() => this.showContextMenu(event, item), 10)
+        })
 
-      if (this.isVisible) this.isVisible = false;
-      else this.showFolderActionsMenu();
-    });
-  },
+        events.$on('contextMenu:hide', () => this.closeAndResetContextMenu())
+
+        events.$on('folder:actions', (folder) => {
+            // Store item
+            this.item = folder
+
+            if (this.isVisible) this.isVisible = false
+            else this.showFolderActionsMenu()
+        })
+    }
 }
 </script>
 
@@ -594,102 +548,103 @@ export default {
 @import "@assets/vue-file-manager/_mixins";
 
 .filePreviewFixed {
-  position: fixed !important;
+    position: fixed !important;
+    display: flex;
 }
 
 .menu-option {
-  display: flex;
-  align-items: center;
+    display: flex;
+    align-items: center;
 
-  .icon {
-    margin-right: 20px;
-    line-height: 0;
-  }
+    .icon {
+        margin-right: 20px;
+        line-height: 0;
+    }
 
-  .text-label {
-    @include font-size(16);
-  }
+    .text-label {
+        @include font-size(16);
+    }
 }
 
 .contextmenu {
-  min-width: 250px;
-  position: absolute;
-  z-index: 99;
-  box-shadow: $shadow;
-  background: white;
-  border-radius: 8px;
-  overflow: hidden;
+    min-width: 250px;
+    position: absolute;
+    z-index: 99;
+    box-shadow: $shadow;
+    background: white;
+    border-radius: 8px;
+    overflow: hidden;
 
-  &.showed {
-    display: block;
-  }
+    &.showed {
+        display: block;
+    }
 }
 
 .menu-options {
-  list-style: none;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-
-  .menu-option-group {
-    padding: 5px 0;
-    border-bottom: 1px solid $light_mode_border;
-
-    &:first-child {
-      padding-top: 0;
-    }
-
-    &:last-child {
-      padding-bottom: 0;
-      border-bottom: none;
-    }
-  }
-
-  .menu-option {
-    white-space: nowrap;
-    font-weight: 700;
-    @include font-size(14);
-    padding: 15px 20px;
-    cursor: pointer;
+    list-style: none;
     width: 100%;
-    color: $text;
+    margin: 0;
+    padding: 0;
 
-    &:hover {
-      background: $light_background;
+    .menu-option-group {
+        padding: 5px 0;
+        border-bottom: 1px solid $light_mode_border;
 
-      .text-label {
-        color: $theme;
-      }
+        &:first-child {
+            padding-top: 0;
+        }
 
-      path,
-      line,
-      polyline,
-      rect,
-      circle,
-      polygon {
-        stroke: $theme;
-      }
+        &:last-child {
+            padding-bottom: 0;
+            border-bottom: none;
+        }
+    }
+
+    .menu-option {
+        white-space: nowrap;
+        font-weight: 700;
+        @include font-size(14);
+        padding: 15px 20px;
+        cursor: pointer;
+        width: 100%;
+        color: $text;
+
+        &:hover {
+            background: $light_background;
+
+            .text-label {
+                color: $theme;
+            }
+
+            path,
+            line,
+            polyline,
+            rect,
+            circle,
+            polygon {
+                stroke: $theme;
+            }
+        }
     }
-  }
 }
 
 @media (prefers-color-scheme: dark) {
-  .contextmenu {
-    background: $dark_mode_foreground;
+    .contextmenu {
+        background: $dark_mode_foreground;
 
-    .menu-options {
-      .menu-option-group {
-        border-color: $dark_mode_border_color;
-      }
+        .menu-options {
+            .menu-option-group {
+                border-color: $dark_mode_border_color;
+            }
 
-      .menu-option {
-        color: $dark_mode_text_primary;
+            .menu-option {
+                color: $dark_mode_text_primary;
 
-        &:hover {
-          background: rgba($theme, 0.1);
+                &:hover {
+                    background: rgba($theme, 0.1);
+                }
+            }
         }
-      }
     }
-  }
 }
 </style>
diff --git a/resources/js/components/FilesView/FileInfoPanel.vue b/resources/js/components/FilesView/FileInfoPanel.vue
index 4a0a7e0d..56e6b0df 100644
--- a/resources/js/components/FilesView/FileInfoPanel.vue
+++ b/resources/js/components/FilesView/FileInfoPanel.vue
@@ -57,13 +57,9 @@
                 </div>
             </ListInfoItem>
 
-            <div  @click="this.showMetaData">
-                <ListInfoItem   v-if="fileInfoDetail.meta_data"            
-                                :title="$t('file_detail_meta.meta_data')"
-                                class="meta-data">    
-                    <ImageMetaData v-if="this.metaDataShow" />
-                </ListInfoItem>
-            </div>
+            <ListInfoItem v-if="canShowMetaData" :title="$t('file_detail_meta.meta_data')">
+                <ImageMetaData />
+            </ListInfoItem>
         </ListInfo>
     </div>
 </template>
@@ -98,26 +94,11 @@
             ...mapGetters(['fileInfoDetail', 'permissionOptions']),
             fileType() {
                 return this.fileInfoDetail.type
-                /*                switch () {
-                                    case 'folder':
-                                        return 'folder'
-                                    break;
-                                    case 'file':
-                                        return 'file'
-                                    break;
-                                    case 'image':
-                                        return 'file-image'
-                                    break;
-                                    case 'video':
-                                        return 'file-video'
-                                    break;
-                                    case 'file':
-                                        return 'file-audio'
-                                    break;
-                                }*/
+            },
+            canShowMetaData() {
+                return this.fileInfoDetail.metadata && this.fileInfoDetail.metadata.ExifImageWidth
             },
             sharedInfo() {
-
                 // Get permission title
                 let title = this.permissionOptions.find(option => {
                     return option.value === this.fileInfoDetail.shared.permission
@@ -141,15 +122,7 @@
                 return this.fileInfoDetail.shared.protected
             }
         },
-        data() {
-            return {
-                metaDataShow: false
-            }
-        },
         methods: {
-            showMetaData() {
-                this.metaDataShow = !this.metaDataShow
-            },
             shareItemOptions() {
                 // Open share item popup
                 events.$emit('popup:open', {name: 'share-edit', item: this.fileInfoDetail})
@@ -230,9 +203,6 @@
             width: 100%;
         }
     }
-    .meta-data{
-        cursor: pointer;
-    }
 
     @media (prefers-color-scheme: dark) {
 
diff --git a/resources/js/components/FilesView/ImageMetaData.vue b/resources/js/components/FilesView/ImageMetaData.vue
index 9546e383..040f2ff9 100644
--- a/resources/js/components/FilesView/ImageMetaData.vue
+++ b/resources/js/components/FilesView/ImageMetaData.vue
@@ -1,75 +1,115 @@
 <template>
     <div>
         <ul class="meta-data-list">
-                    <li v-if="fileInfoDetail.meta_data.Artist"> {{$t('file_detail_meta.author')}}
-                         <p> {{fileInfoDetail.meta_data.Artist}} </p> </li>
+            <li v-if="fileInfoDetail.metadata.DateTimeOriginal">
+                <span>{{ $t('file_detail_meta.time_data') }}</span>
+                <b>{{ fileInfoDetail.metadata.DateTimeOriginal }}</b>
+            </li>
 
-                    <li v-if="fileInfoDetail.meta_data.DateTimeOriginal">{{$t('file_detail_meta.time_data')}}
-                         <p> {{fileInfoDetail.meta_data.DateTimeOriginal}} </p> </li>     
+            <li v-if="fileInfoDetail.metadata.Artist">
+                <span>{{ $t('file_detail_meta.author') }}</span>
+                <b>{{ fileInfoDetail.metadata.Artist }}</b>
+            </li>
 
-                    <li v-if="fileInfoDetail.meta_data.Make">{{$t('file_detail_meta.make')}} 
-                        <p> {{fileInfoDetail.meta_data.Make}} </p> </li>
+            <li v-if="fileInfoDetail.metadata.ExifImageWidth && fileInfoDetail.metadata.ExifImageLength">
+                <span>{{ $t('file_detail_meta.dimension') }}</span>
+                <b>{{ fileInfoDetail.metadata.ExifImageWidth }}x{{ fileInfoDetail.metadata.ExifImageLength }}</b>
+            </li>
 
-                    <li v-if="fileInfoDetail.meta_data.Model">{{$t('file_detail_meta.model')}}
-                        <p> {{fileInfoDetail.meta_data.Model}} </p> </li>
+            <li v-if="fileInfoDetail.metadata.XResolution && fileInfoDetail.metadata.YResolution">
+                <span>{{ $t('file_detail_meta.resolution') }}Resolution</span>
+                <b>{{ fileInfoDetail.metadata.XResolution }}x{{ fileInfoDetail.metadata.YResolution }}</b>
+            </li>
 
-                    <li v-if="fileInfoDetail.meta_data.COMPUTED.CCDWidth">{{$t('file_detail_meta.camera_lens')}} 
-                        <p> {{fileInfoDetail.meta_data.COMPUTED.CCDWidth}} </p> </li>
+            <!--TODO: Colour space:RGB-->
+            <!--TODO: Colour profile:sRGB IEC61966-2.1-->
 
-                    <li v-if="fileInfoDetail.meta_data.COMPUTED.ApertureFNumber">{{$t('file_detail_meta.aperature')}} 
-                        <p> {{fileInfoDetail.meta_data.COMPUTED.ApertureFNumber}} </p> </li>
+            <li v-if="fileInfoDetail.metadata.Make">
+                <span>{{ $t('file_detail_meta.make') }}</span>
+                <b>{{ fileInfoDetail.metadata.Make }}</b>
+            </li>
 
-                    <li v-if="fileInfoDetail.meta_data.ISOSpeedRatings">{{$t('file_detail_meta.iso')}}
-                        <p> {{fileInfoDetail.meta_data.ISOSpeedRatings}} </p> </li>
+            <li v-if="fileInfoDetail.metadata.Model">
+                <span>{{ $t('file_detail_meta.model') }}</span>
+                <b>{{ fileInfoDetail.metadata.Model }}</b>
+            </li>
 
-                    <li v-if="fileInfoDetail.meta_data.FocalLength">{{$t('file_detail_meta.focal')}} 
-                        <p> {{fileInfoDetail.meta_data.FocalLength}} </p> </li>
+            <li v-if="fileInfoDetail.metadata.ApertureValue">
+                <span>{{ $t('file_detail_meta.aperture_value') }}</span>
+                <b v-html="parseInt(fileInfoDetail.metadata.ApertureValue) / 100"></b>
+            </li>
 
-                    <li v-if="fileInfoDetail.meta_data.ExposureTime">{{$t('file_detail_meta.exposure')}} 
-                        <p> {{fileInfoDetail.meta_data.ExposureTime}} </p> </li>
+            <li v-if="fileInfoDetail.metadata.ExposureTime">
+                <span>{{ $t('file_detail_meta.exposure') }}</span>
+                <b>{{ fileInfoDetail.metadata.ExposureTime }}</b>
+            </li>
 
-                    <li v-else>{{$t('file_detail_meta.not_avaible')}} </li> 
+            <li v-if="fileInfoDetail.metadata.FocalLength">
+                <span>{{ $t('file_detail_meta.focal') }}</span>
+                <b>{{ fileInfoDetail.metadata.FocalLength }}</b>
+            </li>
 
-                </ul>
+            <li v-if="fileInfoDetail.metadata.ISOSpeedRatings">
+                <span>{{ $t('file_detail_meta.iso') }}</span>
+                <b>{{ fileInfoDetail.metadata.ISOSpeedRatings }}</b>
+            </li>
+
+            <li v-if="fileInfoDetail.metadata.COMPUTED.ApertureFNumber">
+                <span>{{ $t('file_detail_meta.aperature') }}</span>
+                <b>{{ fileInfoDetail.metadata.COMPUTED.ApertureFNumber }}</b>
+            </li>
+
+            <li v-if="fileInfoDetail.metadata.COMPUTED.CCDWidth">
+                <span>{{ $t('file_detail_meta.camera_lens') }}</span>
+                <b>{{ fileInfoDetail.metadata.COMPUTED.CCDWidth }}</b>
+            </li>
+
+            <!--TODO: Longitude: 20° 50' 24,432" E-->
+            <!--TODO: Latitude: 47° 23' 14,49" N-->
+        </ul>
     </div>
 </template>
 
 <script>
-    import {mapGetters} from 'vuex'
+import { mapGetters } from 'vuex'
 
-    export default {
-        name: 'ImageMetaData',
-        computed: {
-            ...mapGetters(['fileInfoDetail']),
-        },
+export default {
+    name: 'ImageMetaData',
+    computed: {
+        ...mapGetters(['fileInfoDetail'])
     }
+}
 </script>
 
 <style lang="scss" scoped>
 @import '@assets/vue-file-manager/_variables';
 @import '@assets/vue-file-manager/_mixins';
 
- .meta-data-list {
-            list-style: none;
-            padding: 0px;
-            margin: 0px;
-          li {
-            margin-top:10px;
+.meta-data-list {
+    list-style: none;
+    padding: 0px;
+    margin: 0px;
+
+    li {
+        display: flex;
+        justify-content: space-between;
+        padding: 9px 0;
+        border-bottom: 1px solid $light_mode_border;
+
+        b, span {
             @include font-size(14);
-            font-weight: bold;
             color: $text;
-            p {
-            @include font-size(13);
-            color: $text;
-            }
-           }
         }
- @media (prefers-color-scheme: dark) {
-     li {
-         color:$dark_mode_text_primary !important;
-         p {
-             color: $dark_mode_text_primary !important;
-         }
-     }
- }
+    }
+}
+
+@media (prefers-color-scheme: dark) {
+    li {
+        color: $dark_mode_text_primary !important;
+
+        p {
+            color: $dark_mode_text_primary !important;
+        }
+    }
+}
 </style>
\ No newline at end of file
diff --git a/resources/js/i18n/lang/cn.json b/resources/js/i18n/lang/cn.json
index e1cae2b8..c7ea944a 100644
--- a/resources/js/i18n/lang/cn.json
+++ b/resources/js/i18n/lang/cn.json
@@ -210,7 +210,7 @@
 		"others": {
 			"mimetypes_blacklist": "Mimetypes Blacklist",
 			"mimetypes_blacklist_plac":"Add mimetypes to Blacklist" ,
-			"mimetypes_blacklist_help" :"If you want ban some type of files to upload just add them to blacklist like this: x-php,mp3,jpeg <br/> Use a comma between each mime type. Don't use a dot before mimetypes." ,
+			"mimetypes_blacklist_help" :"If you want to prevent upload some type of files, just add them to blacklist like this: x-php,mp3,jpeg <br/> Use a comma between each mimetype. Don't use a dot before mimetypes." ,
 			"section_cache": "Application Cache",
 			"cache_disclaimer": "Did you change anything in your .env file or change your stripe credentials? Then clear your cache.",
 			"cache_clear": "Clear Cache",
@@ -299,17 +299,19 @@
 		"where": "地址"
 	},
 	"file_detail_meta": {
+		"dimension": "Dimensions",
+		"resolution": "Resolution",
+		"aperture_value": "Aperture Value",
 		"meta_data": "Metadata",
 		"author": "Author",
-		"time_data": "Original time data",
+		"time_data": "Content Created",
 		"make": "Camera",
 		"model": "Model",
 		"camera_lens": "Camera lens",
-		"aperature": "Aperture F Number",
+		"aperature": "F Number",
 		"iso": "ISO",
 		"focal": "Focal length",
-		"exposure": "Exposure time",
-		"not_avaible": "Metadata not avaible"
+		"exposure": "Exposure time"
 	},
 	"folder": {
 		"empty": "空的",
diff --git a/resources/js/i18n/lang/en.json b/resources/js/i18n/lang/en.json
index 5c3c064d..072a2686 100644
--- a/resources/js/i18n/lang/en.json
+++ b/resources/js/i18n/lang/en.json
@@ -212,7 +212,7 @@
 		"others": {
 			"mimetypes_blacklist": "Mimetypes Blacklist",
 			"mimetypes_blacklist_plac":"Add mimetypes to Blacklist" ,
-			"mimetypes_blacklist_help" :"If you want ban some type of files to upload just add them to blacklist like this: x-php,mp3,jpeg <br/> Use a comma between each mime type. Don't use a dot before mimetypes." ,
+			"mimetypes_blacklist_help" :"If you want to prevent upload some type of files, just add them to blacklist like this: x-php,mp3,jpeg <br/> Use a comma between each mimetype. Don't use a dot before mimetypes." ,
 			"section_cache": "Application Cache",
 			"cache_disclaimer": "Did you change anything in your .env file or change your Stripe credentials? Then clear your cache.",
 			"cache_clear": "Clear Cache",
@@ -301,17 +301,19 @@
 		"where": "Where"
 	},
 	"file_detail_meta": {
+		"dimension": "Dimensions",
+		"resolution": "Resolution",
+		"aperture_value": "Aperture Value",
 		"meta_data": "Metadata",
 		"author": "Author",
-		"time_data": "Original time data",
+		"time_data": "Content Created",
 		"make": "Camera",
 		"model": "Model",
 		"camera_lens": "Camera lens",
-		"aperature": "Aperture F Number",
+		"aperature": "F Number",
 		"iso": "ISO",
 		"focal": "Focal length",
-		"exposure": "Exposure time",
-		"not_avaible": "Metadata not avaible"
+		"exposure": "Exposure time"
 	},
 	"folder": {
 		"empty": "Empty",
diff --git a/resources/js/i18n/lang/sk.json b/resources/js/i18n/lang/sk.json
index c3fe7947..cb5cd145 100644
--- a/resources/js/i18n/lang/sk.json
+++ b/resources/js/i18n/lang/sk.json
@@ -301,17 +301,19 @@
 		"where": "Umiestnenie"
 	},
 	"file_detail_meta": {
+		"dimension": "Dimenzie",
+		"resolution": "Rozlíšenie",
+		"aperture_value": "Hodnota clony",
 		"meta_data": "Metadata",
 		"author": "Autor",
-		"time_data": "Pôvodných časový údaj",
+		"time_data": "Obsah vytvorený",
 		"make": "Fotoaparát",
 		"model": "Model",
 		"camera_lens": "Objektív fotoaparátu",
 		"aperature": "Clona",
 		"iso": "ISO",
 		"focal": "Ohnisková vzdialenosť",
-		"exposure": "Doba expozície",
-		"not_avaible": "Metadáta nie sú k dispozícii"
+		"exposure": "Doba expozície"
 	},
 	"folder": {
 		"empty": "Prázdne",