Refactroing
Fuse both toggle classes