Clean login flow and add logout button in options menu