UI improvements to flag