Final adjustments
Still has a lot of bugs in the chart