More work on the new UI.