Updated floor plan + sketches (see comment below)