More modal enhancements