Some UI improvements.