improve UI and bug fix