diff --git a/freepost/static/stylus/freepost.styl b/freepost/static/stylus/freepost.styl
index e00a71b..0d9bf7a 100755
--- a/freepost/static/stylus/freepost.styl
+++ b/freepost/static/stylus/freepost.styl
@@ -102,7 +102,7 @@ body
             .vote
                 margin 0
                 
-                > form
+                form
                     display inline-block
                     
                     > button
@@ -146,14 +146,16 @@ body
                 > .post
                     display grid
                     grid-template-columns min-content auto
-                    margin  0 0 2em 0
+                    grid-column-gap 1.5rem
+                    
+                    margin-bottom 2rem
                     
                     /* Show numbered position in the list */
                     > .position
                         color #555
                         font-style italic
                         line-height 1.9rem
-                        margin-right 1.5rem
+                        text-align right
                     
                     > .info
                         > .title
diff --git a/freepost/static/stylus/reset.styl b/freepost/static/stylus/reset.styl
index a195e69..cb0ef21 100755
--- a/freepost/static/stylus/reset.styl
+++ b/freepost/static/stylus/reset.styl
@@ -128,6 +128,9 @@ textarea.form-control
     height 8rem
 
 .pagination
+    > form
+        display inline-block
+    
     > .page_number
         font-size .7rem
         font-weight bold
diff --git a/freepost/templates/posts.html b/freepost/templates/posts.html
index ffe58e8..ae714d7 100644
--- a/freepost/templates/posts.html
+++ b/freepost/templates/posts.html
@@ -50,11 +50,15 @@
                             </time>
                         </a>
                     </em>
+                    
                     by
+                    
                     <a href="{{ url ('user_public', username=post.username) }}">
                         {{ post.username }}
                     </a>
+                    
                     —
+                    
                     <a href="{{ url ('post', hash_id=post.hashId) }}#comments">
                         {% if post.commentsCount > 0 %}
                             {{ post.commentsCount }} comments
@@ -68,18 +72,22 @@
         
     {% endfor %}
     
-    <form class="pagination">
-        {% for key, value in request.query.items () %}
-            <input type="hidden" name="{{ key }}" value="{{ value }}" />
-        {% endfor %}
-        
+    <div class="pagination">
         {% if page_number > 0 %}
-            <button type="submit"
-                    name="page"
-                    value="{{ page_number - 1 }}"
-                    class="button button_default1">
-                    Previous
-            </button>
+            <form>
+                {% for key, value in request.query.items () %}
+                    {% if key != 'page' %}
+                        <input type="hidden" name="{{ key }}" value="{{ value }}" />
+                    {% endif %}
+                {% endfor %}
+                
+                <button type="submit"
+                        name="page"
+                        value="{{ page_number - 1 }}"
+                        class="button button_default1">
+                        Previous
+                </button>
+            </form>
         {% endif %}
         
         {% if page_number > 0 %}
@@ -89,12 +97,20 @@
         {% endif %}
         
         {% if posts %}
-            <button type="submit"
-                    name="page"
-                    value="{{ page_number + 1 }}"
-                    class="button button_default1">
-                    Next
-            </button>
+            <form>
+                {% for key, value in request.query.items () %}
+                    {% if key != 'page' %}
+                        <input type="hidden" name="{{ key }}" value="{{ value }}" />
+                    {% endif %}
+                {% endfor %}
+                
+                <button type="submit"
+                        name="page"
+                        value="{{ page_number + 1 }}"
+                        class="button button_default1">
+                        Next
+                </button>
+            </form>
         {% endif %}
-    </form>
+    </div>
 </div>
diff --git a/freepost/templates/vote.html b/freepost/templates/vote.html
index 6c75e12..bb0f191 100755
--- a/freepost/templates/vote.html
+++ b/freepost/templates/vote.html
@@ -21,7 +21,7 @@
                     ⯅
                 </button>
             </form>
-
+            
             {# Show number of votes #}
             <span class="count">{{ item.vote }}</span>
             
@@ -34,11 +34,11 @@
                     ⯆
                 </button>
             </form>
-
+        
         {% else %}
             
-            {{ item.vote ~ ' vote' ~ ('s' if item.vote != 1 else '') }}
-        
+            {{ item.vote ~ ' vote' ~ ('s' if item.vote != 1) }}
+            
         {% endif %}
         
     </span>