diff --git a/app/views/diary_entry/edit.rhtml b/app/views/diary_entry/edit.rhtml
index 87f5e9fac..a69f4fd9c 100644
--- a/app/views/diary_entry/edit.rhtml
+++ b/app/views/diary_entry/edit.rhtml
@@ -5,24 +5,28 @@
 <% form_for :diary_entry do |f| %>
   <table>
     <tr valign="top">
-      <th>Subject</th>
+      <td class="fieldName">Subject:</td>
       <td><%= f.text_field :title, :size => 60 %></td>
     </tr>
     <tr valign="top">
-      <th>Body</th>
+      <td class="fieldName">Body:</td>
       <td><%= f.text_area :body, :cols => 80 %></td>
     </tr>
     <tr valign="top">
-      <th>Location</th>
+      <td class="fieldName">Location:</td>
       <td>
         <div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 400px; display: none;"></div>
         <span class="location">Latitude: <%= f.text_field :latitude, :size => 20, :id => "latitude" %> Longitude: <%= f.text_field :longitude, :size => 20, :id => "longitude" %></span>
         <a href="javascript:openMap()" id="usemap">use map</a>
+        <br/><br/>
       </td>
     </tr>
     <tr>
-      <th></th>
-      <td><%= submit_tag 'Save' %></td>
+      <td></td>
+      <td>
+	  <%= submit_tag 'Save' %>
+	  <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %>
+      </td>
     </tr>
   </table>
 <% end %>
diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml
index 7a2ccf74d..9852313bb 100644
--- a/app/views/diary_entry/list.rhtml
+++ b/app/views/diary_entry/list.rhtml
@@ -4,29 +4,40 @@
  <%= image_tag url_for_file_column(@this_user, "image") %>
 <% end %>
 
-<br />
 
 <% if @this_user %>
   <% if @user == @this_user %>
-    <%= link_to 'New diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
+    <%= link_to image_tag("new.png", :border=>0) + 'New diary entry', {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => 'Compose a new entry in your user diary'} %>
   <% end %>
 <% else %>
   <% if @user %>
-    <%= link_to 'New diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
+    <%= link_to image_tag("new.png", :border=>0) + 'New diary entry', {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => 'Compose a new entry in your user diary'} %>
   <% end %>
 <% end %>
 
-<h3>Recent diary entries:</h3>
 
-<%= render :partial => 'diary_entry', :collection => @entries %>
+<% if @entries.empty? %>
+	<p>No diary entries</p>
 
-<%= link_to "Older Entries", { :page => @entry_pages.current.next } if @entry_pages.current.next %>
-<% if @entry_pages.current.next and @entry_pages.current.previous %>
-|
+<% else %>
+	
+	<p>Recent diary entries:</p>
+	<hr />
+	<%= render :partial => 'diary_entry', :collection => @entries %>
+	
+	<%= link_to "Older Entries", { :page => @entry_pages.current.next } if @entry_pages.current.next %>
+	<% if @entry_pages.current.next and @entry_pages.current.previous %>
+	|
+	<% end %>
+	<%= link_to "Newer Entries", { :page => @entry_pages.current.previous } if @entry_pages.current.previous %>
+	
+	<br />
+	
 <% end %>
-<%= link_to "Newer Entries", { :page => @entry_pages.current.previous } if @entry_pages.current.previous %>
-
-<br />
 
 <%= rss_link_to :action => 'rss' %>
 <%= auto_discovery_link_tag :atom, :action => 'rss' %>
+
+
+<br />
+<br />
\ No newline at end of file
diff --git a/public/images/new.png b/public/images/new.png
new file mode 100644
index 000000000..202e10eca
Binary files /dev/null and b/public/images/new.png differ
diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
index 2bfe21d24..764d8971b 100644
--- a/public/stylesheets/site.css
+++ b/public/stylesheets/site.css
@@ -277,6 +277,12 @@ hides rule from IE5-Mac \*/
   font-size: 10px;
 }
 
+hr {
+  border: none;
+  background-color: #ccc;
+  color: #ccc;
+  height: 1px;
+}
 
 .gpxsummary {
   font-size: 12px;