diff --git a/app/helpers/body_trackers_helper.rb b/app/helpers/body_trackers_helper.rb
index f246ae9..9e47de2 100644
--- a/app/helpers/body_trackers_helper.rb
+++ b/app/helpers/body_trackers_helper.rb
@@ -7,8 +7,10 @@ module BodyTrackersHelper
     when amount.nan?
       '?'
     else
-      unit_desc = unit != mfu_unit ? unit && " [#{unit.shortname}]" || ' [-]' : ''
-      "%.#{precision}f%s" % [amount, unit_desc]
+      a = amount.round(precision)
+      a_desc = a.nonzero? ? "%.#{precision}f" % a : '-'
+      u_desc = unit && " [#{unit.shortname}]" || ' [-]' if unit != mfu_unit && a.nonzero?
+      "#{a_desc}#{u_desc}"
     end
   end