dashboard fixes
merge fix