Remove unnecessary routes
Add step 2.5 in the navigation bar (not pretty solution, may be refactor later)