diff --git a/package.json b/package.json
index c5fe6fd..7035eed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Trec",
-  "version": "0.8.0",
+  "version": "0.9.5",
   "description": "T-rec time tracker is built for speed and live work item update in youtrack system.",
   "homepage": "",
   "author": {
diff --git a/src/Menu.ts b/src/Menu.ts
index bdf0e22..04f9e79 100644
--- a/src/Menu.ts
+++ b/src/Menu.ts
@@ -14,16 +14,16 @@ export class CustomMenu {
       {
         label: 'Accounts',
         submenu: [
-          {
-            label: 'Add Account',
+          { 
+            label: 'Switch',
             click() {
-              mainWindow.webContents.executeJavaScript('window.location="#/add-account?firstAccount=false"')
+              mainWindow.webContents.executeJavaScript('window.location="#/accounts"')
             }
           },
-          { 
-            label: 'Accounts',
+          {
+            label: 'Add new',
             click() {
-              mainWindow.webContents.executeJavaScript('window.location="#/accounts"')
+              mainWindow.webContents.executeJavaScript('window.location="#/add-account?firstAccount=false"')
             }
           }
         ]
diff --git a/src/app/components/switch-account/switch-account.component.html b/src/app/components/switch-account/switch-account.component.html
index a071318..659b318 100644
--- a/src/app/components/switch-account/switch-account.component.html
+++ b/src/app/components/switch-account/switch-account.component.html
@@ -6,14 +6,15 @@
         <ul *ngIf="accounts?.length > 0 else noAccounts">
             <div class="accounts__title">SET ACTIVE ACCOUNT</div>         
             <li *ngFor="let account of accounts" [ngClass]="account.current? 'active' : ''">
-                <button class="accounts__name" (click)="setAsCurrent(account)">{{ account.name || 'unnamed account' }} </button>
-                <!-- <button class="menu__edit-account" (click)="editAccount(account)">edit</button> -->
+                <button class="accounts__name" (click)="setAsCurrent(account)">{{ account.name || 'unnamed account' }} </button>                
             </li>
         </ul>
         <ng-template #noAccounts>
             <div class="accounts__no-account">No accounts added</div>
         </ng-template>
-        <button class="btn btn--red" type="submit" (click)="goToAddAccount(false)">ADD ACCOUNT</button>    
-        <button *ngIf="isCurrentAccountExists" class="btn btn--transparent" type="submit" (click)="goBack()">CANCEL</button>
+        <div class="accounts__buttons">
+            <button [disabled]="!isCurrentAccountExists" class="btn btn--grey" type="submit" (click)="goBack()">CANCEL</button>
+            <button class="btn btn--red" (click)="goToAddAccount(false)" type="submit">ADD ACCOUNT</button>
+        </div>
     </div> 
   </div>
\ No newline at end of file
diff --git a/src/app/components/switch-account/switch-account.component.scss b/src/app/components/switch-account/switch-account.component.scss
index ba5d0d4..f3fcc31 100644
--- a/src/app/components/switch-account/switch-account.component.scss
+++ b/src/app/components/switch-account/switch-account.component.scss
@@ -20,6 +20,16 @@
         font-weight: 400;
         text-align: center;
     }
+    &__buttons {
+        cursor: default;
+        .btn {
+            display: inline-block;                    
+            width: calc(50% - 4px);
+            &:nth-child(2) {
+                float: right;
+            }
+        }
+      }
     &__content {
         .accounts__title {
             font-family: 'Montserrat', sans-serif;