UI improvements and ordered facets!