some wording and layout tweaks