Small changes for the Router.
Small Changes for the UI and router.