Improve UI and design