diff --git a/tracks/app/controllers/project_controller.rb b/tracks/app/controllers/project_controller.rb
index e480125e..8faef22e 100644
--- a/tracks/app/controllers/project_controller.rb
+++ b/tracks/app/controllers/project_controller.rb
@@ -61,14 +61,25 @@ class ProjectController < ApplicationController
   #
   def toggle_check
     self.init
-
+    
     item = check_user_return_item
     item.toggle!('done')
     item.completed = Time.now () # For some reason, the before_save in todo.rb stopped working
-    if item.save
+    if item.save        
       render :partial => 'project/show_items', :object => item
     end
   end
+  
+  # Toggles the 'done' status of a project
+  #
+  def toggle_project_done
+    check_user_set_project
+    
+    @project.toggle!('done')
+    if @project.save
+      redirect_to(:action => "list")
+    end
+  end
 
   # Delete a project
   #
diff --git a/tracks/app/views/project/_empty.rhtml b/tracks/app/views/project/_empty.rhtml
new file mode 100644
index 00000000..f92ff187
--- /dev/null
+++ b/tracks/app/views/project/_empty.rhtml
@@ -0,0 +1 @@
+<p><%= message %></p>
\ No newline at end of file
diff --git a/tracks/app/views/project/_project_listing.rhtml b/tracks/app/views/project/_project_listing.rhtml
index 9cc403cc..6f500d9d 100644
--- a/tracks/app/views/project/_project_listing.rhtml
+++ b/tracks/app/views/project/_project_listing.rhtml
@@ -9,7 +9,7 @@
   <%= link_to( sanitize("#{project.name}"), :action => "show", :name => urlize(project.name) ) %><%= " (" + project.count_undone_todos("actions") + ")" %>
 </div>
 <div class="buttons">
-  <% if project.done == 1 -%>
+  <% if project.done? -%>
     <span class="grey">COMPLETED</span>
   <% else -%>
     <span class="grey">ACTIVE</span>
diff --git a/tracks/app/views/project/show.rhtml b/tracks/app/views/project/show.rhtml
index 32225085..0e1cf124 100644
--- a/tracks/app/views/project/show.rhtml
+++ b/tracks/app/views/project/show.rhtml
@@ -7,14 +7,21 @@
 <% end -%>
 
   <div id="next_actions">
-    <% if @project.done == 1 -%>
-      <p class="info">This project has been completed</p>
-      <%= render :partial => "show_items", :collection => @not_done %>
-    <% elsif @not_done.empty? -%>
-      <p>There are no next actions yet in this project</p>
-    <% else -%>
-      <%= render :partial => "show_items", :collection => @not_done %>
+    <% if @project.done? -%>
+      <p class="completed">Project has been marked as completed</p>
     <% end -%>
+    <% if !@project.done? and @not_done.empty? -%>
+        <div id="empty-nd" style="display:block;">
+          <%= render :partial => "empty", 
+              :locals => { :message => "There are currently no uncompleted actions in this project"} %>
+        </div>
+    <% else -%>
+        <div id="empty-nd" style="display:none;">
+          <%= render :partial => "empty", 
+              :locals => { :message => "There are currently no uncompleted actions in this project"} %>
+        </div>
+    <% end -%>
+        <%= render :partial => "show_items", :collection => @not_done %>
   </div><!-- [end:next_actions] -->
 </div><!-- [end:contexts] -->
 
@@ -23,10 +30,17 @@
 
   <div id="completed">
     <% if @done.empty? %>
-      <p>There are no completed next actions yet in this project</p>
-    <% else %>
-      <%= render :partial => "show_items", :collection => @done %>
-    <% end %>
+    <div id="empty-d">
+        <%= render :partial => "empty",
+        :locals => {:message => "There are currently no completed next actions in this project"} %>
+    </div>
+    <% else -%>
+        <div id="empty-nd" style="display:none;">
+          <%= render :partial => "empty", 
+              :locals => { :message => "There are currently no uncompleted actions in this project"} %>
+        </div>
+    <% end -%>
+        <%= render :partial => "show_items", :collection => @done %>
   </div>
 </div><!-- [end:contexts] -->
 
@@ -43,6 +57,12 @@
 </div>
 <!-- end div.contexts -->
 
+<% if @project.done? -%>
+  <%= button_to "Mark project as uncompleted", {:action => "toggle_project_done", :id => @project.id} %><br />
+<% else -%>
+  <%= button_to "Mark project as completed", {:action => "toggle_project_done", :id => @project.id} %><br />
+<% end -%>
+
 <%= link_to_function( "Add a note", "Element.toggle('new-note'); Form.focusFirstElement('form-new-note');") %>
 
 <div id="new-note" style="display:none;">
diff --git a/tracks/public/stylesheets/standard.css b/tracks/public/stylesheets/standard.css
index a7b87478..5e915c00 100644
--- a/tracks/public/stylesheets/standard.css
+++ b/tracks/public/stylesheets/standard.css
@@ -277,6 +277,14 @@ a.footer_link:hover {color: #fff; background-color: #cc3334 !important;}
       color: #ED2E38;
       text-align: center;
       }
+
+.completed {
+      border: 1px solid #007E00; 
+      background-color: #c2ffc2;
+      padding: 5px;
+      color: #007E00;
+      text-align: center;
+}
               
 /*   Draw attention to some text 
     Same format as traffic lights */
@@ -454,7 +462,13 @@ form {
     border: none;
     padding: 3px;
     width: 100%;
-    }    
+    }
+
+form.button-to {
+	border: none;
+	padding: 0px;
+	margin: 0px;
+}
 
 label {
     font-weight: bold;