Edit routes, now advances user to next screen upon login
Merge branch 'fix-routes' into jay-new
Updated routes.