diff --git a/app/controllers/quantities_controller.rb b/app/controllers/quantities_controller.rb
index 5e3f1d3..c044fff 100644
--- a/app/controllers/quantities_controller.rb
+++ b/app/controllers/quantities_controller.rb
@@ -55,6 +55,7 @@ class QuantitiesController < BodyTrackingPluginController
   def parents
     @form = params[:form]
     @domain = params[:quantity][:domain]
+    render layout: false
   end
 
   def move
diff --git a/app/views/ingredients/create.js.erb b/app/views/ingredients/create.js.erb
index 09f1b54..de75697 100644
--- a/app/views/ingredients/create.js.erb
+++ b/app/views/ingredients/create.js.erb
@@ -1,4 +1,3 @@
-<%= render partial: 'body_trackers/flash' %>
 $('#new-ingredient').empty();
 <% if current_view == :nutrients %>
   $('#nutrients').html('<%= j render partial: 'ingredients/nutrients' %>');
diff --git a/app/views/ingredients/destroy.js.erb b/app/views/ingredients/destroy.js.erb
index 76a9a10..691a0b5 100644
--- a/app/views/ingredients/destroy.js.erb
+++ b/app/views/ingredients/destroy.js.erb
@@ -1,4 +1,3 @@
-<%= render partial: 'body_trackers/flash' %>
 <% if @ingredient.destroyed? %>
   $('tr[id=ingredient-<%= @ingredient.id %>]').nextUntil('tr.primary').addBack().remove();
 <% end %>
diff --git a/app/views/ingredients/edit.js.erb b/app/views/ingredients/edit.js.erb
index d3142c4..025dc47 100644
--- a/app/views/ingredients/edit.js.erb
+++ b/app/views/ingredients/edit.js.erb
@@ -1,4 +1,3 @@
-<%= render partial: 'body_trackers/flash' %>
 $('tr[id=ingredient-<%= @ingredient.id %>]').nextUntil('tr.primary', ':not(.ingredient)')
   .remove();
 var columns = $('table > thead > tr > th').length;
diff --git a/app/views/ingredients/index.js.erb b/app/views/ingredients/index.js.erb
index d8c0cbb..cb6b1ef 100644
--- a/app/views/ingredients/index.js.erb
+++ b/app/views/ingredients/index.js.erb
@@ -1,4 +1,3 @@
-<%= render partial: 'body_trackers/flash' %>
 <% if current_view == :nutrients %>
   $('#nutrients').html('<%= j render partial: 'ingredients/nutrients' %>');
 <% else %>
diff --git a/app/views/ingredients/new.js.erb b/app/views/ingredients/new.js.erb
index 5176d41..3078c9d 100644
--- a/app/views/ingredients/new.js.erb
+++ b/app/views/ingredients/new.js.erb
@@ -1,2 +1 @@
-<%= render partial: 'body_trackers/flash' %>
 $('#new-ingredient').html('<%= j render partial: 'ingredients/new_form' %>');
diff --git a/app/views/ingredients/toggle.js.erb b/app/views/ingredients/toggle.js.erb
index 84822aa..38570b4 100644
--- a/app/views/ingredients/toggle.js.erb
+++ b/app/views/ingredients/toggle.js.erb
@@ -1,2 +1 @@
-<%= render partial: 'body_trackers/flash' %>
 $('#ingredients').html('<%= j render partial: 'ingredients/index' %>');
diff --git a/app/views/body_trackers/_flash.js.erb b/app/views/layouts/body_tracking.js.erb
similarity index 87%
rename from app/views/body_trackers/_flash.js.erb
rename to app/views/layouts/body_tracking.js.erb
index 3195872..3c22679 100644
--- a/app/views/body_trackers/_flash.js.erb
+++ b/app/views/layouts/body_tracking.js.erb
@@ -1,2 +1,3 @@
 $('div[id^=flash_]').remove();
 $('#content').prepend('<%= j render_flash_messages %>');
+<%= yield %>
diff --git a/app/views/measurements/create.js.erb b/app/views/measurements/create.js.erb
index 793151b..749210b 100644
--- a/app/views/measurements/create.js.erb
+++ b/app/views/measurements/create.js.erb
@@ -1,4 +1,3 @@
-<%= render partial: 'body_trackers/flash' %>
 $('#new-measurement').empty();
 <% if defined? @quantities %>
   $('#readouts').html('<%= j render partial: 'measurements/readouts' %>');
diff --git a/app/views/measurements/destroy.js.erb b/app/views/measurements/destroy.js.erb
index 945fa74..70ee4e9 100644
--- a/app/views/measurements/destroy.js.erb
+++ b/app/views/measurements/destroy.js.erb
@@ -1,4 +1,3 @@
-<%= render partial: 'body_trackers/flash' %>
 <% if @measurement.destroyed? %>
   $('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 4b36f23..650403f 100644
--- a/app/views/measurements/edit.js.erb
+++ b/app/views/measurements/edit.js.erb
@@ -1,4 +1,3 @@
-<%= render partial: 'body_trackers/flash' %>
 $('tr[id=measurement-<%= @measurement.id %>]').nextUntil('tr.primary', ':not(.measurement)')
   .remove();
 var columns = $('table > thead > tr > th').length;
diff --git a/app/views/measurements/index.js.erb b/app/views/measurements/index.js.erb
index b1bf4ed..dd08504 100644
--- a/app/views/measurements/index.js.erb
+++ b/app/views/measurements/index.js.erb
@@ -1,4 +1,3 @@
-<%= render partial: 'body_trackers/flash' %>
 <% if defined? @quantities %>
   $('#readouts').html('<%= j render partial: 'measurements/readouts' %>');
 <% else %>
diff --git a/app/views/measurements/new.js.erb b/app/views/measurements/new.js.erb
index df67aae..daac126 100644
--- a/app/views/measurements/new.js.erb
+++ b/app/views/measurements/new.js.erb
@@ -1,2 +1 @@
-<%= render partial: 'body_trackers/flash' %>
 $('#new-measurement').html('<%= j render partial: 'measurements/new_form' %>');
diff --git a/app/views/quantities/create.js.erb b/app/views/quantities/create.js.erb
index 7eb20de..ebf578c 100644
--- a/app/views/quantities/create.js.erb
+++ b/app/views/quantities/create.js.erb
@@ -1,3 +1,2 @@
-<%= render partial: 'body_trackers/flash' %>
 $('#new-quantity').empty();
 $('#quantities').html('<%= j render partial: 'quantities/index' %>');
diff --git a/app/views/quantities/create_child.js.erb b/app/views/quantities/create_child.js.erb
index dd4e21b..1c9c12e 100644
--- a/app/views/quantities/create_child.js.erb
+++ b/app/views/quantities/create_child.js.erb
@@ -1,2 +1 @@
-<%= render partial: 'body_trackers/flash' %>
 $('#quantities').html('<%= j render partial: 'quantities/index' %>');
diff --git a/app/views/quantities/destroy.js.erb b/app/views/quantities/destroy.js.erb
index d71c52d..d41b42d 100644
--- a/app/views/quantities/destroy.js.erb
+++ b/app/views/quantities/destroy.js.erb
@@ -1,4 +1,3 @@
-<%= render partial: 'body_trackers/flash' %>
 <% if @quantity.destroyed? %>
   <% @quantity_tree.each do |q| %>
     $('tr[id=quantity-<%= q.id %>]').nextUntil('tr.quantity').addBack().remove();
diff --git a/app/views/quantities/edit.js.erb b/app/views/quantities/edit.js.erb
index 8c7cde9..efc436e 100644
--- a/app/views/quantities/edit.js.erb
+++ b/app/views/quantities/edit.js.erb
@@ -1,4 +1,3 @@
-<%= render partial: 'body_trackers/flash' %>
 $('tr[id=quantity-<%= @quantity.id %>]').nextUntil('tr.quantity').remove();
 var columns = $('table > thead > tr > th').length;
 $('tr[id=quantity-<%= @quantity.id %>]').nextUntil('tr.quantity').addBack().after(
diff --git a/app/views/quantities/index.js.erb b/app/views/quantities/index.js.erb
index 99235df..648aa01 100644
--- a/app/views/quantities/index.js.erb
+++ b/app/views/quantities/index.js.erb
@@ -1,4 +1,2 @@
-$('div[id^=flash_]').remove();
-$('#content').prepend('<%= escape_javascript(render_flash_messages) %>');
 $('#quantities').html('<%= escape_javascript(render partial: 'quantities/index') %>');
 $('#quantity_domain').trigger('change');
diff --git a/app/views/quantities/new.js.erb b/app/views/quantities/new.js.erb
index 4083893..751bbee 100644
--- a/app/views/quantities/new.js.erb
+++ b/app/views/quantities/new.js.erb
@@ -1,2 +1 @@
-<%= render partial: 'body_trackers/flash' %>
 $('#new-quantity').html('<%= j render partial: 'quantities/new_form' %>');
diff --git a/app/views/quantities/new_child.js.erb b/app/views/quantities/new_child.js.erb
index 8a78fe5..e79ba2c 100644
--- a/app/views/quantities/new_child.js.erb
+++ b/app/views/quantities/new_child.js.erb
@@ -1,4 +1,3 @@
-<%= render partial: 'body_trackers/flash' %>
 $('tr[id=quantity-<%= @parent_quantity.id %>]').nextUntil('tr.quantity').remove();
 var columns = $('table > thead > tr > th').length;
 $('tr[id=quantity-<%= @parent_quantity.id %>]').nextUntil('tr.quantity').addBack().after(