Make some wording and html changes