Small tweaks to modals