Finish up work on the server browser