Login/Logout and final UI cleanup