Merge pull request #711 from jnarron/havoc

Reorganized TranslateConfig, account page design tweak
Merge remote-tracking branch 'upstream/havoc' into havoc