Refactor view logic to reflect areas of law found