Refactored all modals