Improve UI coverage