Improve entity selector
Improve UI