Make map view nicer to look at
Fix ConnectionServerTest unit test