Merge "Improve the Dashboard layout"