Added Screens, Refactored, Connected

Added addUser screen
Added manageGateway screen
refactored to meaningful names
Connected all the screens together