Wording and layout fixup