More layout and wording updates for #1274