More buttons, cleaning up code.