Merge pull request #685 from jnarron/havoc

Presentation page finished, minor bug fixes