simplify routes and refactor links accordingly
simplify routes and refactor links accordingly