DashBoard refactoring in process