Small changes on wording and design