Import JBChartView and other improvements