CityScape and CityLayout finished