dashboard fixes
Fixes
merge conflicts