Update with header/footer includes