Converted most of the figures to ggplot2