Fixed layout instantiation logic. Move to new layout qaulifiers.