Merge pull request #719 from jnarron/havoc

Template structure improvements, avatar and status item visual tweaks