Improved error messaging / confirmation modals