diff --git a/app/views/measurements/_form.html.erb b/app/views/measurements/_form.html.erb
index c76c209..9b58646 100644
--- a/app/views/measurements/_form.html.erb
+++ b/app/views/measurements/_form.html.erb
@@ -35,9 +35,8 @@
         <%= ff.number_field :value, {size: 8, step: :any, label: ''} %>
         <%= ff.select :unit_id, unit_options, {label: ''} %>
         <%= ff.hidden_field :_destroy %>
-        <%= link_to t(".button_delete_readout"), '#',
-          class: 'icon icon-del',
-          style: (@measurement.readouts.length > 1 ? "" : "display:none"),
+        <%= link_to t(".button_delete_readout"), '#', class: 'icon icon-del',
+          style: (@measurement.readouts.many? ? "" : "display:none"),
           onclick: "deleteReadout(); return false;" %>
         </p>
       <% end %>
diff --git a/app/views/targets/_form.html.erb b/app/views/targets/_form.html.erb
index d3d62c0..ce92e5d 100644
--- a/app/views/targets/_form.html.erb
+++ b/app/views/targets/_form.html.erb
@@ -36,6 +36,7 @@
           <% end %>
         <% end %>
         <%= link_to t(".button_delete_target"), '#', class: 'icon icon-del',
+          style: (@targets.many? ? "" : "display:none"),
           onclick: "deleteTarget(); return false;" %>
       <% end %>
       </p>
diff --git a/test/system/targets_test.rb b/test/system/targets_test.rb
index 70281da..1639511 100644
--- a/test/system/targets_test.rb
+++ b/test/system/targets_test.rb
@@ -40,12 +40,22 @@ class TargetsTest < BodyTrackingSystemTestCase
     assert_selector 'table#targets thead th'
   end
 
-  # TODO: rename to test_new; move checking of default values here
-  def test_index_show_and_hide_new_target_form
+  def test_new
     visit project_targets_path(@project1)
     assert_no_selector 'form#new-target-form'
     click_link t('targets.contextual.link_new_target')
     assert_selector 'form#new-target-form', count: 1
+    within 'form#new-target-form' do
+      assert has_select?(t(:field_goal), selected: t('targets.form.binding_goal'))
+      assert has_field?(t(:field_effective_from), with: Date.current.strftime)
+      assert has_no_link?(t('targets.form.button_delete_target'))
+    end
+  end
+
+  def test_new_cancel
+    visit project_targets_path(@project1)
+    click_link t('targets.contextual.link_new_target')
+    assert_selector 'form#new-target-form', count: 1
     click_on t(:button_cancel)
     assert_no_selector 'form#new-target-form'
   end
@@ -56,8 +66,6 @@ class TargetsTest < BodyTrackingSystemTestCase
       visit project_targets_path(@project1)
       click_link t('targets.contextual.link_new_target')
       within 'form#new-target-form' do
-        assert has_select?(t(:field_goal), selected: t('targets.form.binding_goal'))
-        assert has_field?(t(:field_effective_from), with: Date.current.strftime)
         within 'p.target' do
           select quantities(:quantities_energy).name
           select '=='