Reconfigured all GUI screens so that Acceptance Testing works