UI changes
Merge remote-tracking branch 'origin/pele' into mazanuj