25411 Dashboard - small layout changes
Merge remote-tracking branch 'origin/master'