Wording and layout improvements for issue #1274