Shift the modal close icon into macros/icons/close_modal
Fix various issues with the EFT modals in the assets template