simplify dashboard
Merge branch 'dashboard'