diff --git a/app/views/targets/_index.html.erb b/app/views/targets/_index.html.erb
index 6fd2ffe..f0829f2 100644
--- a/app/views/targets/_index.html.erb
+++ b/app/views/targets/_index.html.erb
@@ -21,14 +21,26 @@
 
           <% row.each do |q, span| %>
             <% row_classes = [] %>
-            <% row_classes << 'quantity' if (i < header.length-1) && (span >= 0) %>
-            <% row_classes << 'empty' if span == 0 %>
+            <% row_classes << 'interim' if (i < header.length-1) && (span >= 0) %>
+            <% row_classes << (span == 0 ? 'empty' : 'closable ellipsible') %>
             <th <%= raw "class=\"#{row_classes.join(' ')}\"" unless row_classes.empty? %>
                 <%= "colspan=#{span}" if span > 0 %>
                 <%= "rowspan=#{-span}" if span < 0 %>
                 style="width: <%= [span, 1].max * 100/total_width %>%;"
                 title="<%= q.description %>">
-              <%= q.name unless span == 0 %>
+              <% unless span == 0 %>
+                <div style="float:right;position:relative;">
+                  <% button_classes = 'icon' %>
+                  <% if (i == header.length-1) || header[i+1].has_key?(q) || (span < -1) %>
+                    <% button_classes += ' icon-close' %>
+                  <% else %>
+                    <% button_classes += ' icon-bullet-closed' %>
+                  <% end %>
+                  <%= link_to '', toggle_exposure_goal_path(@goal, quantity_id: q.id),
+                    {class: button_classes, method: :post, remote: true} %>
+                </div>
+                <%= q.name %>
+              <% end %>
             </th>
           <% end %>
 
diff --git a/assets/stylesheets/body_tracking.css b/assets/stylesheets/body_tracking.css
index 4178621..bfa10e4 100644
--- a/assets/stylesheets/body_tracking.css
+++ b/assets/stylesheets/body_tracking.css
@@ -6,10 +6,10 @@ table.list .date,
 table.list .name,
 table.list td.quantity {text-align: left;}
 /* TODO: merge with .closable and/or remove .closable */
-/* TODO: replace .quantityhead(empty) with th.quantity/.empty */
+/* TODO: replace .quantity(head)(empty) with th.interim/.empty */
 table.list .quantityhead {border-bottom: none;}
 table.list .quantityheadempty {border-top: none; border-bottom: none;}
-table.list th.quantity {border-bottom: none;}
+table.list th.interim {border-bottom: none;}
 table.list th.empty {border-top: none;}
 
 table.list .action,