Made some changes to the jade files.
Manually merged some changes
The graphics javascript is now functional.