Only generate row field columns and column layout columns if required. Not very efficient at the moment