diff --git a/src/popup/app/config.js b/src/popup/app/config.js
index 3da5f429..a1029339 100644
--- a/src/popup/app/config.js
+++ b/src/popup/app/config.js
@@ -30,23 +30,20 @@
                 url: "/login",
                 controller: 'accountsLoginController',
                 templateUrl: "app/accounts/views/accountsLogin.html",
-                data: {
-                    authorize: false
-                }
+                data: { authorize: false }
+            })
+            .state('twoFactor', {
+                url: "/two-factor",
+                controller: 'accountsLoginController',
+                templateUrl: "app/accounts/views/accountsLoginTwoFactor.html",
+                data: { authorize: false }
             })
-                .state('login.twoFactor', {
-                    url: "/two-factor",
-                    controller: 'accountsLoginController',
-                    templateUrl: "app/accounts/views/accountsLoginTwoFactor.html"
-                })
 
             .state('tabs', {
                 url: "/tab",
                 abstract: true,
                 templateUrl: "app/global/tabs.html",
-                data: {
-                    authorize: true
-                }
+                data: { authorize: true }
             })
                 .state('tabs.current', {
                     url: "/current",
@@ -68,16 +65,24 @@
                     templateUrl: "app/tools/views/tools.html",
                     controller: 'toolsController'
                 })
+
             .state('viewSite', {
                 url: "/view-site?siteId",
                 templateUrl: "app/vault/views/vaultViewSite.html",
                 controller: 'vaultViewSiteController',
-                params: {
-                    siteId: null
-                },
-                data: {
-                    authorize: true
-                }
+                data: { authorize: true }
+            })
+            .state('addSite', {
+                url: "/add-site",
+                templateUrl: "app/vault/views/vaultAddSite.html",
+                controller: 'vaultAddSiteController',
+                data: { authorize: true }
+            })
+            .state('editSite', {
+                url: "/edit-site?siteId",
+                templateUrl: "app/vault/views/vaultEditSite.html",
+                controller: 'vaultEditSiteController',
+                data: { authorize: true }
             });
     })
     .run(function ($rootScope, userService, loginService, tokenService, $state) {
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index ad8ba17f..bd5a75d5 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -1,6 +1,5 @@
 <div class="header">
-    <a href="#" class="left"><i class="fa fa-chevron-left"></i> Back</a>
-    <a class="right" ng-click="addSite()"><i class="fa fa-plus"></i></a>
+    <a class="right" ui-sref="addSite"><i class="fa fa-plus fa-lg"></i></a>
     <div class="title">My Vault</div>
 </div>
 <div class="content">
diff --git a/src/popup/app/vault/views/vaultAddSite.html b/src/popup/app/vault/views/vaultAddSite.html
index 71c8c265..3aad81e3 100644
--- a/src/popup/app/vault/views/vaultAddSite.html
+++ b/src/popup/app/vault/views/vaultAddSite.html
@@ -1,63 +1,53 @@
-<ion-modal-view ng-controller="vaultAddSiteController">
-    <ion-header-bar class="bar bar-header bar-positive">
-        <button class="button button-clear button-primary" ng-click="close()">Cancel</button>
-        <h1 class="title">Add Site</h1>
-        <button class="button button-clear button-primary" ng-click="createSite(site)">Save</button>
-    </ion-header-bar>
-    <ion-content>
-        <div class="list">
-            <div class="item item-divider">
-                Site Information
-            </div>
-            <label class="item item-input item-stacked-label">
-                <span class="input-label">Name</span>
-                <input type="text" ng-model="site.name">
-            </label>
-            <label class="item item-input item-stacked-label">
-                <span class="input-label">URI</span>
-                <input type="text" ng-model="site.uri">
-            </label>
-            <label class="item item-input item-stacked-label">
-                <span class="input-label">Username</span>
-                <input type="text" ng-model="site.username">
-            </label>
-            <label class="item item-input item-stacked-label">
-                <span class="input-label">Password</span>
-                <input type="password" ng-model="site.password">
-            </label>
-            <a class="item item-icon-right" href="#">
-                Generate Password
-                <i class="icon ion-ios-arrow-right"></i>
-            </a>
-            <div class="item item-divider">
-                &nbsp;
-            </div>
-            <label class="item item-input item-select">
-                <div class="input-label">Folder</div>
-                <select>
-                    <option>Blue</option>
-                    <option selected>Green</option>
-                    <option>Red</option>
-                </select>
-            </label>
-            <div class="item item-toggle">
-                Favorite
-                <label class="toggle toggle-assertive">
-                    <input type="checkbox" ng-model="site.favorite">
-                    <div class="track">
-                        <div class="handle"></div>
-                    </div>
-                </label>
-            </div>
-            <div class="item item-divider">
-                Notes
-            </div>
-            <div class="item item-input">
-                <textarea rows="5" ng-model="site.notes"></textarea>
-            </div>
-            <div class="item item-divider">
-                &nbsp;
-            </div>
+<div class="header">
+    <a ui-sref="tabs.vault" class="left">Close</a>
+    <a href="#" class="right">Save</a>
+    <div class="title">Add Site</div>
+</div>
+<div class="content">
+    <div class="list">
+        <div class="list-divider">
+            Site Information
         </div>
-    </ion-content>
-</ion-modal-view>
+        <div class="list-item">
+            <label>Name</label>
+            <input type="text" ng-model="site.name">
+        </div>
+        <div class="list-item">
+            <label>URI</label>
+            <input type="text" ng-model="site.uri">
+        </div>
+        <div class="list-item">
+            <label>Username</label>
+            <input type="text" ng-model="site.username">
+        </div>
+        <div class="list-item">
+            <label>Password</label>
+            <input type="password" ng-model="site.password">
+        </div>
+        <a class="list-item" href="#">
+            Generate Password
+            <i class="fa fa-chevron-right"></i>
+        </a>
+        <div class="list-divider">
+            &nbsp;
+        </div>
+        <div class="list-item">
+            <label>Folder</label>
+            <select>
+                <option>Blue</option>
+                <option selected>Green</option>
+                <option>Red</option>
+            </select>
+        </div>
+        <div class="list-item">
+            <label>Favorite</label>
+            <input type="checkbox" ng-model="site.favorite">
+        </div>
+        <div class="list-divider">
+            Notes
+        </div>
+        <div class="list-item">
+            <textarea rows="5" ng-model="site.notes"></textarea>
+        </div>
+    </div>
+</div>