Updated non-location pages to use include files