some ux improvements