diff --git a/src/Funnel1.vue b/src/Funnel1.vue
index 8bbfbc974..f55bfe40c 100644
--- a/src/Funnel1.vue
+++ b/src/Funnel1.vue
@@ -26,24 +26,29 @@
     <div class="row">
       <div class="col my-3 d-flex align-items-center">
         <buttonPrimary
-          buttonText="Primary"
-          buttonType="btn-primary"
+          btnText="Primary"
         />
       </div>
     </div>
     <div class="row">
       <div class="col my-3 d-flex align-items-center">
-        <buttonPrimary
-          buttonText="Primary Focus"
-          buttonType="btn-primary-focus"
+        <buttonPrimaryFocus
+          btnText="Primary Focus"
         />
       </div>
     </div>
     <div class="row">
       <div class="col my-3 d-flex align-items-center">
-        <buttonPrimary
-          buttonText="Disabled"
-          buttonType="disabled"
+        <buttonPrimary class="button-loader"
+          btnText="w/Loader"
+          btnClass="test"
+        />
+      </div>
+    </div>
+    <div class="row">
+      <div class="col my-3 d-flex align-items-center">
+        <buttonDisabled
+          btnText="Disabled"
         />
       </div>
     </div>
@@ -56,6 +61,8 @@
   import imageButton from './components/imageButton';
   import confetti from './components/confetti';
   import buttonPrimary from './components/buttons/buttonPrimary';
+  import buttonPrimaryFocus from './components/buttons/buttonPrimaryFocus';
+  import buttonDisabled from './components/buttons/buttonDisabled';
 
 
   export default {
@@ -65,7 +72,9 @@
       vehicleImage,
       imageButton,
       confetti,
-      buttonPrimary
+      buttonPrimary,
+      buttonPrimaryFocus,
+      buttonDisabled
     }
 }
 </script>
diff --git a/src/assets/scss/components/_buttons.scss b/src/assets/scss/components/_buttons.scss
index 0d0608dd7..efbb34ded 100644
--- a/src/assets/scss/components/_buttons.scss
+++ b/src/assets/scss/components/_buttons.scss
@@ -30,11 +30,11 @@
         }
       }
     }
-  }
-  &.disabled {
-    background: $gray-100;
-    background: linear-gradient(270deg, $gray-100 0%, $gray-100 100%);
-    color: $gray-400;
+    &:disabled {
+      background: $gray-100;
+      background: linear-gradient(270deg, $gray-100 0%, $gray-100 100%);
+      color: $gray-400;
+    }
   }
   &.btn-primary-focus {
     position: relative;//Required for :after pseduo to position correctly
diff --git a/src/components/buttons/buttonPrimary.vue b/src/components/buttons/buttonPrimary.vue
index abc24e291..50cd6daa7 100644
--- a/src/components/buttons/buttonPrimary.vue
+++ b/src/components/buttons/buttonPrimary.vue
@@ -1,30 +1,10 @@
 <template>
-  <button
-    type="button"
-    class="btn d-flex align-items-center"
-    v-on:click="showLoader()"
-    v-bind:class="[(this.isLoading ? 'button-loader' : 'not-loading'),this.buttonType]"
-    >
-    {{ this.buttonText }}
-  </button>
+  <button type="button" class="btn btn-primary d-flex align-items-center">{{btnText}}</button>
 </template>
 
 <script>
 export default {
   name: 'buttonPrimary',
-  props: {
-    buttonText: String,
-    buttonType: String
-  },
-  data(){
-    return {
-      isLoading: false
-    }
-  },
-  methods: {
-    showLoader(){
-      this.isLoading = true;
-    }
-  }
+  props: ['btnText']
 }
 </script>