CityView.lua Modifications

CSD (v15) compatibility, CEP labels, and minor updates from the last
patch.