Jul 19 city update 2

removed more placeholders, adjusts building layout