style and template wording changes