US749:Layout fixes using css
Merge remote-tracking branch 'origin/integration' into integration