Added new UI from Nick