diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb
index 3757a470..90d5e398 100644
--- a/lib/gollum/frontend/app.rb
+++ b/lib/gollum/frontend/app.rb
@@ -80,6 +80,7 @@ module Precious
     def show_page_or_file(name)
       wiki = Gollum::Wiki.new($path)
       if page = wiki.page(name)
+        @page = page
         @name = name
         @content = page.formatted_data
         mustache :page
diff --git a/lib/gollum/frontend/templates/page.mustache b/lib/gollum/frontend/templates/page.mustache
index f8724a66..360aba81 100644
--- a/lib/gollum/frontend/templates/page.mustache
+++ b/lib/gollum/frontend/templates/page.mustache
@@ -9,3 +9,19 @@
     </div>
   </div>
 </div>
+<div class="admin">
+  <div style="float: left;">
+    <small>Last edited by <b>{{author}}</b>, {{date}}</small>
+    <div class="actions">
+      <a href="/">Home</a> | <a href="/edit/{{name}}">Edit</a>
+    </div>
+  </div>
+  <div style="float: right;">
+    <small>Versions:</small>
+    <select id="versions_select" name="versions_select">
+      {{#versions}}
+        <option value="{{id}}">Version {{num}} ({{id7}}) by {{author}}</option>
+      {{/versions}}
+    </select>
+  </div>
+</div>
diff --git a/lib/gollum/frontend/views/page.rb b/lib/gollum/frontend/views/page.rb
index 689ddb54..ed5012a9 100644
--- a/lib/gollum/frontend/views/page.rb
+++ b/lib/gollum/frontend/views/page.rb
@@ -1,7 +1,7 @@
 module Precious
   module Views
     class Page < Layout
-      attr_reader :content
+      attr_reader :content, :page
 
       def human_name
         @name.gsub(/-/, ' ')
@@ -10,6 +10,25 @@ module Precious
       def title
         "A Page"
       end
+
+      def author
+        @page.version.author.name
+      end
+
+      def date
+        @page.version.authored_date.strftime("%Y-%m-%d %H:%M:%S")
+      end
+
+      def versions
+        i = @page.versions.size + 1
+        @page.versions.map do |v|
+          i -= 1
+          { :id => v.id,
+            :id7 => v.id[0..6],
+            :num => i,
+            :author => v.author.name }
+        end
+      end
     end
   end
 end