bug fixed layout/model + generator