Replaced toggleClass with add/removeClass where appropriate

Partial fix for #3338