Bit of UI improvements.