Merge pull request #647 from jnarron/havoc

Style fixes, added new services, and added sidebar code