The 3D visuals below show how the improved layout of the building now works - with everything under one roof.
There is a full description of the proposals on the 2D plan page above.