A bit more on UI improvements