u/BrowOfBrass

I would not just go back to the old bunker, but smooth out the new bunker.

I kept the rooms the same size. With two exceptions: combining the Kiosk room with the Main and front hall, then combining the Medical and Garden rooms.
The layout also adds doorways to the Generator room and market hall, the kitchen is also inverted.

The last image shows how much less walking there would be.

^((I would also make the reload bench storable and the pegboard behind it capable of holding Ammoboxxes.))

Short of grinding lvl 3 jiri for water pumps, (which is a ton of work) not having a working water filter is making the farm crazy hard to maintain.