Formatting labels and colours
Update indicators
Bug fix -- missing comma