More UI improvements.