diff --git a/simplewiki_base.html b/simplewiki_base.html
index 714edf5a9b..a4f792b825 100644
--- a/simplewiki_base.html
+++ b/simplewiki_base.html
@@ -89,8 +89,8 @@
 
       <ul class="action">
         <li>
-    	            <div class="wiki_box_title">Search</div>
-    	        <form method="POST" action='${reverse("wiki_search_articles", args=[""])}'>
+    	        <div class="wiki_box_title">Search</div>
+    	        <form method="POST" action='${reverse("wiki_search_articles", args=[])}'>
     	            <div style="display:none">
                 	    <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
                 	</div>
@@ -99,8 +99,12 @@
     	        </form>
         </li>
         <li>
-          <input type="button" onclick="javascript:location.href='${reverse("wiki_random", args=["wiki_articleget_url"])}'" value="Random article" class="button" />
+          <input type="button" onclick="javascript:location.href='${reverse("wiki_random", args=[])}'" value="Random article" class="button" />
         </li>
+        <li>
+          <input type="button" onclick="javascript:location.href='${reverse("wiki_list_articles", args=[])}'" value="All articles" class="button" />
+        </li>
+        
 
         <li class="create-article">
           <h3>
diff --git a/simplewiki_error.html b/simplewiki_error.html
index f251f8d411..eb78521fb0 100644
--- a/simplewiki_error.html
+++ b/simplewiki_error.html
@@ -21,7 +21,7 @@ ${wiki_error}
 %if wiki_url is not UNDEFINED:
 <p>
 The page you requested could not be found.
-Click <a href="{% url wiki_create wiki_url %}">here</a> to create it.
+Click <a href="${reverse("wiki_create", args=[wiki_url])}">here</a> to create it.
 </p>
 %else:
 <p>