updated: list, detail pages; updated data model