Here's my best, since i can't draw anything in paint.
i added the MG section, plus the shield test room, the BSG room, and the NW room. couldn't find anywhere to put the emperor's chambers though. i wanted to put it on the floor above the grognards forum, but there wasn't any room.
plus i added the waiting room.