diff --git a/simplewiki_error.html b/simplewiki_error.html
index 91721abfc5..5f9bb0be5c 100644
--- a/simplewiki_error.html
+++ b/simplewiki_error.html
@@ -74,6 +74,10 @@ ${wiki_error}
 	<p>
 	The article you tried to access has been deleted. You may be able to restore it to an earlier version in its <a href="${reverse("wiki_history", args=[wiki_article.get_url(),1])}">history</a>, or <a href="${reverse("wiki_edit", args=[wiki_article.get_url()])}">create a new version</a>.
 	</p>
+%elif wiki_err_norevision is not UNDEFINED:
+	<p>
+	This article does not contain revision ${wiki_err_norevision | h}.
+	</p>
 %else:
 	<p>
 	An error has occured.
diff --git a/simplewiki_history.html b/simplewiki_history.html
index efeeb95430..0cdeaf4b30 100644
--- a/simplewiki_history.html
+++ b/simplewiki_history.html
@@ -70,7 +70,8 @@ ${ wiki_article.title }
         </tfoot>
     %endif
 </table>
-<input type="submit" name="change" value="Change revision"
+<input type="submit" name="view" value="View revision"/>
+<input type="submit" name="change" value="Change to revision"
 %if not wiki_write:
 	disabled="true"
 %endif
diff --git a/simplewiki_view.html b/simplewiki_view.html
index d939e3e1d8..6492174670 100644
--- a/simplewiki_view.html
+++ b/simplewiki_view.html
@@ -8,6 +8,6 @@
 
 <%block name="wiki_body">
   <div id="wiki_article">
-    ${ wiki_article.current_revision.contents_parsed| n}
+    ${ wiki_article_revision.contents_parsed| n}
   </div>
 </%block>