Improved wording and styling