Add facet formatting and constraints

Re-implemented constraints in a new area
    ->Still needs more work!
Formatted the facet names to take display off the end