Move info rows into specific models
Add headings to all info content blocks