GUI Mockup changes. Corrected the screens as per new service outputs.