Fixed problem with ggplot versions, beautifying, etc.