am 1434a407: Merge "More tweaks to match UX spec." into klp-dev

* commit '1434a4075d4582d932023b1720b2a1213e6ea282':
  More tweaks to match UX spec.