diff --git a/src/app/layouts/organization-layout.component.html b/src/app/layouts/organization-layout.component.html
index ce20ebef9c7..2ef8b04aac9 100644
--- a/src/app/layouts/organization-layout.component.html
+++ b/src/app/layouts/organization-layout.component.html
@@ -1,22 +1,31 @@
 <app-navbar></app-navbar>
-<div class="orgnav" *ngIf="organization">
+<div class="org-nav" *ngIf="organization">
     <div class="container d-flex flex-column justify-content-end">
         <div class="my-auto d-flex align-items-center pl-1">
             <app-avatar [data]="organization.name" [width]="45" [height]="45" [circle]="true"></app-avatar>
-            <span>{{organization.name}}</span>
+            <div class="org-name ml-3">
+                <span>{{organization.name}}</span>
+                <small class="text-muted">{{'organization' | i18n}}</small>
+            </div>
         </div>
         <ul class="nav nav-tabs">
             <li class="nav-item">
-                <a class="nav-link active" href="#">Active</a>
+                <a class="nav-link" routerLink="vault" routerLinkActive="active">
+                    <i class="fa fa-lock"></i>
+                    {{'vault' | i18n}}
+                </a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" href="#">Link</a>
+                <a class="nav-link" routerLink="manage" routerLinkActive="active">
+                    <i class="fa fa-sliders"></i>
+                    {{'manage' | i18n}}
+                </a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" href="#">Link</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link disabled" href="#">Disabled</a>
+                <a class="nav-link" routerLink="settings" routerLinkActive="active">
+                    <i class="fa fa-cog"></i>
+                    {{'settings' | i18n}}
+                </a>
             </li>
         </ul>
     </div>
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 7b3a2622276..1b775ac2634 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -368,6 +368,9 @@
   "myVault": {
     "message": "My Vault"
   },
+  "vault": {
+    "message": "Vault"
+  },
   "shareSelected": {
     "message": "Share Selected"
   },
diff --git a/src/scss/styles.scss b/src/scss/styles.scss
index f332e649f0c..e2710f8de87 100644
--- a/src/scss/styles.scss
+++ b/src/scss/styles.scss
@@ -572,7 +572,7 @@ app-user-billing {
     @extend .mt-3;
 }
 
-.orgnav {
+.org-nav {
     background-color: $input-bg;
     border-bottom: 1px solid $border-color;
     height: 100px;
@@ -604,8 +604,11 @@ app-user-billing {
         }
     }
 
-    span {
-        font-size: $font-size-lg;
-        @extend .ml-3;
+    .org-name {
+        line-height: 1;
+        span {
+            font-size: $font-size-lg;
+            display: block;
+        }
     }
 }