alert view and more UX improvements