diff --git a/public/templates/artists/_show_layout.html b/public/templates/artists/_show_layout.html
index e58942cf..cb7c8c8b 100644
--- a/public/templates/artists/_show_layout.html
+++ b/public/templates/artists/_show_layout.html
@@ -1,6 +1,6 @@
 <div class="resource-details artist-details" ng-class="::{'x-archived': artist.is_archived}">
 
-    <header ng-style="{{::gradient}}">
+    <header ng-style="{'background-image': 'linear-gradient(135deg, ' + artist.avatar_colors[0] + ' 15%, ' + artist.avatar_colors[1] + ' 100%)'}">
         <img src="{{::artist.avatars.normal}}">
         <div class="artist-right">
             <h1>{{::artist.name}}</h1>
diff --git a/resources/assets/scripts/app/controllers/artist.coffee b/resources/assets/scripts/app/controllers/artist.coffee
index a7688246..64a3c600 100644
--- a/resources/assets/scripts/app/controllers/artist.coffee
+++ b/resources/assets/scripts/app/controllers/artist.coffee
@@ -26,9 +26,6 @@ module.exports = angular.module('ponyfm').controller "artist", [
         artists.fetch($state.params.slug)
             .done (artistResponse) ->
                 $scope.artist = artistResponse.artist
-                $scope.gradient = {
-                    'background-image': 'linear-gradient(135deg, ' + $scope.artist.avatar_colors[0] + ' 15%, ' + $scope.artist.avatar_colors[1] + ' 100%)'
-                }
 
         $scope.toggleFollow = () ->
             follow.toggle('artist', $scope.artist.id).then (res) ->
diff --git a/resources/assets/styles/components/components.less b/resources/assets/styles/components/components.less
index 517145db..ea16f0c5 100644
--- a/resources/assets/styles/components/components.less
+++ b/resources/assets/styles/components/components.less
@@ -375,23 +375,35 @@ html {
   }
 
   .pagination {
+    .border-radius(0px);
     border: none;
     background: #eee;
     margin: 0px;
     margin-bottom: 10px;
     padding: 0px;
     overflow: hidden;
+    width: 100%;
 
     ul {
       .border-radius(0px);
       margin: 5px;
       display: block;
       overflow: hidden;
+      padding: 0;
+      width: 100%;
 
       > li:first-child > a, > li:last-child > a {
         .border-radius(0px);
       }
 
+      .disabled {
+        a {
+          color: #999;
+          background-color: transparent;
+          cursor: default;
+        }
+      }
+
       li {
         display: block;
         float: left;
@@ -403,6 +415,7 @@ html {
           display: block;
           float: left;
           color: @pfm-purple;
+          background-color: #fff;
         }
       }