new header, breaking layout into include files