More UX tweaks and bug fixes