Updated UI + added NavigationController