Navigator facets ui improvements