missing links + route and base url improvements