got navigation to look right...also refactored user service and the login middleware.  Probably need to do some more refactoring, but for now this should be good