More layout creation and changes.
Updated and created associations between tables.