diff --git a/public/js/site.js b/public/js/site.js
index 725747d..472508b 100644
--- a/public/js/site.js
+++ b/public/js/site.js
@@ -41,7 +41,7 @@ $(document).ready(function(){
 
     // Toggle appearance of lists of error/warnings/notifications
 	expandLink.click( function(){
-		$(this).parent().next('ul').slideToggle('slow', function(){});
+		$(this).parent().next().slideToggle('slow', function(){});
         if ($(this).parent().hasClass('showing')) {
             $(this).html('+');
         }
@@ -54,7 +54,7 @@ $(document).ready(function(){
      // Back to top links
     toTopLinks.click( function(e){
         e.preventDefault();
-        $(animateSection($('#top'), -55));
+        $(animateSection($('#top'), -75));
     });
 
 	switchStandardsList(standardSelect);
diff --git a/view/task.html b/view/task.html
index 6bc9b36..7a882fb 100644
--- a/view/task.html
+++ b/view/task.html
@@ -101,54 +101,67 @@
 <div class="col-md-9">
 	{{#if results}}
 		<div class="heading label-danger showing first" id="errors">
-			Errors ( 13 )
 			<span data-role="expander" class="pull-right expander"> - </span>
+			Errors ( 13 )
+		</div>
+		<div class="task-danger tasks-list collapse clearfix in">
+			<ul class="list-unstyled">
+				{{#lastResult.messages}}
+					<li>
+						<p class="crunch rule-name">{{type}} : {{code}} <span class="badge">{{count}}</span></p>
+						<p>{{message}}</p>
+					</li>
+				{{/lastResult.messages}}
+			</ul>
+			<a class="pull-right" href="#top" data-role="top">Back to top</a>
 		</div>
-		<ul class="list-unstyled task-danger tasks-list collapse in">
-			{{#lastResult.messages}}
-				<li>
-					<p class="crunch rule-name">{{type}} : {{code}} <span class="badge">{{count}}</span></p>
-					<p>{{message}}</p>
-				</li>
-			{{/lastResult.messages}}
-		</ul>
 
 		<div class="heading label-warning" id="warnings">
-			Warnings ( 142 )
 			<span data-role="expander" class="pull-right expander"> + </span>
+			Warnings ( 142 )
+		</div>
+		<div class="task-warning tasks-list collapse clearfix">
+			<ul class="list-unstyled">
+				{{#lastResult.messages}}
+					<li>
+						<p class="crunch rule-name">{{type}} : {{code}} <span class="badge">{{count}}</span></p>
+						<p>{{message}}</p>
+					</li>
+				{{/lastResult.messages}}
+			</ul>
+			<a class="pull-right" href="#top" data-role="top">Back to top</a>
 		</div>
-		<ul class="list-unstyled task-warning tasks-list collapse">
-			{{#lastResult.messages}}
-				<li>
-					<p class="crunch rule-name">{{type}} : {{code}} <span class="badge">{{count}}</span></p>
-					<p>{{message}}</p>
-				</li>
-			{{/lastResult.messages}}
-		</ul>
 
 		<div class="heading label-info" id="notifications">
+			<span data-role="expander" class="pull-right expander"> + </span>
 			Notifications ( 166 )
-			<span data-role="expander" class="pull-right expander"> + </span>
 		</div>
-		<ul class="list-unstyled task-info tasks-list collapse">
-			{{#lastResult.messages}}
-				<li>
-					<p class="crunch rule-name">{{type}} : {{code}} <span class="badge">{{count}}</span></p>
-					<p>{{message}}</p>
-				</li>
-			{{/lastResult.messages}}
-		</ul>
+		<div class="task-info tasks-list collapse clearfix">
+			<ul class="list-unstyled">
+				{{#lastResult.messages}}
+					<li>
+						<p class="crunch rule-name">{{type}} : {{code}} <span class="badge">{{count}}</span></p>
+						<p>{{message}}</p>
+					</li>
+				{{/lastResult.messages}}
+			</ul>
+			<a class="pull-right" href="#top" data-role="top">Back to top</a>
+		</div>
 
-		<div class="heading label-default">Ignored Rules
+		<div class="heading label-default">
 			<span data-role="expander" class="pull-right expander"> + </span>
+			Ignored Rules
+		</div>
+		<div class="task-default tasks-list collapse clearfix">
+			<ul class="list-unstyled">
+			    {{#task.ignore}}
+			        <li>
+			        	<p class="crunch rule-name">{{.}}</p>
+					</li>
+			    {{/task.ignore}}
+			</ul>
+			<a class="pull-right" href="#top" data-role="top">Back to top</a>
 		</div>
-		<ul class="list-unstyled task-default tasks-list collapse">
-		    {{#task.ignore}}
-		        <li>
-		        	<p class="crunch rule-name">{{.}}</p>
-				</li>
-		    {{/task.ignore}}
-		</ul>
 	{{else}}
 		<div class="alert alert-info">
 			<h4>No results to show</h4>