split up header more, adjustments to page templates