New version of layout-generator added.