Improve margin system with facets