dashboard functions
Merge branch 'dashboard'