fixes to CityScape and Viewport, CityScape still bresents some layout bugs but Viewport seems to work fine even with wrapping