some ui tweaks
Merge remote-tracking branch 'origin/milestone2' into milestone2