Merge pull request #735 from jnarron/havoc

Implemented group view, visual changes and bugfixes, code refactoring