diff --git a/app/controllers/measurements_controller.rb b/app/controllers/measurements_controller.rb
index ab3a76e..06e8575 100644
--- a/app/controllers/measurements_controller.rb
+++ b/app/controllers/measurements_controller.rb
@@ -22,7 +22,12 @@ class MeasurementsController < ApplicationController
     @measurement = @project.measurements.new(measurement_params)
     if @measurement.save
       flash[:notice] = 'Created new measurement'
-      prepare_measurements
+      if session[:m_filters][:scope].empty?
+        prepare_measurements
+      else
+        prepare_readouts
+        render :create_readouts
+      end
     else
       @measurement.readouts.new if @measurement.readouts.empty?
       render :new
@@ -35,8 +40,13 @@ class MeasurementsController < ApplicationController
   def update
     if @measurement.update(measurement_params)
       flash[:notice] = 'Updated measurement'
-      prepare_measurements
-      render :index
+      if session[:m_filters][:scope].empty?
+        prepare_measurements
+        render :index
+      else
+        prepare_readouts
+        render :readouts
+      end
     else
       render :edit
     end
@@ -65,6 +75,7 @@ class MeasurementsController < ApplicationController
   def toggle_column
     @measurement.column_view.toggle_column!(@quantity)
     prepare_readouts
+    render :readouts
   end
 
   private
diff --git a/app/views/measurements/_index.html.erb b/app/views/measurements/_index.html.erb
index f4487be..930a28d 100644
--- a/app/views/measurements/_index.html.erb
+++ b/app/views/measurements/_index.html.erb
@@ -11,7 +11,8 @@
     <tbody>
       <% @measurements.each do |m| %>
         <% next if m.new_record? %>
-        <tr id="measurement-<%= m.id %>" class="measurement <%= 'hidden' if m.hidden %>">
+        <tr id="measurement-<%= m.id %>"
+            class="primary measurement <%= 'hidden' if m.hidden %>">
           <td class="date"><%= format_datetime(m) %></td>
           <td class="name">
             <div style="float:left;">
diff --git a/app/views/measurements/_readouts.html.erb b/app/views/measurements/_readouts.html.erb
index 12b9e7f..683aa1c 100644
--- a/app/views/measurements/_readouts.html.erb
+++ b/app/views/measurements/_readouts.html.erb
@@ -8,7 +8,7 @@
         <th style="width:<%= 2 * 100/total_width%>%"><%= l(:field_taken_at_date) %></th>
         <% @quantities.each do |q| %>
           <th style="width:<%= 100/total_width %>%">
-            <div style="float:right;">
+            <div style="float:right;position:relative;">
               <%= link_to '', toggle_column_measurement_path(@measurement, quantity_id: q.id),
                 {class: "icon icon-close", method: :post, remote: true} %>
             </div>
@@ -22,7 +22,7 @@
       <% @measurements.each_with_index do |m, index| %>
         <% row_class = "measurement #{cycle('odd', 'even')}" %>
         <tr id="measurement-<%= m.id %>" class="primary <%= row_class %>">
-          <td class="date" style="cursor: pointer;" onclick="$(this).closest('tr').toggle(); $(this).closest('tr').nextUntil('tr.primary', 'tr').toggle(); return false;">
+          <td class="date" style="cursor: pointer;" onclick="$(this).closest('tr').toggle(); $(this).closest('tr').nextUntil('tr.primary', '.measurement').toggle(); return false;">
             <span class="icon icon-bullet-closed"><%= format_datetime(m) %></span>
           </td>
           <% @requested_r[index].each do |*, value| %>
@@ -37,8 +37,8 @@
              else
                rows = 1
              end %>
-          <td rowspan="<%= rows %>" class="date" style="cursor: pointer;" onclick="$(this).closest('tr').prev('tr.primary').toggle(); $(this).closest('tr').prev('tr.primary').nextUntil('tr.primary', 'tr').toggle(); return false;">
-            <span class="icon icon-bullet-closed"><%= format_datetime(m) %></span>
+          <td rowspan="<%= rows %>" class="date" style="cursor: pointer;" onclick="$(this).closest('tr').prev('tr.primary').toggle(); $(this).closest('tr').prev('tr.primary').nextUntil('tr.primary', '.measurement').toggle(); return false;">
+            <span class="icon icon-bullet-open"><%= format_datetime(m) %></span>
           </td>
           <% @requested_r[index].each do |q_name, value| %>
             <td class="primary quantity">
diff --git a/app/views/measurements/create_readouts.js.erb b/app/views/measurements/create_readouts.js.erb
new file mode 100644
index 0000000..1ed5667
--- /dev/null
+++ b/app/views/measurements/create_readouts.js.erb
@@ -0,0 +1,4 @@
+$('div[id^=flash_]').remove();
+$('#content').prepend('<%= j render_flash_messages %>');
+$('#new-measurement').empty();
+$('#readouts').html('<%= j render partial: 'measurements/readouts' %>');
diff --git a/app/views/measurements/destroy.js.erb b/app/views/measurements/destroy.js.erb
index c82772a..d7f10fb 100644
--- a/app/views/measurements/destroy.js.erb
+++ b/app/views/measurements/destroy.js.erb
@@ -1,5 +1,5 @@
 $('div[id^=flash_]').remove();
 $('#content').prepend('<%= j render_flash_messages %>');
 <% if @measurement.destroyed? %>
-  $('tr[id=measurement-<%= @measurement.id %>]').remove();
+  $('tr[id=measurement-<%= @measurement.id %>]').nextUntil('tr.primary').addBack().remove();
 <% end %>
diff --git a/app/views/measurements/edit.js.erb b/app/views/measurements/edit.js.erb
index 4a375bf..cfe4907 100644
--- a/app/views/measurements/edit.js.erb
+++ b/app/views/measurements/edit.js.erb
@@ -1,4 +1,6 @@
 $('div[id^=flash_]').remove();
 $('#content').prepend('<%= j render_flash_messages %>');
-$('tr[id=measurement-<%= @measurement.id %>]').nextUntil('tr.measurement').remove();
-$('tr[id=measurement-<%= @measurement.id %>]').after('<tr><td class="form" colspan="5"><div id="edit-measurement"><%= j render partial: "measurements/edit_form" %></div></td></tr>');
+$('tr[id=measurement-<%= @measurement.id %>]').nextUntil('tr.primary', ':not(.measurement)')
+  .remove();
+$('tr[id=measurement-<%= @measurement.id %>]').nextAll('tr.primary').first()
+  .before('<tr><td class="form" colspan="5"><div id="edit-measurement"><%= j render partial: "measurements/edit_form" %></div></td></tr>');
diff --git a/app/views/measurements/readouts.js.erb b/app/views/measurements/readouts.js.erb
new file mode 100644
index 0000000..8a2cc7f
--- /dev/null
+++ b/app/views/measurements/readouts.js.erb
@@ -0,0 +1,3 @@
+$('div[id^=flash_]').remove();
+$('#content').prepend('<%= j render_flash_messages %>');
+$('#readouts').html('<%= j render partial: 'measurements/readouts' %>');
diff --git a/app/views/measurements/toggle_column.js.erb b/app/views/measurements/toggle_column.js.erb
deleted file mode 100644
index 5011ac6..0000000
--- a/app/views/measurements/toggle_column.js.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-$('div[id^=flash_]').remove();
-$('#content').prepend('<%= escape_javascript(render_flash_messages) %>');
-$('#readouts').html('<%= escape_javascript(render partial: 'measurements/readouts') %>');