Adjust sizes, move to single chart class