Apply patch Row chart enhancements
Bug fix
Clean code