trunk modal fixes and additional options
modal updates in trunk