Wording and layout updates from Frini