am 854395ad: am c481a634: Merge "UI tweaks." into klp-dev

* commit '854395add8ceaa2b80a14e063567f1292eb91c4d':
  UI tweaks.