diff --git a/app/views/shared/_javascripts.html.erb b/app/views/shared/_javascripts.html.erb
index 9d7517d..df7f9d6 100644
--- a/app/views/shared/_javascripts.html.erb
+++ b/app/views/shared/_javascripts.html.erb
@@ -1,9 +1,10 @@
 <script>
-$('.glucose-measurement-value').each(function() {
-  if($(this).text() > 8.0) {
+$('.glucose-measurement-value .value').each(function() {
+  var value = $(this).text().trim().split(' ')[0]
+  if(value > 8.0) {
     $(this).addClass('bg-high')
   }
-  if($(this).text() < 4.0) {
+  if(value < 4.0) {
     $(this).addClass('bg-low')
   }
 })
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index ba8635a..a581548 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -28,11 +28,12 @@
         <% count = 0 %>
         <% class_name(value).fields.each do |field| %>
           <td class='<%= "#{value.class.name.underscore.gsub('_', '-')}-#{field}" %>'>
-            <%= value.send(field) %>
             <% if value.class.units[:applies_to] == field.to_sym %>
-              <span data-toggle='tooltip' data-placement='top' title='<%= value.send(field) %> <%= value.class.units[:full] %>'>
-                <%= value.class.units[:short] %>
+              <span class='value' data-toggle='tooltip' data-placement='top' title='<%= value.send(field) %> <%= value.class.units[:full] %>'>
+                <%= value.send(field) %> <%= value.class.units[:short] %>
               </span>
+            <% else %>
+              <%= value.send(field) %>
             <% end %>
           </td>
           <% count += 1 %>