Merge pull request #746 from jnarron/havoc

Minor account page bug fixes, changed group label colors back to original