Fixed conflicts. (Previous: Initial data model set up. Layout string fixes.)