Routing and users admin page updates
merge with landing_page
Undo revert "Simplified routing code"
Merge remote-tracking branch 'origin/landing_page' into node_threejs
slight fix for admin/instances after merge