Ongoing: Refine the dashboard