Changed view service and login service to wait for their services.