Change some design and wording