diff --git a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectDescriptionContacts.java b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectDescriptionContacts.java
index 5214ca5..eaa335d 100644
--- a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectDescriptionContacts.java
+++ b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectDescriptionContacts.java
@@ -29,7 +29,7 @@ import javax.ws.rs.core.Response;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
-@Path(MvcAuthoringSteps.PATH_PREFIX + "sciproject-description/contacts")
+@Path(MvcAuthoringSteps.PATH_PREFIX + "sciproject-description-contacts")
 public class SciProjectDescriptionContacts {
 
     @Inject
diff --git a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectDescriptionStep.java b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectDescriptionStep.java
index 1b0d502..d35d984 100644
--- a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectDescriptionStep.java
+++ b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectDescriptionStep.java
@@ -461,7 +461,7 @@ public class SciProjectDescriptionStep extends AbstractMvcAuthoringStep {
     }
 
     @POST
-    @Path("/contacts/remove")
+    @Path("/contacts/{contactId}/remove")
     @Transactional(Transactional.TxType.REQUIRED)
     @AuthorizationRequired
     public String removeContact(
@@ -469,7 +469,7 @@ public class SciProjectDescriptionStep extends AbstractMvcAuthoringStep {
         final String sectionIdentifier,
         @PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
         final String documentPath,
-        @FormParam("contactId")
+        @PathParam("contactId")
         final String contactId
     ) {
         try {
diff --git a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/sciproject-description.xhtml b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/sciproject-description.xhtml
index 1e8258a..664eef9 100644
--- a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/sciproject-description.xhtml
+++ b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/sciproject-description.xhtml
@@ -66,6 +66,7 @@
                 assetPickerId="contacts-picker"
                 baseUrl="#{SciProjectDescriptionContacts.baseUrl}"
                 contentSection="#{ContentSectionModel.sectionName}"
+                dialogTitle="#{SciProjectMessageBundle['contact.add.title']}"
                 formParamName="contactableUuid">
                 <bootstrap:formGroupText 
                     help="#{SciProjectMessageBundle['contacts.type.help']}"
@@ -94,7 +95,7 @@
                 </c:when>
                 <c:otherwise>
                     <table id="sciproject-contacts-table"
-                           data-saveUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@sciproject-description/contacts/save-order">
+                           data-saveUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@sciproject-description-contacts/save-order">
                         <thead>
                             <tr>
                                 <th scope="col">#{SciProjectMessageBundle['contacts.cols.contactable']}</th>
@@ -124,21 +125,23 @@
                                     <td>
                                         <button class="btn btn-secondary"
                                                 data-toggle="modal"
-                                                data-target="#contact-edit-dialog"
+                                                data-target="#contact-edit-dialog-#{contact.contactId}"
                                                 type="button">
                                             <bootstrap:svgIcon icon="pen" />
                                             <span>#{SciProjectMessageBundle['contacts.edit.label']}</span>
                                         </button>
                                         <div aria-hidden="true"
-                                             aria-labelledby="contact-edit-dialog-title"
+                                             aria-labelledby="contact-edit-dialog-#{contact.contactId}-title"
                                              class="modal fade"
-                                             id="contact-edit-dialog"
+                                             id="contact-edit-dialog-#{contact.contactId}"
                                              tabindex="-1">
                                             <div class="modal-dialog">
-                                                <form class="modal-content">
+                                                <form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@sciproject-description/contacts/edit/#{contact.contactId}"
+                                                    class="modal-content"
+                                                      method="post">
                                                     <div class="modal-header">
                                                         <h4 class="modal-title"
-                                                            id="contact-edit-dialog-title">
+                                                            id="contact-edit-dialog-#{contact.contactId}-title">
                                                             #{SciProjectMessageBundle['contacts.edit.title']}
                                                         </h4>
                                                         <button 
@@ -155,7 +158,7 @@
                                                             inputId="type-edit"
                                                             label="#{SciProjectMessageBundle['contacts.edit.type.label']}"
                                                             name="type"
-
+                                                            value="#{contact.contactType}"
                                                             />
                                                     </div>
                                                     <div class="modal-footer">
@@ -175,14 +178,14 @@
                                     </td>
                                     <td>
                                         <libreccm:deleteDialog
-                                            actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@sciproject-description/contacts/remove/#{contact.contactId}"
+                                            actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@sciproject-description/contacts/#{contact.contactId}/remove"
                                             buttonText="#{SciProjectMessageBundle['contacts.delete.label']}"
                                             cancelLabel="#{SciProjectMessageBundle['contacts.delete.cancel']}"
                                             confirmLabel="#{SciProjectMessageBundle['contacts.delete.confirm']}"
-                                            dialogId="contact-delete-dialog"
+                                            dialogId="contact-delete-dialog-#{contact.contactId}"
                                             dialogTitle="#{SciProjectMessageBundle['contacts.delete.title']}"
                                             message="#{SciProjectMessageBundle.getMessage('contacts.delete.message', [contact.contactable, contact.contactType])}"
-
+                                            
                                             />
                                     </td>
                                 </tr>
diff --git a/sci-types-project/src/main/resources/org/scientificcms/contenttypes/sciproject/ui/SciProjectBundle.properties b/sci-types-project/src/main/resources/org/scientificcms/contenttypes/sciproject/ui/SciProjectBundle.properties
index 1f2f0b5..b4e7dce 100644
--- a/sci-types-project/src/main/resources/org/scientificcms/contenttypes/sciproject/ui/SciProjectBundle.properties
+++ b/sci-types-project/src/main/resources/org/scientificcms/contenttypes/sciproject/ui/SciProjectBundle.properties
@@ -79,11 +79,11 @@ contacts.cols.contactable=Contact
 contacts.cols.type=Type
 contacts.cols.actions=Actions
 contacts.edit.label=Edit
-contacts.edit.title=Add a contact
+contacts.edit.title=Edit contact
 contacts.edit.cancel=Cancel
 contacts.edit.type.help=The type of the contact.
 contacts.edit.type.label=Type
-contacts.edit.submit=Add
+contacts.edit.submit=Save
 contacts.delete.label=Remove
 contacts.delete.cancel=Cancel
 contacts.delete.confirm=Remove
@@ -177,3 +177,4 @@ contacts.order.save.inprogress=Saving...
 contacts.order.save=Save order
 contacts.sort.errors.general=Error sorting contacts.
 contacts.sort.errors.save=Failed to save contacts order.
+contact.add.title=Add contact
diff --git a/sci-types-project/src/main/resources/org/scientificcms/contenttypes/sciproject/ui/SciProjectBundle_de.properties b/sci-types-project/src/main/resources/org/scientificcms/contenttypes/sciproject/ui/SciProjectBundle_de.properties
index 85c398d..c863f79 100644
--- a/sci-types-project/src/main/resources/org/scientificcms/contenttypes/sciproject/ui/SciProjectBundle_de.properties
+++ b/sci-types-project/src/main/resources/org/scientificcms/contenttypes/sciproject/ui/SciProjectBundle_de.properties
@@ -79,11 +79,11 @@ contacts.cols.contactable=Kontakt
 contacts.cols.type=Typ
 contacts.cols.actions=Aktionen
 contacts.edit.label=Bearbeiten
-contacts.edit.title=Kontakt hinzuf\u00fcgen
+contacts.edit.title=Kontakt bearbeiten
 contacts.edit.cancel=Abbrechen
 contacts.edit.type.help=Der Typ des Kontaktes.
 contacts.edit.type.label=Typ
-contacts.edit.submit=Hinzuf\u00fcgen
+contacts.edit.submit=Speichern
 contacts.delete.label=Entfernen
 contacts.delete.cancel=Abbrechen
 contacts.delete.confirm=Entfernen
@@ -177,3 +177,4 @@ contacts.order.save.inprogress=Speichern...
 contacts.order.save=Sortierung speichern
 contacts.sort.errors.general=Fehler f\u00fcr Sortierung der Kontakte.
 contacts.sort.errors.save=Fehler beim Speichern der Sortierung der Kontakte.
+contact.add.title=Kontakt hinzuf\u00fcgen