Integrating new UI