- Extracted chart
- Made chart refresh smarter