Add buttons, clean up layout