Merging new UI work