Improve UI and compilation