Merge pull request #750 from jnarron/havoc

Minor visual changes, code cleanup, started changing clickable labels to buttons