now with better modals and more consistent presentation