some UI improvements
Merge remote-tracking branch 'Places/master' into CustomBranch
corrected