small UI changes
Merge remote-tracking branch 'origin/newMaster' into newMaster