Fixed wording & layout