diff --git a/src/components/Toolbar.vue b/src/components/Toolbar.vue
index 111c798..a35479c 100644
--- a/src/components/Toolbar.vue
+++ b/src/components/Toolbar.vue
@@ -1,7 +1,6 @@
 <template>
   <md-toolbar class="md-primary">
 
-
     <md-button class="md-icon-button" @click="showDrawerClicked">
       <md-icon>menu</md-icon>
     </md-button>
@@ -11,12 +10,12 @@
 
       <md-progress-spinner
           v-if="processing"
-          class="md-accent"
+          class="white-spinner"
           md-mode="indeterminate"
           :md-stroke="4"
           :md-diameter="35" />
 
-      <md-button class="md-raised" :disabled="!applyEnabled" @click="applyClicked">Apply</md-button>
+      <md-button class="md-raised" :disabled="!(modelChanged && !processing)" @click="applyClicked">Apply</md-button>
 
     </div>
   </md-toolbar>
@@ -30,7 +29,7 @@ export default {
       type: Boolean,
       default: false
     },
-    applyEnabled: {
+    modelChanged: {
       type: Boolean,
       default: false
     }
@@ -46,6 +45,9 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<!-- This isn't scoped either -->
+<style>
+.white-spinner .md-progress-spinner-draw .md-progress-spinner-circle {
+  stroke: white;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 356fde7..4c1d51b 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -2,7 +2,7 @@
   <div class="page-container md-layout-column" id="dashboard-container">
 
     <!-- toolbar -->
-    <toolbar @showDrawerClicked="showDrawer = true"/>
+    <toolbar @showDrawerClicked="showDrawer = true" :processing="false" :model-changed="true"/>
 
     <!-- drawer -->
     <md-drawer :md-active.sync="showDrawer" md-swipeable>