More changes to message dialog
Merge branch 'develop' into feature/wordpress