Update headers and add category layout