Improve modal wording and interaction