Additional UX improvements