Adding the ability to decorate default state - @mrDinckleman;
Fixing issues with clicks to associated labels;