Fixed buttons, now working