Content page now matches the view
Merged generator-changes