More tweaks to match UX spec.