A participant on the Mongoose boards posted a hand-drawn re-arrangement of the A2, so I modified my version as well.

Aside from adjusting the vertical hatches so they line up and adding airlocks to his external iris valves and the cargo access, this is FraNe91's layout.