[Refactor] cleaned up and fixed login code and flow. Now working on Paul's android device