further polishing of the new UI