(feat) Further modifications to UI routing