Added support to compute the layout for structural model and measurement model seperately.