Merging new UI