Refactor form modals w/ macros