Cleaned up UI. Fixed login/logout