diff --git a/README.rst b/README.rst
index 7a3ae0362..486b0ef30 100644
--- a/README.rst
+++ b/README.rst
@@ -12,6 +12,7 @@ Mycodo is open source software for the Raspberry Pi that couples inputs and outp
 .. contents:: Table of Contents
    :depth: 1
 
+
 Quick Install
 -------------
 
diff --git a/mycodo/widgets/widget_gauge_angular.py b/mycodo/widgets/widget_gauge_angular.py
index 09ca9d373..d628f7799 100644
--- a/mycodo/widgets/widget_gauge_angular.py
+++ b/mycodo/widgets/widget_gauge_angular.py
@@ -303,11 +303,6 @@ def generate_page_variables(widget_unique_id, widget_options):
           getLastDataGaugeAngular('{{each_widget.unique_id}}', '{{device_id}}', 'input', '{{measurement_id}}', {{widget_options['max_measure_age']}});
           repeatLastDataGaugeAngular('{{each_widget.unique_id}}', '{{device_id}}', 'input', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['max_measure_age']}});
           {%- endfor -%}
-
-          {% for each_math in math if each_math.unique_id == device_id %}
-          getLastDataGaugeAngular('{{each_widget.unique_id}}', '{{device_id}}', 'math', '{{measurement_id}}', {{widget_options['max_measure_age']}});
-          repeatLastDataGaugeAngular('{{each_widget.unique_id}}', '{{device_id}}', 'math', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['max_measure_age']}});
-          {%- endfor -%}
           
           {% for each_function in function if each_function.unique_id == device_id %}
           getLastDataGaugeAngular('{{each_widget.unique_id}}', '{{device_id}}', 'function', '{{measurement_id}}', {{widget_options['max_measure_age']}});
@@ -401,10 +396,6 @@ def generate_page_variables(widget_unique_id, widget_options):
             {%- endif -%}
           {%- endif -%}
         {%- endfor -%}
-
-        {%- for each_math in math if each_math.unique_id == device_id -%}
-          {{each_math.measure|safe}}
-        {%- endfor -%}
         
         {%- for each_function in function if each_function.unique_id == device_id -%}
           {{each_function.measure|safe}}
@@ -435,10 +426,6 @@ def generate_page_variables(widget_unique_id, widget_options):
         {%- for each_input in input if each_input.unique_id == device_id -%}
           {{' ' + dict_units[device_measurements_dict[measurement_id].unit]['unit']}}
         {%- endfor -%}
-
-        {%- for each_math in math if each_math.unique_id == device_id -%}
-          {{' ' + each_math.measure_units|safe}}
-        {%- endfor -%}
         
         {%- for each_function in function if each_function.unique_id == device_id -%}
           {{' ' + each_function.measure_units|safe}}
diff --git a/mycodo/widgets/widget_gauge_solid.py b/mycodo/widgets/widget_gauge_solid.py
index dde29b5e0..393f91bab 100644
--- a/mycodo/widgets/widget_gauge_solid.py
+++ b/mycodo/widgets/widget_gauge_solid.py
@@ -315,11 +315,6 @@ def generate_page_variables(widget_unique_id, widget_options):
           getLastDataGaugeSolid('{{each_widget.unique_id}}', '{{device_id}}', 'input', '{{measurement_id}}', {{widget_options['max_measure_age']}});
           repeatLastDataGaugeSolid('{{each_widget.unique_id}}', '{{device_id}}', 'input', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['max_measure_age']}});
           {%- endfor -%}
-
-          {% for each_math in math if each_math.unique_id == device_id %}
-          getLastDataGaugeSolid('{{each_widget.unique_id}}', '{{device_id}}', 'math', '{{measurement_id}}', {{widget_options['max_measure_age']}});
-          repeatLastDataGaugeSolid('{{each_widget.unique_id}}', '{{device_id}}', 'math', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['max_measure_age']}});
-          {%- endfor -%}
           
           {% for each_function in function if each_function.unique_id == device_id %}
           getLastDataGaugeSolid('{{each_widget.unique_id}}', '{{device_id}}', 'function', '{{measurement_id}}', {{widget_options['max_measure_age']}});
@@ -408,16 +403,6 @@ def generate_page_variables(widget_unique_id, widget_options):
           {{', ' + dict_measurements[device_measurements_dict[measurement_id].measurement]['name']}}
             {%- endif -%}
         {%- endfor -%}
-
-        {%- for each_math in math if each_math.unique_id == device_id and measurement_id in device_measurements_dict -%}
-          {{each_math.name}} (
-            {%- if not device_measurements_dict[measurement_id].single_channel -%}
-              {{'CH' + (device_measurements_dict[measurement_id].channel|int)|string}}
-            {%- endif -%}
-            {%- if device_measurements_dict[measurement_id].measurement -%}
-          {{', ' + dict_measurements[device_measurements_dict[measurement_id].measurement]['name']}}
-            {%- endif -%}
-        {%- endfor -%}
         
         {%- for each_function in function if each_function.unique_id == device_id and measurement_id in device_measurements_dict -%}
           {{each_function.name}} (
@@ -451,12 +436,6 @@ def generate_page_variables(widget_unique_id, widget_options):
             return this.series.name + ':<b> ' + Highcharts.numberFormat(this.y, 2) + ' {{dict_units[device_measurements_dict[measurement_id].unit]['unit']}}</b><br>';
         },
         {%- endfor -%}
-
-        {%- for each_math in math if each_math.unique_id == device_id %}
-        pointFormatter: function () {
-            return this.series.name + '</span>:<b> ' + Highcharts.numberFormat(this.y, 2) + ' {{dict_units[device_measurements_dict[measurement_id].unit]['unit']}}</b><br>';
-        },
-        {%- endfor -%}
         
         {%- for each_function in function if each_function.unique_id == device_id %}
         pointFormatter: function () {
@@ -469,10 +448,6 @@ def generate_page_variables(widget_unique_id, widget_options):
             {{' ' + dict_units[device_measurements_dict[measurement_id].unit]['unit']}}
         {%- endfor -%}
 
-        {%- for each_math in math if each_math.unique_id == device_id -%}
-            {{' ' + dict_units[device_measurements_dict[measurement_id].unit]['unit']}}
-        {%- endfor -%}
-        
         {%- for each_function in function if each_function.unique_id == device_id -%}
             {{' ' + dict_units[device_measurements_dict[measurement_id].unit]['unit']}}
         {%- endfor -%}
diff --git a/mycodo/widgets/widget_indicator.py b/mycodo/widgets/widget_indicator.py
index 858ef56b9..67c9b8bfc 100644
--- a/mycodo/widgets/widget_indicator.py
+++ b/mycodo/widgets/widget_indicator.py
@@ -197,11 +197,6 @@
   repeatLastDataIndicator('{{each_widget.unique_id}}', '{{each_input.unique_id}}', 'input', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['measurement_max_age']}}, {{each_widget.decimal_places}}, {{widget_options['option_invert']|int}});
   {%- endfor -%}
 
-  {% for each_math in math if each_math.unique_id == device_id %}
-  getLastDataIndicator('{{each_widget.unique_id}}', '{{each_math.unique_id}}', 'math', '{{measurement_id}}', {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}}, {{widget_options['option_invert']|int}});
-  repeatLastDataIndicator('{{each_widget.unique_id}}', '{{each_math.unique_id}}', 'math', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['measurement_max_age']}}, {{each_widget.decimal_places}}, {{widget_options['option_invert']|int}});
-  {%- endfor -%}
-
   {% for each_output in output if each_output.unique_id == device_id %}
   getLastDataIndicator('{{each_widget.unique_id}}', '{{each_output.unique_id}}', 'output', '{{channel_id}}', {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}}, {{widget_options['option_invert']|int}});
   repeatLastDataIndicator('{{each_widget.unique_id}}', '{{each_output.unique_id}}', 'output', '{{channel_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['measurement_max_age']}}, {{each_widget.decimal_places}}, {{widget_options['option_invert']|int}});
diff --git a/mycodo/widgets/widget_measurement.py b/mycodo/widgets/widget_measurement.py
index bde54911b..bf2f0449e 100644
--- a/mycodo/widgets/widget_measurement.py
+++ b/mycodo/widgets/widget_measurement.py
@@ -142,7 +142,7 @@
 
     'widget_dashboard_head': """<!-- No head content -->""",
 
-    'widget_dashboard_title_bar': """<span style="padding-right: 0.5em; font-size: {{each_widget.font_em_name}}em">{{each_widget.name}}</span>""",
+    'widget_dashboard_title_bar': """<span class="widget-title-bar" style="padding-right: 0.5em; font-size: {{each_widget.font_em_name}}em">{{each_widget.name}}</span>""",
 
     'widget_dashboard_body': """
   {%- set device_id = widget_options['measurement'].split(",")[0] -%}
@@ -152,7 +152,7 @@
   
   {%- for each_input in input if each_input.unique_id == device_id and measurement_id in device_measurements_dict -%}
   
-    <span style="font-size: {{widget_options['font_em_value']}}em" id="value-{{each_widget.unique_id}}"></span><span style="font-size: {{widget_options['font_em_unit']}}em">
+    <span class="widget-measurement-value" style="font-size: {{widget_options['font_em_value']}}em" id="value-{{each_widget.unique_id}}"></span><span class="widget-measurement-unit" style="font-size: {{widget_options['font_em_unit']}}em">
         {%- if dict_measure_units[measurement_id] in dict_units and
                dict_units[dict_measure_units[measurement_id]]['unit'] and
                widget_options['enable_unit'] -%}
@@ -183,40 +183,6 @@
           {{')'}}
         {%- endif -%}
   {%- endfor -%}
-
-  {%- for each_math in math if each_math.unique_id == device_id and measurement_id in device_measurements_dict -%}
-
-    <span style="font-size: {{widget_options['font_em_value']}}em" id="value-{{each_widget.unique_id}}"></span><span style="font-size: {{widget_options['font_em_unit']}}em">
-        {%- if dict_measure_units[measurement_id] in dict_units and
-               dict_units[dict_measure_units[measurement_id]]['unit'] and
-               widget_options['enable_unit'] -%}
-          {{' ' + dict_units[dict_measure_units[measurement_id]]['unit']}}
-        {%- endif -%}
-    </span>
-
-        {%- if widget_options['enable_name'] or widget_options['enable_channel'] or widget_options['enable_measurement'] -%}
-    <br/><span style="font-size: {{widget_options['font_em_timestamp']}}em">
-        {%- endif -%}
-
-        {%- if widget_options['enable_name'] -%}
-          {{each_math.name + ' '}}
-        {%- endif -%}
-        {%- if widget_options['enable_channel'] or widget_options['enable_measurement'] -%}
-          {{'('}}
-        {%- endif -%}
-        {%- if not device_measurements_dict[measurement_id].single_channel and widget_options['enable_channel'] -%}
-          {{'CH' + (device_measurements_dict[measurement_id].channel|int)|string}}
-        {%- endif -%}
-        {%- if widget_options['enable_channel'] and widget_options['enable_measurement'] -%}
-          {{', '}}
-        {%- endif -%}
-        {%- if widget_options['enable_measurement'] and device_measurements_dict[measurement_id].measurement -%}
-          {{dict_measurements[device_measurements_dict[measurement_id].measurement]['name']}}
-        {%- endif -%}
-        {%- if widget_options['enable_channel'] or widget_options['enable_measurement'] -%}
-          {{')'}}
-        {%- endif -%}
-  {%- endfor -%}
   
   {%- for each_function in function if each_function.unique_id == device_id and measurement_id in device_measurements_dict -%}
 
@@ -413,11 +379,6 @@
   getLastDataMeasurement('{{each_widget.unique_id}}', '{{each_input.unique_id}}', 'input', '{{measurement_id}}', {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}});
   repeatLastDataMeasurement('{{each_widget.unique_id}}', '{{each_input.unique_id}}', 'input', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}});
   {%- endfor -%}
-
-  {% for each_math in math if each_math.unique_id == device_id %}
-  getLastDataMeasurement('{{each_widget.unique_id}}', '{{each_math.unique_id}}', 'math', '{{measurement_id}}', {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}});
-  repeatLastDataMeasurement('{{each_widget.unique_id}}', '{{each_math.unique_id}}', 'math', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}});
-  {%- endfor -%}
   
   {% for each_function in function if each_function.unique_id == device_id %}
   getLastDataMeasurement('{{each_widget.unique_id}}', '{{each_function.unique_id}}', 'function', '{{measurement_id}}', {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}});