Fixes for routing.
Merge branch 'master' of https://github.com/ShawLevin/menus.git