Rework views for privacy criteria