More fixes to templates for generic content layout.