diff --git a/src/app/organization/organizationSubvaultsController.js b/src/app/organization/organizationSubvaultsController.js
new file mode 100644
index 0000000000..07d09ce9fe
--- /dev/null
+++ b/src/app/organization/organizationSubvaultsController.js
@@ -0,0 +1,6 @@
+angular
+    .module('bit.organization')
+
+    .controller('organizationSubvaultsController', function ($scope) {
+
+    });
diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html
index dddacd19c3..1607e68ae9 100644
--- a/src/app/organization/views/organizationPeople.html
+++ b/src/app/organization/views/organizationPeople.html
@@ -8,6 +8,11 @@
     <div class="box">
         <div class="box-header with-border">
             <h3 class="box-title">Users</h3>
+            <div class="box-tools">
+                <button type="button" class="btn btn-primary btn-sm">
+                    Invite user
+                </button>
+            </div>
         </div>
         <div class="box-body">
             Some data
diff --git a/src/app/organization/views/organizationSubvaults.html b/src/app/organization/views/organizationSubvaults.html
new file mode 100644
index 0000000000..76f87265b1
--- /dev/null
+++ b/src/app/organization/views/organizationSubvaults.html
@@ -0,0 +1,21 @@
+<section class="content-header">
+    <h1>
+        Subvaults
+        <small>share with your organization</small>
+    </h1>
+</section>
+<section class="content">
+    <div class="box">
+        <div class="box-header with-border">
+            <h3 class="box-title">Subvaults</h3>
+            <div class="box-tools">
+                <button type="button" class="btn btn-primary btn-sm">
+                    New subvault
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            Some data
+        </div>
+    </div>
+</section>
diff --git a/src/app/settings.js b/src/app/settings.js
index 00329f52c1..5ad8af7f60 100644
--- a/src/app/settings.js
+++ b/src/app/settings.js
@@ -1,2 +1,2 @@
 angular.module("bit")
-.constant("appSettings", {"rememberedEmailCookieName":"bit.rememberedEmail","apiUri":"https://api.bitwarden.com","version":"1.9.1","environment":"Production"});
+.constant("appSettings", {"rememberedEmailCookieName":"bit.rememberedEmail","apiUri":"http://localhost:4000","version":"1.9.1","environment":"Development"});
diff --git a/src/app/views/organizationLayout.html b/src/app/views/organizationLayout.html
index 53960dde8e..7fe9124470 100644
--- a/src/app/views/organizationLayout.html
+++ b/src/app/views/organizationLayout.html
@@ -27,7 +27,7 @@
             </div>
             <div class="pull-left info">
                 <p>{{orgProfile.name}}</p>
-                <a ui-sref="frontend.logout">Log Out</a>
+                <a ui-sref="backend.user.vault"><i class="fa fa-arrow-left"></i> Return to my vault</a>
             </div>
         </div>
         <ul class="sidebar-menu">
@@ -42,6 +42,21 @@
                     <i class="fa fa-users fa-fw"></i> <span>People</span>
                 </a>
             </li>
+            <li ng-class="{active: $state.is('backend.org.subvaults')}">
+                <a ui-sref="backend.org.subvaults({orgId: params.orgId})">
+                    <i class="fa fa-share-alt fa-fw"></i> <span>Subvaults</span>
+                </a>
+            </li>
+            <li ng-class="{active: $state.is('backend.org.billing')}">
+                <a ui-sref="backend.org.billing({orgId: params.orgId})">
+                    <i class="fa fa-credit-card fa-fw"></i> <span>Billing</span>
+                </a>
+            </li>
+            <li ng-class="{active: $state.is('backend.org.settings')}">
+                <a ui-sref="backend.org.settings({orgId: params.orgId})">
+                    <i class="fa fa-gears fa-fw"></i> <span>Settings</span>
+                </a>
+            </li>
         </ul>
     </section>
 </aside>
diff --git a/src/index.html b/src/index.html
index 7264ff43f8..b25ead7892 100644
--- a/src/index.html
+++ b/src/index.html
@@ -123,6 +123,7 @@
     <script src="app/organization/organizationModule.js"></script>
     <script src="app/organization/organizationDashboardController.js"></script>
     <script src="app/organization/organizationPeopleController.js"></script>
+    <script src="app/organization/organizationSubvaultsController.js"></script>
 
     <script src="app/settings/settingsModule.js"></script>
     <script src="app/settings/settingsController.js"></script>