edited dashboard
Merge branch 'Ren'