Major improvements to the modals options and functionality.