Ported modals to use a custom solution