Fixed bug with $routernum and new routers. Navigation cleanup.