Merge "Update Dashboard layout - part 2"