Fixed buttons being selected