updates to data model|removed unneeded layouts