New layout and initial header work