Layout and wording simplification