Fixing toggle styles. Adding badge support.