Refactoring for preparing to insert chart
Web reloads improved and some seasonning