more UX fixes