diff --git a/app/views/workflows/copy.rhtml b/app/views/workflows/copy.rhtml
index 2cecc84..54a683f 100644
--- a/app/views/workflows/copy.rhtml
+++ b/app/views/workflows/copy.rhtml
@@ -3,31 +3,38 @@
 <h2><%=l(:label_workflow)%></h2>
 
 <% form_tag({}, :id => 'workflow_copy_form') do %>
-<div class="tabular box">
+<fieldset class="tabular box">
+<legend><%= l(:label_copy_source) %></legend>
 <p>
-	<label><%= l(:label_copy_source) %></label>
-	<%= l(:label_tracker) %><br />
+	<label><%= l(:label_tracker) %></label>
 	<%= select_tag('source_tracker_id', 
 									"<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
 									"<option value=\"any\">--- #{ l(:label_copy_same_as_target) } ---</option>" + 
-									options_from_collection_for_select(@trackers, 'id', 'name', @source_tracker && @source_tracker.id)) %><br />
-	<%= l(:label_role) %><br />
+									options_from_collection_for_select(@trackers, 'id', 'name', @source_tracker && @source_tracker.id)) %>
+</p>
+<p>
+	<label><%= l(:label_role) %></label>
 	<%= select_tag('source_role_id',
 									"<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
 									"<option value=\"any\">--- #{ l(:label_copy_same_as_target) } ---</option>" + 
 									options_from_collection_for_select(@roles, 'id', 'name', @source_role && @source_role.id)) %>
 </p>
+</fieldset>
+
+<fieldset class="tabular box">
+<legend><%= l(:label_copy_target) %></legend>
 <p>
-	<label><%= l(:label_copy_target) %></label>
-	<%= l(:label_tracker) %><br />
+	<label><%= l(:label_tracker) %></label>
 	<%= select_tag 'target_tracker_ids',
 									"<option value=\"\" disabled=\"disabled\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
-									options_from_collection_for_select(@trackers, 'id', 'name', @target_trackers && @target_trackers.map(&:id)), :multiple => true %><br />
-	<%= l(:label_role) %><br />
+									options_from_collection_for_select(@trackers, 'id', 'name', @target_trackers && @target_trackers.map(&:id)), :multiple => true %>
+</p>
+<p>
+	<label><%= l(:label_role) %></label>
 	<%= select_tag 'target_role_ids',
 									"<option value=\"\" disabled=\"disabled\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
 									options_from_collection_for_select(@roles, 'id', 'name', @target_roles && @target_roles.map(&:id)), :multiple => true %>
 </p>
-</div>
+</fieldset>
 <%= submit_tag l(:button_copy) %>
 <% end %>