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

* commit 'be9ebb4436678ab5afecccc8a4bb7b9be6af370a':
  Minor UI tweakings