am 594150da: am be9ebb44: Merge "Minor UI tweakings" into klp-dev

* commit '594150daa55941c09788a7e9122f2e1987c8a60d':
  Minor UI tweakings