updates to buttons, and layout