WCM-98 ux improvements