Finished updating all graphs to ggplot2