--- /dev/null
+++ b/app/controllers/components_controller.rb
@@ -0,0 +1,2 @@
+class ComponentsController < ApplicationController
+end

--- /dev/null
+++ b/app/controllers/milestones_controller.rb
@@ -0,0 +1,2 @@
+class MilestonesController < ApplicationController
+end

--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -4,7 +4,7 @@ class TicketsController < ApplicationController
 
   def index
     @title, @url_suffix = Project.tab_settings(PRJ_TAB_TICKETS)
-    @tickets = Ticket.filtered(params[:ticket] ? params[:ticket] : "")
+    @tickets = Ticket.filtered(params[:ticketfilter] ? params[:ticketfilter] : "")
     @current_milestone = Milestone.find_current_milestone(@project.id)
     #@assignees = @project.tickets.assignees
     render :action => "ac_project_index"

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -339,10 +339,10 @@ module ApplicationHelper
     acts << %Q{<li>#{link_to("Close Ticket", root_path)}</li>} if flags[:close_ticket]
     acts << %Q{<li>#{link_to("List Tickets", project_tickets_path(@project.slug))}</li>} if flags[:list_tickets]
     acts << %Q{<li>#{link_to("New Milestone", new_project_milestone_path(@project.slug))}</li>} if flags[:new_milestone] && @is_member
-    acts << %Q{<li>#{link_to("List Active Milestones", root_path)}</li>} if flags[:list_active_milestones]
-    acts << %Q{<li>#{link_to("List Completed Milestones", root_path)}</li>} if flags[:list_completed_milestones]
-    acts << %Q{<li>#{link_to("Edit Milestones", root_path)}</li>} if flags[:edit_milestones] && @is_member
-    acts << %Q{<li>#{link_to("Edit Components", root_path)}</li>} if flags[:edit_components] && @is_member
+#    acts << %Q{<li>#{link_to("List Active Milestones", root_path)}</li>} if flags[:list_active_milestones]
+#    acts << %Q{<li>#{link_to("List Completed Milestones", root_path)}</li>} if flags[:list_completed_milestones]
+    acts << %Q{<li>#{link_to("Manage Milestones", project_milestones_path)}</li>} if flags[:manage_milestones] && @is_member
+    acts << %Q{<li>#{link_to("Manage Components", project_components_path)}</li>} if flags[:manage_components] && @is_member
     acts << %Q{<li>#{link_to("New Member", root_path)}</li>} if flags[:new_member] && @is_member
     acts << %Q{<li>#{link_to("List Members", root_path)}</li>} if flags[:list_members]
     acts << %Q{<li>#{link_to("Clone Mainline", new_project_repository_path(@project.slug, @repository))}</li>} if flags[:clone_mainline] && logged_in?

--- /dev/null
+++ b/app/helpers/components_helper.rb
@@ -0,0 +1,2 @@
+module ComponentsHelper
+end

--- /dev/null
+++ b/app/helpers/milestones_helper.rb
@@ -0,0 +1,2 @@
+module MilestonesHelper
+end

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -132,9 +132,7 @@ module ProjectsHelper
     when PRJ_TAB_TICKETS
       case subtab
       when PRJ_TAB_SUBTAB_NONE
-        out << actionbox_complex(:allow_shortcuts => true, :new_ticket => true, :new_milestone => true,
-          :list_completed_milestones => true, :list_active_milestones => true, :edit_milestones => true,
-          :edit_components => true)
+        out << actionbox_complex(:allow_shortcuts => true, :new_ticket => true, :manage_milestones => true, :manage_components => true)
         out << render(:partial => "ac_right_ticket_filter")
       when PRJ_TAB_TICKETS_SHOW
         out << actionbox_complex(:allow_shortcuts => true, :list_tickets => true, :edit_ticket => true, :close_ticket => true)
@@ -148,7 +146,8 @@ module ProjectsHelper
       when PRJ_TAB_WIKI_LIST
         out << actionbox_complex(:allow_shortcuts => true, :new_project_wiki => true)
       else
-        out << actionbox_complex(:allow_shortcuts => true, :edit_project_wiki => true, :new_project_wiki => true, :list_project_wikis => true)
+        out << actionbox_complex(:allow_shortcuts => true, :edit_project_wiki => true, :new_project_wiki => true,
+          :list_project_wikis => true)
       end
     when PRJ_TAB_ARTICLES
       case subtab

--- a/app/helpers/tickets_helper.rb
+++ b/app/helpers/tickets_helper.rb
@@ -3,7 +3,7 @@ module TicketsHelper
   include ProjectsHelper
 
   def ticket_value_checked? (v)
-    params[:ticket][v] == "1" ? "checked" : "" if params[:ticket]
+    params[:ticketfilter][v] == "1" ? "checked" : "" if params[:ticketfilter]
   end
     
     

--- a/app/views/tickets/_ac_right_ticket_filter.html.erb
+++ b/app/views/tickets/_ac_right_ticket_filter.html.erb
@@ -1,34 +1,34 @@
 
 <table class='right_default_table' cellspacing=0px>
 
-<% form_for :ticket, :url => project_tickets_path(@project.slug), :method => :get, :html => {:name => 'ticketfilter'} do |f| %>
-    
+<% form_for :ticketfilter, :url => project_tickets_path(@project.slug), :html => {:method => :get, :name => 'ticketfilter', :id => 'input'} do |f| %>
+  
 <tr><th colspan=2>Ticket Filter</th></tr>
 
 <tr>
 
 <td><small>
 <br />
-<%= check_box(:ticket, :ttype_defect, {:checked => ticket_value_checked?(:ttype_defect)}, "1", "0") %>Defect<br />
-<%= check_box(:ticket, :ttype_enhancement, {:checked => ticket_value_checked?(:ttype_enhancement)}, "1", "0") %>Enhancement<br />
-<%= check_box(:ticket, :ttype_task, {:checked => ticket_value_checked?(:ttype_task)}, "1", "0") %>Task<br />
+<%= check_box(:ticketfilter, :ttype_defect, {:checked => ticket_value_checked?(:ttype_defect)}, "1", "0") %>Defect<br />
+<%= check_box(:ticketfilter, :ttype_enhancement, {:checked => ticket_value_checked?(:ttype_enhancement)}, "1", "0") %>Enhancement<br />
+<%= check_box(:ticketfilter, :ttype_task, {:checked => ticket_value_checked?(:ttype_task)}, "1", "0") %>Task<br />
 <br />
-<%= check_box(:ticket, :status_proposed, {:checked => ticket_value_checked?(:status_proposed)}, "1", "0") %>Proposed<br />
-<%= check_box(:ticket, :status_open, {:checked => ticket_value_checked?(:status_open)}, "1", "0") %>Open<br />
-<%= check_box(:ticket, :status_closed, {:checked => ticket_value_checked?(:status_closed)}, "1", "0") %>Closed<br />
+<%= check_box(:ticketfilter, :status_proposed, {:checked => ticket_value_checked?(:status_proposed)}, "1", "0") %>Proposed<br />
+<%= check_box(:ticketfilter, :status_open, {:checked => ticket_value_checked?(:status_open)}, "1", "0") %>Open<br />
+<%= check_box(:ticketfilter, :status_closed, {:checked => ticket_value_checked?(:status_closed)}, "1", "0") %>Closed<br />
 <br />
 </small></td>
 
 <td><small>
 <br />
-<%= check_box(:ticket, :impact_low, {:checked => ticket_value_checked?(:impact_low)}, "1", "0") %>Low Impact<br />
-<%= check_box(:ticket, :impact_high, {:checked => ticket_value_checked?(:impact_high)}, "1", "0") %>High Impact<br />
-<%= check_box(:ticket, :impact_security, {:checked => ticket_value_checked?(:impact_security)}, "1", "0") %>Security Impact<br />
+<%= check_box(:ticketfilter, :impact_low, {:checked => ticket_value_checked?(:impact_low)}, "1", "0") %>Low Impact<br />
+<%= check_box(:ticketfilter, :impact_high, {:checked => ticket_value_checked?(:impact_high)}, "1", "0") %>High Impact<br />
+<%= check_box(:ticketfilter, :impact_security, {:checked => ticket_value_checked?(:impact_security)}, "1", "0") %>Security Impact<br />
 <br />
-<%= check_box(:ticket, :priority_none, {:checked => ticket_value_checked?(:priority_none)}, "1", "0") %>No Priority<br />
-<%= check_box(:ticket, :priority_low, {:checked => ticket_value_checked?(:priority_low)}, "1", "0") %>Low Priority<br />
-<%= check_box(:ticket, :priority_high, {:checked => ticket_value_checked?(:priority_high)}, "1", "0") %>High Priority<br />
-<%= check_box(:ticket, :priority_critical, {:checked => ticket_value_checked?(:priority_critical)}, "1", "0") %>Critical<br />
+<%= check_box(:ticketfilter, :priority_none, {:checked => ticket_value_checked?(:priority_none)}, "1", "0") %>No Priority<br />
+<%= check_box(:ticketfilter, :priority_low, {:checked => ticket_value_checked?(:priority_low)}, "1", "0") %>Low Priority<br />
+<%= check_box(:ticketfilter, :priority_high, {:checked => ticket_value_checked?(:priority_high)}, "1", "0") %>High Priority<br />
+<%= check_box(:ticketfilter, :priority_critical, {:checked => ticket_value_checked?(:priority_critical)}, "1", "0") %>Critical<br />
 <br />
 </small></td>
 

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -22,7 +22,7 @@ ActionController::Routing::Routes.draw do |map|
                                        :team => :get,
                                        :log => :get,
                                        :config => :get
-                                      } do |projects|
+  } do |projects|
     projects.resources(:repositories, :member => { 
       :new => :get, :create => :post, 
       :writable_by => :get, 
@@ -31,14 +31,11 @@ ActionController::Routing::Routes.draw do |map|
       repo.resources :committers, :name_prefix => nil, :collection => {:auto_complete_for_user_login => :post, :list => :get, :create => :post}
       repo.resources :comments, :member => { :commmit => :get  }
       repo.resources :merge_requests, :member => { :resolve => :put }, :collection => { :create => :post }
-      repo.commit_comment "comments/commit/:sha", :controller => "comments", 
-        :action => "commit", :conditions => { :method => :get }
-      
+      repo.commit_comment "comments/commit/:sha", :controller => "comments", :action => "commit", :conditions => { :method => :get }
       repo.resources :logs, :requirements => { :id => VALID_SHA }#, :member => { :feed => :get }
-      repo.formatted_log_feed "logs/:id/feed.:format", :controller => "logs", :action => "feed", 
-        :conditions => {:feed => :get}, :requirements => {:id => VALID_SHA}
+      repo.formatted_log_feed "logs/:id/feed.:format", :controller => "logs", :action => "feed", :conditions => {:feed => :get}, :requirements => {:id => VALID_SHA}
       repo.resources :commits
-      repo.trees          "trees/", :controller => "trees", :action => "index"
+      repo.trees "trees/", :controller => "trees", :action => "index"
       repo.with_options(:requirements => { :id => VALID_SHA }) do |r|
         r.tree           "trees/:id/*path", :controller => "trees", :action => "show"
         r.formatted_tree "trees/:id/*path.:format", :controller => "trees", :action => "show"
@@ -46,16 +43,14 @@ ActionController::Routing::Routes.draw do |map|
         r.raw_blob       "blobs/raw/:id/*path", :controller => "blobs", :action => "raw"
         r.blob           "blobs/:id/*path", :controller => "blobs", :action => "show"
       end
-      #FIXME these maybe should be down a level
-      projects.resources(:articles)
-      projects.resources(:members)
-      projects.resources(:messages)
-      projects.resources(:wikis)
-      projects.resources(:milestones)
-      projects.resources(:tickets, :member => {:close => :get})
-      #projects.resources(:members)
     end
-    #projects.resource :respository
+    projects.resources(:articles)
+    projects.resources(:members)
+    projects.resources(:messages)
+    projects.resources(:wikis)
+    projects.resources(:milestones)
+    projects.resources(:tickets, :member => {:close => :get})
+    projects.resources(:components)
   end
   
   map.resource :search

--- /dev/null
+++ b/test/functional/components_controller_test.rb
@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ComponentsControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

--- /dev/null
+++ b/test/functional/milestones_controller_test.rb
@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class MilestonesControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end