diff --git a/contrib/static/site.css b/contrib/static/site.css
index 6836034..b2a7998 100644
--- a/contrib/static/site.css
+++ b/contrib/static/site.css
@@ -1,9 +1,3 @@
-.thread {
-    margin-bottom: 1em;
-    display: inline-block;
-    word-wrap: break-word;
-    width: 100%;
-}
 
 .frontend , .subject {
     color: #928BFF;
@@ -252,6 +246,54 @@ html {
     background: grey;
 }
 
-.history_num {
-    text-align: right;
+figure {
+    float: left;
+    margin: 1ex;
+}
+figure img {
+    max-width:256px;
+    max-height:128px;
+    max-width:100%;
+}
+fieldset {
+    overflow: auto;
+    max-width: 120ex;
+}
+legend {
+    background-color: lightgray;
+}
+
+.thread {
+    float: left;
+    width: 66%;
+}
+.replybar {
+    float: left;
+    position: fixed;
+    top: 2ex;
+    right: 0;
+    width: 34%
+    }
+@media (max-width: 100ex) {
+    .replybar, .thread {
+		width: 100%;
+		position: static;
+    }
+}
+
+.hide-reply:checked ~ div {
+    width: 100%;
+    position: static;
+}
+
+textarea#reply-text {
+    width: 100%;
+    resize: vertical;
+}
+
+.hide-reply {
+    float: right;
+    position: fixed;
+    top: 0;
+    right: 0;
 }
\ No newline at end of file
diff --git a/contrib/templates/default/board.mustache b/contrib/templates/default/board.mustache
index e41c478..b97767d 100644
--- a/contrib/templates/default/board.mustache
+++ b/contrib/templates/default/board.mustache
@@ -14,6 +14,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
+    <meta name="viewport" content="initial-scale=1" />
     <link rel="stylesheet" href="{{board.Prefix}}static/site.css" />
     <link rel="stylesheet" href="{{board.Prefix}}static/user.css" />
     <script type="text/javascript" src="{{board.Prefix}}static/nntpchan.js"></script>
diff --git a/contrib/templates/default/post.mustache b/contrib/templates/default/post.mustache
index 91850bf..6701463 100644
--- a/contrib/templates/default/post.mustache
+++ b/contrib/templates/default/post.mustache
@@ -1,49 +1,29 @@
-<div class="{{CSSClass}}" id="{{PostHash}}">
-  <p class="intro">
-    <label for="delete_{{PostHash}}">
-      <span class="origin">
+<fieldset>
+  <legend>
+    <span>
       {{#IsI2P}}
-      <img src="{{Prefix}}static/i2p.png" title="post from i2p" />
+        <img src="{{Prefix}}static/i2p.png" title="post from i2p" />
       {{/IsI2P}}
       {{#IsTor}}
-      <img src="{{Prefix}}static/tor.png" title="post from tor" />
+        <img src="{{Prefix}}static/tor.png" title="post from tor" />
       {{/IsTor}}
       {{#IsClearnet}}
-      <img src="{{Prefix}}static/clearnet.png" title="post from clearnet" />
+        <img src="{{Prefix}}static/clearnet.png" title="post from clearnet" />
       {{/IsClearnet}}
-      </span>
-      <span class="subject">
-        {{Subject}}
-      </span>
-      <span class="name">
-        {{#Sage}}
-          <a href="mailto:sage">
-            {{Name}}
-          </a>
-        {{/Sage}}
-        {{^Sage}}
-          {{Name}}
-        {{/Sage}}
-      </span>
-      <span class="postdate">
-        {{Date}}
-      </span>
-    </label>
-    <a onclick="nntpchan_backlink('{{ShortHash}}');" title="{{MessageID}}">No. {{ShortHash}}</a>
-    <a href="{{PostURL}}">[reply]</a>
-    <span class="tripcode">{{{Pubkey}}}</span>
-  </p>
-  <div class="files">
-    {{#Attachments}}
-      <div class="file">
-        <p class="file_info">
-          <span>File: {{Filename}}</span>
-        </p>
-        <a target="_blank" class="file-link" href="{{Source}}" title="{{Filename}}">
-          <img class="file-thumbnail" src="{{Thumbnail}}" alt="{{Filename}}" />
-        </a>
-      </div>
-    {{/Attachments}}
-  </div>
-  <div class="post_body">{{{RenderBody}}}</div>
-</div>
\ No newline at end of file
+    </span>
+    {{Subject}} {{Name}} {{Date}}
+    No. <a onclick="nntpchan_backlink('{{ShortHash}}');" title="{{MessageID}}">{{ShortHash}}</a>
+    <a href="{{PostURL}}">[reply]</a> <span class="tripcode">{{{Pubkey}}}</span><br />
+  </legend>
+  <label>
+    {{{RenderBody}}}
+  </label>  
+  {{#Attachments}}
+    <figure>
+    <figcaption>
+    <a target="_blank" href="{{Source}}" title="{{Filename}}">{{Filename}}</a>
+    </figcaption>
+    <img src="{{Thumbnail}}" alt="{{Filename}}" />
+    </figure>
+  {{/Attachments}}
+</fieldset>
diff --git a/contrib/templates/default/thread.mustache b/contrib/templates/default/thread.mustache
index 03baa94..d09522d 100644
--- a/contrib/templates/default/thread.mustache
+++ b/contrib/templates/default/thread.mustache
@@ -14,6 +14,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
+    <meta name="viewport" content="initial-scale=1" />
     <link rel="stylesheet" href="{{thread.Prefix}}static/site.css" />
     <link rel="stylesheet" href="{{thread.Prefix}}static/user.css" />
     <script type="text/javascript" src="{{thread.Prefix}}static/nntpchan.js"></script>
