Small router updates
Improve menu