Improve UI and add new icon