diff --git a/boards/static/js/refpopup.js b/boards/static/js/refpopup.js
--- a/boards/static/js/refpopup.js
+++ b/boards/static/js/refpopup.js
@@ -65,7 +65,9 @@ function showPostPreview(e) {
         cln.id = 'pstprev_' + pNum;
         cln.className = 'post_preview';
 
-        cln.style.cssText = 'top:' + y + 'px;' + (x < doc.body.clientWidth/2 ? 'left:' + x + 'px' : 'right:' + parseInt(doc.body.clientWidth - x + 1) + 'px');
+//      var newX = x < doc.body.clientWidth/2 ? 'left:' + x : 'right:' + parseInt(doc.body.clientWidth - x - reflink.width());
+//      var newY = y < doc.body.clientHeight/2 ? 'top:' + y : 'bottom:' + parseInt(doc.body.clientHeight - y - reflink.height());
+        cln.style.cssText = 'left:' + x + 'px; top:' + y + 'px';
 
         cln.addEventListener('mouseout', delPostPreview, false);
 
diff --git a/boards/templates/boards/all_threads.html b/boards/templates/boards/all_threads.html
--- a/boards/templates/boards/all_threads.html
+++ b/boards/templates/boards/all_threads.html
@@ -201,8 +201,7 @@
                     {% ifequal page current_page.number %}
                         class="current_page"
                     {% endifequal %}
-                    href="{% page_url paginator page %}">{{ page }}</a>
-                {% if not forloop.last %},{% endif %}
+                    href="{% page_url paginator page %}">{{ page }}</a>{% if not forloop.last %},{% endif %}
             {% endfor %}
         {% endwith %}
         ]
diff --git a/boards/templates/boards/feed.html b/boards/templates/boards/feed.html
--- a/boards/templates/boards/feed.html
+++ b/boards/templates/boards/feed.html
@@ -61,8 +61,7 @@
                     {% ifequal page current_page.number %}
                         class="current_page"
                     {% endifequal %}
-                    href="{% page_url paginator page %}">{{ page }}</a>
-                {% if not forloop.last %},{% endif %}
+                    href="{% page_url paginator page %}">{{ page }}</a>{% if not forloop.last %},{% endif %}
             {% endfor %}
         {% endwith %}
         ]