styled modals
merge fixes