2507 audit facets

I think we should get this change in with the large release since it will make the facets look very different.  If we wait until next release, the labs will have just gotten used to the factes one way.