Updates to GUI, multiple buttons per screen, etc