diff --git a/app/controllers/impasse_test_plans_controller.rb b/app/controllers/impasse_test_plans_controller.rb
index 8b5f96f..ee5372d 100644
--- a/app/controllers/impasse_test_plans_controller.rb
+++ b/app/controllers/impasse_test_plans_controller.rb
@@ -25,7 +25,7 @@ def new
       flash[:notice] = l(:notice_successful_create)
       redirect_to :action => :tc_assign, :project_id => @project, :id => @test_plan
     end
-    @versions = @project.versions
+    @versions = @project.shared_versions
   end
 
   def edit
@@ -35,7 +35,7 @@ def edit
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => :show, :project_id => @project, :id => @test_plan
     end
-    @versions = @project.versions
+    @versions = @project.shared_versions
   end
 
   def destroy
diff --git a/app/views/impasse_settings/_form.html.erb b/app/views/impasse_settings/_form.html.erb
index 6827d1b..89a1bd5 100644
--- a/app/views/impasse_settings/_form.html.erb
+++ b/app/views/impasse_settings/_form.html.erb
@@ -5,18 +5,20 @@
 </div>
 <% unless @custom_fields_by_type.empty? %>
   <fieldset class="box" id="impasse_custom_fields"><legend><%=l(:label_custom_field_plural)%></legend>
-    <% impasse_custom_fields_tabs.each do |tab| %>
-      <% if @custom_fields_by_type[tab[:name]] %>
-	<h3><%= l(tab[:label])%></h3>
-	<div>
-	<% @custom_fields_by_type[tab[:name]].each do |custom_field| %>
-	  <label class="floating">
-	    <%= check_box_tag 'custom_field_ids[]', custom_field.id, (@impasse_custom_fields[tab[:name]].include? custom_field) %>
-	    <%=h custom_field.name %>
-	  </label>
-	<% end %>
-	  <br class="clear"/>
-	</div>
+    <% unless @impasse_custom_fields_tabs.empty? %>
+      <% impasse_custom_fields_tabs.each do |tab| %>
+        <% if @custom_fields_by_type[tab[:name]] %>
+	  <h3><%= l(tab[:label])%></h3>
+	  <div>
+	  <% @custom_fields_by_type[tab[:name]].each do |custom_field| %>
+	    <label class="floating">
+	      <%= check_box_tag 'custom_field_ids[]', custom_field.id, (@impasse_custom_fields[tab[:name]].include? custom_field) %>
+	      <%=h custom_field.name %>
+	    </label>
+	  <% end %>
+	    <br class="clear"/>
+	  </div>
+        <% end %>
       <% end %>
     <% end %>
   </fieldset>
diff --git a/app/views/impasse_test_plans/_form.html.erb b/app/views/impasse_test_plans/_form.html.erb
index aff91fc..0b52104 100644
--- a/app/views/impasse_test_plans/_form.html.erb
+++ b/app/views/impasse_test_plans/_form.html.erb
@@ -5,7 +5,7 @@
   <p><%= form.text_area :notes, :rows => 10,
          :class => 'wiki-edit' %></p>
   <%= wikitoolbar_for 'test_plan_notes' %>
-  <p><%= form.select :version_id, @versions.collect{|v| [v.name, v.id]}, {:include_blank => false}, :required=>true%></p>
+  <p><%= form.select :version_id, @versions.collect{|v| [(@project != v.project ? v.project.name + ' - ' : '') + v.name, v.id]}, {:include_blank => false}, :required=>true%></p>
   <% @test_plan.custom_field_values.each do |value| %>
     <p><%= custom_field_tag_with_label :test_plan, value %></p>
   <% end %>