Included facets and made UI better looking