rearrange template files
Add Facet blocks