It makes me sad, but this fixes the new NRE flood on map views
Also tweaked connection window layout, partially addresses #744