add more ux enhancements