modals fixes