improve ui routing