Fixing adding/removing of classes with hover and active