Merge the new UI, mark two