diff --git a/README.md b/README.md
index ed3a924..434e085 100644
--- a/README.md
+++ b/README.md
@@ -15,4 +15,5 @@ https://forevermatt.github.io/svelte-budget/
 - [x] Add a financial account
 - [ ] Edit a financial account
 - [ ] Record an expense
+- [ ] Create separate repo to document data structure versions
 - [ ] ...
diff --git a/src/data/budget.js b/src/data/budget.js
index ab93cf3..0b35bcb 100644
--- a/src/data/budget.js
+++ b/src/data/budget.js
@@ -17,6 +17,11 @@ const addCategoryToBudget = (categoryUuid, budgeted) => {
   })
 }
 
+export const getBudgetedFor = uuid => {
+  let budgetCategory = get(budgetStore)[uuid] || {}
+  return budgetCategory.budgeted || 0
+}
+
 const isExistingCategory = uuid => get(budgetStore).hasOwnProperty(uuid)
 
 export const loadBudget = () => {
diff --git a/src/views/CategoryAmount.svelte b/src/views/CategoryAmount.svelte
index d4b0b5b..4903b3b 100644
--- a/src/views/CategoryAmount.svelte
+++ b/src/views/CategoryAmount.svelte
@@ -1,6 +1,6 @@
 <script>
 import AmountInput from '../components/AmountInput.svelte'
-import { setBudgetedForCategory } from '../data/budget'
+import { getBudgetedFor, setBudgetedForCategory } from '../data/budget'
 import { categories } from '../data/categories'
 import { push } from 'svelte-spa-router'
 
@@ -8,7 +8,7 @@ export let params // URL parameters provider by router.
 
 $: uuid = params.uuid
 $: category = $categories.find(category => category.uuid === uuid) || {}
-$: initialAmount = category.amount || 0
+$: initialAmount = getBudgetedFor(uuid) || 0
 
 function onSubmit(event) {
   let amount = event.detail
diff --git a/src/views/CategoryView.svelte b/src/views/CategoryView.svelte
index 7e8d23f..926812d 100644
--- a/src/views/CategoryView.svelte
+++ b/src/views/CategoryView.svelte
@@ -1,4 +1,5 @@
 <script>
+import { getBudgetedFor } from '../data/budget'
 import { categories, updateCategory } from '../data/categories'
 import { formatAmount } from '../helpers/numbers'
 
@@ -25,7 +26,7 @@ const renameCategory = () => {
   <b class="editable" on:click={renameCategory}
      title="(Click to rename)">{ category.name }:</b>
   <a class="btn btn-default" href="#/category/{ uuid }/amount">
-    <sup>$</sup> { formatAmount(category.amount) }
+    <sup>$</sup> { formatAmount(getBudgetedFor(uuid)) }
   </a>
 </h2>
 <hr class="small" />