Another change to make the new UI more fluent