diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index d937fe6..87fc17e 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -1,14 +1,4 @@
 <style>
-    .grey-link {
-        color: #373a3c;
-        text-decoration: none;
-    }
-
-    .grey-link:hover, .grey-link:focus, .grey-link:active {
-        color: #373a3c;
-        text-decoration: none;
-    }
-
     .white-link {
         color: white;
     }
@@ -29,7 +19,7 @@
             <div class="row">
                 <div class="col-xs-6">
                     <router-link class="white-link" :to="{ name: 'home'}">LessPass</router-link>
-                    <span v-on:click="saveOrUpdatePassword">
+                    <span v-on:click="saveOrUpdatePassword" class="white-link">
                         <i class="fa fa-save ml-1 fa-clickable" v-if="passwordStatus=='DIRTY'"></i>
                     </span>
                     <span v-if="passwordStatus=='CREATED' || passwordStatus=='UPDATED'" class="text-success">
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 0519e43..f8e2a2d 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,10 +1,5 @@
 <template>
     <form>
-        <div class="form-group row" v-if="showError">
-            <div class="col-xs-12 text-muted text-danger">
-                {{ errorMessage }}
-            </div>
-        </div>
         <div class="form-group row">
             <div class="col-xs-12">
                 <div class="inner-addon left-addon">
@@ -56,25 +51,7 @@
             </div>
         </div>
         <div class="form-group row">
-            <div class="col-xs-12 hint--bottom" aria-label="You can use your self hosted LessPass Database">
-                <div class="inner-addon left-addon">
-                    <i class="fa fa-globe"></i>
-                    <input id="baseURL"
-                           class="form-control"
-                           type="text"
-                           placeholder="LessPass Database (https://...)"
-                           v-model="baseURL">
-                    <small class="form-text text-muted">
-                        <span v-if="noErrors()">You can use your self hosted LessPass Database</span>
-                        <span v-if="errors.baseURLRequired" class="text-danger">
-                            A LessPass database url is required
-                        </span>
-                    </small>
-                </div>
-            </div>
-        </div>
-        <div class="form-group row">
-            <div class="col-xs-12">
+            <div class="col-xs-8" v-show="!generatedPassword">
                 <button id="signInButton" class="btn" type="button" v-on:click="signIn"
                         v-bind:class="{ 'btn-warning': version===1, 'btn-primary': version===2 }">
                     <span v-if="loadingSignIn"><i class="fa fa-spinner fa-pulse fa-fw"></i></span>
@@ -85,10 +62,42 @@
                     Register
                 </button>
             </div>
+            <div class="col-xs-4 text-xs-right">
+                <button type="button" class="btn btn-secondary" v-on:click="toggleVersion"
+                        v-bind:class="{ 'btn-outline-warning': version===1, 'btn-outline-primary': version===2 }">
+                    <small v-show="version===1">v1</small>
+                    <small v-show="version===2">v2</small>
+                </button>
+                <button type="button" class="btn btn-secondary" v-on:click="showOptions=!showOptions">
+                    <i class="fa fa-sliders" aria-hidden="true"></i>
+                </button>
+            </div>
+        </div>
+        <div class="form-group" v-if="showError">
+            <div class="alert alert-danger" role="alert">
+                {{ errorMessage }}
+            </div>
+        </div>
+        <div class="form-group" v-if="showOptions">
+            <label for="baseURL">Self Hosted Url</label>
+            <div class="inner-addon left-addon">
+                <i class="fa fa-globe"></i>
+                <input id="baseURL"
+                       class="form-control"
+                       type="text"
+                       placeholder="LessPass Database (https://...)"
+                       v-model="baseURL">
+                <small class="form-text text-muted">
+                    <span v-if="noErrors()">You can use your self hosted LessPass Database</span>
+                    <span v-if="errors.baseURLRequired" class="text-danger">
+                            A LessPass database url is required
+                        </span>
+                </small>
+            </div>
         </div>
         <div class="form-group mb-0">
             <router-link :to="{ name: 'passwordReset'}">
-                Forgot your password?
+                <small>Forgot your password?</small>
             </router-link>
         </div>
     </form>
@@ -121,7 +130,8 @@
                 errorMessage: '',
                 loadingRegister: false,
                 loadingSignIn: false,
-                errors: {...defaultErrors}
+                errors: {...defaultErrors},
+                showOptions: false,
             };
         },
         methods: {
@@ -211,6 +221,13 @@
                 this.errorMessage = errorMessage;
                 this.showError = true;
             },
+            toggleVersion(){
+                if (this.version === 1) {
+                    this.$store.commit('CHANGE_VERSION', {version: 2});
+                } else {
+                    this.$store.commit('CHANGE_VERSION', {version: 1});
+                }
+            },
         },
         computed: {
             ...mapGetters(['version']),
@@ -242,22 +259,30 @@
                     return;
                 }
 
-                var site = 'lesspass.com';
-                var options = {
-                    counter: 1,
-                    length: 12,
-                    lowercase: true,
-                    uppercase: true,
-                    numbers: true,
-                    symbols: true
+                var passwordProfiles = {
+                    1: {
+                        lowercase: true,
+                        uppercase: true,
+                        numbers: true,
+                        symbols: true,
+                        length: 12,
+                        counter: 1,
+                        version: 1,
+                    },
+                    2: {
+                        lowercase: true,
+                        uppercase: true,
+                        numbers: true,
+                        symbols: true,
+                        length: 16,
+                        counter: 1,
+                        version: 2,
+                    }
                 };
 
-                LessPass.encryptLogin(this.email, this.password)
-                        .then(encryptedLogin => {
-                            LessPass.renderPassword(encryptedLogin, site, options).then(generatedPassword => {
-                                this.password = generatedPassword;
-                            });
-                        });
+                return LessPass.generatePassword('lesspass.com', this.email, this.password, passwordProfiles[this.version]).then(generatedPassword => {
+                    this.password = generatedPassword;
+                });
             },
         }
     }
diff --git a/src/views/PasswordGenerator.vue b/src/views/PasswordGenerator.vue
index 26556b3..cd79f9b 100644
--- a/src/views/PasswordGenerator.vue
+++ b/src/views/PasswordGenerator.vue
@@ -104,9 +104,8 @@
                 </div>
             </div>
             <div class="col-xs-9" v-show="!generatedPassword">
-                <div class="btn-group" role="group">
                     <button type="button" class="btn" v-on:click="generatePassword"
-                            v-bind:class="{ 'btn-outline-warning': password.version===1, 'btn-outline-primary': password.version===2 }">
+                            v-bind:class="{ 'btn-warning': password.version===1, 'btn-primary': password.version===2 }">
                         <span v-if="!generatingPassword">Generate</span>
                         <span v-if="generatingPassword">Generating...</span>
                     </button>
@@ -115,7 +114,6 @@
                         <small v-show="password.version===1">v1</small>
                         <small v-show="password.version===2">v2</small>
                     </button>
-                </div>
             </div>
             <div class="col-xs-3">
                 <div class="btn-group float-xs-right" role="group">
diff --git a/src/views/PasswordReset.vue b/src/views/PasswordReset.vue
index 165d068..13ed3a5 100644
--- a/src/views/PasswordReset.vue
+++ b/src/views/PasswordReset.vue
@@ -28,7 +28,8 @@
         </div>
         <div class="form-group row">
             <div class="col-xs-12">
-                <button id="loginButton" class="btn btn-primary" type="submit">
+                <button id="loginButton" class="btn" type="submit"
+                        v-bind:class="{ 'btn-warning': version===1, 'btn-primary': version===2 }">
                     <span v-if="loading"><i class="fa fa-spinner fa-pulse fa-fw"></i></span>
                     Send me a reset link
                 </button>
@@ -39,7 +40,7 @@
 <script type="text/ecmascript-6">
     import Auth from '../api/auth';
     import Storage from '../api/storage';
-    import {mapActions} from 'vuex';
+    import {mapActions, mapGetters} from 'vuex';
 
     export default {
         data() {
@@ -52,9 +53,12 @@
                 emailRequired: false,
                 showError: false,
                 loading: false,
-                successMessage: false,
+                successMessage: false
             };
         },
+        computed: {
+            ...mapGetters(['version'])
+        },
         methods: {
             cleanErrors(){
                 this.loading = false;
diff --git a/src/views/PasswordResetConfirm.vue b/src/views/PasswordResetConfirm.vue
index 466c172..9d6d0f4 100644
--- a/src/views/PasswordResetConfirm.vue
+++ b/src/views/PasswordResetConfirm.vue
@@ -30,7 +30,8 @@
         </div>
         <div class="form-group row">
             <div class="col-xs-12">
-                <button id="loginButton" class="btn btn-primary" type="submit">
+                <button id="loginButton" class="btn" type="submit"
+                        v-bind:class="{ 'btn-warning': version===1, 'btn-primary': version===2 }">
                     Reset my password
                 </button>
             </div>
@@ -40,7 +41,7 @@
 <script type="text/ecmascript-6">
     import Auth from '../api/auth';
     import Storage from '../api/storage';
-    import {mapActions} from 'vuex';
+    import {mapActions, mapGetters} from 'vuex';
 
     export default {
         data() {
@@ -84,6 +85,9 @@
                     this.showError = true;
                 });
             }
-        }
+        },
+        computed: {
+            ...mapGetters(['version'])
+        },
     }
 </script>
\ No newline at end of file
diff --git a/src/views/Passwords.vue b/src/views/Passwords.vue
index 8705dbe..80eedcd 100644
--- a/src/views/Passwords.vue
+++ b/src/views/Passwords.vue
@@ -9,6 +9,10 @@
             </div>
         </div>
         <ul class="list-group">
+            <li class="list-group-item" v-if="passwords.length === 0">
+                You don't have any passwords saved in your database.
+                <router-link :to="{ name: 'home'}">Would you like to create one ?</router-link>
+            </li>
             <li class="list-group-item" v-for="password in filteredPasswords">
                 <delete-button class="float-xs-right mt-1 text-xs-right"
                                confirmText="Are you sure you want to delete this password profile?"