Fix confirmation modals and reduce complexity