Layout changes for Dashboard.
Merge remote-tracking branch 'origin/master'