Lots of UI and wording tweaks