Small improvement in UI