Fixes and Chart Cell
Fix rendering