diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6
index 91da2a9ead7..0dc7254a335 100644
--- a/app/assets/javascripts/discourse/ember/resolver.js.es6
+++ b/app/assets/javascripts/discourse/ember/resolver.js.es6
@@ -3,7 +3,7 @@
 var classify = Ember.String.classify;
 var get = Ember.get;
 
-var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages', 'admin', 'adminFlags'],
+var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages', 'admin', 'adminFlags', 'user', 'preferences'],
     _dummyRoute,
     _loadingView;
 
diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs
index 14831435178..0363777f5db 100644
--- a/app/assets/javascripts/discourse/templates/user/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user/user.hbs
@@ -187,7 +187,9 @@
       {{/if}}
     </section>
 
-    {{outlet}}
+    <section class='user-right'>
+      {{outlet}}
+    </section>
 
   </section>
 </div>
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 8c8355b103b..d6138cea3d0 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -141,15 +141,18 @@
     }
   }
 
+  .user-right {
+    width: 75%;
+    float: right;
+    margin-top: 20px;
+  }
+
   .user-content {
     padding: 10px 8px;
     background-color: $secondary;
     border: 1px solid scale-color-diff();
     margin-bottom: 10px;
     box-sizing: border-box;
-    width: 75%;
-    float: right;
-    margin-top: 20px;
 
     .btn.right {
       float: right
@@ -394,8 +397,6 @@
 
 
   .user-stream {
-      float: right;
-      width: 75%;
     .excerpt {
       margin: 5px 0;
       font-size: 13px;
@@ -574,20 +575,16 @@
 }
 
 .paginated-topics-list {
-  float: right;
-  width: 75%;
-  margin-top: 20px;
+  .topic-list > tbody > tr:nth-child(odd) {
+    background-color: darken($secondary, 3%);
+  }
 
-    .topic-list > tbody > tr:nth-child(odd)  {
-      background-color: darken($secondary, 3%);
-      }
+  .topic-list > tbody > tr:nth-child(even) {
+    background-color: $secondary;
+  }
 
-    .topic-list > tbody > tr:nth-child(even) {
-      background-color: $secondary;
-      }
-
-    .user-content {
-        width: 100%;
-        margin-top: 0;
-      }
+  .user-content {
+    width: 100%;
+    margin-top: 0;
+  }
 }