diff --git a/tracks/app/helpers/application_helper.rb b/tracks/app/helpers/application_helper.rb
index dece18b8..535e1fe6 100644
--- a/tracks/app/helpers/application_helper.rb
+++ b/tracks/app/helpers/application_helper.rb
@@ -1,4 +1,5 @@
-# The methods added to this helper will be available to all templates in the application.
+# The methods added to this helper will be available to all templates in the
+# application.
 module ApplicationHelper
   
   def user_time
@@ -6,9 +7,8 @@ module ApplicationHelper
   end
   
   # Replicates the link_to method but also checks request.request_uri to find
-  # current page. If that matches the url, the link is marked
-  # id = "current"
-  #
+  # current page. If that matches the url, the link is marked id = "current"
+  # 
   def navigation_link(name, options = {}, html_options = nil, *parameters_for_method_reference)
     if html_options
       html_options = html_options.stringify_keys
@@ -27,9 +27,9 @@ module ApplicationHelper
     date.to_date - user_time.to_date
   end
   
-  # Check due date in comparison to today's date
-  # Flag up date appropriately with a 'traffic light' colour code
-  #
+  # Check due date in comparison to today's date Flag up date appropriately with
+  # a 'traffic light' colour code
+  # 
   def due_date(due)
     if due == nil
       return ""
@@ -38,30 +38,31 @@ module ApplicationHelper
     days = days_from_today(due)
        
     case days
-      # overdue or due very soon! sound the alarm!
-      when -1000..-1
-        "<a title='#{format_date(due)}'><span class=\"red\">Overdue by #{pluralize(days * -1, 'day')}</span></a> "
-      when 0
-           "<a title='#{format_date(due)}'><span class=\"amber\">Due Today</span></a> "
-      when 1
-           "<a title='#{format_date(due)}'><span class=\"amber\">Due Tomorrow</span></a> "
+    when 0
+      "<a title='#{format_date(due)}'><span class=\"amber\">Due Today</span></a> "
+    when 1
+      "<a title='#{format_date(due)}'><span class=\"amber\">Due Tomorrow</span></a> "
       # due 2-7 days away
-      when 2..7
+    when 2..7
       if prefs.due_style == Preference.due_styles[:due_on]
         "<a title='#{format_date(due)}'><span class=\"orange\">Due on #{due.strftime("%A")}</span></a> "
       else
         "<a title='#{format_date(due)}'><span class=\"orange\">Due in #{pluralize(days, 'day')}</span></a> "
       end
-      # more than a week away - relax
+    else
+      # overdue or due very soon! sound the alarm!
+      if days < 0
+        "<a title='#{format_date(due)}'><span class=\"red\">Overdue by #{pluralize(days * -1, 'day')}</span></a> "
       else
+        # more than a week away - relax
         "<a title='#{format_date(due)}'><span class=\"green\">Due in #{pluralize(days, 'day')}</span></a> "
+      end
     end
   end
 
-  # Check due date in comparison to today's date
-  # Flag up date appropriately with a 'traffic light' colour code
-  # Modified method for mobile screen
-  #
+  # Check due date in comparison to today's date Flag up date appropriately with
+  # a 'traffic light' colour code Modified method for mobile screen
+  # 
   def due_date_mobile(due)
     if due == nil
       return ""
@@ -70,26 +71,28 @@ module ApplicationHelper
     days = days_from_today(due)
        
     case days
-      # overdue or due very soon! sound the alarm!
-      when -1000..-1
-        "<span class=\"red\">" + format_date(due) +"</span>"
-      when 0
-           "<span class=\"amber\">"+ format_date(due) + "</span>"
-      when 1
-           "<span class=\"amber\">" + format_date(due) + "</span>"
+    when 0
+      "<span class=\"amber\">"+ format_date(due) + "</span>"
+    when 1
+      "<span class=\"amber\">" + format_date(due) + "</span>"
       # due 2-7 days away
-      when 2..7
-          "<span class=\"orange\">" + format_date(due) + "</span>"
-     # more than a week away - relax
+    when 2..7
+      "<span class=\"orange\">" + format_date(due) + "</span>"
+    else
+      # overdue or due very soon! sound the alarm!
+      if days < 0
+        "<span class=\"red\">" + format_date(due) +"</span>"
       else
+        # more than a week away - relax
         "<span class=\"green\">" + format_date(due) + "</span>"
+      end
     end
   end
   
-  # Returns a count of next actions in the given context or project
-  # The result is count and a string descriptor, correctly pluralised if there are no
+  # Returns a count of next actions in the given context or project The result
+  # is count and a string descriptor, correctly pluralised if there are no
   # actions or multiple actions
-  #
+  # 
   def count_undone_todos_phrase(todos_parent, string="actions")
     @controller.count_undone_todos_phrase(todos_parent, string)
   end
@@ -128,9 +131,9 @@ module ApplicationHelper
     render :partial => 'shared/flash', :locals => { :flash => flash }
   end
   
-  # Display a flash message in RJS templates
-  # Usage: page.notify :warning, "This is the message", 5.0
-  # Puts the message into a flash of type 'warning', fades over 5 secs
+  # Display a flash message in RJS templates Usage: page.notify :warning, "This
+  # is the message", 5.0 Puts the message into a flash of type 'warning', fades
+  # over 5 secs
   def notify(type, message, fade_duration)
     type = type.to_s  # symbol to string
     page.replace 'flash', "<h4 id='flash' class='alert #{type}'>#{message}</h4>"