Continued work on facet display for CC Theme