Refactored modal-form and made it much better