diff --git a/stylesheets/style.css b/stylesheets/style.css
index 32ad70b5..1572b36e 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -228,6 +228,8 @@ div.post.op hr {
 }
 
 .intro {
+  display: flex;
+  justify-content: space-between;
   margin: 0.5em 0;
   padding: 0;
   padding-bottom: 0.2em;
@@ -257,12 +259,19 @@ div.delete {
   float: right;
 }
 
-div.post.reply p {
-  margin: 0.3em 0 0 0;
+.required-star {
+  color: maroon;
 }
 
-div.post.reply div.body {
-  margin-left: 1.8em;
+div.post p {
+  margin: 0;
+
+  line-height: 1.16em;
+  font-size: 13px;
+  min-height: 1.16em;
+}
+
+div.post div.body {
   margin-top: 0.8em;
   padding-right: 3em;
   padding-bottom: 0.3em;
@@ -288,7 +297,7 @@ div.post div.body {
 div.post.reply {
   background: #D6DAF0;
   margin: 0.2em 4px;
-  padding: 0.2em 0.3em 0.5em 0.6em;
+  padding: 0.5em 0.3em;
   border-width: 1px;
   border-style: none solid solid none;
   border-color: #B7C5D9;
diff --git a/templates/post_reply.html b/templates/post_reply.html
index 0111d6e4..658c853b 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -11,9 +11,9 @@
 		{% include 'post/flag.html' %}
 	</label>
 	{% apply spaceless %}
-	{% include 'post/poster_id.html' %}&nbsp;
+	{% include 'post/poster_id.html' %}
 	{% 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" 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>
 	</p>
 	{% endapply %}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 7ac58eb3..6477a268 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -7,18 +7,16 @@
 {% 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">
-	<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
 	<label for="delete_{{ post.id }}">
-
 		{% include 'post/subject.html' %}
 		{% include 'post/name.html' %}
 		{% include 'post/ip.html' %}
 		{% include 'post/flag.html' %}
-		{% include 'post/time.html' %}
 	</label>
 	{% apply spaceless %}
 	{% include 'post/poster_id.html' %}&nbsp;
-	<a class="post_no" id="post_no_{{ post.id }}" title="Link to this post" o onclick="highlightReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('', '50') }}{% else %}{{ post.link }}{% endif %}">No.</a>
+	{% 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 %}