Add new layout files, remove header and footer includes. Layout edits.