Fixing up the markup to match changes to the models that were previously made.