Fix those Buttons