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

* commit 'c481a634f4db6e95bc03b22b72414ba12da99f4b':
  UI tweaks.