Replace add/removes with toggles

[cazier]

(NOTE: This issue is a migrated issue from the old git instance)

It's cleaner to use just the JQuery toggle, so need to replace the add/removes with toggles

[cazier]

This isn't always possible, as some items have classes/attributes that are not idempotent.