Switched the label filter to use the new style label control
Added a color label control