Fixed switching active class in button issues