Refactor/user login

edited multiple files in minor login refactor, still needs work