[g2s-cps-en] Various UX improvements