[Cap 164] more ux changes