Dev

Updated data model and styling