changed layout and data models
update pages with v0.2