Integration of new UI