Better routes and add it's links to the right places