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

* commit '9ffc4a65e51ae8695be0531c6fae0d33301ded60':
  UI tweaks.