Improved UX and delete redirection