Not a complaint, just a note: this makes sense with the current display but will have to be redone when we have a fix for CLC-2509.