New layout for table (not optimal ….) and facets