Cleaned up layout, included plots, etc.