Remove commented out code.
Fix server list display.
Merge pull request #2906 from jburel/server-dialog

Server dialog