minor adjustments; refactor ModelData and to do with input layouts