Refactored constraint view