Replace Nav Container
Tidy up some routes
Fix tests