updated ui routing and layot usage