diff --git a/constants/company.js b/constants/company.js
new file mode 100644
index 0000000..4fba4b2
--- /dev/null
+++ b/constants/company.js
@@ -0,0 +1,25 @@
+export const COMPANY = {
+  name: 'BigDataTechCloud',
+  website: 'https://bigdatatech.cloud',
+
+  parent: {
+    name: 'BigDataTech',
+    website: 'https://bigdatatech.vn/',
+    email: 'contact@bigdatatech.vn',
+    phone: '(+84) 943 833 599',
+    address: 'Tầng 4, 505 Đường Minh Khai, Phường Vĩnh Tuy, Hà Nội',
+    slogan: 'BigDataTech - Giải pháp Big Data & Phát triển Phần mềm',
+  },
+
+  email: {
+    contact: 'contact@bigdatatech.vn',
+    support: 'contact@bigdatatech.vn',
+  },
+
+  phone: {
+    main: '(+84) 943 833 599',
+    hotline: '(+84) 943 833 599',
+  },
+
+  address: 'Tầng 4, 505 Đường Minh Khai, Phường Vĩnh Tuy, Hà Nội',
+};
diff --git a/layouts/default.vue b/layouts/default.vue
index 027d61b..5c8e072 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,56 +1,78 @@
 <template>
   <div>
-    <Nuxt class="has-background-light" style="min-height: 100vh;" v-if="ready" />
-    <Modal @close="showmodal=undefined" v-bind="showmodal" v-if="showmodal"></Modal>
-    <SnackBar @close="snackbar=undefined" v-bind="snackbar" v-if="snackbar" />
+    <Nuxt class="has-background-light" style="min-height: 100vh" v-if="ready" />
+    <Modal @close="showmodal = undefined" v-bind="showmodal" v-if="showmodal"></Modal>
+    <SnackBar @close="snackbar = undefined" v-bind="snackbar" v-if="snackbar" />
   </div>
 </template>
+
 <script>
+import { COMPANY } from '../constants/company';
+
 export default {
   data() {
     return {
-      ready: false
-    }
+      ready: false,
+      company: COMPANY,
+    };
   },
   head() {
-    return {title: 'Login'}
+    return { title: `${this.company.name}` };
   },
   async created() {
-    let connlist = this.$readyapi(['registermethod', 'authmethod', 'usertype', 'authstatus', 'common'])
-    let filter = connlist.filter(v=>!v.ready)
-    let result = filter.length>0? await this.$getapi(filter) : undefined
-    if(result==='error') {
-      this.$dialog({width: '500px', icon: 'mdi mdi-alert-circle',
-      content: 'An error occurred while connecting to the data. Please try again in a few minutes.', type: 'is-danger', progress:true, duration: 6})
+    let connlist = this.$readyapi(['registermethod', 'authmethod', 'usertype', 'authstatus', 'common']);
+    let filter = connlist.filter((v) => !v.ready);
+    let result = filter.length > 0 ? await this.$getapi(filter) : undefined;
+    if (result === 'error') {
+      this.$dialog({
+        width: '500px',
+        icon: 'mdi mdi-alert-circle',
+        content: 'An error occurred while connecting to the data. Please try again in a few minutes.',
+        type: 'is-danger',
+        progress: true,
+        duration: 6,
+      });
     } else {
-      this.ready = true
+      this.ready = true;
     }
   },
   mounted() {
-    var width = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth
-    if(this.$empty(this.viewport)) {
-      if(width<=768) this.viewport = 1 //'mobile'
-      else if(width>=769 && width<=1023) this.viewport = 2  //'tablet'
-      else if(width>=1024 && width<=1215) this.viewport = 3 //'desktop'
-      else if(width>=1216 && width<=1407) this.viewport = 4 //'widescreen'
-      else if(width>=1408) this.viewport = 5 //'fullhd'
+    var width = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+    if (this.$empty(this.viewport)) {
+      if (width <= 768) this.viewport = 1; //'mobile'
+      else if (width >= 769 && width <= 1023) this.viewport = 2; //'tablet'
+      else if (width >= 1024 && width <= 1215) this.viewport = 3; //'desktop'
+      else if (width >= 1216 && width <= 1407) this.viewport = 4; //'widescreen'
+      else if (width >= 1408) this.viewport = 5; //'fullhd'
     }
-    if(this.$route.query.link) this.$store.commit("updateLink", {link: this.$route.query.link})
-    if(this.$route.query.module) this.$store.commit('updateStore', {name: 'module', data: this.$route.query.module})
+    if (this.$route.query.link) this.$store.commit('updateLink', { link: this.$route.query.link });
+    if (this.$route.query.module) this.$store.commit('updateStore', { name: 'module', data: this.$route.query.module });
   },
   computed: {
     showmodal: {
-      get: function() {return this.$store.state['showmodal']},
-      set: function(val) {this.$store.commit('updateStore', {name: 'showmodal', data: val})}
+      get: function () {
+        return this.$store.state['showmodal'];
+      },
+      set: function (val) {
+        this.$store.commit('updateStore', { name: 'showmodal', data: val });
+      },
     },
     snackbar: {
-      get: function() {return this.$store.state['snackbar']},
-      set: function(val) {this.$store.commit('updateStore', {name: 'snackbar', data: val})}
+      get: function () {
+        return this.$store.state['snackbar'];
+      },
+      set: function (val) {
+        this.$store.commit('updateStore', { name: 'snackbar', data: val });
+      },
     },
     viewport: {
-      get: function() {return this.$store.state.viewport},
-      set: function(val) {this.$store.commit("updateViewPort", {viewport: val})}
-    }
-  }
-}
-</script>
\ No newline at end of file
+      get: function () {
+        return this.$store.state.viewport;
+      },
+      set: function (val) {
+        this.$store.commit('updateViewPort', { viewport: val });
+      },
+    },
+  },
+};
+</script>
diff --git a/package.json b/package.json
index b61c541..00bebb5 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "dev": "nuxt",
+    "dev": "nuxt dev",
     "build": "nuxt build",
     "start": "nuxt start",
     "generate": "nuxt generate"
diff --git a/pages/signin.vue b/pages/signin.vue
index eb7113a..6b98ae4 100755
--- a/pages/signin.vue
+++ b/pages/signin.vue
@@ -4,7 +4,7 @@
       <div class="has-background-white px-6 py-6 login-box">
         <div class="login-header">
           <Logo />
-          <h2 class="title mt-4">{{ isVietnamese ? 'Đăng nhập hệ thống' : 'Login' }}</h2>
+          <h2 class="title mt-4">{{ isVietnamese ? 'Đăng nhập' : 'Login' }}</h2>
           <p class="subtitle is-6 has-text-centered" v-if="getEnv">
             {{ getEnv }}
           </p>
@@ -71,7 +71,11 @@
           </div>
           <div class="field is-grouped mt-5 is-align-items-center is-justify-content-space-between">
             <div class="control">
-              <button class="button btn-primary" @click="signin()" @keyup.enter="signin()">
+              <button
+                :class="['button', 'btn-primary', isLoaded && 'is-loading']"
+                @click="signin()"
+                @keyup.enter="signin()"
+              >
                 {{ isVietnamese ? 'Đăng nhập' : 'Login' }}
               </button>
             </div>
@@ -83,12 +87,18 @@
           </div>
         </div>
         <footer class="login-footer">
-          <span
-            >©{{ new Date().getFullYear() }}
-            {{
-              isVietnamese ? 'Bản quyền thuộc về Utopia Villas & Resort' : 'Copyright by Utopia Villas & Resort'
-            }}</span
-          >
+          <span v-if="isVietnamese">
+            ©{{ new Date().getFullYear() }} Bản quyển thuộc về
+            <a :href="company.parent.website" target="_blank" :title="company.parent.slogan">
+              {{ company.parent.name }}
+            </a>
+          </span>
+          <span v-else>
+            ©{{ new Date().getFullYear() }} Copyright by
+            <a :href="company.parent.website" target="_blank" :title="company.parent.name">
+              {{ company.parent.name }}
+            </a>
+          </span>
         </footer>
       </div>
     </div>
@@ -96,9 +106,10 @@
 </template>
 <script>
 import Bowser from 'bowser';
+import { COMPANY } from '../constants/company';
 export default {
   head() {
-    return { title: this.isVietnamese ? 'Đăng nhập' : 'Login' };
+    return { title: this.isVietnamese ? `Đăng nhập - ${this.company.name}` : `Login - ${this.company.name}` };
   },
   data() {
     return {
@@ -112,15 +123,15 @@ export default {
       isLoaded: false,
       data: undefined,
       account: undefined,
+      company: COMPANY,
     };
   },
-  mounted() {
-    window.addEventListener('keyup', (ev) =>
-      ev.key === 'Enter' && this.$route.name === 'signup' ? this.signin() : false,
-    );
-    if (!this.module) return this.$router.push('/welcome');
-
-  },
+  // mounted() {
+  //   window.addEventListener('keyup', (ev) =>
+  //     ev.key === 'Enter' && this.$route.name === 'signup' ? this.signin() : false,
+  //   );
+  //   if (!this.module) return this.$router.push('/welcome');
+  // },
   computed: {
     login: {
       get: function () {
@@ -255,20 +266,25 @@ export default {
       return this.errors.length > 0 ? true : false;
     },
     async signin() {
-      if (this.checkError()) return;
+      this.isLoaded = true;
+      if (this.checkError()) {
+        this.isLoaded = false;
+        return;
+      }
       let conn = this.$findapi('login');
       conn.params.filter = { username: this.username, password: this.password };
       let result = await this.$getapi([conn]);
       if (result === 'error') {
+        this.isLoaded = false;
         return this.$dialog(
           `${
             this.isVietnamese
-              ? 'Đã xảy ra lỗi. Vui lòng thử lại hoặc liên hệ số hotline để được hỗ trợ.'
-              : 'An error occurred. Please try again or contact the hotline for support.'
+              ? `Đã xảy ra lỗi. Vui lòng thử lại hoặc liên hệ số hotline: ${this.company.phone.hotline} để được hỗ trợ.`
+              : `An error occurred. Please try again or contact the hotline: ${this.company.phone.hotline} for support.`
           }`,
           `${this.isVietnamese ? 'Lỗi kết nối' : 'Connection error'}`,
           'Error',
-          10,
+          20,
         );
       }
       let data = result.find((v) => v.name === 'login').data.rows;
@@ -296,7 +312,10 @@ export default {
       return this.errors.length > 0 ? true : false;
     },
     async fillData(data) {
-      if (this.invalidLogin(data)) return;
+      if (this.invalidLogin(data)) {
+        this.isLoaded = false;
+        return;
+      }
       //check permision
       if (this.module !== 'website') {
         let userapps = await this.$getdata('userapps', { user: data.id, apps__code: this.module }, undefined, true);
@@ -398,7 +417,7 @@ export default {
   width: 100%;
   height: 46px;
 
-  background-color: #1f3a3d; /* primary from logo */
+  background-color: #16a34a; /* primary from logo */
   color: #ffffff;
 
   border: none;
@@ -412,7 +431,7 @@ export default {
 }
 
 .wrapper-login .btn-primary:hover {
-  background-color: #2c5054;
+  background-color: #15803d;
 }
 
 .wrapper-login .btn-primary:active {
@@ -431,7 +450,7 @@ export default {
 .wrapper-login .reset-link {
   font-size: 14px;
   font-weight: 500;
-  color: #3f6e73;
+  color: #16a34a;
   text-decoration: none;
   transition: all 0.2s ease;
 }
diff --git a/static/favicon.ico b/static/favicon.ico
index 640bb73..3f656b7 100644
Binary files a/static/favicon.ico and b/static/favicon.ico differ
diff --git a/static/logo.png b/static/logo.png
index dcd3834..3f656b7 100644
Binary files a/static/logo.png and b/static/logo.png differ