Squashed commit of new UI.