[Logical me]

Don't we have some left over quonset huts from WWII. Set them up on bardges and anchor out.

[verbal voter]

We must not allow NYC to permit improvements or additions. They will want increased revenue.
The UN must be made to decentralize, with about 15-20% of operations maximum, in any country, spread around the world based up populations. Place various specialties in or near countries where they are needed. With todays electronics instant face to face meeting are possible.

With diplomats located in places like Central Africa, India, China, and Indonesia problems would be solved faster.