Improvements to the design and default text