diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index bef240d1..8541ece5 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -21,7 +21,7 @@
     "/chunks/app-billings.js": "/chunks/app-billings.js?id=b209d3c7dea80946c0e1",
     "/chunks/app-email.js": "/chunks/app-email.js?id=818ceb6be0fe9f4d06a4",
     "/chunks/app-index.js": "/chunks/app-index.js?id=325286e1d4e26f766ddd",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=009566c6461a90ed56e2",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=91e1d30bf7a3c7a54136",
     "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js": "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js?id=38b2085e829a84df0e5f",
     "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js?id=3cbb19b80e635b3524e5",
     "/chunks/app-others.js": "/chunks/app-others.js?id=388ee5b424fc37d19061",
@@ -481,5 +481,39 @@
     "/chunks/page-edit.8f6b1ead0763d95603ac.hot-update.js": "/chunks/page-edit.8f6b1ead0763d95603ac.hot-update.js",
     "/chunks/page-edit.ec3f46f43ba8d34ac548.hot-update.js": "/chunks/page-edit.ec3f46f43ba8d34ac548.hot-update.js",
     "/chunks/page-edit.25fa7990d11953ed4563.hot-update.js": "/chunks/page-edit.25fa7990d11953ed4563.hot-update.js",
-    "/chunks/page-edit.05b1fd5aa8aaad1a5e97.hot-update.js": "/chunks/page-edit.05b1fd5aa8aaad1a5e97.hot-update.js"
+    "/chunks/page-edit.05b1fd5aa8aaad1a5e97.hot-update.js": "/chunks/page-edit.05b1fd5aa8aaad1a5e97.hot-update.js",
+    "/chunks/app-language.a764c1adc6fa61831232.hot-update.js": "/chunks/app-language.a764c1adc6fa61831232.hot-update.js",
+    "/chunks/app-language.0eb709c5adbbe9cb8421.hot-update.js": "/chunks/app-language.0eb709c5adbbe9cb8421.hot-update.js",
+    "/chunks/app-language.59d563c2c1114ae16fef.hot-update.js": "/chunks/app-language.59d563c2c1114ae16fef.hot-update.js",
+    "/chunks/app-language.4bbee111247a2a38511f.hot-update.js": "/chunks/app-language.4bbee111247a2a38511f.hot-update.js",
+    "/chunks/app-language.fee56a0e43f6d90023bb.hot-update.js": "/chunks/app-language.fee56a0e43f6d90023bb.hot-update.js",
+    "/chunks/app-language.1cc7ba4e2887f073afd8.hot-update.js": "/chunks/app-language.1cc7ba4e2887f073afd8.hot-update.js",
+    "/chunks/app-language.d3355c20aa7a69483de8.hot-update.js": "/chunks/app-language.d3355c20aa7a69483de8.hot-update.js",
+    "/chunks/app-language.a23a732071af0b841809.hot-update.js": "/chunks/app-language.a23a732071af0b841809.hot-update.js",
+    "/chunks/app-language.ccbc1dd355cadf6a85f7.hot-update.js": "/chunks/app-language.ccbc1dd355cadf6a85f7.hot-update.js",
+    "/chunks/app-language.f5cf98e25fe541b61c39.hot-update.js": "/chunks/app-language.f5cf98e25fe541b61c39.hot-update.js",
+    "/chunks/app-language.f24dfd765b99bd354434.hot-update.js": "/chunks/app-language.f24dfd765b99bd354434.hot-update.js",
+    "/chunks/app-language.553bdc849c26c63423d3.hot-update.js": "/chunks/app-language.553bdc849c26c63423d3.hot-update.js",
+    "/chunks/app-language.f97bc8557b29d933ee34.hot-update.js": "/chunks/app-language.f97bc8557b29d933ee34.hot-update.js",
+    "/chunks/app-language.108f45abbce9e35688a0.hot-update.js": "/chunks/app-language.108f45abbce9e35688a0.hot-update.js",
+    "/chunks/app-language.7e4925c51324d167e6e4.hot-update.js": "/chunks/app-language.7e4925c51324d167e6e4.hot-update.js",
+    "/chunks/app-language.d75e675d0bce7a819f51.hot-update.js": "/chunks/app-language.d75e675d0bce7a819f51.hot-update.js",
+    "/chunks/app-language.d7b463dac05cfcf75f3c.hot-update.js": "/chunks/app-language.d7b463dac05cfcf75f3c.hot-update.js",
+    "/chunks/app-language.fb77c1f8cce5d7110386.hot-update.js": "/chunks/app-language.fb77c1f8cce5d7110386.hot-update.js",
+    "/chunks/app-language.728ab55340bbfc5eb957.hot-update.js": "/chunks/app-language.728ab55340bbfc5eb957.hot-update.js",
+    "/chunks/app-language.ebea4ddbf1aae7b7b38f.hot-update.js": "/chunks/app-language.ebea4ddbf1aae7b7b38f.hot-update.js",
+    "/chunks/app-language.a07302c7a40a2c11fa14.hot-update.js": "/chunks/app-language.a07302c7a40a2c11fa14.hot-update.js",
+    "/chunks/app-language.ca694dfca55931ca67ca.hot-update.js": "/chunks/app-language.ca694dfca55931ca67ca.hot-update.js",
+    "/chunks/app-language.479e6b08f63f3254e2b4.hot-update.js": "/chunks/app-language.479e6b08f63f3254e2b4.hot-update.js",
+    "/chunks/app-language.5b24127bd37a8a9ea683.hot-update.js": "/chunks/app-language.5b24127bd37a8a9ea683.hot-update.js",
+    "/chunks/app-language.d7c12559a66e9697cff0.hot-update.js": "/chunks/app-language.d7c12559a66e9697cff0.hot-update.js",
+    "/chunks/app-language.c70d9bc59a5fb465b223.hot-update.js": "/chunks/app-language.c70d9bc59a5fb465b223.hot-update.js",
+    "/chunks/app-language.e16512d592ee603cec32.hot-update.js": "/chunks/app-language.e16512d592ee603cec32.hot-update.js",
+    "/chunks/app-language.01d145fbab7a39ce7565.hot-update.js": "/chunks/app-language.01d145fbab7a39ce7565.hot-update.js",
+    "/chunks/app-language.a544b32fa7fffa90cd18.hot-update.js": "/chunks/app-language.a544b32fa7fffa90cd18.hot-update.js",
+    "/chunks/app-language.9f5d2800cd1a65f02b19.hot-update.js": "/chunks/app-language.9f5d2800cd1a65f02b19.hot-update.js",
+    "/chunks/app-language.7046d5fd1f6ee803cd98.hot-update.js": "/chunks/app-language.7046d5fd1f6ee803cd98.hot-update.js",
+    "/chunks/app-language.31f1aa9bada98dfac7d6.hot-update.js": "/chunks/app-language.31f1aa9bada98dfac7d6.hot-update.js",
+    "/chunks/app-language.01bf509b4f467d9224eb.hot-update.js": "/chunks/app-language.01bf509b4f467d9224eb.hot-update.js",
+    "/chunks/app-language.83549f4e8f7eb650a294.hot-update.js": "/chunks/app-language.83549f4e8f7eb650a294.hot-update.js"
 }
diff --git a/resources/js/views/Admin/Languages/Language.vue b/resources/js/views/Admin/Languages/Language.vue
index c10cf7e3..aa711eac 100644
--- a/resources/js/views/Admin/Languages/Language.vue
+++ b/resources/js/views/Admin/Languages/Language.vue
@@ -1,147 +1,148 @@
 <template>
-    <div id="single-page">
-        <div id="page-content">
-            <MobileHeader :title="$t('routes_title.language')" />
-            <PageHeader :title="$t('routes_title.language')" />
+    <div>
+		<div v-if="languages" class="flex space-x-6">
 
-            <div v-if="languages" class="content-page">
+			<!--Sidebar-->
+			<div class="side-content">
 
-                <!--Sidebar-->
-                <div class="side-content">
+				<div class="card shadow-card sticky top-0">
+					<div class="languages-wrapper page-tab">
+						<div class="language-label-wrapper">
+							<label class="language-label">{{ $t('languages') }}</label>
+						</div>
 
-                    <div class="sticky top-65">
-                        <div class="languages-wrapper page-tab from-fixed-width">
-                            <div class="language-label-wrapper">
-                                <label class="language-label">{{ $t('languages') }}</label>
-                            </div>
+						<!-- Languages -->
+						<div class="all-language-wrapper">
+							<div @click="getLanguage(language)" v-for="language in languages" :key="language.data.id" class="language group">
+								<label class="name" :class="{'active': selectedLanguage && selectedLanguage.data.attributes.locale === language.data.attributes.locale}">
+									<span class="active-text-theme group-hover-text-theme">{{ language.data.attributes.name }}</span>
+								</label>
+								<x-icon
+									v-if="language.data.attributes.locale !== 'en'"
+									@click.stop="deleteLanguage(language)"
+									class="icon"
+									size="17"
+								/>
+							</div>
+						</div>
+					</div>
 
-                            <!-- Languages -->
-                            <div class="all-language-wrapper">
-                                <div @click="getLanguage(language)" v-for="language in languages" :key="language.data.id" class="language group">
-                                    <label class="name" :class="{'active': selectedLanguage && selectedLanguage.data.attributes.locale === language.data.attributes.locale}">
-                                        <span class="active-text-theme group-hover-text-theme">{{ language.data.attributes.name }}</span>
-                                    </label>
-                                    <x-icon
-                                        v-if="language.data.attributes.locale !== 'en'"
-                                        @click.stop="deleteLanguage(language)"
-                                        class="icon"
-                                        size="17"
-                                    />
-                                </div>
-                            </div>
-                        </div>
+					<MobileActionButton @click.native="createLanguage" icon="plus" class="button-add-language">
+						{{ $t('add_language') }}
+					</MobileActionButton>
+				</div>
+			</div>
 
-                        <MobileActionButton @click.native="createLanguage" icon="plus" class="button-add-language">
-                            {{ $t('add_language') }}
-                        </MobileActionButton>
-                    </div>
-                </div>
+			<!--Content-->
+			<div class="form block-form content">
 
-                <!--Content-->
-                <div class="form block-form content">
+				<!--Inline Search for mobile-->
+<!--				<div class="block-wrapper sticky search-bar-wrapper">
+					<SearchInput v-model="query" @reset-query="query = ''" />
+				</div>-->
 
-                    <!--Inline Search for mobile-->
-                    <div class="block-wrapper sticky search-bar-wrapper">
-                        <SearchInput v-model="query" @reset-query="query = ''" />
-                    </div>
+				<!--Mobile language navigation-->
+				<div class="menu-list-wrapper horizontal">
 
-                    <!--Mobile language navigation-->
-                    <div class="menu-list-wrapper horizontal">
+					<!--List of languages-->
+					<div @click="getLanguage(language)" v-for="language in languages" :key="language.data.id" :class="{'router-link-active': selectedLanguage && selectedLanguage.data.attributes.locale === language.data.attributes.locale}" class="menu-list-item link border-bottom-theme">
+						<div class="label text-theme">
+							{{ language.data.attributes.name }}
+						</div>
+					</div>
 
-                        <!--List of languages-->
-                        <div @click="getLanguage(language)" v-for="language in languages" :key="language.data.id" :class="{'router-link-active': selectedLanguage && selectedLanguage.data.attributes.locale === language.data.attributes.locale}" class="menu-list-item link border-bottom-theme">
-                            <div class="label text-theme">
-                                {{ language.data.attributes.name }}
-                            </div>
-                        </div>
+					<!--Add new language-->
+					<div @click="createLanguage" class="menu-list-item link border-bottom-theme">
+						<div class="icon text-theme">
+							<plus-icon size="17" />
+						</div>
+					</div>
+				</div>
 
-                        <!--Add new language-->
-                        <div @click="createLanguage" class="menu-list-item link border-bottom-theme">
-                            <div class="icon text-theme">
-                                <plus-icon size="17" />
-                            </div>
-                        </div>
-                    </div>
+				<div class="dynamic-content">
 
-                    <div class="dynamic-content">
+					<Spinner v-if="! selectedLanguage" class="spinner" />
 
-                        <Spinner v-if="! selectedLanguage" class="spinner" />
+					<div v-if="selectedLanguage">
 
-                        <div v-if="selectedLanguage">
+						<!--Disable content when user is searching translations-->
+						<div v-if="! isSearching">
 
-                            <!--Disable content when user is searching translations-->
-                            <div v-if="! isSearching">
-                                <FormLabel icon="settings">
-                                    {{ $t('language_settings') }}
-                                </FormLabel>
+							<div class="card shadow-card">
+								<FormLabel icon="settings">
+									{{ $t('language_settings') }}
+								</FormLabel>
 
-                                <!--Language name-->
-                                <div class="block-wrapper">
-                                    <label>{{ $t('language_name') }}:</label>
-                                    <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Description" rules="required" v-slot="{ errors }">
-                                        <input @input="$updateText(`/admin/languages/${selectedLanguage.data.id}`, 'name', selectedLanguage.data.attributes.name)" v-model="selectedLanguage.data.attributes.name"
-                                               :placeholder="$t('admin_settings.appearance.description_plac')" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
-                                        <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
-                                    </ValidationProvider>
-                                </div>
+								<!--Language name-->
+								<div class="block-wrapper">
+									<label>{{ $t('language_name') }}:</label>
+									<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Description" rules="required" v-slot="{ errors }">
+										<input @input="$updateText(`/admin/languages/${selectedLanguage.data.id}`, 'name', selectedLanguage.data.attributes.name)" v-model="selectedLanguage.data.attributes.name"
+											   :placeholder="$t('admin_settings.appearance.description_plac')" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme input-dark" />
+										<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+									</ValidationProvider>
+								</div>
 
-                                <!--Set default language-->
-                                <div class="block-wrapper">
-                                    <div class="input-wrapper">
-                                        <div class="inline-wrapper">
-                                            <div class="switch-label">
-                                                <label class="input-label">
-                                                    {{ $t('set_as_default_language') }}:
-                                                </label>
-                                                <small class="input-help">
-                                                    If this language is set as default, app will appear in this language for all users.
-                                                </small>
-                                            </div>
-                                            <SwitchInput
-                                                @input="setDefaultLanguage"
-                                                class="switch"
-                                                :class="{'disable-switch': selectedLanguage.data.attributes.locale === this.defaultLanguageLocale }"
-                                                :state="selectedLanguage.data.attributes.locale === this.defaultLanguageLocale"
-                                            />
-                                        </div>
-                                    </div>
-                                </div>
+								<!--Set default language-->
+								<div class="block-wrapper">
+									<div class="input-wrapper">
+										<div class="inline-wrapper">
+											<div class="switch-label">
+												<label class="input-label">
+													{{ $t('set_as_default_language') }}:
+												</label>
+												<small class="input-help">
+													If this language is set as default, app will appear in this language for all users.
+												</small>
+											</div>
+											<SwitchInput
+												@input="setDefaultLanguage"
+												class="switch"
+												:class="{'disable-switch': selectedLanguage.data.attributes.locale === this.defaultLanguageLocale }"
+												:state="selectedLanguage.data.attributes.locale === this.defaultLanguageLocale"
+											/>
+										</div>
+									</div>
+								</div>
+							</div>
 
-                                <!--Translations-->
-                                <FormLabel class="mt-70">
-                                    {{ $t('edit_translations') }}
-                                </FormLabel>
+							<div class="card shadow-card">
+								<!--Translations-->
+								<FormLabel>
+									{{ $t('edit_translations') }}
+								</FormLabel>
 
-                                <InfoBox class="info-box">
-                                    <p>Please preserve in your translations special string variables defined in format as <b class="text-theme">:variable</b> or <b class="text-theme">{variable}</b>.</p>
-                                </InfoBox>
-                            </div>
+								<InfoBox>
+									<p>Please preserve in your translations special string variables defined in format as <b class="text-theme">:variable</b> or <b class="text-theme">{variable}</b>.</p>
+								</InfoBox>
 
-                            <!--Translation-->
-                            <div class="block-wrapper" v-for="(translation, key) in translationList" :key="key">
-                                <label> {{ referenceTranslations[key] }}:</label>
-                                <ValidationProvider tag="div" class="input-wrapper" name="Language string" rules="required" v-slot="{ errors }">
+								<!--Translation-->
+								<div class="block-wrapper" v-for="(translation, key) in translationList" :key="key">
+									<label> {{ referenceTranslations[key] }}:</label>
+									<ValidationProvider tag="div" class="input-wrapper" name="Language string" rules="required" v-slot="{ errors }">
 
-                                    <!--Textarea-->
-                                    <textarea
-                                        v-model="selectedLanguage.data.attributes.translations[key]"
-                                        @input="$updateText(`/admin/languages/${selectedLanguage.data.id}/strings`, key, selectedLanguage.data.attributes.translations[key])"
-                                        :rows="selectedLanguage.data.attributes.translations[key].length >= 80 ? 3 : 1"
-                                        class="focus-border-theme"
-                                        :class="{'is-error': errors[0]}"
-                                    ></textarea>
+										<!--Textarea-->
+										<textarea
+											v-model="selectedLanguage.data.attributes.translations[key]"
+											@input="$updateText(`/admin/languages/${selectedLanguage.data.id}/strings`, key, selectedLanguage.data.attributes.translations[key])"
+											:rows="selectedLanguage.data.attributes.translations[key].length >= 80 ? 3 : 1"
+											class="focus-border-theme input-dark"
+											:class="{'is-error': errors[0]}"
+										></textarea>
 
-                                    <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
-                                </ValidationProvider>
-                            </div>
-                        </div>
+										<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+									</ValidationProvider>
+								</div>
+							</div>
 
-                    </div>
-                </div>
-            </div>
+						</div>
+					</div>
 
-            <Spinner v-if="! languages" />
-        </div>
+				</div>
+			</div>
+		</div>
+
+		<Spinner v-if="! languages" />
     </div>
 </template>
 
@@ -320,12 +321,7 @@
     }
 }
 
-.info-box {
-    margin-bottom: 32px;
-}
-
 .side-content {
-    flex: 0 0 225px;
 
     .button-add-language {
         margin-top: 30px;