diff --git a/client/src/api/index.js b/client/src/api/todo.js
similarity index 88%
rename from client/src/api/index.js
rename to client/src/api/todo.js
index 5338045..c38dcf1 100644
--- a/client/src/api/index.js
+++ b/client/src/api/todo.js
@@ -1,9 +1,8 @@
-import { writable } from 'svelte/store'
 import axios from 'axios'
 
-axios.defaults.baseURL = '//localhost:8000'
+import { todos } from '../stores'
 
-export const todos = writable([])
+axios.defaults.baseURL = '//localhost:8000'
 
 export async function refresh() {
   const { data } = await axios({
diff --git a/client/src/components/Add.svelte b/client/src/components/Add.svelte
index 2948d2e..d23eea0 100644
--- a/client/src/components/Add.svelte
+++ b/client/src/components/Add.svelte
@@ -2,7 +2,7 @@
   import Button from './Button.svelte'
   import Field from './Field.svelte'
 
-  import { add } from '../api'
+  import { add } from '../api/todo.js'
 
   let title = ''
 
diff --git a/client/src/components/Button.svelte b/client/src/components/Button.svelte
index 978e915..a02c847 100644
--- a/client/src/components/Button.svelte
+++ b/client/src/components/Button.svelte
@@ -7,11 +7,13 @@
     outline: none;
     border: none;
     color: hsl(0, 0%, 100%);
-    background-color: hsl(0, 0%, 0%);
+    background-color: var(--clr-accent);
     padding: 0.5em 1em;
     border-radius: 1em;
     font-size: inherit;
     cursor: pointer;
+    min-width: 5em;
+    text-align: center;
   }
 </style>
 
diff --git a/client/src/components/Field.svelte b/client/src/components/Field.svelte
index acfb390..c5555cf 100644
--- a/client/src/components/Field.svelte
+++ b/client/src/components/Field.svelte
@@ -6,7 +6,7 @@
 <style>
   input {
     outline: none;
-    border: 3px solid hsl(0, 0%, 0%);
+    border: 3px solid var(--clr-accent);
     border-radius: 1em;
     font-size: inherit;
     padding: 0.25em 1em;
diff --git a/client/src/components/List.svelte b/client/src/components/List.svelte
index 4dded7f..e78869e 100644
--- a/client/src/components/List.svelte
+++ b/client/src/components/List.svelte
@@ -1,6 +1,6 @@
 <script>
   import Todo from './Todo.svelte'
-  import { todos } from '../api'
+  import { todos } from '../stores.js'
 </script>
 
 <style>
diff --git a/client/src/components/Todo.svelte b/client/src/components/Todo.svelte
index c37eff3..b7b76a4 100644
--- a/client/src/components/Todo.svelte
+++ b/client/src/components/Todo.svelte
@@ -2,33 +2,53 @@
   import Button from './Button.svelte'
   import Field from './Field.svelte'
 
-  import { remove, update } from '../api'
+  import { remove, update } from '../api/todo.js'
 
   export let todo
+
+  function toggle() {
+    update({
+      ...todo,
+      done: !todo.done,
+    })
+  }
 </script>
 
 <style>
   li {
+    display: block;
+  }
+
+  li.done {
+    --clr-accent: #c9c9c9;
+  }
+
+  div {
     display: flex;
     flex-direction: row;
-    justify-content: space-between;
-    margin-bottom: 2.5em;
+    margin-top: 0.5em;
+    margin-bottom: 3em;
   }
 
   span {
     display: block;
-    width: 1em;
+    width: 0.5em;
   }
 </style>
 
-<li>
+<li class:done={todo.done}>
   <Field bind:value={todo.title} full />
-  <span />
-  <Button
-    on:click={() => (window.location.pathname = '/todo/' + todo._id)}
-    text="View" />
-  <span />
-  <Button on:click={() => update(todo)} text="Update" />
-  <span />
-  <Button on:click={() => remove(todo._id)} text="Delete" />
+  <div>
+    <Button on:click={toggle} text={todo.done ? 'Reopen' : 'Completed'} />
+    {#if !todo.done}
+      <span />
+      <Button on:click={() => update(todo)} text="Update" />
+      <span />
+      <a href={'/todo/' + todo._id}>
+        <Button text="View" />
+      </a>
+    {/if}
+    <span />
+    <Button on:click={() => remove(todo._id)} text="Delete" />
+  </div>
 </li>
diff --git a/client/src/routes/_layout.svelte b/client/src/routes/_layout.svelte
index 7e16760..0c3f812 100644
--- a/client/src/routes/_layout.svelte
+++ b/client/src/routes/_layout.svelte
@@ -2,16 +2,19 @@
   // import 'bootstrap/dist/css/bootstrap.min.css'
   import { onMount } from 'svelte'
 
-  import { refresh } from '../api'
+  import { refresh } from '../api/todo.js'
 
   onMount(() => {
     refresh()
-    console.log('mounted')
   })
 </script>
 
 <style>
-  * {
+  :root {
+    --clr-accent: #000;
+  }
+
+  :global(*) {
     box-sizing: border-box;
     font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
       Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
diff --git a/client/src/routes/todo/[id].svelte b/client/src/routes/todo/[id].svelte
index b8429d4..ef4cde8 100644
--- a/client/src/routes/todo/[id].svelte
+++ b/client/src/routes/todo/[id].svelte
@@ -6,13 +6,21 @@
 
 <script>
   import Todo from '../../components/Todo.svelte'
-  import { todos } from '../../api'
+  import Button from '../../components/Button.svelte'
+
+  import { todos } from '../../stores.js'
 
   export let id
 
   $: todo = $todos.find(todo => todo._id === id)
 </script>
 
+<a href="/">
+  <Button text="← Back" />
+</a>
+<br />
+<br />
+
 {#if todo}
   <Todo {todo} />
 {/if}
diff --git a/client/src/stores.js b/client/src/stores.js
new file mode 100644
index 0000000..64a0d13
--- /dev/null
+++ b/client/src/stores.js
@@ -0,0 +1,6 @@
+import { writable } from 'svelte/store'
+
+export const todos = writable([])
+
+// And so on...
+export const someOtherStore = writable('something')