Graphics

Adding in the new graphics
Merged in Shauna's changes
Merge remote-tracking branch 'origin/master'