diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index a44d2fb8..e3a02081 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -46,7 +46,7 @@ module ProjectsHelper
     options = ''
     options << "<option value=''></option>" if project.allowed_parents.include?(nil)
     options << project_tree_options_for_select(project.allowed_parents.compact, :selected => selected)
-    content_tag('select', options, :name => 'project[parent_id]')
+    content_tag('select', options, :name => 'project[parent_id]', :id => 'project_parent_id')
   end
   
   # Renders a tree of projects as a nested set of unordered lists
diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index ef2a1885..30848e4c 100644
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -5,7 +5,7 @@
 <p><%= f.text_field :name, :required => true %><br /><em><%= l(:text_caracters_maximum, 30) %></em></p>
 
 <% unless @project.allowed_parents.compact.empty? %>
-    <p><label><%= l(:field_parent) %></label><%= parent_project_select_tag(@project) %></p>
+    <p><%= label(:project, :parent_id, l(:field_parent)) %><%= parent_project_select_tag(@project) %></p>
 <% end %>
 
 <p><%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %></p>
diff --git a/app/views/projects/settings/_modules.rhtml b/app/views/projects/settings/_modules.rhtml
index 06dea9b4..c123b4c9 100644
--- a/app/views/projects/settings/_modules.rhtml
+++ b/app/views/projects/settings/_modules.rhtml
@@ -2,13 +2,15 @@
             :url => { :action => 'modules', :id => @project },
             :html => {:id => 'modules-form'} do |f| %>
             
-<div class=box>
-<strong><%= l(:text_select_project_modules) %></strong>
+<div class="box">
+<fieldset>
+<legend><%= l(:text_select_project_modules) %></legend>
 
 <% Redmine::AccessControl.available_project_modules.each do |m| %>
 <p><label><%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) -%>
  <%= l_or_humanize(m, :prefix => "project_module_") %></label></p>
 <% end %>
+</fieldset>
 </div>
 
 <p><%= check_all_links 'modules-form' %></p>
diff --git a/app/views/projects/settings/_repository.rhtml b/app/views/projects/settings/_repository.rhtml
index cdfb7feb..18bb2cd7 100644
--- a/app/views/projects/settings/_repository.rhtml
+++ b/app/views/projects/settings/_repository.rhtml
@@ -6,7 +6,7 @@
 <%= error_messages_for 'repository' %>
 
 <div class="box tabular">
-<p><label><%= l(:label_scm) %></label><%= scm_select_tag(@repository) %></p>
+<p><%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %></p>
 <%= repository_field_tags(f, @repository) if @repository %>
 </div>