Freelancer:
ronaaron2
A quick reworking of various rooms
Choose whatever works for you. This is only a quick sketch and once you decide on this layout, more discussion will take place for revisions.