Updated UI system and lists