Checking in experimental FlexLayou version to work with margin offsets