diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index bc0ecbaee..be9ae7afa 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -52,12 +52,11 @@
 											<div class="info_font" style=" word-wrap: break-word; word-break: break-all">
 												<%= @project.name %>
 											</div> 
-											<%if User.current.login?%>
-												<% unless @course.teacher.id == User.current.id%>
-													<!-- <%= image_tag "/images/sidebar/add.png" %>
-													<%= image_tag "/images/add.png" %> -->
-													<div class="icon-add icon" style="margin-right: 30px; margin-left: 20px">
-												<%= join_in_course(@project, User.current)%></div>
+											<%if User.current.logged?%>
+												<% if @course.teacher.id == User.current.id%>
+													<%= link_to l(:label_course_settings), {:controller => 'projects', :action => 'settings', :id => @project} %>
+												<% else %>
+													<%= join_in_course(@project, User.current)%></div>
 												<% end %> 
 												<% unless User.current.member_of?(@project) %>
 												<!-- <%= image_tag "/images/fav.png" %> -->
diff --git a/app/views/users/_my_create_homework.html.erb b/app/views/users/_my_create_homework.html.erb
index 6f17ab265..672428c2b 100644
--- a/app/views/users/_my_create_homework.html.erb
+++ b/app/views/users/_my_create_homework.html.erb
@@ -4,7 +4,7 @@
 <% @bid.each do |bids|%>
 <!-- <h2><%= link_to(Project.find(bids[0]).name, project_path(bids[0])) %></h2> -->
 <% for bid in bids[1] %>
-<% if @user == bid.author %>
+<% if @user == bid.author%>
 <table width="95%" border="0" style="padding-left: 10px; padding-top: 10px;">
 	<tr>
 		<td colspan="2" valign="top" width="50" ><%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %></td>
@@ -13,8 +13,7 @@
 			<tr>
 				<td colspan="2" valign="top"><strong><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>: &nbsp;
 				<%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>&nbsp;&nbsp;&nbsp;
-				<%= l(:label_course_homework) %> : <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %></strong> </span>
-					<span style="float: right"><%= link_to(
+				<%= l(:label_course_homework) %> : <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %></strong> </span> <span style="float: right"> <%= link_to(
 					l(:button_delete),
 					{:action => 'homework_destroy', :controller=>'bids', :course_id => bid.id},
 					:method => :post,