Active class related changes