Add chart to dashboard
Improve messages
Merge branch 'charts' into dev