refactor dashboard
merge
rebump dashboard