Add toogleswitch and correct font classes