add login and clean up UI