fix 2), 3) and 4)
update dashboard for speed and filtering
merge conflicts
Merge branch 'erikevans719-master'