changed order of columns and styling in table
Changed the plus sign to bold in the table
Reset meterfilter in heading
Merge remote-tracking branch 'origin/master' into layout