Cues UI improvements