diff --git a/app/components/sync-button.coffee b/app/components/sync-button.coffee
index 86e3b3d7..8e2c4bd2 100644
--- a/app/components/sync-button.coffee
+++ b/app/components/sync-button.coffee
@@ -3,8 +3,7 @@
 Component = Ember.Component.extend
   actions: {
     sync: ->
-        console.log(@get('user'));
+      @get('user').sync()
   }
-  
 
 `export default Component`
diff --git a/app/styles/app/components/sync-button.sass b/app/styles/app/components/sync-button.sass
index c843683d..eb67c4e5 100644
--- a/app/styles/app/components/sync-button.sass
+++ b/app/styles/app/components/sync-button.sass
@@ -1,5 +1,6 @@
 
 .sync-button
+  padding: 0.8em 0
   button
     @extend %border-radius-4px
     padding: 0 10px
@@ -30,6 +31,7 @@
 
 .sync-last
   display: inline-block
+  margin: 0
   font-size: 12px
   color: #848384
   text-align: right
diff --git a/app/styles/app/modules/buttons.sass b/app/styles/app/modules/buttons.sass
index bf61402a..b5047de4 100644
--- a/app/styles/app/modules/buttons.sass
+++ b/app/styles/app/modules/buttons.sass
@@ -99,7 +99,8 @@ $button-border-color: #d4d4d4
   width: 8em
 
 // temp
-#auth #navigation .button--signin
+#auth #navigation .button--signin,
+#auth #navigation .button--signingin
   display: none
 
 .button--grey
diff --git a/app/templates/components/sync-button.hbs b/app/templates/components/sync-button.hbs
index a2d2006a..2b72a9f6 100644
--- a/app/templates/components/sync-button.hbs
+++ b/app/templates/components/sync-button.hbs
@@ -1,11 +1,14 @@
 <div class="sync-button">
-  <p class="sync-last">last synced {{user.syncedAt}}</p>
-  <button {{action sync}} class="button">
-    <span class="icon icon-sync"></span>Sync account
-  </button>
-  <button class="button is-syncing">
-    <span class="sync-spinner"><i></i><i></i><i></i></span>Syncing from Github
-  </button>
+  {{#if user.isSyncing }}
+    <button class="button is-syncing">
+      <span class="sync-spinner"><i></i><i></i><i></i></span>Syncing from Github
+    </button>
+  {{else}}
+    <p class="sync-last">last synced {{format-time user.syncedAt}}</p>
+    <button {{action sync}} class="button">
+      <span class="icon icon-sync"></span>Sync account
+    </button>
+  {{/if}}
 </div>
 
 
diff --git a/app/templates/dashboard/repositories.hbs b/app/templates/dashboard/repositories.hbs
index bf8dcb48..d6888d7e 100644
--- a/app/templates/dashboard/repositories.hbs
+++ b/app/templates/dashboard/repositories.hbs
@@ -1,8 +1,6 @@
 <div id="filters" class="section section--white section--maxheight">
   <div class="row">
-
       {{orgs-filter orgs=orgs selected=selectedOrg action="selectOrg"}}
-
     <div class="float-right">
       {{sync-button user=auth.currentUser}}
     </div>