diff --git a/seahub/templates/repo_history.html b/seahub/templates/repo_history.html
index d89871e4d9..84893f9c93 100644
--- a/seahub/templates/repo_history.html
+++ b/seahub/templates/repo_history.html
@@ -54,9 +54,9 @@
             {% if page_next %}
             <a href="?page={{ next_page }}&per_page={{ per_page }}">{% trans "Next"%}</a>
             {% endif %}
-	    {% if current_page != 1 or page_next %}
-	    |
-	    {% endif %}
+            {% if current_page != 1 or page_next %}
+            |
+            {% endif %}
             <span>{% trans "Per page: "%}</span>
             {% if per_page == 25 %}
             <span> 25 </span>
diff --git a/seahub/templates/repo_view_snapshot.html b/seahub/templates/repo_view_snapshot.html
index fcbced8449..bc984e0876 100644
--- a/seahub/templates/repo_view_snapshot.html
+++ b/seahub/templates/repo_view_snapshot.html
@@ -47,10 +47,13 @@
         </table>
         <div id="paginator">
             {% if current_page != 1 %}
-            <a href="?page={{ prev_page }}&per_page={{ per_page }}">{% trans "Previous"%}</a> |
+            <a href="?page={{ prev_page }}&per_page={{ per_page }}">{% trans "Previous"%}</a>
             {% endif %}
             {% if page_next %}
-            <a href="?page={{ next_page }}&per_page={{ per_page }}">{% trans "Next"%}</a> |
+            <a href="?page={{ next_page }}&per_page={{ per_page }}">{% trans "Next"%}</a>
+            {% endif %}
+            {% if current_page != 1 or page_next %}
+            |   
             {% endif %}
             <span>{% trans "Per page: "%}</span>
             {% if per_page == 25 %}
diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py
index 8cd2f68d23..fef2cdfb7b 100644
--- a/seahub/views/__init__.py
+++ b/seahub/views/__init__.py
@@ -655,7 +655,7 @@ def repo_view_snapshot(request, repo_id):
 
     # don't show the current commit
     commits_all = get_commits(repo_id, per_page * (current_page -1) + 1,
-                              per_page + 2)
+                              per_page + 1)
     commits = commits_all[:per_page]
 
     if len(commits_all) == per_page + 1: