Adding UX improvements