Finally fixed the edit chart functionality
Merge branch 'chart-functions'
Merge commit for edit chart branch