Refactored all modals to make proper use of forms