diff --git a/app/controllers/backlogs_controller.rb b/app/controllers/backlogs_controller.rb
index 19530fa27c..4695161a42 100644
--- a/app/controllers/backlogs_controller.rb
+++ b/app/controllers/backlogs_controller.rb
@@ -1,4 +1,5 @@
 include StoriesHelper
+include BacklogMenuHelper
 
 class BacklogsController < ApplicationController
   unloadable
diff --git a/app/helpers/backlog_menu_helper.rb b/app/helpers/backlog_menu_helper.rb
new file mode 100644
index 0000000000..cfa97e5b75
--- /dev/null
+++ b/app/helpers/backlog_menu_helper.rb
@@ -0,0 +1,31 @@
+module BacklogMenuHelper
+  unloadable
+
+  def backlog_menu(is_sprint, items = [])
+    html = %{
+      <ul class="actions pureCssMenu pureCssMenum">
+          <li class="pureCssMenui">
+              <a class="pureCssMenui" href="#"><span class="ui-icon ui-icon-triangle-1-s"></span></a>
+              <ul class="pureCssMenum">
+    }
+    items.each do |item|
+      item[:condition] = true if item[:condition].nil?
+      if item[:condition] && ( (is_sprint && item[:for] == :sprint) ||
+                               (!is_sprint && item[:for] == :product) ||
+                               (item[:for] == :both) )
+        html += %{ <li class="pureCssMenui">#{item[:item]}</li> }
+      end
+    end
+    html += %{
+              </ul>
+          </li>
+      </ul>
+    }
+  end
+
+  def menu_link(label, options = {})
+    # options[:class] = "pureCssMenui"
+    link_to(label, options)
+  end
+
+end
diff --git a/app/views/backlogs/_backlog.html.erb b/app/views/backlogs/_backlog.html.erb
index 7e0f5e0aeb..f06625b9a0 100644
--- a/app/views/backlogs/_backlog.html.erb
+++ b/app/views/backlogs/_backlog.html.erb
@@ -7,32 +7,36 @@
       <div class="end_date datepicker"><%= date_or_nil(backlog.effective_date) %></div>
     </div>
     <div class="points"><%= backlog.points %></div>
-    <ul class="actions pureCssMenu pureCssMenum">
-        <li class="pureCssMenui">
-            <a class="pureCssMenui" href="#"><span class="ui-icon ui-icon-triangle-1-s"></span></a>
-            <ul class="pureCssMenum">
-                <li class="pureCssMenui">
-                    <%= link_to('Stories/Tasks', {
-                                :controller => 'backlogs',
-                                :action => 'select_sprint',
-                                :project_id => @project.id,
-                                :sprint_id => backlog.id },
-                                :class => "pureCssMenui") %>
-                </li>
-                <% if @project.wiki %>
-                    <li class="pureCssMenui">
-                        <%= link_to('Wiki', {
-                                    :controller => 'backlogs',
-                                    :action => 'wiki_page',
-                                    :project_id => @project.id,
-                                    :sprint_id => backlog.id },
-                                    :class => "pureCssMenui") %>
-                    </li>
-                <% end %>
-            </ul>
-        </li>
-    </ul>
     <%- end %>
+    <%= backlog_menu is_sprint(backlog),
+        [
+          {
+            :item => "<a>New story</a>",
+            :for => :both
+          },
+          {
+            :item => menu_link('Stories/Tasks', {
+                               :controller => 'backlogs',
+                               :action => 'select_sprint',
+                               :project_id => @project,
+                               :sprint_id => backlog }),
+            :for => :sprint
+          },
+          {
+            :item => menu_link('Wiki', {
+                               :controller => 'backlogs',
+                               :action => 'wiki_page',
+                               :project_id => @project.id,
+                               :sprint_id => backlog.id }),
+            :for => :sprint,
+            :condition => @project.enabled_modules.any? {|m| m.name=="wiki" }
+          },
+          {
+            :item => "<a>Select All</a>",
+            :for => :both
+          }
+        ]
+    %>
   </div><!-- class="header" -->
   <ul class="stories">
     <%= render :partial => "stories/story", :collection => stories(backlog) %>
diff --git a/assets/stylesheets/index.css b/assets/stylesheets/index.css
index 016c90bfe4..db6f5b2173 100644
--- a/assets/stylesheets/index.css
+++ b/assets/stylesheets/index.css
@@ -19,13 +19,10 @@
   font-weight:bold;
   padding-left:15px;
 }
-.backlog.product .header .name{
-  padding-left:0;
-}
 .backlog .header .actions{
   display:block;
   position:absolute;
-  left:7px;
+  left:6px;
   top:6px;
 }
 .backlog .header .dates{