Finished chart implementation
Updated small bug in chart