Refactor decree page highlighting model and corresponding view