Fixes in addClass removeClass and toggleClass