Merge branch 'hotfix/fix-chart-overflow'
Options : syncronization issue fixed
fixed admin charts
Merge branch 'hotfix/fix-admin-charts' into develop