dashboard
Merge branch 'fix' into dev_thiago
Dashboard improvements