Switch to using content_for
Remove old headers partial