Index: trunk/BookmarkController.pm
===================================================================
--- trunk/BookmarkController.pm	(revision 63)
+++ trunk/BookmarkController.pm	(revision 64)
@@ -337,7 +337,10 @@
         } else {
             # display the bookmark form for this bookmark
+            # TODO: these should probably be methods on the Bookmark class
             $bookmark->{exists} = 1;
-            $bookmark->{created} = "Created " . localtime($bookmark->ctime);
-            $bookmark->{created} .= '; Updated ' . localtime($bookmark->mtime) unless $bookmark->ctime == $bookmark->mtime;
+            $bookmark->{created} = localtime($bookmark->ctime);
+            $bookmark->{updated} = localtime($bookmark->mtime);
+            ($bookmark->{created_iso} = time2isoz($bookmark->ctime)) =~ s/\D//g;
+            ($bookmark->{updated_iso} = time2isoz($bookmark->mtime)) =~ s/\D//g;
             my $template = Template->new;
             $template->process(
Index: trunk/bookmark.tt
===================================================================
--- trunk/bookmark.tt	(revision 63)
+++ trunk/bookmark.tt	(revision 64)
@@ -5,4 +5,7 @@
 body, th, td {
     font-size: .875em;
+}
+h1 {
+  font-size: 1.25em;
 }
 li {
@@ -17,10 +20,15 @@
   <body>
     <div>
+      <h1>
       [% UNLESS exists %]
         <strong>New bookmark:</strong>
       [% END %]
       <a href="[% uri | html %]" target="_blank">[% title or uri %]</a>
+      </h1>
       [% IF exists %]
-        <p class="timestamps">[% created %]</p>
+        <p class="timestamps">
+	  Bookmark created <a href="http://web.archive.org/web/[% created_iso %]/[% uri %]" title="Nearest Wayback Machine Link" target="_blank">[% created %]</a>[% IF mtime != ctime %]; updated
+	  <a href="http://web.archive.org/web/[% updated_iso %]/[% uri %]" title="Nearest Wayback Machine Link" target="_blank">[% updated %]</a>[% END %]
+        </p>
         [% IF tags.size %]
           <p class="tags">Tagged as:
