facet fix and minor layout change