Repaired Dashboard & graphics
Merge branch 'local' into develop