Design and wording tweaks