diff --git a/api/src/Controller/DashboardController.php b/api/src/Controller/DashboardController.php
index 845fdd80..ad191451 100644
--- a/api/src/Controller/DashboardController.php
+++ b/api/src/Controller/DashboardController.php
@@ -85,7 +85,17 @@ public function notificationsAction(Session $session, Request $request, CommonGr
     public function claimsAction(Session $session, Request $request, CommonGroundService $commonGroundService, ApplicationService $applicationService, ParameterBagInterface $params, string $slug = 'home')
     {
         $variables = [];
-        $variables['claims'] = $commonGroundService->getResourceList('https://dev.zuid-drecht.nl/api/v1/wac/claims')['hydra:member']; //['component' => 'wac', 'type' => 'claims'], ['person' => $this->getUser()->getPerson(), 'order[dateCreated]' => 'desc']
+        $variables['claims'] = $commonGroundService->getResourceList(['component' => 'wac', 'type' => 'claims'], ['person' => $this->getUser()->getPerson(), 'order[dateCreated]' => 'desc'])['hydra:member'];
+
+        if ($request->isMethod('POST')) {
+            $resource = $request->request->all();
+
+            $resource['person'] = $this->getUser()->getPerson();
+
+            $commonGroundService->saveResource($resource, (['component' => 'wac', 'type' => 'claims']));
+
+            return $this->redirect($this->generateUrl('app_dashboard_claims'));
+        }
 
         return $variables;
     }
@@ -97,7 +107,7 @@ public function claimsAction(Session $session, Request $request, CommonGroundSer
     public function contractsAction(Session $session, Request $request, CommonGroundService $commonGroundService, ApplicationService $applicationService, ParameterBagInterface $params, string $slug = 'home')
     {
         $variables = [];
-        $variables['contracts'] = $commonGroundService->getResourceList('https://dev.zuid-drecht.nl/api/v1/wac/contracts')['hydra:member']; //['component' => 'wac', 'type' => 'contracts'], ['person' => $this->getUser()->getPerson(), 'order[dateCreated]' => 'desc']
+        $variables['contracts'] = $commonGroundService->getResourceList(['component' => 'wac', 'type' => 'contracts'], ['person' => $this->getUser()->getPerson(), 'order[dateCreated]' => 'desc'])['hydra:member'];
 
         return $variables;
     }
diff --git a/api/templates/dashboard/claims.html.twig b/api/templates/dashboard/claims.html.twig
index cb26d6c5..5451f8d7 100644
--- a/api/templates/dashboard/claims.html.twig
+++ b/api/templates/dashboard/claims.html.twig
@@ -65,7 +65,7 @@
                                                 </small>
 
                                             </div>
-                                            <div class="col-auto">
+                                            <div class="col-auto mr-n5">
 
                                                 <!-- Button -->
                                                 <a class="btn btn-xs btn-primary" href="pricing.html">
@@ -73,6 +73,23 @@
                                                 </a>
 
                                             </div>
+
+                                            <div class="col-auto">
+
+                                                <!-- Dropdown -->
+                                                <div class="dropdown">
+                                                    <a class="text-gray-400 text-decoration-none" data-toggle="dropdown" href="#" aria-expanded="false">
+                                                        <i class="fe fe-more-vertical"></i>
+                                                    </a>
+                                                    <div class="dropdown-menu" style="">
+                                                        <a class="dropdown-item" href="#">{{ 'view contracts'|trans|capitalize }}</a>
+                                                        <a class="dropdown-item" href="#">{{ 'view dossier'|trans|capitalize }}</a>
+                                                        <a class="dropdown-item" href="#">{{ 'view usage2'|trans|capitalize }}</a>
+                                                        <a class="dropdown-item" href="#" style="color: red">{{ 'delete data'|trans|capitalize }}</a>
+                                                    </div>
+                                                </div>
+
+                                            </div>
                                         </div>
 
                                         {% if claim.proofs is defined and claim.proofs is not empty %}
@@ -139,5 +156,5 @@
         </div> <!-- / .row -->
     </div> <!-- / .container -->
 
-    {% include 'dashboard/modals/claim_modal.html.twig' %}
+    {% include 'dashboard/modals/add_claim_modal.html.twig' %}
 {% endblock %}
diff --git a/api/templates/dashboard/modals/add_claim_modal.html.twig b/api/templates/dashboard/modals/add_claim_modal.html.twig
new file mode 100644
index 00000000..c91c0ecb
--- /dev/null
+++ b/api/templates/dashboard/modals/add_claim_modal.html.twig
@@ -0,0 +1,101 @@
+<!-- modals -->
+<div class="modal fade" id="modalClaim" tabindex="-1" role="dialog" aria-labelledby="modalPaymentTitle" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-body">
+                <!-- Close -->
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                </button>
+
+                <!-- Heading -->
+                <h2 class="font-weight-bold text-center mb-1" id="modalPaymentTitle">
+                    {{ 'load data'|trans|capitalize }}
+                </h2>
+                <!-- Form -->
+                <form method="post" action="{{ path('app_dashboard_claims') }}" enctype="multipart/form-data" style="padding-top: 1rem">
+                    <!-- Name -->
+                    <div class="form-group">
+                        <!-- Select -->
+                        <select class="custom-select custom-select-xs" data-choices>
+                            <option value="" disabled selected hidden>{{ 'Where do you want to retrieve your data from?'|trans }}</option>
+                            <option>Github</option>
+                            <option>Facebook</option>
+                            <option>Gmail</option>
+                            <option>Idin</option>
+                        </select>
+                    </div>
+                    <!-- Submit -->
+                    <button class="btn btn-block btn-primary mt-3 lift">
+                        {{ 'retrieve data'|trans }}
+                    </button>
+                </form>
+
+                <div style="padding-top: 2rem"></div>
+
+                <!-- Heading -->
+                <h2 class="font-weight-bold text-center mb-1" id="modalPaymentTitle">
+                    {{ 'add manually'|trans|capitalize }}
+                </h2>
+                <!-- Form -->
+                <form method="post" action="{{ path('app_dashboard_claims') }}" enctype="multipart/form-data" style="padding-top: 1rem">
+                    <!-- Select -->
+                    <select class="custom-select custom-select-xs" data-choices onchange="handleSelect()" id="addManuallySelect">
+                        <option value="" disabled selected hidden>{{ 'What data do you want to add manually?'|trans }}</option>
+                        <option value="email">{{ 'email'|trans|capitalize }}</option>
+                        <option value="name">{{ 'name'|trans|capitalize }}</option>
+                        <option value="phoneNumber">{{ 'phone number'|trans|capitalize }}</option>
+                    </select>
+
+                    <!-- Hidden input for property -->
+                    <input type="hidden" value="X" name="property" id="property">
+
+                    <!-- Input -->
+                    <div class="form-group">
+                        <input required disabled class="form-control" name="data[email]" id="email" type="hidden" placeholder="{{ 'email'|trans|capitalize }}">
+                        <input required disabled class="form-control" name="data[name]" id="name" type="hidden" placeholder="{{ 'name'|trans|capitalize }}">
+                        <input required disabled class="form-control" name="data[phoneNumber]" id="phoneNumber" type="hidden" placeholder="{{ 'phone number'|trans|capitalize }}">
+                    </div>
+                    <!-- Submit -->
+                    <button class="btn btn-block btn-primary mt-3 lift">
+                        {{ 'add'|trans }}
+                    </button>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    function handleSelect() {
+        let property_input = document.getElementById("property");
+        let select_element = document.getElementById("addManuallySelect");
+        let email_input = document.getElementById("email");
+        let name_input = document.getElementById("name");
+        let phoneNumber_input = document.getElementById("phoneNumber");
+
+        email_input.type = 'hidden';
+        email_input.disabled = true;
+        name_input.type = 'hidden';
+        name_input.disabled = true;
+        phoneNumber_input.type = 'hidden';
+        phoneNumber_input.disabled = true;
+
+        property_input.value = select_element.innerText;
+        let selected_value = select_element.value;
+        switch (selected_value) {
+            case 'email':
+                email_input.type = 'email';
+                email_input.disabled = false;
+                break;
+            case 'name':
+                name_input.type = 'text';
+                name_input.disabled = false;
+                break;
+            case 'phoneNumber':
+                phoneNumber_input.type = 'tel';
+                phoneNumber_input.disabled = false;
+                break;
+        }
+    }
+</script>
diff --git a/api/templates/dashboard/modals/claim_modal.html.twig b/api/templates/dashboard/modals/claim_modal.html.twig
deleted file mode 100644
index d7ba15a6..00000000
--- a/api/templates/dashboard/modals/claim_modal.html.twig
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- modals -->
-<div class="modal fade" id="modalClaim" tabindex="-1" role="dialog" aria-labelledby="modalPaymentTitle" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered" role="document">
-        <div class="modal-content">
-            <div class="modal-body">
-                <!-- Close -->
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">×</span>
-                </button>
-
-                <!-- Heading -->
-                <h2 class="font-weight-bold text-center mb-1" id="modalPaymentTitle">
-                    {{ 'load data'|trans|capitalize }}
-                </h2>
-                <!-- Form -->
-                <form method="post" action="{{ path('app_dashboard_claims') }}" enctype="multipart/form-data">
-                    <!-- Name -->
-                    <div class="form-group">
-                        <!-- Select -->
-                        <select class="custom-select custom-select-xs" data-choices>
-                            <option value="" disabled selected hidden>Please Choose...</option>
-                            <option>github</option>
-                            <option>facebook</option>
-                            <option>gmail</option>
-                            <option>idin</option>
-                        </select>
-                    </div>
-                    <!-- Submit -->
-                    <button class="btn btn-block btn-primary mt-3 lift">
-                        {{ 'retrieve data'|trans }}
-                    </button>
-                </form>
-
-                <div style="padding-top: 2rem"></div>
-
-                <!-- Heading -->
-                <h2 class="font-weight-bold text-center mb-1" id="modalPaymentTitle">
-                    {{ 'add manually'|trans|capitalize }}
-                </h2>
-                <!-- Form -->
-                <form method="post" action="{{ path('app_dashboard_claims') }}" enctype="multipart/form-data">
-                    <!-- Select -->
-                    <select class="custom-select custom-select-xs" data-choices>
-                        <option value="" disabled selected hidden>Please Choose...</option>
-                        <option>naam</option>
-                        <option>email</option>
-                        <option>telefoonnummer</option>
-                    </select>
-
-                    <!-- Input -->
-                    <div class="form-group">
-                        <label for="name">{{ 'name'|trans|capitalize }} <span style="color: red; font-weight: bold">*</span></label>
-                        <input required class="form-control" name="name" id="name" type="text" placeholder="{{ 'name'|trans|capitalize }}">
-                    </div>
-                    <!-- Submit -->
-                    <button class="btn btn-block btn-primary mt-3 lift">
-                        {{ 'retrieve data'|trans }}
-                    </button>
-                </form>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/api/translations/messages.nl.xlf b/api/translations/messages.nl.xlf
index 836283c5..99c1d628 100644
--- a/api/translations/messages.nl.xlf
+++ b/api/translations/messages.nl.xlf
@@ -135,13 +135,53 @@
       </trans-unit>
       <trans-unit id="ckvw2St" resname="no claims available">
         <source>no claims available</source>
-        <target>__no claims available</target>
+        <target>geen claims beschikbaar</target>
       </trans-unit>
-      <trans-unit id="sJTbfOL" resname="contracts">
+      <trans-unit id="kQhOIIO" resname="add data">
+        <source>add data</source>
+        <target>gegevens toevoegen</target>
+      </trans-unit>
+      <trans-unit id="y4X9zxh" resname="load data">
+        <source>load data</source>
+        <target>gegevens inladen</target>
+      </trans-unit>
+      <trans-unit id="N1Rob-5" resname="retrieve data">
+        <source>retrieve data</source>
+        <target>gegevens ophalen</target>
+      </trans-unit>
+      <trans-unit id="157YQhT" resname="delete data">
+        <source>delete data</source>
+        <target>gegevens verwijderen</target>
+      </trans-unit>
+      <trans-unit id="Vnyb4vp" resname="Where do you want to retrieve your data from?">
+        <source>Where do you want to retrieve your data from?</source>
+        <target>Waar wilt u uw gegevens van ophalen?</target>
+      </trans-unit>
+      <trans-unit id="Duaa9Kh" resname="add data">
+        <source>add data</source>
+        <target>gegevens toevoegen</target>
+      </trans-unit>
+      <trans-unit id="pJeH-8r" resname="What data do you want to add manually?">
+        <source>What data do you want to add manually?</source>
+        <target>Welke gegevens wilt u handmatig toevoegen?</target>
+      </trans-unit>
+      <trans-unit id="IDtLYtj" resname="add manually">
+        <source>add manually</source>
+        <target>handmatig toevoegen</target>
+      </trans-unit>
+      <trans-unit id="9FjPhPy" resname="contracts">
         <source>contracts</source>
         <target>contracten</target>
       </trans-unit>
-      <trans-unit id="00d6zUr" resname="no contracts available">
+      <trans-unit id="KaZuFG1" resname="view contracts">
+        <source>view contracts</source>
+        <target>contracten bekijken</target>
+      </trans-unit>
+      <trans-unit id="_DH4cHH" resname="view dossier">
+        <source>view dossier</source>
+        <target>dossier bekijken</target>
+      </trans-unit>
+      <trans-unit id="WCt473o" resname="no contracts available">
         <source>no contracts available</source>
         <target>geen contracten beschikbaar</target>
       </trans-unit>
@@ -193,7 +233,11 @@
         <source>view usage</source>
         <target>gebruik inzien</target>
       </trans-unit>
-      <trans-unit id="dnWT04R" resname="end contract">
+      <trans-unit id="bhyArLN" resname="view usage2">
+        <source>view usage</source>
+        <target>gebruik bekijken</target>
+      </trans-unit>
+      <trans-unit id="mTPq2tC" resname="end contract">
         <source>end contract</source>
         <target>contract beëindigen</target>
       </trans-unit>
@@ -1523,7 +1567,7 @@
       </trans-unit>
       <trans-unit id="lFniS0w" resname="checkins">
         <source>checkins</source>
-        <target>__checkins</target>
+        <target>checkins</target>
       </trans-unit>
       <trans-unit id="pMxrwBq" resname="privacy">
         <source>privacy</source>
@@ -1663,11 +1707,11 @@
       </trans-unit>
       <trans-unit id="rLIFg9y" resname="no organizations">
         <source>no organizations</source>
-        <target>__no organizations</target>
+        <target>geen organisaties</target>
       </trans-unit>
       <trans-unit id="h1uTgIZ" resname="development">
         <source>development</source>
-        <target>__development</target>
+        <target>ontwikkeling</target>
       </trans-unit>
       <trans-unit id="rZXV_mU" resname="free">
         <source>free</source>