Fixed bug where username/password was not being cached correctly because of recent token changes
UI refactoring and cleanup