lots of more UX changes