diff --git a/app/views/custom_fields/_form.html.erb b/app/views/custom_fields/_form.html.erb
index 2e50188..5a90cc0 100644
--- a/app/views/custom_fields/_form.html.erb
+++ b/app/views/custom_fields/_form.html.erb
@@ -27,33 +27,12 @@
 <% case @custom_field.class.name
 when "IssueCustomField" %>
     <p><%= f.check_box :is_required %></p>
-    <p><%= f.check_box :is_for_all, :data => {:disables => '#custom_field_project_ids input'} %></p>
     <% if @custom_field.format.is_filter_supported %>
     <p><%= f.check_box :is_filter %></p>
     <% end %>
     <% if @custom_field.format.searchable_supported %>
     <p><%= f.check_box :searchable %></p>
     <% end %>
-    <p>
-      <label><%= l(:field_visible) %></label>
-      <label class="block">
-        <%= radio_button_tag 'custom_field[visible]', 1, @custom_field.visible?, :id => 'custom_field_visible_on',
-              :data => {:disables => '.custom_field_role input'} %>
-        <%= l(:label_visibility_public) %>
-      </label>
-      <label class="block">
-        <%= radio_button_tag 'custom_field[visible]', 0, !@custom_field.visible?, :id => 'custom_field_visible_off',
-              :data => {:enables => '.custom_field_role input'} %>
-        <%= l(:label_visibility_roles) %>:
-      </label>
-      <% Role.givable.sorted.each do |role| %>
-        <label class="block custom_field_role" style="padding-left:2em;">
-          <%= check_box_tag 'custom_field[role_ids][]', role.id, @custom_field.roles.include?(role), :id => nil %>
-          <%= role.name %>
-        </label>
-      <% end %>
-      <%= hidden_field_tag 'custom_field[role_ids][]', '' %>
-    </p>
 
 <% when "UserCustomField" %>
     <p><%= f.check_box :is_required %></p>
@@ -99,6 +78,27 @@ when "IssueCustomField" %>
 </div>
 
 <% if @custom_field.is_a?(IssueCustomField) %>
+
+  <fieldset class="box tabular"><legend><%= l(:field_visible) %></legend>
+    <label class="block">
+      <%= radio_button_tag 'custom_field[visible]', 1, @custom_field.visible?, :id => 'custom_field_visible_on',
+            :data => {:disables => '.custom_field_role input'} %>
+      <%= l(:label_visibility_public) %>
+    </label>
+    <label class="block">
+      <%= radio_button_tag 'custom_field[visible]', 0, !@custom_field.visible?, :id => 'custom_field_visible_off',
+            :data => {:enables => '.custom_field_role input'} %>
+      <%= l(:label_visibility_roles) %>:
+    </label>
+    <% Role.givable.sorted.each do |role| %>
+      <label class="block custom_field_role" style="padding-left:2em;">
+        <%= check_box_tag 'custom_field[role_ids][]', role.id, @custom_field.roles.include?(role), :id => nil %>
+        <%= role.name %>
+      </label>
+    <% end %>
+    <%= hidden_field_tag 'custom_field[role_ids][]', '' %>
+  </fieldset>
+
   <fieldset class="box" id="custom_field_tracker_ids"><legend><%=l(:label_tracker_plural)%></legend>
   <% Tracker.sorted.each do |tracker| %>
     <%= check_box_tag "custom_field[tracker_ids][]",
@@ -113,13 +113,17 @@ when "IssueCustomField" %>
   <p><%= check_all_links 'custom_field_tracker_ids' %></p>
   </fieldset>
 
-  <fieldset class="box" id="custom_field_project_ids"><legend><%= l(:label_project_plural) %></legend>
-    <% project_ids = @custom_field.project_ids.to_a %>
-    <%= render_project_nested_lists(Project.all) do |p|
-      content_tag('label', check_box_tag('custom_field[project_ids][]', p.id, project_ids.include?(p.id), :id => nil) + ' ' + p)
-    end %>
-    <%= hidden_field_tag('custom_field[project_ids][]', '', :id => nil) %>
-    <p><%= check_all_links 'custom_field_project_ids' %></p>
+  <fieldset class="box"><legend><%= l(:label_project_plural) %></legend>
+    <p><%= f.check_box :is_for_all, :data => {:disables => '#custom_field_project_ids input'} %></p>
+
+    <div id="custom_field_project_ids">
+      <% project_ids = @custom_field.project_ids.to_a %>
+      <%= render_project_nested_lists(Project.all) do |p|
+        content_tag('label', check_box_tag('custom_field[project_ids][]', p.id, project_ids.include?(p.id), :id => nil) + ' ' + p)
+      end %>
+      <%= hidden_field_tag('custom_field[project_ids][]', '', :id => nil) %>
+      <p><%= check_all_links 'custom_field_project_ids' %></p>
+    </div>
   </fieldset>
 <% end %>
 </div>