Basic data model & improved layout