improve UI and some feedback