Buttons all redone