diff --git a/machine/engine.py b/machine/engine.py
index fb83abd..aa0f7fc 100644
--- a/machine/engine.py
+++ b/machine/engine.py
@@ -168,6 +168,7 @@ async def evaluate(
         sources: dict[str, pd.DataFrame] | None = None,
         calculation_date=None,
         requested_output: str | None = None,
+        approved: bool = False,
     ) -> dict[str, Any]:
         """Evaluate rules using service context and sources"""
         parameters = parameters or {}
@@ -181,7 +182,9 @@ async def evaluate(
         claims = None
         if "BSN" in parameters:
             bsn = parameters["BSN"]
-            claims = self.service_provider.claim_manager.get_claim_by_bsn_service_law(bsn, self.service_name, self.law)
+            claims = self.service_provider.claim_manager.get_claim_by_bsn_service_law(
+                bsn, self.service_name, self.law, approved=approved
+            )
 
         context = RuleContext(
             definitions=self.definitions,
diff --git a/machine/events/case/aggregate.py b/machine/events/case/aggregate.py
index 1569e7a..76937d2 100644
--- a/machine/events/case/aggregate.py
+++ b/machine/events/case/aggregate.py
@@ -11,7 +11,7 @@ class CaseStatus(str, Enum):
     OBJECTED = "OBJECTED"
 
 
-class ClaimStatusTranscoding(Transcoding):
+class CaseStatusTranscoding(Transcoding):
     @staticmethod
     def can_handle(obj: object) -> bool:
         return isinstance(obj, CaseStatus | str)
@@ -29,7 +29,7 @@ def decode(data: str) -> str:
         return data  # Keep it as a string
 
 
-Transcoding.register(ClaimStatusTranscoding)
+Transcoding.register(CaseStatusTranscoding)
 
 
 class Case(Aggregate):
@@ -43,6 +43,7 @@ def __init__(
         claimed_result: dict,
         rulespec_uuid: str,
     ) -> None:
+        self.claim_ids = None
         self.bsn = bsn
         self.service = service_type
         self.law = law
@@ -190,3 +191,26 @@ def can_appeal(self) -> bool:
         if not hasattr(self, "appeal_status") or self.appeal_status is None:
             return False
         return bool(self.appeal_status.get("possible", False))
+
+    @event("ClaimCreated")
+    def add_claim(self, claim_id: str) -> None:
+        """Record when a new claim is created for this case"""
+        if not hasattr(self, "claim_ids") or self.claim_ids is None:
+            self.claim_ids = set()
+        self.claim_ids.add(claim_id)
+
+    @event("ClaimApproved")
+    def approve_claim(self, claim_id: str) -> None:
+        """Record when a claim is approved"""
+        if not hasattr(self, "claim_ids") or self.claim_ids is None:
+            self.claim_ids = set()
+        if claim_id not in self.claim_ids:
+            self.claim_ids.add(claim_id)
+
+    @event("ClaimRejected")
+    def reject_claim(self, claim_id: str) -> None:
+        """Record when a claim is rejected"""
+        if not hasattr(self, "claim_ids") or self.claim_ids is None:
+            self.claim_ids = set()
+        if claim_id not in self.claim_ids:
+            self.claim_ids.add(claim_id)
diff --git a/machine/events/claim/aggregate.py b/machine/events/claim/aggregate.py
index 721c0fd..e37ada0 100644
--- a/machine/events/claim/aggregate.py
+++ b/machine/events/claim/aggregate.py
@@ -57,11 +57,44 @@ def __init__(
         self.status = ClaimStatus.PENDING
         self.created_at = datetime.now()
 
+    @event("Reset")
+    def reset(
+        self,
+        service: str,
+        key: str,
+        new_value: Any,
+        reason: str,
+        claimant: str,
+        law: str,
+        bsn: str,
+        case_id: str | None = None,
+        old_value: Any | None = None,
+        evidence_path: str | None = None,
+    ) -> None:
+        self.service = service
+        self.key = key
+        self.old_value = old_value
+        self.new_value = new_value
+        self.reason = reason
+        self.evidence_path = evidence_path
+        self.claimant = claimant
+        self.case_id = case_id
+        self.law = law
+        self.bsn = bsn
+        self.status = ClaimStatus.PENDING
+        self.created_at = datetime.now()
+
+    @event("AutoApproved")
+    def auto_approve(self, verified_by: str, verified_value: Any) -> None:
+        """Approve the claim with potentially adjusted value"""
+        self.status = ClaimStatus.APPROVED
+        self.verified_by = verified_by
+        self.verified_value = verified_value
+        self.verified_at = datetime.now()
+
     @event("Approved")
     def approve(self, verified_by: str, verified_value: Any) -> None:
         """Approve the claim with potentially adjusted value"""
-        if self.status != ClaimStatus.PENDING:
-            raise ValueError("Can only approve pending claims")
         self.status = ClaimStatus.APPROVED
         self.verified_by = verified_by
         self.verified_value = verified_value
@@ -70,8 +103,6 @@ def approve(self, verified_by: str, verified_value: Any) -> None:
     @event("Rejected")
     def reject(self, rejected_by: str, rejection_reason: str) -> None:
         """Reject the claim with a reason"""
-        if self.status != ClaimStatus.PENDING:
-            raise ValueError("Can only reject pending claims")
         self.status = ClaimStatus.REJECTED
         self.rejected_by = rejected_by
         self.rejection_reason = rejection_reason
diff --git a/machine/events/claim/application.py b/machine/events/claim/application.py
index 10d5d39..3f52177 100644
--- a/machine/events/claim/application.py
+++ b/machine/events/claim/application.py
@@ -19,8 +19,10 @@ def __init__(self, rules_engine, **kwargs) -> None:
         self._service_index: dict[str, list[str]] = {}  # service -> [claim_ids]
         self._case_index: dict[str, list[str]] = {}  # case_id -> [claim_ids]
         self._claimant_index: dict[str, list[str]] = {}  # claimant -> [claim_ids]
+        self._bsn_index: dict[str, list[str]] = {}  # claimant -> [claim_ids]
         self._status_index: dict[ClaimStatus, list[str]] = {status: [] for status in ClaimStatus}
         self._bsn_service_law_index: dict[tuple[str, str, str], dict[str, str]] = {}  # (service, key) -> claim_id
+        self._case_manager = None
 
     def _index_claim(self, claim: Claim) -> None:
         """Add claim to all indexes"""
@@ -42,19 +44,19 @@ def _index_claim(self, claim: Claim) -> None:
             self._claimant_index[claim.claimant] = []
         self._claimant_index[claim.claimant].append(claim_id)
 
-        # Status index
-        self._status_index[claim.status].append(claim_id)
+        # BSN index
+        if claim.bsn not in self._bsn_index:
+            self._bsn_index[claim.bsn] = []
+        self._bsn_index[claim.bsn].append(claim_id)
 
         # Service-Key index
         if (claim.bsn, claim.service, claim.law) not in self._bsn_service_law_index:
             self._bsn_service_law_index[(claim.bsn, claim.service, claim.law)] = {}
         self._bsn_service_law_index[(claim.bsn, claim.service, claim.law)][claim.key] = claim_id
 
-    def _update_status_index(self, claim: Claim, old_status: ClaimStatus) -> None:
-        """Update status index when claim status changes"""
-        claim_id = str(claim.id)
-        self._status_index[old_status].remove(claim_id)
-        self._status_index[claim.status].append(claim_id)
+    @property
+    def case_manager(self):
+        return self._case_manager
 
     def submit_claim(
         self,
@@ -68,42 +70,84 @@ def submit_claim(
         case_id: str | None = None,
         old_value: Any | None = None,
         evidence_path: str | None = None,
+        auto_approve: bool = False,  # Add this parameter
     ) -> str:
         """
         Submit a new claim. Can be linked to an existing case or standalone.
+        If auto_approve is True, the claim will be automatically approved.
         """
-        claim = Claim(
-            service=service,
-            key=key,
-            new_value=new_value,
-            reason=reason,
-            claimant=claimant,
-            case_id=case_id,
-            old_value=old_value,
-            evidence_path=evidence_path,
-            law=law,
-            bsn=bsn,
-        )
+        existing_claims = self.get_claim_by_bsn_service_law(bsn, service, law, include_rejected=True)
+        if existing_claims and key in existing_claims:
+            claim = existing_claims[key]
+            claim.reset(
+                service=service,
+                key=key,
+                new_value=new_value,
+                reason=reason,
+                claimant=claimant,
+                case_id=case_id,
+                old_value=old_value,
+                evidence_path=evidence_path,
+                law=law,
+                bsn=bsn,
+            )
+            self.save(claim)
+        else:
+            claim = Claim(
+                service=service,
+                key=key,
+                new_value=new_value,
+                reason=reason,
+                claimant=claimant,
+                case_id=case_id,
+                old_value=old_value,
+                evidence_path=evidence_path,
+                law=law,
+                bsn=bsn,
+            )
+            self.save(claim)
+            self._index_claim(claim)
+
+        case = None
+        if claim.case_id:
+            case = self.case_manager.get_case_by_id(claim.case_id)
+            if case:
+                case.add_claim(claim.id)
+                self.case_manager.save(case)
+
+        # Auto-approve if requested
+        if auto_approve:
+            claim.auto_approve(verified_by=claimant, verified_value=new_value)
+            self.save(claim)
+            if case:
+                case.approve_claim(claim.id)
+                self.case_manager.save(case)
 
-        self.save(claim)
-        self._index_claim(claim)
         return str(claim.id)
 
     def approve_claim(self, claim_id: str, verified_by: str, verified_value: Any) -> None:
         """Approve a claim with verified value"""
         claim = self.get_claim(claim_id)
-        old_status = claim.status
         claim.approve(verified_by, verified_value)
         self.save(claim)
-        self._update_status_index(claim, old_status)
+
+        if claim.case_id:
+            case = self.case_manager.get_case_by_id(claim.case_id)
+            if case:
+                case.approve_claim(claim.id)
+                self.case_manager.save(case)
 
     def reject_claim(self, claim_id: str, rejected_by: str, rejection_reason: str) -> None:
         """Reject a claim with reason"""
         claim = self.get_claim(claim_id)
-        old_status = claim.status
         claim.reject(rejected_by, rejection_reason)
         self.save(claim)
-        self._update_status_index(claim, old_status)
+
+        if claim.case_id:
+            case = self.case_manager.get_case_by_id(claim.case_id)
+            if case:
+                case.reject_claim(claim.id)
+                self.case_manager.save(case)
 
     def link_case(self, claim_id: str, case_id: str) -> None:
         """Link an existing claim to a case"""
@@ -127,27 +171,67 @@ def get_claim(self, claim_id: str) -> Claim:
         """Get claim by ID"""
         return self.repository.get(UUID(claim_id))
 
-    def get_claims_by_service(self, service: str) -> list[Claim]:
-        """Get all claims for a service"""
-        return [self.get_claim(claim_id) for claim_id in self._service_index.get(service, [])]
+    @staticmethod
+    def _filter_claims_by_status(claims: list[Claim], approved: bool, include_rejected: bool = False) -> list[Claim]:
+        """
+        Helper method to filter claims based on approved parameter.
 
-    def get_claims_by_case(self, case_id: str) -> list[Claim]:
-        """Get all claims for a case"""
-        return [self.get_claim(claim_id) for claim_id in self._case_index.get(case_id, [])]
+        Args:
+            claims: List of claims to filter
+            approved: If True, only return approved claims. If False, return approved and submitted claims.
+            include_rejected: If True, also include rejected claims in the results.
+        """
+        if approved:
+            return [claim for claim in claims if claim.status == ClaimStatus.APPROVED]
 
-    def get_claims_by_claimant(self, claimant: str) -> list[Claim]:
-        """Get all claims made by a claimant"""
-        return [self.get_claim(claim_id) for claim_id in self._claimant_index.get(claimant, [])]
+        allowed_statuses = {ClaimStatus.APPROVED, ClaimStatus.PENDING}
+        if include_rejected:
+            allowed_statuses.add(ClaimStatus.REJECTED)
 
-    def get_claims_by_status(self, status: ClaimStatus) -> list[Claim]:
-        """Get all claims with a specific status"""
-        return [self.get_claim(claim_id) for claim_id in self._status_index.get(status, [])]
+        return [claim for claim in claims if claim.status in allowed_statuses]
 
-    def get_claim_by_bsn_service_law(self, bsn: str, service: str, law: str) -> dict[str:Claim] | None:
+    def get_claims_by_service(
+        self, service: str, approved: bool = False, include_rejected: bool = False
+    ) -> list[Claim]:
         """
-        Get a dictionary with claims
+        Get all claims for a service, filtered by status
+
+        Args:
+            service: Service to filter by
+            approved: If True, only return approved claims
+            include_rejected: If True, also include rejected claims
         """
+        claims = [self.get_claim(claim_id) for claim_id in self._service_index.get(service, [])]
+        return self._filter_claims_by_status(claims, approved, include_rejected)
+
+    def get_claims_by_case(self, case_id: str, approved: bool = False, include_rejected: bool = False) -> list[Claim]:
+        """Get all claims for a case, filtered by status"""
+        claims = [self.get_claim(claim_id) for claim_id in self._case_index.get(case_id, [])]
+        return self._filter_claims_by_status(claims, approved, include_rejected)
+
+    def get_claims_by_claimant(
+        self, claimant: str, approved: bool = False, include_rejected: bool = False
+    ) -> list[Claim]:
+        """Get all claims made by a claimant, filtered by status"""
+        claims = [self.get_claim(claim_id) for claim_id in self._claimant_index.get(claimant, [])]
+        return self._filter_claims_by_status(claims, approved, include_rejected)
+
+    def get_claims_by_bsn(self, bsn: str, approved: bool = False, include_rejected: bool = False) -> list[Claim]:
+        """Get all claims for a BSN, filtered by status"""
+        claims = [self.get_claim(claim_id) for claim_id in self._bsn_index.get(bsn, [])]
+        return self._filter_claims_by_status(claims, approved, include_rejected)
+
+    def get_claim_by_bsn_service_law(
+        self, bsn: str, service: str, law: str, approved: bool = False, include_rejected: bool = False
+    ) -> dict[str:Claim] | None:
+        """Get a dictionary with claims filtered by status"""
         key_index = self._bsn_service_law_index.get((bsn, service, law))
-        if key_index:
-            return {key: self.get_claim(claim_id) for key, claim_id in key_index.items()}
-        return None
+        if not key_index:
+            return None
+        claims = {key: self.get_claim(claim_id) for key, claim_id in key_index.items()}
+        filtered_claims = {
+            key: claim
+            for key, claim in claims.items()
+            if claim in self._filter_claims_by_status([claim], approved, include_rejected)
+        }
+        return filtered_claims if filtered_claims else None
diff --git a/machine/events/claim/processor.py b/machine/events/claim/processor.py
index 6051f6f..f1ffee5 100644
--- a/machine/events/claim/processor.py
+++ b/machine/events/claim/processor.py
@@ -1,8 +1,6 @@
 from eventsourcing.dispatch import singledispatchmethod
 from eventsourcing.system import ProcessApplication
 
-from .aggregate import Claim
-
 
 class ClaimProcessor(ProcessApplication):
     """Process application for handling claim events"""
@@ -22,23 +20,3 @@ def case_manager(self):
     @singledispatchmethod
     def policy(self, domain_event, process_event) -> None:
         """Sync policy that processes events"""
-
-    @policy.register(Claim.Approved)
-    async def handle_claim_approved(self, domain_event, process_event) -> None:
-        """
-        When a claim is approved:
-        1. If linked to a case, update the case
-        2. Run any applicable rules
-        """
-        claim = self.repository.get(domain_event.originator_id)
-
-        # If claim is linked to a case, update it
-        if claim.case_id:
-            case = self.case_manager.get_case_by_id(claim.case_id)
-            if case:
-                # Update the case parameter
-                case.update_parameter(key=claim.key, new_value=domain_event.verified_value)
-                self.case_manager.save(case)
-
-        # Run any applicable rules
-        await self.rules_engine.apply_rules(domain_event)
diff --git a/machine/service.py b/machine/service.py
index 16a3a3b..f286562 100644
--- a/machine/service.py
+++ b/machine/service.py
@@ -80,6 +80,7 @@ async def evaluate(
         parameters: dict[str, Any],
         overwrite_input: dict[str, Any] | None = None,
         requested_output: str | None = None,
+        approved: bool = False,
     ) -> RuleResult:
         """
         Evaluate rules for given law and reference date
@@ -101,6 +102,7 @@ async def evaluate(
             sources=self.source_dataframes,
             calculation_date=reference_date,
             requested_output=requested_output,
+            approved=approved,
         )
         return RuleResult.from_engine_result(result, engine.spec.get("uuid"))
 
@@ -161,6 +163,8 @@ def __init__(self, env=None, **kwargs) -> None:
         self.case_manager = self.runner.get(WrappedCaseManager)
         self.claim_manager = self.runner.get(WrappedClaimManager)
 
+        self.claim_manager._case_manager = self.case_manager
+
     def __exit__(self):
         self.runner.stop()
 
@@ -179,6 +183,7 @@ async def evaluate(
         reference_date: str | None = None,
         overwrite_input: dict[str, Any] | None = None,
         requested_output: str | None = None,
+        approved: bool = False,
     ) -> RuleResult:
         reference_date = reference_date or self.root_reference_date
         with logger.indent_block(
@@ -191,6 +196,7 @@ async def evaluate(
                 parameters=parameters,
                 overwrite_input=overwrite_input,
                 requested_output=requested_output,
+                approved=approved,
             )
 
     async def apply_rules(self, event) -> None:
diff --git a/web/routers/admin.py b/web/routers/admin.py
index 0c59482..2184a6f 100644
--- a/web/routers/admin.py
+++ b/web/routers/admin.py
@@ -173,4 +173,33 @@ async def view_case(request: Request, case_id: str, services: Services = Depends
     case.events = services.case_manager.get_events(case.id)
     law, result, rule_spec = await evaluate_law(case.bsn, case.law, case.service, services)
     flat_path = flatten_path_nodes(result.path)
-    return templates.TemplateResponse("admin/case_detail.html", {"request": request, "case": case, "path": flat_path})
+    claims = services.claim_manager.get_claims_by_bsn(case.bsn, include_rejected=True)
+    claim_ids = {claim.id: claim for claim in claims}
+    claim_map = {(claim.service, claim.law, claim.key): claim for claim in claims}
+    return templates.TemplateResponse(
+        "admin/case_detail.html",
+        {
+            "request": request,
+            "case": case,
+            "path": flat_path,
+            "claim_map": claim_map,
+            "claim_ids": claim_ids,
+        },
+    )
+
+
+@router.get("/claims/{claim_id}")
+async def view_claim(request: Request, claim_id: str, services: Services = Depends(get_services)):
+    """View details of a specific claim"""
+    claim = services.claim_manager.get_claim(claim_id)
+    if not claim:
+        raise HTTPException(status_code=404, detail="Claim not found")
+
+    # Get related case if it exists
+    related_case = None
+    if claim.case_id:
+        related_case = services.case_manager.get_case_by_id(claim.case_id)
+
+    return templates.TemplateResponse(
+        "admin/claim_detail.html", {"request": request, "claim": claim, "related_case": related_case}
+    )
diff --git a/web/routers/edit.py b/web/routers/edit.py
index 2bc681c..698f0fb 100644
--- a/web/routers/edit.py
+++ b/web/routers/edit.py
@@ -1,6 +1,6 @@
 import json
 
-from fastapi import APIRouter, Depends, File, Form, Request, UploadFile
+from fastapi import APIRouter, Depends, File, Form, HTTPException, Request, UploadFile
 from fastapi.responses import HTMLResponse
 
 from machine.service import Services
@@ -18,6 +18,8 @@ async def get_edit_form(
     value: str,
     law: str,
     bsn: str,
+    show_approve: bool = False,
+    services: Services = Depends(get_services),
 ):
     """Return the edit form HTML"""
     try:
@@ -25,6 +27,25 @@ async def get_edit_form(
     except json.JSONDecodeError:
         parsed_value = value
 
+    # Try to get existing claim by bsn, service, law and key
+    claim_data = None
+    existing_claims = services.claim_manager.get_claim_by_bsn_service_law(
+        bsn=bsn,
+        service=service,
+        law=law,
+        include_rejected=True,  # Include rejected claims to show history
+    )
+
+    if existing_claims and key in existing_claims:
+        claim = existing_claims[key]
+        claim_data = {
+            "new_value": claim.new_value,
+            "reason": claim.reason,
+            "evidence_path": claim.evidence_path,
+            "auto_approve": claim.status == "APPROVED",
+            "status": claim.status,
+        }
+
     return templates.TemplateResponse(
         "partials/edit_form.html",
         {
@@ -35,6 +56,8 @@ async def get_edit_form(
             "value": parsed_value,
             "law": law,
             "bsn": bsn,
+            "show_approve": show_approve,
+            "claim_data": claim_data,
         },
     )
 
@@ -50,6 +73,8 @@ async def update_value(
     law: str = Form(...),
     bsn: str = Form(...),
     evidence: UploadFile = File(None),
+    claimant: str = Form(...),  # Add this
+    auto_approve: bool = Form(False),  # Add this
     services: Services = Depends(get_services),
 ):
     """Handle the value update by creating a claim"""
@@ -86,11 +111,12 @@ async def update_value(
         key=key,
         new_value=parsed_value,
         reason=reason,
-        claimant=None,
+        claimant=claimant,
         case_id=case_id,
         evidence_path=evidence_path,
         law=law,
         bsn=bsn,
+        auto_approve=auto_approve,
     )
 
     response = templates.TemplateResponse(
@@ -99,3 +125,61 @@ async def update_value(
     )
     response.headers["HX-Trigger"] = "edit-dialog-closed"
     return response
+
+
+@router.post("/reject-claim", response_class=HTMLResponse)
+async def reject_claim(
+    request: Request,
+    claim_id: str = Form(...),
+    reason: str = Form(...),
+    services: Services = Depends(get_services),
+):
+    """Handle dropping a claim by rejecting it"""
+    try:
+        services.claim_manager.reject_claim(
+            claim_id=claim_id,
+            rejected_by="USER",  # You might want to get this from auth
+            rejection_reason=f"Claim dropped: {reason}",
+        )
+
+        response = templates.TemplateResponse("partials/claim_dropped.html", {"request": request})
+        response.headers["HX-Trigger"] = "edit-dialog-closed"
+        return response
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.get("/reject-claim-form", response_class=HTMLResponse)
+async def get_reject_claim_form(
+    request: Request,
+    claim_id: str,
+):
+    """Return the drop claim form HTML"""
+    return templates.TemplateResponse(
+        "partials/reject-claim-form.html",
+        {
+            "request": request,
+            "claim_id": claim_id,
+        },
+    )
+
+
+@router.post("/approve-claim", response_class=HTMLResponse)
+async def approve_claim(
+    request: Request,
+    claim_id: str = Form(...),
+    services: Services = Depends(get_services),
+):
+    """Handle approving a claim by verifying it with its original new_value"""
+    try:
+        services.claim_manager.approve_claim(
+            claim_id=claim_id,
+            verified_by="USER",
+            verified_value=None,
+        )
+
+        response = templates.TemplateResponse("partials/claim_approved.html", {"request": request})
+        response.headers["HX-Trigger"] = "edit-dialog-closed"
+        return response
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
diff --git a/web/routers/laws.py b/web/routers/laws.py
index e91ccce..f11629f 100644
--- a/web/routers/laws.py
+++ b/web/routers/laws.py
@@ -47,7 +47,7 @@ async def evaluate_law(bsn: str, law: str, service: str, services: Services):
             services.set_source_dataframe(service_name, table_name, df)
 
     # Execute the law
-    result = await services.evaluate(service, law=law, parameters={"BSN": bsn}, reference_date=TODAY)
+    result = await services.evaluate(service, law=law, parameters={"BSN": bsn}, reference_date=TODAY, approved=True)
     return law, result, rule_spec
 
 
@@ -206,6 +206,9 @@ async def explain_panel(
         flat_path = flatten_path_nodes(result.path)
         existing_case = services.case_manager.get_case(bsn, service, law)
 
+        claims = services.claim_manager.get_claims_by_bsn(bsn, include_rejected=True)
+        claim_map = {(claim.service, claim.law, claim.key): claim for claim in claims}
+
         return templates.TemplateResponse(
             "partials/tiles/components/explanation_panel.html",
             {
@@ -219,6 +222,7 @@ async def explain_panel(
                 "path": flat_path,
                 "bsn": bsn,
                 "current_case": existing_case,
+                "claim_map": claim_map,
             },
         )
     except Exception as e:
diff --git a/web/templates/admin/case_detail.html b/web/templates/admin/case_detail.html
index 6441971..73b0dfa 100644
--- a/web/templates/admin/case_detail.html
+++ b/web/templates/admin/case_detail.html
@@ -202,10 +202,89 @@ <h3 class="text-md font-medium mb-2">Geverifieerde Resultaten</h3>
                 </div>
             </div>
 
+            <!-- Claims -->
+            <div class="p-6 border-b border-gray-200">
+                <h2 class="text-lg font-semibold mb-4">Claims</h2>
+                {% if case.claim_ids %}
+                <div class="space-y-4">
+                    {% for claim_id in case.claim_ids %}
+                    {% set claim = claim_ids[claim_id] %}
+                    <div class="bg-gray-50 p-4 rounded-md">
+                        <div class="flex justify-between items-start">
+                            <div>
+                                <h3 class="font-medium">{{ claim.key|title|replace('_', ' ') }}</h3>
+                                <p class="text-sm text-gray-600">{{ claim.reason }}</p>
+                                <div class="mt-2">
+                                    <span class="text-sm">
+                                        {% if claim.status == 'PENDING' %}
+                                        <span class="bg-yellow-100 text-yellow-800 px-2 py-1 rounded-full text-xs">In behandeling</span>
+                                        {% elif claim.status == 'APPROVED' %}
+                                        <span class="bg-green-100 text-green-800 px-2 py-1 rounded-full text-xs">Goedgekeurd</span>
+                                        {% elif claim.status == 'REJECTED' %}
+                                        <span class="bg-red-100 text-red-800 px-2 py-1 rounded-full text-xs">Afgewezen</span>
+                                        {% endif %}
+                                    </span>
+                                </div>
+                            </div>
+                            <a href="/admin/claims/{{ claim.id }}"
+                               class="text-blue-600 hover:text-blue-800 text-sm">
+                                Details →
+                            </a>
+                        </div>
+                        <div class="mt-3 grid grid-cols-2 gap-4 text-sm">
+                            <div>
+                                <p class="text-gray-600">Nieuwe waarde</p>
+                                <p>{{ claim.new_value }}</p>
+                            </div>
+                            {% if claim.status == 'APPROVED' %}
+                            <div>
+                                <p class="text-gray-600">Geverifieerde waarde</p>
+                                <p>{{ claim.verified_value }}</p>
+                            </div>
+                            {% endif %}
+                        </div>
+                        {% if claim.status == 'PENDING' %}
+                        <div class="mt-4 flex justify-end gap-2">
+                            <button
+                                    class="inline-flex items-center gap-1 px-3 py-1.5 rounded text-sm font-medium bg-green-100 text-green-800 hover:bg-green-200"
+                                    hx-get="/edit/approve-claim"
+                                    hx-target="#edit-form-container"
+                                    hx-vals='{
+                                        "claim_id": "{{ claim.id }}"
+                                    }'
+                            >
+                                <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
+                                </svg>
+                                Goedkeuren
+                            </button>
+                            <button
+                                    class="inline-flex items-center gap-1 px-3 py-1.5 rounded text-sm font-medium bg-red-100 text-red-800 hover:bg-red-200"
+                                    hx-get="/edit/reject-claim-form"
+                                    hx-target="#edit-form-container"
+                                    hx-vals='{
+                                        "claim_id": "{{ claim.id }}"
+                                    }'
+                            >
+                                <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                                </svg>
+                                Afwijzen
+                            </button>
+                        </div>
+                        {% endif %}
+                    </div>
+                    {% endfor %}
+                </div>
+                {% else %}
+                <p class="text-gray-500">Geen claims voor deze zaak</p>
+                {% endif %}
+            </div>
+
             <!-- Parameters -->
             <div class="p-6 {% if case.status == 'IN_REVIEW' %}border-b border-gray-200{% endif %}">
             <h2 class="text-lg font-semibold mb-6">Gebruikte gegevens</h2>
-            {{ render_path(path, case.id|string, case.service, case.law, case.bsn) }}
+            {{ render_path(path, case.id|string, case.service, case.law, case.bsn, claim_map, show_approve=True, claimant="CIVIL_SERVANT") }}
             </div>
 
             <!-- Gebeurtenissen -->
diff --git a/web/templates/admin/claim_detail.html b/web/templates/admin/claim_detail.html
new file mode 100644
index 0000000..34c8fd3
--- /dev/null
+++ b/web/templates/admin/claim_detail.html
@@ -0,0 +1,150 @@
+{% extends "admin/base.html" %}
+{% from "macros/logos.html" import org_logo %}
+
+{% block content %}
+<div class="min-h-screen bg-gray-50">
+    {# Top navigation bar #}
+    <div class="bg-white shadow">
+        <div class="px-6 py-4 flex justify-between items-center">
+            <h1 class="text-2xl font-bold">Claimdetails</h1>
+            <div class="-mt-2 -mr-2">{{ org_logo(claim.service) }}</div>
+        </div>
+    </div>
+
+    <div class="p-6">
+        <div class="bg-white shadow rounded-lg">
+            <!-- Basic Information -->
+            <div class="p-6 border-b border-gray-200">
+                <h2 class="text-lg font-semibold mb-4">Basis Informatie</h2>
+                <div class="grid grid-cols-2 gap-4">
+                    <div>
+                        <p class="text-sm text-gray-600">BSN</p>
+                        <p class="font-medium">{{ claim.bsn }}</p>
+                    </div>
+                    <div>
+                        <p class="text-sm text-gray-600">Dienst</p>
+                        <p class="font-medium">{{ claim.service }}</p>
+                    </div>
+                    <div>
+                        <p class="text-sm text-gray-600">Wet</p>
+                        <p class="font-medium">{{ claim.law }}</p>
+                    </div>
+                    <div>
+                        <p class="text-sm text-gray-600">Status</p>
+                        <p class="font-medium">{{ claim.status }}</p>
+                    </div>
+                    <div>
+                        <p class="text-sm text-gray-600">Aanvrager</p>
+                        <p class="font-medium">{{ claim.claimant }}</p>
+                    </div>
+                    <div>
+                        <p class="text-sm text-gray-600">Aangemaakt op</p>
+                        <p class="font-medium">{{ claim.created_at.strftime('%Y-%m-%d %H:%M:%S') }}</p>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Claim Details -->
+            <div class="p-6 border-b border-gray-200">
+                <h2 class="text-lg font-semibold mb-4">Claim Details</h2>
+                <div class="grid grid-cols-2 gap-4">
+                    <div class="col-span-2">
+                        <p class="text-sm text-gray-600">Parameter</p>
+                        <p class="font-medium">{{ claim.key }}</p>
+                    </div>
+                    {% if claim.old_value is not none %}
+                    <div class="col-span-2">
+                        <p class="text-sm text-gray-600">Oude Waarde</p>
+                        <p class="font-medium">{{ claim.old_value }}</p>
+                    </div>
+                    {% endif %}
+                    <div class="col-span-2">
+                        <p class="text-sm text-gray-600">Nieuwe Waarde</p>
+                        <p class="font-medium">{{ claim.new_value }}</p>
+                    </div>
+                    <div class="col-span-2">
+                        <p class="text-sm text-gray-600">Reden</p>
+                        <p class="font-medium">{{ claim.reason }}</p>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Verification Details -->
+            {% if claim.status == 'APPROVED' %}
+            <div class="p-6 border-b border-gray-200">
+                <h2 class="text-lg font-semibold mb-4">Verificatie Details</h2>
+                <div class="grid grid-cols-2 gap-4">
+                    <div>
+                        <p class="text-sm text-gray-600">Geverifieerd door</p>
+                        <p class="font-medium">{{ claim.verified_by }}</p>
+                    </div>
+                    <div>
+                        <p class="text-sm text-gray-600">Geverifieerd op</p>
+                        <p class="font-medium">{{ claim.verified_at.strftime('%Y-%m-%d %H:%M:%S') }}</p>
+                    </div>
+                    <div class="col-span-2">
+                        <p class="text-sm text-gray-600">Geverifieerde Waarde</p>
+                        <p class="font-medium">{{ claim.verified_value }}</p>
+                    </div>
+                </div>
+            </div>
+            {% endif %}
+
+            <!-- Rejection Details -->
+            {% if claim.status == 'REJECTED' %}
+            <div class="p-6 border-b border-gray-200">
+                <h2 class="text-lg font-semibold mb-4">Afwijzings Details</h2>
+                <div class="grid grid-cols-2 gap-4">
+                    <div>
+                        <p class="text-sm text-gray-600">Afgewezen door</p>
+                        <p class="font-medium">{{ claim.rejected_by }}</p>
+                    </div>
+                    <div>
+                        <p class="text-sm text-gray-600">Afgewezen op</p>
+                        <p class="font-medium">{{ claim.rejected_at.strftime('%Y-%m-%d %H:%M:%S') }}</p>
+                    </div>
+                    <div class="col-span-2">
+                        <p class="text-sm text-gray-600">Reden voor afwijzing</p>
+                        <p class="font-medium">{{ claim.rejection_reason }}</p>
+                    </div>
+                </div>
+            </div>
+            {% endif %}
+
+            <!-- Evidence -->
+            {% if claim.evidence_path %}
+            <div class="p-6 border-b border-gray-200">
+                <h2 class="text-lg font-semibold mb-4">Bewijsmateriaal</h2>
+                <div class="grid grid-cols-2 gap-4">
+                    <div class="col-span-2">
+                        <p class="text-sm text-gray-600">Bewijsmateriaal Locatie</p>
+                        <p class="font-medium">{{ claim.evidence_path }}</p>
+                    </div>
+                </div>
+            </div>
+            {% endif %}
+
+            <!-- Related Case -->
+            {% if related_case %}
+            <div class="p-6">
+                <h2 class="text-lg font-semibold mb-4">Gerelateerde Zaak</h2>
+                <div class="grid grid-cols-2 gap-4">
+                    <div>
+                        <p class="text-sm text-gray-600">Zaak ID</p>
+                        <p class="font-medium">
+                            <a href="/admin/cases/{{ related_case.id }}" class="text-blue-600 hover:text-blue-800">
+                                {{ related_case.id }}
+                            </a>
+                        </p>
+                    </div>
+                    <div>
+                        <p class="text-sm text-gray-600">Zaak Status</p>
+                        <p class="font-medium">{{ related_case.status }}</p>
+                    </div>
+                </div>
+            </div>
+            {% endif %}
+        </div>
+    </div>
+</div>
+{% endblock %}
diff --git a/web/templates/macros/render_path.html b/web/templates/macros/render_path.html
index 79283e2..8ab6ffa 100644
--- a/web/templates/macros/render_path.html
+++ b/web/templates/macros/render_path.html
@@ -1,9 +1,9 @@
-{% macro render_value(key, value, case_id, service, law, bsn) %}
+{% macro render_value(key, value, case_id, service, law, bsn, claim_map, show_approve, claimant) %}
 {% if value is none or value is undefined %}
 <span class="text-gray-400">-</span>
 {% else %}
 <button
-        class="text-blue-600 hover:text-blue-800 cursor-pointer"
+        class="group inline-flex items-center gap-1 text-blue-600 hover:text-blue-800 cursor-pointer rounded px-1 hover:bg-blue-50"
         hx-get="/edit/edit-form"
         hx-target="#edit-form-container"
         hx-vals='{
@@ -12,7 +12,9 @@
         "key": "{{ key }}",
         "value": {{ value|tojson }},
         "law": "{{ law }}",
-        "bsn": "{{ bsn }}"
+        "bsn": "{{ bsn }}",
+        "show_approve": {{ show_approve|default(false)|tojson }},
+        "claimant": "{{ claimant }}"
     }'
         type="button">
     {% if value is mapping and value.result is defined %}
@@ -33,18 +35,86 @@
     {% else %}
     {{ display_value }}
     {% endif %}
+    <svg class="w-3.5 h-3.5 text-gray-300 group-hover:text-blue-400 transition-colors" fill="none" viewBox="0 0 24 24"
+         stroke="currentColor">
+        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+              d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z"/>
+    </svg>
 </button>
+
+
+{% if (service, law, key) in claim_map %}
+{% set claim = claim_map[(service, law, key)] %}
+<span class="text-gray-500 text-xs">→</span>
+<span class="text-gray-800 text-xs">{{ claim.new_value }}</span>
+{% if claim.status == "PENDING" %}
+<div class="ml-2 inline-flex items-center gap-1">
+    <div class="inline-flex gap-1 ml-2">
+        {% if show_approve %}
+        <button
+                class="inline-flex items-center gap-1 px-2 py-0.5 rounded text-xs font-medium bg-green-100 text-green-800 hover:bg-green-200"
+                hx-post="/edit/approve-claim"
+                hx-target="#edit-form-container"
+                hx-vals='{
+                    "claim_id": "{{ claim.id }}"
+                }'
+        >
+            <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
+            </svg>
+            Goedkeuren
+        </button>
+        {% endif %}
+        <button
+                class="inline-flex items-center gap-1 px-2 py-0.5 rounded text-xs font-medium bg-red-100 text-red-800 hover:bg-red-200"
+                hx-get="/edit/reject-claim-form"
+                hx-target="#edit-form-container"
+                hx-vals='{
+                    "claim_id": "{{ claim.id }}"
+                }'
+        >
+            <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+            </svg>
+            Intrekken
+        </button>
+    </div>
+</div>
+{% elif claim.status == "APPROVED" %}
+<div class="ml-2 inline-flex gap-1">
+    <button
+            class="inline-flex items-center gap-1 px-2 py-0.5 rounded text-xs font-medium bg-gray-100 text-gray-800 hover:bg-gray-200"
+                hx-get="/edit/reject-claim-form"
+            hx-target="#edit-form-container"
+            hx-vals='{
+                "claim_id": "{{ claim.id }}"
+            }'
+    >
+        <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+        </svg>
+            Intrekken
+    </button>
+</div>
+{% elif claim.status == "REJECTED" %}
+<div class="ml-2 inline-flex items-center gap-1 px-2 py-0.5 rounded text-xs font-medium bg-red-100 text-red-800">
+    <span>Ingetrokken</span>
+</div>
+{% endif %}
+{% endif %}
+
+
 {% endif %}
 {% endmacro %}
 
-{% macro render_node(key, node, case_id, service, law, bsn) %}
+{% macro render_node(key, node, case_id, service, law, bsn, claim_map, show_approve, claimant) %}
 {% if node is mapping and ('service' in node or 'children' in node) %}
 <div x-data="{ open: false }" class="text-sm leading-5">
     <div class="hover:bg-gray-50 transition-colors duration-150 py-0.5 flex items-start cursor-pointer gap-2"
          @click="open = !open">
         <div class="text-sm leading-5 py-0.5">
             <span class="text-gray-600">{{ key|title|replace('_', ' ') }}: </span>
-            <span class="ml-2">{% if node.result is defined %}{{ render_value(key, node.result, case_id, service, law, bsn) }}{% else %}{{ render_value(key, node, case_id, service, law, bsn) }}{% endif %}</span>
+            <span class="ml-2">{% if node.result is defined %}{{ render_value(key, node.result, case_id, service, law, bsn, claim_map, show_approve, claimant) }}{% else %}{{ render_value(key, node, case_id, service, law, bsn, claim_map, show_approve, claimant) }}{% endif %}</span>
         </div>
         <div class="min-w-0 flex items-center">
             <svg :class="{'rotate-[270deg]': open, 'rotate-90': !open}"
@@ -67,7 +137,7 @@
     <div x-show="open" class="ml-6 border-l border-gray-200 pl-4">
         {% if node.children %}
         {% for child_key, child_node in node.children|dictsort %}
-        {{ render_node(child_key, child_node, case_id, node.service, law, bsn) }}
+        {{ render_node(child_key, child_node, case_id, node.service, law, bsn, claim_map, show_approve, claimant) }}
         {% endfor %}
         {% endif %}
     </div>
@@ -75,12 +145,12 @@
 {% else %}
 <div class="text-sm leading-5 py-0.5">
     <span class="text-gray-600">{{ key|title|replace('_', ' ') }}: </span>
-    <span class="ml-2">{{ render_value(key, node.result, case_id, service, law, bsn) }}</span>
+    <span class="ml-2">{{ render_value(key, node.result, case_id, service, law, bsn, claim_map, show_approve, claimant) }}</span>
 </div>
 {% endif %}
 {% endmacro %}
 
-{% macro render_path(path, case_id, service, law, bsn) %}
+{% macro render_path(path, case_id, service, law, bsn, claim_map, show_approve=False, claimant="CITIZEN") %}
 <!-- Alpine.js store for managing dialog state -->
 <script>
     document.addEventListener('alpine:init', () => {
@@ -124,7 +194,7 @@
 
 <div class="bg-gray-50 rounded-lg text-sm p-4 border border-gray-100">
     {% for key, node in path|dictsort %}
-    {{ render_node(key, node, case_id, service, law, bsn) }}
+    {{ render_node(key, node, case_id, service, law, bsn, claim_map, show_approve, claimant) }}
     {% endfor %}
 </div>
 
diff --git a/web/templates/partials/claim_approved.html b/web/templates/partials/claim_approved.html
new file mode 100644
index 0000000..152d0c4
--- /dev/null
+++ b/web/templates/partials/claim_approved.html
@@ -0,0 +1,14 @@
+<div class="rounded-md bg-green-50 p-4">
+    <div class="flex">
+        <div class="flex-shrink-0">
+            <svg class="h-5 w-5 text-green-400" viewBox="0 0 20 20" fill="currentColor">
+                <path fill-rule="evenodd"
+                      d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"
+                      clip-rule="evenodd"/>
+            </svg>
+        </div>
+        <div class="ml-3">
+            <p class="text-sm font-medium text-green-800">Claim successfully approved</p>
+        </div>
+    </div>
+</div>
diff --git a/web/templates/partials/claim_dropped.html b/web/templates/partials/claim_dropped.html
new file mode 100644
index 0000000..c323885
--- /dev/null
+++ b/web/templates/partials/claim_dropped.html
@@ -0,0 +1,14 @@
+<div class="rounded-md bg-green-50 p-4">
+    <div class="flex">
+        <div class="flex-shrink-0">
+            <svg class="h-5 w-5 text-green-400" viewBox="0 0 20 20" fill="currentColor">
+                <path fill-rule="evenodd"
+                      d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"
+                      clip-rule="evenodd"/>
+            </svg>
+        </div>
+        <div class="ml-3">
+            <p class="text-sm font-medium text-green-800">Claim successfully dropped</p>
+        </div>
+    </div>
+</div>
diff --git a/web/templates/partials/edit_form.html b/web/templates/partials/edit_form.html
index d786c0e..46de5d9 100644
--- a/web/templates/partials/edit_form.html
+++ b/web/templates/partials/edit_form.html
@@ -1,115 +1,204 @@
 <div class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full"
      id="edit-modal"
-     x-data='{ value: {{ value|tojson }} }'>
-    <div class="relative top-20 mx-auto p-5 border w-96 shadow-lg rounded-md bg-white">
-        <div class="mt-3">
-            <h3 class="text-lg leading-6 font-medium text-gray-900">
-                Waarde wijzigen
+     x-data='{
+        value: {{ value|tojson }},
+        {% if claim_data %}
+        newValue: {{ claim_data.new_value|tojson }},
+        reason: {{ claim_data.reason|tojson }},
+        autoApprove: {{ claim_data.auto_approve|tojson }},
+        status: {{ claim_data.status|tojson }},
+        selectedHardheidsclausule: "",
+        showHardheidsclausuleInfo: false,
+        {% else %}
+        newValue: {{ value|tojson }},
+        reason: "",
+        autoApprove: false,
+        status: null,
+        selectedHardheidsclausule: "",
+        showHardheidsclausuleInfo: false,
+        {% endif %}
+        formatDate(dateStr) {
+            if (!dateStr) return "";
+            const date = new Date(dateStr);
+            return date.toISOString().split("T")[0];
+        }
+     }'>
+    <div class="relative top-20 mx-auto p-6 border w-[800px] shadow-lg rounded-lg bg-white">
+        <!-- Header -->
+        <div class="mb-6">
+            <h3 class="text-xl font-semibold text-gray-900">
+                Waarde wijzigen voor {{ key|title|replace('_', ' ') }}
             </h3>
 
-            <form class="mt-4"
-                  hx-post="/edit/update-value"
-                  hx-target="#edit-form-container"
-                  enctype="multipart/form-data">
-                <input type="hidden" name="case_id" value="{{ case_id }}">
-                <input type="hidden" name="service" value="{{ service }}">
-                <input type="hidden" name="key" value="{{ key }}">
-                <input type="hidden" name="law" value="{{ law }}">
-                <input type="hidden" name="bsn" value="{{ bsn }}">
-             <div class="mb-4">
-                    <label class="block text-sm font-medium text-gray-700">Huidige waarde</label>
-                    <template x-if="typeof value === 'boolean'">
-                        <div class="mt-1">
-                            <div class="text-gray-700 bg-gray-50 px-3 py-2 rounded-md">
-                                <span x-text="value ? 'Ja' : 'Nee'"></span>
-                            </div>
-                        </div>
-                    </template>
-                    <template x-if="typeof value === 'string' && !isNaN(Date.parse(value))">
-                        <div class="mt-1">
-                            <div class="text-gray-700 bg-gray-50 px-3 py-2 rounded-md">
-                                <span x-text="new Date(value).toLocaleDateString('nl-NL')"></span>
-                            </div>
+            {% if claim_data %}
+            <div class="mt-3 p-3 rounded-lg border flex items-center gap-2"
+                 :class="{
+                    'bg-yellow-50 border-yellow-200': status === 'PENDING',
+                    'bg-green-50 border-green-200': status === 'APPROVED',
+                    'bg-red-50 border-red-200': status === 'REJECTED'
+                 }">
+                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor"
+                     :class="{
+                        'text-yellow-700': status === 'PENDING',
+                        'text-green-700': status === 'APPROVED',
+                        'text-red-700': status === 'REJECTED'
+                     }">
+                    <path fill-rule="evenodd"
+                          d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z"
+                          clip-rule="evenodd"/>
+                </svg>
+                <p class="text-sm"
+                   :class="{
+                    'text-yellow-700': status === 'PENDING',
+                    'text-green-700': status === 'APPROVED',
+                    'text-red-700': status === 'REJECTED'
+                   }">
+                    <span class="font-medium">Let op:</span> Er bestaat al een claim voor deze waarde
+                    <span x-text="{
+                        'PENDING': '(in behandeling)',
+                        'APPROVED': '(goedgekeurd)',
+                        'REJECTED': '(ingetrokken)'
+                    }[status]"></span>.<br/>
+                    <span>Met dit formulier wijzigt u de bestaande claim en wordt deze opnieuw in behandeling genomen.</span>
+                </p>
+            </div>
+            {% endif %}
+        </div>
+
+        <form hx-post="/edit/update-value"
+              hx-target="#edit-form-container"
+              enctype="multipart/form-data">
+            <input type="hidden" name="case_id" value="{{ case_id }}">
+            <input type="hidden" name="service" value="{{ service }}">
+            <input type="hidden" name="key" value="{{ key }}">
+            <input type="hidden" name="law" value="{{ law }}">
+            <input type="hidden" name="bsn" value="{{ bsn }}">
+            <input type="hidden" name="claimant" value="{{ claimant }}">
+
+            <div class="space-y-6">
+                <!-- Current and New Value Section -->
+                <div class="grid grid-cols-2 gap-6">
+                    <!-- Current Value -->
+                    <div class="bg-gray-50 p-4 rounded-lg">
+                        <label class="block text-sm font-medium text-gray-700">Huidige waarde</label>
+                        <div class="mt-2">
+                            <template x-if="typeof value === 'boolean'">
+                                <div class="text-gray-900 font-medium">
+                                    <span x-text="value ? 'Ja' : 'Nee'"></span>
+                                </div>
+                            </template>
+                            <template x-if="typeof value === 'string' && !isNaN(Date.parse(value))">
+                                <div class="text-gray-900 font-medium">
+                                    <span x-text="new Date(value).toLocaleDateString('nl-NL')"></span>
+                                </div>
+                            </template>
+                            <template
+                                    x-if="typeof value === 'string' && isNaN(Date.parse(value)) || typeof value === 'number'">
+                                <div class="text-gray-900 font-medium">
+                                    <span x-text="value"></span>
+                                </div>
+                            </template>
                         </div>
-                    </template>
-                    <template x-if="typeof value === 'string' && isNaN(Date.parse(value)) || typeof value === 'number'">
-                        <div class="mt-1">
-                            <div class="text-gray-700 bg-gray-50 px-3 py-2 rounded-md">
-                                <span x-text="value"></span>
-                            </div>
+                    </div>
+
+                    <!-- New Value -->
+                    <div class="bg-gray-50 p-4 rounded-lg">
+                        <label for="new-value" class="block text-sm font-medium text-gray-700">Nieuwe waarde</label>
+                        <div class="mt-2">
+                            <template x-if="typeof value === 'boolean'">
+                                <select id="new-value" name="new_value"
+                                        class="block w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500"
+                                        x-model="newValue">
+                                    <option value="true">Ja</option>
+                                    <option value="false">Nee</option>
+                                </select>
+                            </template>
+                            <template x-if="typeof value === 'string' && !isNaN(Date.parse(value))">
+                                <input type="date" id="new-value" name="new_value"
+                                       class="block w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500"
+                                       x-model="newValue"
+                                       required>
+                            </template>
+                            <template x-if="typeof value === 'number'">
+                                <input type="number" id="new-value" name="new_value"
+                                       x-model="newValue"
+                                       class="block w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500"
+                                       required>
+                            </template>
+                            <template x-if="typeof value === 'string' && isNaN(Date.parse(value))">
+                                <input type="text" id="new-value" name="new_value"
+                                       x-model="newValue"
+                                       class="block w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500"
+                                       required>
+                            </template>
                         </div>
-                    </template>
+                    </div>
                 </div>
 
-                <div class="mb-4">
-                    <label for="new-value" class="block text-sm font-medium text-gray-700">Nieuwe waarde</label>
-                    <template x-if="typeof value === 'boolean'">
-                        <select id="new-value" name="new_value"
-                                class="mt-1 block w-full border-gray-300 rounded-md shadow-sm"
-                                x-bind:value="value.toString()">
-                            <option value="true">Ja</option>
-                            <option value="false">Nee</option>
-                        </select>
-                    </template>
-                    <template x-if="typeof value === 'string' && !isNaN(Date.parse(value))">
-                        <input type="date" id="new-value" name="new_value"
-                               class="mt-1 block w-full border-gray-300 rounded-md shadow-sm"
-                               x-bind:value="new Date(value).toISOString().split('T')[0]"
-                               required>
-                    </template>
-                    <template x-if="typeof value === 'number'">
-                        <input type="number" id="new-value" name="new_value"
-                               x-bind:value="value"
-                               class="mt-1 block w-full border-gray-300 rounded-md shadow-sm"
-                               required>
-                    </template>
-                    <template x-if="typeof value === 'string' && isNaN(Date.parse(value))">
-                        <input type="text" id="new-value" name="new_value"
-                               x-bind:value="value"
-                               class="mt-1 block w-full border-gray-300 rounded-md shadow-sm"
-                               required>
-                    </template>
+                <!-- Motivation -->
+                <div>
+                    <label for="reason" class="block text-sm font-medium text-gray-700 mb-2">Motivatie voor wijziging</label>
+                    <textarea id="reason" name="reason" rows="3"
+                              class="block w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500"
+                              x-model="reason"
+                              required></textarea>
                 </div>
 
-                <div class="mb-4">
-                    <label for="hardheidsclausule" class="block text-sm font-medium text-gray-700">Hardheidsclausule</label>
-                    <select id="hardheidsclausule" name="hardheidsclausule"
-                            class="mt-1 block w-full border-gray-300 rounded-md shadow-sm">
-                        <option value="">Selecteer een hardheidsclausule</option>
-                        <option value="Awb Art. 4:84">Awb Art. 4:84 - Inherente afwijkingsbevoegdheid bestuursorgaan</option>
-                        <option value="Participatiewet Art. 18">Participatiewet Art. 18 - Bijzondere bijstand</option>
-                        <option value="Wmo 2015 Art. 2.3.5">Wmo 2015 Art. 2.3.5 - Maatwerkvoorziening</option>
-                        <option value="Belastingwet Art. 63">Belastingwet Art. 63 - Hardheidsclausule Belastingen</option>
-                        <option value="Jeugdwet Art. 2.3">Jeugdwet Art. 2.3 - Maatwerkvoorziening jeugdhulp</option>
-                        <option value="Anders">Anders - Andere specifieke hardheidsclausule</option>
-                    </select>
+                <!-- Hardheidsclausule Section -->
+                <div class="bg-blue-50 p-4 rounded-lg space-y-3">
+                    <div>
+                        <p class="text-sm text-blue-800 mb-3">
+                            Een hardheidsclausule maakt het mogelijk om af te wijken van standaardregels wanneer deze tot onredelijke situaties leiden.
+                        </p>
+                    </div>
+                    <div>
+                        <label for="hardheidsclausule" class="block text-sm font-medium text-gray-700 mb-2">Selecteer een hardheidsclausule</label>
+                        <select id="hardheidsclausule" name="hardheidsclausule"
+                                class="block w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500"
+                                x-model="selectedHardheidsclausule">
+                            <option value="">Selecteer een hardheidsclausule</option>
+                            <option value="Awb Art. 4:84">Awb Art. 4:84 - Inherente afwijkingsbevoegdheid bestuursorgaan</option>
+                            <option value="Participatiewet Art. 18">Participatiewet Art. 18 - Bijzondere bijstand</option>
+                            <option value="Wmo 2015 Art. 2.3.5">Wmo 2015 Art. 2.3.5 - Maatwerkvoorziening</option>
+                            <option value="Belastingwet Art. 63">Belastingwet Art. 63 - Hardheidsclausule Belastingen</option>
+                            <option value="Jeugdwet Art. 2.3">Jeugdwet Art. 2.3 - Maatwerkvoorziening jeugdhulp</option>
+                            <option value="Anders">Anders - Andere specifieke hardheidsclausule</option>
+                        </select>
+                    </div>
                 </div>
 
-                <div class="mb-4">
-                    <label for="reason" class="block text-sm font-medium text-gray-700">Motivatie voor wijziging</label>
-                    <textarea id="reason" name="reason" rows="3"
-                              class="mt-1 block w-full border-gray-300 rounded-md shadow-sm"
-                              required></textarea>
+                <!-- Evidence Upload -->
+                <div class="border border-gray-200 rounded-lg p-4">
+                    <label for="evidence" class="block text-sm font-medium text-gray-700 mb-2">Bewijs</label>
+                    <input type="file" id="evidence" name="evidence"
+                           class="block w-full text-sm text-gray-500 file:mr-4 file:py-2 file:px-4 file:rounded-md file:border-0 file:text-sm file:font-medium file:bg-blue-50 file:text-blue-700 hover:file:bg-blue-100">
+                    <p class="mt-2 text-sm text-gray-500">Upload hier eventueel bewijsmateriaal voor de wijziging</p>
                 </div>
 
-                <div class="mb-4">
-                    <label for="evidence" class="block text-sm font-medium text-gray-700">Bewijs</label>
-                    <input type="file" id="evidence" name="evidence" class="mt-1 block w-full">
-                    <p class="mt-1 text-sm text-gray-500">Upload hier eventueel bewijsmateriaal voor de wijziging</p>
+                {% if show_approve %}
+                <div class="border-t pt-4">
+                    <label class="inline-flex items-center">
+                        <input type="checkbox" id="auto_approve" name="auto_approve"
+                               class="rounded border-gray-300 text-blue-600 focus:ring-blue-500"
+                               x-model="autoApprove">
+                        <span class="ml-2 text-sm text-gray-700">Direct goedkeuren</span>
+                    </label>
                 </div>
+                {% endif %}
 
-                <div class="flex justify-end space-x-3">
+                <!-- Buttons -->
+                <div class="flex justify-end gap-3 pt-2">
                     <button type="button"
-                            class="bg-gray-200 px-4 py-2 rounded-md text-gray-700 hover:bg-gray-300"
+                            class="px-4 py-2 rounded-md border border-gray-300 bg-white text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500"
                             @click="document.getElementById('edit-modal').remove()">
                         Annuleren
                     </button>
                     <button type="submit"
-                            class="bg-blue-600 px-4 py-2 rounded-md text-white hover:bg-blue-700">
+                            class="px-4 py-2 rounded-md bg-blue-600 text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
                         Opslaan
                     </button>
                 </div>
-            </form>
-        </div>
+            </div>
+        </form>
     </div>
 </div>
diff --git a/web/templates/partials/reject-claim-form.html b/web/templates/partials/reject-claim-form.html
new file mode 100644
index 0000000..94a49c6
--- /dev/null
+++ b/web/templates/partials/reject-claim-form.html
@@ -0,0 +1,40 @@
+<div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
+<div class="fixed inset-0 z-10 overflow-y-auto">
+   <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
+       <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pb-4 pt-5 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg sm:p-6">
+           <div class="mt-3 text-center sm:mt-5">
+               <h3 class="text-base font-semibold leading-6 text-gray-900">Claim Afwijzen</h3>
+               <div class="mt-2">
+                   <p class="text-sm text-gray-500">Geef een reden voor het afwijzen van deze claim.</p>
+               </div>
+           </div>
+           <form hx-post="/edit/reject-claim" hx-target="#edit-form-container" class="mt-5 sm:mt-6">
+               <input type="hidden" name="claim_id" value="{{ claim_id }}">
+               <div class="mt-2">
+                   <textarea
+                           name="reason"
+                           rows="3"
+                           class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
+                           placeholder="Voer reden voor afwijzing in"
+                           required
+                   ></textarea>
+               </div>
+               <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2 sm:gap-3">
+                   <button
+                           type="submit"
+                           class="inline-flex w-full justify-center rounded-md bg-red-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-red-500 sm:col-start-2"
+                   >
+                       Afwijzen
+                   </button>
+                   <button
+                           type="button"
+                           class="mt-3 inline-flex w-full justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:col-start-1 sm:mt-0"
+                           onclick="document.getElementById('edit-form-container').innerHTML = ''"
+                   >
+                       Annuleren
+                   </button>
+               </div>
+           </form>
+       </div>
+   </div>
+</div>
diff --git a/web/templates/partials/tiles/components/explanation_panel.html b/web/templates/partials/tiles/components/explanation_panel.html
index bfeb001..c49a1a4 100644
--- a/web/templates/partials/tiles/components/explanation_panel.html
+++ b/web/templates/partials/tiles/components/explanation_panel.html
@@ -75,7 +75,7 @@ <h4 class="font-medium text-gray-900">Uitkomst</h4>
 
         <h4 class="font-medium text-gray-900">Gebruikte gegevens</h4>
         <div class="max-w-7xl mx-auto">
-            {{ render_path(path, current_case.id|string, service, law, bsn) }}
+            {{ render_path(path, current_case.id|string, service, law, bsn, claim_map, show_approve=False, claimant="CITIZEN") }}
         </div>
 
         <!-- Collapsible Technical Section -->