clean up login flow
Merge pull request #43 from rpandey1234/master

Clean login flow and add logout button in options menu