UX and messaging improvements