Clean up data model and add display items