Cleaning up the contents generation for the nodes. Moved one more node as a name over its true model.