Fixed some UX requirements refs #21413