Updated UI navigation to match mockup page flow