Improve wording and templates