Some UI improvements