Fixed routes, Dynamic menu

Next up - fix 404 issue