Alignment and wording updates