Merge "More tweaks to match UX spec." into klp-dev