diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index 1a2cfba2..967e89bc 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -455,7 +455,7 @@ class StatsController < ApplicationController
     @completed_actions = current_user.todos.completed.find(:all, { :select => "completed_at, created_at" })
 
     actions_sum, actions_max = 0,0
-    actions_min = @completed_actions.first.completed_at - @completed_actions.first.created_at
+    actions_min = @completed_actions.first ? @completed_actions.first.completed_at - @completed_actions.first.created_at : 0
     
     @completed_actions.each do |r|
       actions_sum += (r.completed_at - r.created_at)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index fbf0a0cf..21d6d868 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -13,7 +13,7 @@ module ApplicationHelper
     else
       tag_options = nil
     end
-    url = options.is_a?(String) ? options : self.url_for(options, *parameters_for_method_reference)    
+    url = options.is_a?(String) ? options : self.url_for(options, *parameters_for_method_reference)
     id_tag = (request.request_uri == url) ? " id=\"current\"" : ""
     
     "<a href=\"#{url}\"#{tag_options}#{id_tag}>#{name || url}</a>"
@@ -53,7 +53,7 @@ module ApplicationHelper
         else
           # overdue or due very soon! sound the alarm!
           if days == -1
-            t('todos.next_actions_due_date.overdue_by', :days => days * -1)            
+            t('todos.next_actions_due_date.overdue_by', :days => days * -1)
           elsif days < -1
             t('todos.next_actions_due_date.overdue_by_plural', :days => days * -1)
           else
@@ -123,7 +123,7 @@ module ApplicationHelper
   def link_to_edit_project (project, descriptor = sanitize(project.name))
     link_to(descriptor,
       url_for({:controller => 'projects', :action => 'edit', :id => project.id}),
-      {:id => "link_edit_#{dom_id(project)}", :class => "project_edit_settings"})
+      {:id => "link_edit_#{dom_id(project)}", :class => "project_edit_settings icon"})
   end
 
   def link_to_edit_context (context, descriptor = sanitize(context.name))
@@ -155,7 +155,7 @@ module ApplicationHelper
   end
   
   def render_flash
-    render :partial => 'shared/flash', :object => flash 
+    render :partial => 'shared/flash', :object => flash
   end
 
   def recurrence_time_span(rt)
@@ -287,7 +287,7 @@ module ApplicationHelper
         done_tag_path(@tag_name)
       else
         done_todos_path
-      end      
+      end
     else
       done_todos_path
     end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 50ea79e9..ddab5ba2 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -51,7 +51,7 @@ module ProjectsHelper
       project_path(project, :format => 'js'),
       {
         :id => "delete_project_#{project.id}",
-        :class => "delete_project_button",
+        :class => "delete_project_button icon",
         :x_confirm_message => t('projects.delete_project_confirmation', :name => project.name),
         :title => t('projects.delete_project_title')
       }
diff --git a/app/views/projects/_project_listing.rhtml b/app/views/projects/_project_listing.rhtml
index 8da4996d..22b1e37c 100644
--- a/app/views/projects/_project_listing.rhtml
+++ b/app/views/projects/_project_listing.rhtml
@@ -6,27 +6,17 @@ suppress_delete_button ||= false
 -%>
 <div id="<%= dom_id(project, "container") %>" class="list">
   <div id="<%= dom_id(project) %>" class="project sortable_row" style="display:block">
-
-    <% unless suppress_drag_handle -%>
-      <div class="position">
-        <span class="handle"><%= t('common.drag_handle') %></span>
-      </div>
-    <% end -%>
-
-    
-    <div class="data">
+    <%= suppress_delete_button ? "" : link_to_delete_project(project, image_tag( "blank.png", :title => t('projects.delete_project_title'), :class=>"delete_item")) %>
+    <%= suppress_edit_button ? "" : link_to_edit_project(project, image_tag( "blank.png", :title => t('projects.edit_project_title'), :class=>"edit_item")) %>
+    <%= image_tag('grip.png',
+      :width => '7', :height => '16', :border => '0',
+      :title => t('common.drag_handle'), :class => 'grip') unless suppress_drag_handle -%>
+    <div class="project_description">
       <span class="<%= needsreview_class( project ) %>">
          <%= link_to_project( project ) %>
          <%= " (" + count_undone_todos_and_notes_phrase(project,"actions") + ")" %>
-      </span>      
+      </span>
     </div>
-
-    <div class="buttons">
-      <span class="grey"><%= project.aasm_current_state.to_s.upcase %></span>
-      <%= suppress_delete_button ? "" : link_to_delete_project(project, image_tag( "blank.png", :title => t('projects.delete_project_title'), :class=>"delete_item")) %>
-      <%= suppress_edit_button ? "" : link_to_edit_project(project, image_tag( "blank.png", :title => t('projects.edit_project_title'), :class=>"edit_item")) %>
-    </div>
-
   </div>
   <div id="<%= dom_id(project, 'edit') %>" class="edit-form" style="display:none;"></div>
 </div>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 5c2302f8..700a7a7a 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -806,7 +806,7 @@ var ProjectListPage = {
         /* make the three lists of project sortable */
         $(['active', 'hidden', 'completed']).each(function() {
             $("#list-"+this+"-projects").sortable({
-                handle: '.handle',
+                handle: '.grip',
                 update: update_order
             });
         });
diff --git a/public/stylesheets/standard.css b/public/stylesheets/standard.css
index 337c1370..88693a9f 100644
--- a/public/stylesheets/standard.css
+++ b/public/stylesheets/standard.css
@@ -426,13 +426,13 @@ input.item-checkbox {
     vertical-align: middle;
 }
 
-.rec_description, .description {
+.rec_description, .description, .project_description {
     margin-left: 80px;
     position:relative;
 }
 
-.rec_description {
-    margin-left: 80px;
+.project_description {
+  margin-left: 50px;
 }
 
 .stale_l1 {