Uat ux improvements