Cleaned up the server browser
Merge pull request #6983 from huwpascoe/server-browser

Cleaned up the server browser