Improve UI and fixed bug