fix charts
Merge branch 'feature/frontend' into develop