Improve UI on modal