Merge change I65b13222 into eclair

* changes:
  Fine tune some UI stuff.