Some work on the new UI.