diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass
index 49df720b..2cec16ca 100644
--- a/app/styles/app/layouts/profile.sass
+++ b/app/styles/app/layouts/profile.sass
@@ -3,6 +3,13 @@
   font-weight: 400
 
 .profile-main
+  padding: 0 $column-gutter/2
+
+  @media #{$medium-up}
+    width: grid-calc(8, 12)
+    float: right
+    padding: 0 0 0 $column-gutter/2
+
   header
     h1
       margin: 0 1.7rem 0 0
@@ -55,7 +62,10 @@
   figcaption
     width: 90%
     margin: auto
-    padding: 0 0 0 2.8em
+    padding: 0 1em 0 2.8em
+    text-align: center
+    @media #{$medium-up}
+      text-align: left
   img
     display: block
     margin: 0 auto 1em
@@ -125,17 +135,18 @@ p.profile-user-last
 .profile-hooklist
   @include resetul
   font-size: $font-size-m
-  color: #7a7a7a
   li
     clear: both
     margin-bottom: .8em
-    overflow: auto
+    // overflow: auto
   .profile-hooks
     width: grid-calc(10, 24)
+    display: inline-block
+    vertical-align: middle
     @media #{$medium-up}
-      width: grid-calc(7, 24)
+      width: grid-calc(5, 24) - 1%
     @media #{$large-up}
-      width: grid-calc(5, 24)
+      width: grid-calc(5, 24) - 1%
   .switch
     display: inline-block
     vertical-align: middle
@@ -158,7 +169,8 @@ p.profile-user-last
 .profile-repo
   @extend %border-radius-4px
   position: relative
-  width: grid-calc(14, 24)
+  display: inline-block
+  width: grid-calc(13, 24)
   padding: .25em .5em .3em
   white-space: nowrap
   overflow: hidden
@@ -182,7 +194,7 @@ p.profile-user-last
       content: ""
       @include fadeOut(right, -90deg, #e2eee2)
   @media #{$medium-up}
-    width: grid-calc(17, 24)
+    width: grid-calc(18, 24)
     height: 30px
     &:hover
       span
diff --git a/app/templates/components/hooks-list-item.hbs b/app/templates/components/hooks-list-item.hbs
index 55f94915..dbf0bb1c 100644
--- a/app/templates/components/hooks-list-item.hbs
+++ b/app/templates/components/hooks-list-item.hbs
@@ -1,4 +1,4 @@
-<div class="profile-hooks profile-switch columns">
+<div class="profile-hooks profile-switch">
   {{hook-switch hook=hook onToggleError="handleToggleError" onToggle="resetErrors"}}
   {{#if hook.isSaving}}
     {{loading-indicator}}
@@ -6,7 +6,7 @@
     {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}<span class="icon icon--cog"></span>{{/link-to}}
   {{/if}}
 </div>
-<a {{bind-attr href="hook.urlGithub"}} rel="nofollow" class="profile-repo columns">
+<a {{bind-attr href="hook.urlGithub"}} rel="nofollow" class="profile-repo">
   {{hook.slug}}
   <span>{{hook.description}}</span></a>
 
diff --git a/app/templates/profile/show.hbs b/app/templates/profile/show.hbs
index e14bec3b..e772d428 100644
--- a/app/templates/profile/show.hbs
+++ b/app/templates/profile/show.hbs
@@ -1,28 +1,3 @@
-<article class="columns medium-8 float-right profile-main">
-
-{{!--   {{#if config.billingEndpoint}}
-    <div class="row">
-      {{#if view.subscribed}}
-        <a class="btn btn-activated" {{bind-attr href="billingUrl"}}>
-          Subscription active!
-        </a>
-      {{else}}
-        {{#if view.education}}
-          <a class="btn btn-activated" {{bind-attr href="billingUrl"}}>
-            Educational account!
-          </a>
-        {{else}}
-          <a class="btn btn-activate" {{bind-attr href="billingUrl"}}>
-            Sign up this account!
-          </a>
-        {{/if}}
-      {{/if}}
-    </div>
-  {{/if}} --}}
-
-  {{!-- {{view 'profile-tabs'}} --}}
-
-  {{!-- <div class="tab"> --}}
-    {{outlet}}
-  {{!-- </div> --}}
+<article class="profile-main">
+  {{outlet}}
 </article>
diff --git a/app/templates/profile/tabs/user.hbs b/app/templates/profile/tabs/user.hbs
index 93ee5043..8579dff7 100644
--- a/app/templates/profile/tabs/user.hbs
+++ b/app/templates/profile/tabs/user.hbs
@@ -1,4 +1,4 @@
-<img {{bind-attr src="view.gravatarUrl"}}>
+{{!-- <img {{bind-attr src="view.gravatarUrl"}}>
 
 <dl class="profile">
   <div>
@@ -26,3 +26,4 @@
     </dd>
   </div>
 </dl>
+ --}}
\ No newline at end of file