Updated UI + Analytics