diff --git a/stylesheets/style.css b/stylesheets/style.css
index fc4bb3ea..70e7aa28 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -148,7 +148,6 @@ form table tr td div label {
 
 .file {
   float: left;
-  margin-right: 2px;
 }
 
 .file:not(.multifile) .post-image {
@@ -161,11 +160,7 @@ form table tr td div label {
 
 p.fileinfo {
   display: block;
-  margin: 0 0 0 20px;
-}
-
-div.post p.fileinfo {
-  padding-left: 5px;
+  margin: 0.2em 0px;
 }
 
 div.banner {
@@ -223,16 +218,25 @@ div.post.op hr {
 }
 
 .intro {
-  display: flex;
-  justify-content: space-between;
-  margin: 0.5em 0;
-  padding: 0;
-  padding-bottom: 0.2em;
+  margin: 0.5em 0px;
+  padding: 0px;
+  line-height: 1.3em;
+}
+
+.intro span {
+  min-width: 0.3em;
+  display: inline-block;
+}
+
+.post-details {
+  text-wrap: nowrap;
+  float: right;
 }
 
 input.delete {
   float: left;
-  margin: 1px 6px 0 0;
+  margin: 1px 6px 0px 0px;
+  scale: 1.05;
 }
 
 .intro span.subject {
@@ -245,11 +249,15 @@ input.delete {
   font-weight: bold;
 }
 
-.intro span.capcode,p.intro a.capcode,p.intro a.nametag {
+.post-details span.capcode,p.intro a.capcode,p.intro a.nametag {
   color: #F00000;
   margin-left: 0;
 }
 
+.post-details a {
+  margin-left: 5px;
+}
+
 div.delete {
   float: right;
 }
@@ -265,16 +273,17 @@ div.post {
   max-width: 94%!important;
 }
 
-div.post p {
-  margin: 0.1em;
-
-  line-height: 1.16em;
-  font-size: 13px;
-  min-height: 1.16em;
+div.post div.head {
+  margin: 0.1em 1em;
+  clear: both;
+  line-height: 1.3em;
 }
 
-div.post div.head {
-  margin: 0.1em 0.4em;
+div.post > p {
+    margin: 0.1em 0.4em;
+
+    font-size: 13px;
+    min-height: 1.16em;
 }
 
 div.post div.body {
@@ -329,20 +338,15 @@ br.clear {
   display: block;
 }
 
-div.controls {
-  float: right;
+span.controls {
   margin: 0;
   padding: 0;
-  font-size: 80%;
 }
 
-div.controls.op {
-  float: none;
-  margin-left: 10px;
-}
-
-div.controls a {
+span.controls a {
   margin: 0;
+  text-wrap: nowrap;
+  display: inline-block;
 }
 
 div#wrap {
@@ -937,7 +941,6 @@ pre {
 
 .poster_id {
   cursor: pointer;
-  display: inline-block;
   user-select: none;
 }
 
diff --git a/templates/post/post_controls.html b/templates/post/post_controls.html
index 9c549362..aa9e17df 100644
--- a/templates/post/post_controls.html
+++ b/templates/post/post_controls.html
@@ -1,6 +1,6 @@
 {% if mod %}
 
-<div class="controls {% if not post.thread %}op{% endif %}">
+ <div class="controls {% if not post.thread %}op{% endif %}">
 {% if mod|hasPermission(config.mod.delete, board.uri) %}
 	{{ secure_link_confirm(config.mod.link_delete, 'Delete'|trans, 'Are you sure you want to delete this?'|trans, board.dir ~ 'delete/' ~ post.id) }}&nbsp;
 {% endif %}
@@ -58,6 +58,6 @@
 {% if mod|hasPermission(config.mod.editpost, board.uri) %}
 	<a title="{% trans %}Edit post{% endtrans %}" href="?/{{ board.dir }}edit{% if config.mod.raw_html_default %}_raw{% endif %}/{{ post.id }}">{{ config.mod.link_editpost }}</a>&nbsp;
 {% endif %}
-</div>
+ </div>
 
 {% endif %}
diff --git a/templates/post_reply.html b/templates/post_reply.html
index e8ad04cb..397ef9a0 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -1,24 +1,24 @@
 {% apply spaceless %}
 {# tabs and new lines will be ignored #}
 <div class="post reply" id="reply_{{ post.id }}" data-board="{{ board.uri }}">
+	<p class="intro">
+		<label for="delete_{{ post.id }}">
+		{% if not index %}<a id="{{ post.id }}" class="post_anchor"></a>{% endif %}
+			<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
+			{% include 'post/subject.html' %}
+			{% include 'post/name.html' %}
+			{% include 'post/ip.html' %}
+			{% include 'post/flag.html' %}
+		</label>
+		{% apply spaceless %}
+		{% include 'post/poster_id.html' %}
+		<label class="post-details">
+			{% include 'post/time.html' %}
+			<a class="post_no" id="post_no_{{ post.id }}" title="Link to this post" onclick="highlightReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('', config.file_page50) }}{% else %}{{ post.link }}{% endif %}">No.</a>
+			<a class="post_no" title="Reply to this post" onclick="citeReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('q', config.file_page50) }}{% else %}{{ post.link('q') }}{% endif %}">{{ post.id }}</a>
+		</label>
+	</p>
 	<div class="head">
-		<p class="intro">
-			<label for="delete_{{ post.id }}">
-			{% if not index %}<a id="{{ post.id }}" class="post_anchor"></a>{% endif %}
-				<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
-				{% include 'post/subject.html' %}
-				{% include 'post/name.html' %}
-				{% include 'post/ip.html' %}
-				{% include 'post/flag.html' %}
-			</label>
-			{% apply spaceless %}
-			{% include 'post/poster_id.html' %}
-			<label style="text-wrap: nowrap;">
-				{% include 'post/time.html' %}
-				<a class="post_no" id="post_no_{{ post.id }}" title="Link to this post" onclick="highlightReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('', config.file_page50) }}{% else %}{{ post.link }}{% endif %}">No.</a>
-				<a class="post_no" title="Reply to this post" onclick="citeReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('q', config.file_page50) }}{% else %}{{ post.link('q') }}{% endif %}">{{ post.id }}</a>
-			</label>
-		</p>
 		{% endapply %}
 		{% include 'post/post_controls.html' %}
 		{% include 'post/fileinfo.html' %}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 605ef964..2ef7a303 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -5,59 +5,65 @@
 {% if not index %}<a id="{{ post.id }}" class="post_anchor"></a>{% endif %}
 
 {% endapply %}
-{% include 'post/fileinfo.html' %}
-<div class="post op" id="op_{{ post.id }}" {%if post.num_files > 1%}style='clear:both'{%endif%}><p class="intro">
-	<label for="delete_{{ post.id }}">
-		{% include 'post/subject.html' %}
-		{% include 'post/name.html' %}
-		{% include 'post/ip.html' %}
-		{% include 'post/flag.html' %}
-	</label>
-	{% apply spaceless %}
-	{% include 'post/poster_id.html' %}&nbsp;
-	{% include 'post/time.html' %}
-	<a class="post_no" id="post_no_{{ post.id }}" title="Link to this post" onclick="highlightReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('', '50') }}{% else %}{{ post.link }}{% endif %}">No.</a>
-	<a class="post_no" title="Reply to this post" onclick="citeReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('q', '50') }}{% else %}{{ post.link('q') }}{% endif %}">{{ post.id }}</a>
-	{% if post.sticky %}
-		{% if config.font_awesome %}
-			<i class="fa fa-thumb-tack" title="Sticky"></i>
-		{% else %}
-			<img class="icon" title="Sticky" src="{{ config.image_sticky }}" alt="Sticky" />
-		{% endif %}
-	{% endif %}
-	{% if post.locked %}
-		{% if config.font_awesome %}
-			<i class="fa fa-lock" title="Locked"></i>
-		{% else %}
-			<img class="icon" title="Locked" src="{{ config.image_locked }}" alt="Locked" />
-		{% endif %}
-	{% endif %}
-	{% if post.sage and (config.mod.view_bumplock < 0 or (post.mod and post.mod|hasPermission(config.mod.view_bumplock, board.uri))) %}
-		{% if config.font_awesome %}
-			<i class="fa fa-anchor" title="Bumplocked"></i>
-		{% else %}
-			<img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Bumplocked" />
-		{% endif %}
-	{% endif %}
-	{% if post.cycle %}
-		{% if config.font_awesome %}
-			<i class="fa fa-refresh" title="Cyclical"></i>
-		{% else %}
-			<img class="icon" title="Cyclical" src="{{ config.image_cyclical }}" alt="Cyclical" />
-		{% endif %}
-	{% endif %}
-	{% if index %}
-		<a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ link_for(post) }}">[{% trans %}Reply{% endtrans %}]</a>
-	{% endif %}
-	{% if isnoko50 %}
-		<a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ link_for(post) }}">[{% trans %}View All{% endtrans %}]</a>
-	{% endif %}
-	{% if hasnoko50 and not isnoko50 %}
-		{% set lastcount = config.noko50_count %}
-		<a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ link_for(post, true) }}">[{% trans %}Last 1 Post{% plural lastcount %}Last {{ count }} Posts{% endtrans %}]</a>
-	{% endif %}
+<div class="post op" id="op_{{ post.id }}" {%if post.num_files > 1%}style='clear:both'{%endif%}>
+	<p class="intro">
+		<label for="delete_{{ post.id }}">
+			<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
+			{% include 'post/subject.html' %}
+			{% include 'post/name.html' %}
+			{% include 'post/ip.html' %}
+			{% include 'post/flag.html' %}
+		</label>
+		{% apply spaceless %}
+		{% include 'post/poster_id.html' %}&nbsp;
+		<label class="post-details">
+			{% include 'post/time.html' %}
+			<a class="post_no" id="post_no_{{ post.id }}" title="Link to this post" onclick="highlightReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('', '50') }}{% else %}{{ post.link }}{% endif %}">No.</a>
+			<a class="post_no" title="Reply to this post" onclick="citeReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('q', '50') }}{% else %}{{ post.link('q') }}{% endif %}">{{ post.id }}</a>
+		</label>
 	</p>
-	{% include 'post/post_controls.html' %}
+	<div class="head">
+		{% if post.sticky %}
+			{% if config.font_awesome %}
+				<i class="fa fa-thumb-tack" title="Sticky"></i>
+			{% else %}
+				<img class="icon" title="Sticky" src="{{ config.image_sticky }}" alt="Sticky" />
+			{% endif %}
+		{% endif %}
+		{% if post.locked %}
+			{% if config.font_awesome %}
+				<i class="fa fa-lock" title="Locked"></i>
+			{% else %}
+				<img class="icon" title="Locked" src="{{ config.image_locked }}" alt="Locked" />
+			{% endif %}
+		{% endif %}
+		{% if post.sage and (config.mod.view_bumplock < 0 or (post.mod and post.mod|hasPermission(config.mod.view_bumplock, board.uri))) %}
+			{% if config.font_awesome %}
+				<i class="fa fa-anchor" title="Bumplocked"></i>
+			{% else %}
+				<img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Bumplocked" />
+			{% endif %}
+		{% endif %}
+		{% if post.cycle %}
+			{% if config.font_awesome %}
+				<i class="fa fa-refresh" title="Cyclical"></i>
+			{% else %}
+				<img class="icon" title="Cyclical" src="{{ config.image_cyclical }}" alt="Cyclical" />
+			{% endif %}
+		{% endif %}
+		{% if index %}
+			<a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ link_for(post) }}">[{% trans %}Reply{% endtrans %}]</a>
+		{% endif %}
+		{% if isnoko50 %}
+			<a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ link_for(post) }}">[{% trans %}View All{% endtrans %}]</a>
+		{% endif %}
+		{% if hasnoko50 and not isnoko50 %}
+			{% set lastcount = config.noko50_count %}
+			<a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ link_for(post, true) }}">[{% trans %}Last 1 Post{% plural lastcount %}Last {{ count }} Posts{% endtrans %}]</a>
+		{% endif %}
+		{% include 'post/post_controls.html' %}
+		{% include 'post/fileinfo.html' %}
+	</div>
 	<div class="body">
 		{% endapply %}{% if index %}{{ post.body|truncate_body(post.link) }}{% else %}{{ post.body }}{% endif %}{% apply spaceless %}
 		{% if post.modifiers['ban message'] %}