Wording and layout fixes for issue 1576