diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index b11d2a46e..ef9a4b5f9 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -213,7 +213,7 @@
 										<%= link_to l(:label_course_overview), project_path(@project), :class => link_class(:overview) %>
 									</li>
 									<li>
-										<%= link_to l(:label_homework), {:controller => 'projects', :action => 'homework'}, :class => link_class('Task'), :project_type => 1 %>
+										<%= link_to l(:label_homework), homework_project_path(@project), :class => link_class('Task') ,:project_type => 1  %>
 									</li>
 									<li>
 										<%= link_to l(:label_course_board), { :controller => 'boards', :action => 'index', :project_id => @project}, :class => link_class(:boards) %> 							
diff --git a/config/routes.rb b/config/routes.rb
index dd1af90c7..8d09fbcab 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -51,6 +51,7 @@ RedmineApp::Application.routes.draw do
   match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
   match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
 
+  # boards
   match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message'
   get 'boards/:board_id/topics/:id', :to => 'messages#show', :as => 'board_message'
   match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post]
@@ -60,6 +61,7 @@ RedmineApp::Application.routes.draw do
   post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply'
   post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
   post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
+  # boards end
   post 'bids/homework_destroy', :to => 'bids#homework_destroy'
 
   # Misc issue routes. TODO: move into resources