UI: improve UI elements;