diff --git a/templates/imgbin/view.html.ep b/templates/imgbin/view.html.ep
index 982b39d..33ce581 100644
--- a/templates/imgbin/view.html.ep
+++ b/templates/imgbin/view.html.ep
@@ -4,16 +4,12 @@
 <h1><%= l('View image') %></h1>
 <div>
   <div>
+    <%= link_to l('Upload') => "/imgbin", class => 'zerobin upload' %>&nbsp;
 % if (config->{imgbin}->{show_latest}) {
-    <span class="zerobin cblock">
-      <%= link_to l('Latest images') => "/imgbin/latest" %>
-    </span>
+    <%= link_to l('Latest images') => "/imgbin/latest", class => 'zerobin latest' %>&nbsp;
 % }
-    <span class="zerobin cblock">
-      <%= link_to l('Upload more') => "/imgbin" %>
-    </span>
   </div>
-  <br/>
+  <hr/>
   <div>
   % my $image = (stash 'image') || {};
   % my $style = sprintf "max-width: %dpx;", $config->{imgbin}->{css_maxwidth};
@@ -23,9 +19,9 @@
   </div>
   <hr/>
   <table>
-% foreach my $key (qw(width height size name comment)) {
-%   next unless $image->{$key};
-    <tr><%= tag td => l(ucfirst($key)) %><td> : </td><%= tag td => $image->{$key} %></tr>
-% }
+    <tr><td><%= l('Dimensions') %></td><td>:</td><td><%= "$image->{width}x$image->{height}" %></td></tr>
+    <tr><td><%= l('Size')       %></td><td>:</td><td><%= sprintf("%.1f kb", $image->{size} / 1024) %></td></tr>
+    <tr><td><%= l('Name')       %></td><td>:</td><td><%= $image->{name}    // '-' %></td></tr>
+    <tr><td><%= l('Comment')    %></td><td>:</td><td><%= $image->{comment} // '-' %></td></tr>
   </table>
 </div>