diff --git a/app/controllers/meals_controller.rb b/app/controllers/meals_controller.rb
index 9265428..c5e0bb9 100644
--- a/app/controllers/meals_controller.rb
+++ b/app/controllers/meals_controller.rb
@@ -40,6 +40,7 @@ class MealsController < ApplicationController
 
   def toggle_eaten
     @meal.toggle_eaten!
+    prepare_meals
   end
 
   private
diff --git a/app/models/meal.rb b/app/models/meal.rb
index 3cf1e01..be1d66d 100644
--- a/app/models/meal.rb
+++ b/app/models/meal.rb
@@ -18,6 +18,10 @@ class Meal < ActiveRecord::Base
     end
   end
 
+  def eaten_at
+    self[:eaten_at].getlocal if self[:eaten_at]
+  end
+
   def toggle_eaten!
     update(eaten_at: self.eaten_at ? nil : DateTime.current)
   end
diff --git a/app/views/meals/_index.html.erb b/app/views/meals/_index.html.erb
index e199011..3e20907 100644
--- a/app/views/meals/_index.html.erb
+++ b/app/views/meals/_index.html.erb
@@ -1,9 +1,9 @@
 <% if @meals.any? { |m| m.persisted? } %>
   <table id="meals" class="odd-even list">
     <tbody>
-      <% @meals.group_by { |m| m.eaten_at ? m.eaten_at.date : Date.current }
+      <% @meals.group_by { |m| m.eaten_at ? m.eaten_at.to_date : Date.current }
         .each do |date, meals| %>
-        <tr id="day-<%= date.strftime('%Y%m%d') %>" class="day">
+        <tr id="day-<%= date.strftime('%Y%m%d') %>" class="date">
           <td class="date" colspan="2">
             <h3><%= date == Date.current ? 'Today' : date.strftime('%F') %></h3>
           </td>
diff --git a/app/views/meals/_show.html.erb b/app/views/meals/_show.html.erb
index 604273a..156184d 100644
--- a/app/views/meals/_show.html.erb
+++ b/app/views/meals/_show.html.erb
@@ -2,7 +2,7 @@
   <td class="name" colspan="2">
     <b><%= "#{t '.label_meal'} ##{index+1}" %></b>
     <% if m.eaten_at %>
-      <%= " - #{m.eaten_at.time}" %>
+      <%= " at #{m.eaten_at.strftime('%R')}" %>
       <%= link_to '', toggle_eaten_meal_path(m),
         {remote: true, method: :post, class: "icon icon-close"} %>
     <% else %>
diff --git a/app/views/meals/toggle_eaten.js.erb b/app/views/meals/toggle_eaten.js.erb
index 19375ef..07e446d 100644
--- a/app/views/meals/toggle_eaten.js.erb
+++ b/app/views/meals/toggle_eaten.js.erb
@@ -1 +1 @@
-$('#readouts').html('<%= j render partial: 'measurements/readouts' %>');
+$('#meals').html('<%= j render partial: 'meals/index' %>');