various UI fixes related to modals