fix some 26 issues
merge
fix dashboard