Fixed 404 bug with routing
Merge conflicts