Merge remote-tracking branch 'origin/master' into layout
Layout meter specific info
Layout meter specific info
Larger button
Colors
layout
changed order of columns and styling in table
Changed the plus sign to bold in the table