changed layout and data models