diff --git a/contrib/static/site.css b/contrib/static/site.css
index 03a5bf8..f223dde 100644
--- a/contrib/static/site.css
+++ b/contrib/static/site.css
@@ -17,10 +17,6 @@ section {
 	width: 100%;
 }
 
-main {
-	max-width: 1110px;
-}
-
 
 .frontend , .subject {
     color: #928BFF;
@@ -150,14 +146,12 @@ input, textarea {
     color: whitesmoke;
     background: #2d2d2d;
     border-color: #4D28CA;
-    border-radius: 3px;
 }
 
 
 .reply {
     margin-left: 1.8em;
     display: inline-block;
-    border-radius: 3px;
 }
 
 .frontend {
@@ -242,9 +236,7 @@ input, textarea {
 }
 
 .reply, .ukko_thread_header , pre {
-    padding: 7px 7px;
-    border-radius: 5px;
-    box-shadow: 1px 1px 3px black;                    
+    padding: 7px 7px;                    
 }
 
 .post_body > p {
@@ -257,9 +249,14 @@ input, textarea {
 
 .post {
     display: inline-block;
+    overflow: auto;
     width: 80%;
 }
 
+.origin {
+    float: right;
+}
+
 #postform_attachment {
     max-width: 330px;
 }
@@ -283,18 +280,10 @@ figure img {
     max-height:128px;
     max-width:100%;
 }
-fieldset {
-    overflow: auto;
-	border-radius: 5px 0px 5px 0px;
-}
-
-fieldset > img {
-	float: right;
-}
 
 .thread {
     float: left;
-	width: 90%;
+	width: 99%;
 	padding-left: 10px;
 	margin-top: 10px;
 	margin-bottom: 10px;
diff --git a/contrib/templates/default/post.mustache b/contrib/templates/default/post.mustache
index c40d627..fa2a47f 100644
--- a/contrib/templates/default/post.mustache
+++ b/contrib/templates/default/post.mustache
@@ -1,5 +1,5 @@
 <div id="{{PostHash}}" class="{{CSSClass}}">
-<fieldset>
+  <div class="origin">
   {{#IsI2P}}
     <img src="{{Prefix}}static/i2p.png" title="post from i2p" />
   {{/IsI2P}}
@@ -9,9 +9,10 @@
   {{#IsClearnet}}
     <img src="{{Prefix}}static/clearnet.png" title="post from clearnet" />
   {{/IsClearnet}}
+  </div>
   <legend>
     <span class="subject">{{Subject}}</span> <span class="name">{{Name}}</span><time datetime="{{DateRFC}}">{{Date}}</time>
-    <a href="{{PostURL}}">No.</a><a onclick="nntpchan_backlink('{{ShortHash}}');" title="{{MessageID}}">{{ShortHash}}</a>
+    <a href="{{PostURL}}" class="postno">No.</a><a onclick="nntpchan_backlink('{{ShortHash}}');" title="{{MessageID}}">{{ShortHash}}</a>
     {{#OP}}<a href="{{PostURL}}">[Reply]</a>{{/OP}} <span class="tripcode">{{{Pubkey}}}</span><br />
   </legend>
   {{#Attachments}}
@@ -24,5 +25,4 @@
   <label class="post_body">
     {{{RenderBody}}}
   </label> 
-</fieldset>
 </div>