Updated dashboard structure