Refactor dashboard

Dashboard refactor complete