diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 2a5706c859..a88276f15d 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1621,8 +1621,6 @@ textarea#profile-jot-text:focus + #preview_profile-jot-text {
     padding: 15px;
 }
 .panel .panel-body {
-    padding: 15px;
-    font-size: 14px;
     word-wrap: break-word;
 }
 .panel .panel-body .wall-item-content {
@@ -1668,13 +1666,19 @@ aside .panel-body {
 
 /* wall items */
 .wall-item-container {
-    background-color: rgba(0, 0, 0, 0.03);
-    padding: 0.5em;
     border-top: 1px solid rgba(255, 255, 255, 0.8);
 }
 
+.wall-item-container.panel-body {
+    padding: 0;
+    border-top: none;
+    overflow: hidden;
+}
+
 .wall-item-container .media {
     margin-top: 0;
+    padding: 10px;
+    background-color: rgba(0, 0, 0, 0.03);
 }
 
 /* wall items contact photo */
@@ -1738,8 +1742,8 @@ aside .panel-body {
     top: 10px;
 }
 .comment .nav-pills.preferences {
-    right: 0px;
-    top: 0px;
+    right: 5px;
+    top: 5px;
 }
 .wall-item-network {
     font-size: 13px;
@@ -1897,7 +1901,7 @@ code > .hl-main {
 }
 .wall-item-tags,
 .itemedited {
-    margin-top: 10px;
+    margin: 10px 0;
     font-size: 13px;
 }
 
@@ -1920,7 +1924,7 @@ code > .hl-main {
 /* item social action buttons */
 .wall-item-actions {
     display: flex;
-    margin: .5em 0;
+    margin: 0;
     justify-content: space-between;
 }
 .wall-item-actions a, .wall-item-actions button {
@@ -1961,6 +1965,10 @@ code > .hl-main {
     margin: 0 .3em;
 }
 
+.wall-item-responses > div > p {
+    margin: 0;
+}
+
 /* wall item hover effects */
 .wall-item-container .wall-item-links,
 .wall-item-container .wall-item-actions,
@@ -2008,7 +2016,6 @@ code > .hl-main {
     margin-bottom: 0;
 }
 .comment-container {
-    margin-top: 10px;
     margin-bottom: 0px;
     border-top-left-radius: 3px;
     border-top-right-radius: 3px;
@@ -2125,7 +2132,6 @@ img.acpopup-img {
 .wall-item-container.thread_level_6,
 .wall-item-container.thread_level_7 {
     margin-left: 15px;
-    margin-right: -0.5em;
 }
 /* Menubar Tabs */
 section > .tabbar-wrapper {
@@ -3531,6 +3537,10 @@ section .profile-match-wrapper {
 		padding: 10px;
 	}
 
+    .toplevel_item > .wall-item-container {
+        padding: 0;
+    }
+
 	.wall-spacer {
 		height: 0px;
 	}
diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index 594fa25634..19b5c4fa6e 100644
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -711,7 +711,7 @@ function scrollToItem(elementId) {
 		return;
 	}
 
-	var $el = $(document.getElementById(elementId));
+	var $el = $('#' + elementId +  ' > .media');
 	// Test if the Item exists
 	if (!$el.length) {
 		return;
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index bd069f5cd7..21923737c0 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -70,9 +70,9 @@ as the value of $top_child_total (this is done at the end of this file)
 
 {{* Use a different div container in dependence max thread-level = 7 *}}
 {{if $item.thread_level<7}}
-<div class="item-{{$item.id}} wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body h-entry{{else}}u-comment h-cite{{/if}}" id="item-{{$item.guid}}"><!-- wall-item-container -->
+<div class="item-{{$item.id}} wall-item-container {{$item.indent}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body h-entry{{else}}u-comment h-cite{{/if}}" id="item-{{$item.guid}}"><!-- wall-item-container -->
 {{else}}
-<div class="item-{{$item.id}} wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7 u-comment h-cite" id="item-{{$item.guid}}">
+<div class="item-{{$item.id}} wall-item-container {{$item.indent}} {{$item.network}} thread_level_7 u-comment h-cite" id="item-{{$item.guid}}">
 {{/if}}
 {{if $item.thread_level==1}}
 <span class="commented" style="display: none;">{{$item.commented}}</span>
@@ -80,7 +80,7 @@ as the value of $top_child_total (this is done at the end of this file)
 <span class="created" style="display: none;">{{$item.created_date}}</span>
 <span class="id" style="display: none;">{{$item.id}}</span>
 {{/if}}
-	<div class="media">
+	<div class="media {{$item.shiny}}">
 		{{* Put addional actions in a top-right dropdown menu *}}
 
 		<ul class="nav nav-pills preferences">
@@ -269,11 +269,6 @@ as the value of $top_child_total (this is done at the end of this file)
 
 		{{* item content *}}
 		<div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
-			{{* insert some space if it's an top-level post *}}
-			{{if $item.thread_level==1}}
-			<div class="wall-spacer">&nbsp;</div> <!-- use padding/margin instead-->
-			{{/if}}
-
 			{{if $item.title}}
 			<span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h4><br /></span>
 			{{/if}}
@@ -396,30 +391,22 @@ as the value of $top_child_total (this is done at the end of this file)
 		{{if $item.thread_level!=1}}
 		</div><!--./media-body from for comments-->
 		{{/if}}
+	</div>
+	{{foreach $item.children as $child}}
+		{{include file="{{$item.template}}" item=$child}}
+	{{/foreach}}
 
-		{{foreach $item.children as $child}}
-			{{*
-			{{if $child.type == tag}}
-				{{include file="wall_item_tag.tpl" item=$child}}
-			{{else}}
-				{{include file="{{$item.template}}" item=$child}}
-			{{/if}}
-			*}}
-			{{include file="{{$item.template}}" item=$child}}
-		{{/foreach}}
-
-		{{* Insert the comment box of the top level post at the bottom of the thread.
-			Display this comment box if there are any comments. If not hide it. In this
-			case it could be opend with the "comment" button *}}
-		{{if $item.comment && $item.thread_level==1}}
-			{{if $item.total_comments_num}}
-			<div class="comment-fake-form" id="comment-fake-form-{{$item.id}}">
-				<textarea id="comment-fake-text-{{$item.id}}" class="comment-fake-text-empty form-control" placeholder="{{$item.reply_label}}" onFocus="commentOpenUI(this, {{$item.id}});"  rows="1"></textarea>
-			</div>
-			{{/if}}
-			<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" data-display="block" style="display: none">{{$item.comment nofilter}}</div>
+	{{* Insert the comment box of the top level post at the bottom of the thread.
+		Display this comment box if there are any comments. If not hide it. In this
+		case it could be opend with the "comment" button *}}
+	{{if $item.comment && $item.thread_level==1}}
+		{{if $item.total_comments_num}}
+		<div class="comment-fake-form" id="comment-fake-form-{{$item.id}}">
+			<textarea id="comment-fake-text-{{$item.id}}" class="comment-fake-text-empty form-control" placeholder="{{$item.reply_label}}" onFocus="commentOpenUI(this, {{$item.id}});"  rows="1"></textarea>
+		</div>
 		{{/if}}
-	</div><!-- /media -->
+		<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" data-display="block" style="display: none">{{$item.comment nofilter}}</div>
+	{{/if}}
 </div><!-- ./panel-body or ./wall-item-container -->
 
 {{if $mode == display}}