Fix links on toolbar
Nest some routes, as appropriate