diff --git a/tracks/app/views/context/_context.rhtml b/tracks/app/views/context/_context.rhtml
new file mode 100644
index 00000000..fac5d2a6
--- /dev/null
+++ b/tracks/app/views/context/_context.rhtml
@@ -0,0 +1,16 @@
+<% @not_done = context.find_not_done_todos %>
+
+
+<% if collapsible -%>
+ <%= image_tag("collapse.png") %>
+<% end -%>
+ <%= link_to( sanitize("#{context.name}"), { :controller => "context", :action => "show", :name => urlize(context.name) }, { :title => "Go to the #{context.name} context page" } ) %>
+
+
+
+ <%= render :partial => "shared/empty",
+ :locals => { :message => "Currently there are no uncompleted actions in this context"} %>
+
+<%= render :partial => "todo/item", :collection => @not_done, :locals => { :project => false } %>
+
+
diff --git a/tracks/app/views/context/_empty.rhtml b/tracks/app/views/context/_empty.rhtml
deleted file mode 100644
index f92ff187..00000000
--- a/tracks/app/views/context/_empty.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-
+
+ <% if collapsible %>
+ <%= image_tag("collapse.png") %>
+ <% end %>
+ <%= sanitize("#{project.name}") %>
+
+ <% if @project.description -%>
+
<%= sanitize(@project.description) %>
+ <% end -%>
+
+ <% if @project.done? -%>
+
Project has been marked as completed
+ <% end -%>
+
+
+ <%= render :partial => "shared/empty",
+ :locals => { :message => "Currently there are no uncompleted actions in this project"} %>
+
+
+ <%= render :partial => "todo/item", :collection => @not_done, :locals => { :project => true } %>
+
+
diff --git a/tracks/app/views/shared/_empty.rhtml b/tracks/app/views/shared/_empty.rhtml
new file mode 100644
index 00000000..f2f2cb9f
--- /dev/null
+++ b/tracks/app/views/shared/_empty.rhtml
@@ -0,0 +1,3 @@
+