Refactor P1 - fix some error in dashboard