modals updated after latest pull requests

@frostini