added active button toggling