Fix modals and empty submits