Fixed FaceCollection & Like layouts (wip)