Fix add/remove class buttons