Tidying.
Merge pull request #152 from greboid/newserverdialog

Tidying.