diff --git a/http/always-needed-data.go b/http/always-needed-data.go
index c2a8dab..816a7e3 100644
--- a/http/always-needed-data.go
+++ b/http/always-needed-data.go
@@ -9,10 +9,8 @@ import (
 )
 
 type AlwaysNeededData struct {
-	Budget            postgres.Budget
-	Accounts          []postgres.GetAccountsWithBalanceRow
-	OnBudgetAccounts  []postgres.GetAccountsWithBalanceRow
-	OffBudgetAccounts []postgres.GetAccountsWithBalanceRow
+	Budget   postgres.Budget
+	Accounts []postgres.GetAccountsWithBalanceRow
 }
 
 func (h *Handler) getImportantData(c *gin.Context) {
@@ -36,20 +34,9 @@ func (h *Handler) getImportantData(c *gin.Context) {
 		return
 	}
 
-	var onBudgetAccounts, offBudgetAccounts []postgres.GetAccountsWithBalanceRow
-	for _, account := range accounts {
-		if account.OnBudget {
-			onBudgetAccounts = append(onBudgetAccounts, account)
-		} else {
-			offBudgetAccounts = append(offBudgetAccounts, account)
-		}
-	}
-
 	base := AlwaysNeededData{
-		Accounts:          accounts,
-		OnBudgetAccounts:  onBudgetAccounts,
-		OffBudgetAccounts: offBudgetAccounts,
-		Budget:            budget,
+		Accounts: accounts,
+		Budget:   budget,
 	}
 
 	c.Set("data", base)
diff --git a/web/src/pages/Budget.vue b/web/src/pages/Budget.vue
index 68c1063..a84d7f2 100644
--- a/web/src/pages/Budget.vue
+++ b/web/src/pages/Budget.vue
@@ -8,6 +8,51 @@ export default {
 </script>
 
 <template>
+  <h1>
+    <a href="/dashboard">⌂</a>
+    {{$store.getters.CurrentBudget.Name}}
+  </h1>
+  <ul>
+    <li><a href="/budget/{{$store.getters.CurrentBudget.ID}}">Budget</a></li>
+    <li>Reports (Coming Soon)</li>
+    <li><a href="/budget/{{$store.getters.CurrentBudget.ID}}/all-accounts">All Accounts</a></li>
+    <li>
+      On-Budget Accounts
+      <ul v-for="account in $store.getters.OnBudgetAccounts" class="two-valued">
+          <li>
+            <a href="/budget/{{$store.getters.CurrentBudget.ID}}/account/{{.ID}}">{{account.Name}}</a>
+            <span>{{account.Balance.Int / 100}}</span>
+          </li>
+      </ul>
+    </li>
+    <li>
+      Off-Budget Accounts
+      <ul v-for="account in $store.getters.OffBudgetAccounts" class="two-valued">
+          <li>
+            <a href="/budget/{{$store.getters.CurrentBudget.ID}}/account/{{.ID}}">{{account.Name}}</a>
+            <span>{{account.Balance.Int / 100}}</span>
+          </li>
+      </ul>
+    </li>
+    <li>
+      Closed Accounts
+    </li>
+    <li>
+      <a href="/budget/{{$.Budget.ID}}/accounts">Edit accounts</a>
+    </li>
+    <li>
+      + Add Account
+    </li>
+    <li>
+      <a href="/budget/{{.Budget.ID}}/settings">Budget-Settings</a>
+    </li>
+    <li>
+      <a href="/admin">Admin</a>
+    </li>
+    <li>
+      <a href="/api/v1/user/logout">Logout</a>
+    </li>
+</ul>        
   <h1>Budget</h1>
   <p>{{ $route.params.budgetid }}</p>
   <p v-for="account in $store.getters.Accounts">{{ account.Name }} / {{ account.Balance.Int / 100 }}</p>
diff --git a/web/src/store/budget/index.js b/web/src/store/budget/index.js
index c211d08..95f6e90 100644
--- a/web/src/store/budget/index.js
+++ b/web/src/store/budget/index.js
@@ -15,7 +15,13 @@ const budget = {
     getters: {
         Accounts(state) {
             return state.Accounts || [];
-        }
+        },
+        OnBudgetAccounts(state) {
+            return (state.Accounts || []).filter(x => x.OnBudget);
+        },
+        OffBudgetAccounts(state) {
+            return (state.Accounts || []).filter(x => !x.OnBudget);
+        },
     },
     actions: {
         fetchBudget ({state, commit, rootState}, budgetid) {