diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsPropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsPropertiesStep.java
index f27dc31..9966ae5 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsPropertiesStep.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsPropertiesStep.java
@@ -424,7 +424,7 @@ public class InProceedingsPropertiesStep
                     getPublication().getProceedings()
                 );
             }
-            
+
             return buildRedirectPathForStep();
         } else {
             return documentUi.showAccessDenied(
@@ -434,24 +434,24 @@ public class InProceedingsPropertiesStep
             );
         }
     }
-    
+
     @POST
     @Path("/properties")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String updateProperties(
-         @PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
+        @PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
         final String sectionIdentifier,
         @PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
         final String documentPath,
         @FormParam("yearOfPublication")
         final String yearOfPublicationParam,
-               @FormParam("startPage")
+        @FormParam("startPage")
         final String startPageParam,
         @FormParam("endPage")
         final String endPageParam
     ) {
-         try {
+        try {
             init();
         } catch (ContentSectionNotFoundException ex) {
             return ex.showErrorMessage();
@@ -465,7 +465,7 @@ public class InProceedingsPropertiesStep
                 documentPath,
                 yearOfPublicationParam
             );
-            
+
             if (endPageParam.matches("\\d*")) {
                 getPublication().setEndPage(
                     Integer.parseInt(endPageParam)
@@ -487,8 +487,8 @@ public class InProceedingsPropertiesStep
             );
         }
     }
-    
-      private String showProceedingsNotFound(
+
+    private String showProceedingsNotFound(
         final String sectionIdentifier,
         final String documentPath,
         final String proceedingsIdentifier
@@ -497,5 +497,4 @@ public class InProceedingsPropertiesStep
         return showStep(sectionIdentifier, documentPath);
     }
 
-
 }
diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsPropertiesStepModel.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsPropertiesStepModel.java
index 47a2f22..da50579 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsPropertiesStepModel.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsPropertiesStepModel.java
@@ -1,5 +1,7 @@
 package org.scientificcms.publications.ui.contenttypes;
 
+import org.scientificcms.publications.Proceedings;
+
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
 
@@ -24,6 +26,10 @@ public class InProceedingsPropertiesStepModel {
     public void setProceedingsTitle(final String proceedingsTitle) {
         this.proceedingsTitle = proceedingsTitle;
     }
+    
+    public String getProceedingsType() {
+        return Proceedings.class.getName();
+    }
 
     public Integer getStartPage() {
         return startPage;
diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsItemCreateStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsItemCreateStep.java
index 9ed3360..a74bd45 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsItemCreateStep.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsItemCreateStep.java
@@ -13,7 +13,7 @@ import javax.inject.Named;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
-@Named("SciCmsProceedingsItemCreateStep")
+@Named("SciPublicationsProceedingsItemCreateStep")
 public class ProceedingsItemCreateStep 
 extends AbstractPublicationWithPublisherItemCreateStep<ProceedingsItem, Proceedings>{
     
diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsPropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsPropertiesStep.java
index c4c3179..b2b0784 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsPropertiesStep.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsPropertiesStep.java
@@ -9,7 +9,6 @@ import org.librecms.contentsection.Asset;
 import org.librecms.contentsection.AssetRepository;
 import org.librecms.ui.contentsections.ContentSectionNotFoundException;
 import org.librecms.ui.contentsections.ItemPermissionChecker;
-import org.librecms.ui.contentsections.assets.OrganizationEditStep;
 import org.librecms.ui.contentsections.documents.DocumentNotFoundException;
 import org.librecms.ui.contentsections.documents.DocumentUi;
 import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef;
@@ -18,7 +17,6 @@ import org.scientificcms.publications.InProceedings;
 import org.scientificcms.publications.Proceedings;
 import org.scientificcms.publications.ProceedingsManager;
 import org.scientificcms.publications.PublicationRepository;
-import org.scientificcms.publications.assets.PublisherAsset;
 import org.scientificcms.publications.contenttypes.ProceedingsItem;
 import org.scientificcms.publications.ui.SciPublicationsUiConstants;
 import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle;
@@ -146,6 +144,12 @@ public class ProceedingsPropertiesStep
                 .map(organizer -> organizer.getName())
                 .orElse(null)
         );
+        propertiesStepModel.setOrganizerUuid(
+            Optional
+                .ofNullable(getPublication().getOrganizer())
+                .map(organizer -> organizer.getUuid())
+                .orElse(null)
+        );
         propertiesStepModel.setPlaceOfConference(
             getPublication().getPlaceOfConference()
         );
diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsPropertiesStepModel.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsPropertiesStepModel.java
index 114ac42..d2df7d7 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsPropertiesStepModel.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsPropertiesStepModel.java
@@ -1,5 +1,6 @@
 package org.scientificcms.publications.ui.contenttypes;
 
+import org.librecms.assets.Organization;
 import org.scientificcms.publications.InProceedings;
 
 import java.util.ArrayList;
@@ -14,7 +15,7 @@ import javax.inject.Named;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
-@Named("SciCmsProceedingsStepModel")
+@Named("SciCmsProceedingsPropertiesStepModel")
 public class ProceedingsPropertiesStepModel {
 
     private String nameOfConference;
@@ -27,6 +28,8 @@ public class ProceedingsPropertiesStepModel {
 
     private String organizer;
 
+    private String organizerUuid;
+
     private List<InProcedingsRow> inProceedings;
 
     public String getInProceedingsType() {
@@ -73,6 +76,18 @@ public class ProceedingsPropertiesStepModel {
         this.organizer = organizer;
     }
 
+    public String getOrganizerUuid() {
+        return organizerUuid;
+    }
+
+    public void setOrganizerUuid(final String organizerUuid) {
+        this.organizerUuid = organizerUuid;
+    }
+
+    public String getOrganizerType() {
+        return Organization.class.getName();
+    }
+
     public List<InProcedingsRow> getInProceedings() {
         return Collections.unmodifiableList(inProceedings);
     }
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/create-inproceedings.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/create-inproceedings.xhtml
new file mode 100644
index 0000000..4484e4a
--- /dev/null
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/create-inproceedings.xhtml
@@ -0,0 +1,47 @@
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/scientificcms/contenttypes/ui/create-publication.xhtml">
+    
+        <ui:param name="availableLocales"
+                  value="#{SciPublicationsInProceedingsCreateStep.availableLocales}" />
+        
+        <ui:param name="availableWorkflows"
+                  value="#{SciPublicationsInProceedingsCreateStep.availableWorkflows}" />
+        
+        <ui:param name="contentSection"
+                  value="#{SciPublicationsInProceedingsCreateStep.contentSectionLabel}" />
+        
+        <ui:param name="createFormSubmitLabel"
+                  value="#{SciPublicationsUiMessageBundle['inproceedings.createform.submit']}" />
+        
+        <ui:param name="documentType"
+                  value="#{SciPublicationsInProceedingsCreateStep.documentType}" />
+        
+        <ui:param name="folderPath"
+                  value="#{SciPublicationsInProceedingsCreateStep.folderPath}" />
+        
+        <ui:param name="initialLocale"
+                  value="#{SciPublicationsInProceedingsCreateStep.initialLocale}" />
+        
+        <ui:param name="messages" 
+                  value="#{SciPublicationsInProceedingsCreateStep.messages}" />
+        
+        <ui:param name="nameValue"
+                  value="#{SciPublicationsInProceedingsCreateStep.name}" />
+        
+        <ui:param name="publicationCreateStepTitle"
+                  value="#{SciPublicationsUiMessageBundle['inproceedings.createform.title']}" />
+        
+        <ui:param name="selectedWorkflow"
+                  value="#{SciPublicationsInProceedingsCreateStep.selectedWorkflow}" />
+        
+        <ui:param name="title"
+                  value="#{SciPublicationsInProceedingsCreateStep.title}" />
+        
+    </ui:composition>
+</html>
+
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-extended-properties.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-extended-properties.xhtml
new file mode 100644
index 0000000..c8fc14d
--- /dev/null
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-extended-properties.xhtml
@@ -0,0 +1,34 @@
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
+      xmlns:librecms="http://xmlns.jcp.org/jsf/composite/components/librecms"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication-extented-properties.xhtml">
+
+        <ui:param name="authoringStep" 
+                  value="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@inproceedings-extendedproperties" />
+
+        <ui:param name="authoringStepTitle"
+                  value="#{SciPublicationsUiMessageBundle.getMessage('inproceedings.extendedproperties.header', [CmsSelectedDocumentModel.itemName])}" />
+
+        <ui:param name="editStepUrlFragement" 
+                  value="inproceedings-extendedproperties" />
+
+        <ui:define name="publicationExtendedPropertiesList">
+
+        </ui:define>
+
+        <ui:define name="publicationExtendedPropertiesFormElements">
+
+        </ui:define>
+
+        <ui:define name="publicationExtendedPropertiesWidgets">
+
+        </ui:define>        
+
+
+    </ui:composition>
+</html>
+
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-inproceedings.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-inproceedings.xhtml
new file mode 100644
index 0000000..f6ab424
--- /dev/null
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-inproceedings.xhtml
@@ -0,0 +1,102 @@
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
+      xmlns:librecms="http://xmlns.jcp.org/jsf/composite/components/librecms"
+      xmlns:scicms="http://xmlns.jcp.org/jsf/composite/components/scicms"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication.xhtml">
+
+        <ui:param name="authoringStep" 
+                  value="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@inproceedings-basicproperties" />
+
+        <ui:param name="authoringStepTitle"
+                  value="#{SciPublicationsUiMessageBundle.getMessage('inproceedings.basicproperties.header', [SciCmsPublicationPropertiesStepModel.name])}" />
+
+        <ui:define name="publicationBasicPropertiesForm">
+
+            <bootstrap:formGroupNumber 
+                help="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.startpage.help']}"
+                inputId="start-page"
+                label="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.startpage.label']}"
+                name="startPage"
+                value="#{SciCmsInProceedingsPropertiesStepModel.startPage}"
+                />
+
+            <bootstrap:formGroupNumber 
+                help="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.endpage.help']}"
+                inputId="end-page"
+                label="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.endpage.label']}"
+                name="endPage"
+                value="#{SciCmsInProceedingsPropertiesStepModel.endPage}"
+                />
+
+        </ui:define>
+
+        <ui:define name="publicationBasicPropertiesDl">
+            <div>
+                <dt>#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.startpage.label']}</dt>
+                <dd>#{SciCmsInProceedingsPropertiesStepModel.startPage}</dd>
+            </div>
+            <div>
+                <dt>#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.endpage.label']}</dt>
+                <dd>#{SciCmsInProceedingsPropertiesStepModel.endPage}</dd>
+            </div>
+        </ui:define>
+
+        <ui:define name="publicationProperties">
+
+            <h3 class="mt-5">#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings']}</h3>
+
+            <c:if test="#{CmsSelectedDocumentModel.canEdit}">
+                <div class="mb-2">
+                    <div class="text-right">
+                        <scicms:publicationPickerButton
+                            publicationPickerId="proceedings-picker"
+                            buttonIcon="pen"
+                            buttonText="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.set.label']}"
+                            />
+                    </div>
+                </div>
+                <scicms:publicationPicker
+                    actionUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@inproceedings-basicproperties/proceedings"
+                    baseUrl="#{SciCmsPublicationPropertiesStepModel.baseUrl}"
+                    contentSection="#{ContentSectionModel.sectionName}"
+                    formParamName="proceedingsIdentifier"
+                    publicationPickerId="proceedings-picker"
+                    publicationType="#{SciCmsInProceedingsPropertiesStepModel.proceedingsType}"
+                    />
+            </c:if>
+
+            <c:choose>
+                <c:when test="#{SciCmsInProceedingsPropertiesStepModel.proceedingsTitle == null}">
+                    <p>#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.none']}</p>
+                </c:when>
+                <c:otherwise>
+                    <p>
+                        #{SciCmsInProceedingsPropertiesStepModel.proceedingsTitle}
+                    </p>
+                </c:otherwise>
+                <c:if test="#{CmsSelectedDocumentModel.canEdit and SciCmsInProceedingsPropertiesStepModel.proceedingsTitle == null}">
+                    <libreccm:deleteDialog
+                        actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@inproceedings-basicproperties/proceedings/remove"
+                        buttonText="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.remove']}"
+                        cancelLabel="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.remove.cancel']}"
+                        confirmLabel="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.remove.confirm']}"
+                        dialogId="remove-proceedings-dialog"
+                        dialogTitle="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.remove.title']}"
+                        message="#{SciPublicationsUiMessageBundle.getMessage('inproceedings.basicproperties.proceedings.remove.message', [CmsSelectedDocumentModel.name, SciCmsInProceedingsPropertiesStepModel.proceedingsTitle])}"
+                        />
+                </c:if>
+            </c:choose>
+
+        </ui:define>
+
+        <ui:define name="publicationScripts">
+            <script src="#{request.contextPath}/assets/@scipublications/publication-picker.js" />
+        </ui:define>
+
+    </ui:composition>
+
+</html>
\ No newline at end of file
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/proceedings/create-proceedings.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/proceedings/create-proceedings.xhtml
new file mode 100644
index 0000000..c7f3dfc
--- /dev/null
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/proceedings/create-proceedings.xhtml
@@ -0,0 +1,46 @@
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/scientificcms/contenttypes/ui/create-publication.xhtml">
+
+          <ui:param name="availableLocales"
+                    value="#{SciPublicationsProceedingsItemCreateStep.availableLocales}" />
+
+        <ui:param name="availableWorkflows"
+                  value="#{SciPublicationsProceedingsItemCreateStep.availableWorkflows}" />
+
+        <ui:param name="contentSection"
+                  value="#{SciPublicationsProceedingsItemCreateStep.contentSectionLabel}" />
+
+        <ui:param name="createFormSubmitLabel"
+                  value="#{SciPublicationsUiMessageBundle['proceedings.createform.submit']}" />
+
+        <ui:param name="documentType"
+                  value="#{SciPublicationsProceedingsItemCreateStep.documentType}" />
+
+        <ui:param name="folderPath"
+                  value="#{SciPublicationsProceedingsItemCreateStep.folderPath}" />
+
+        <ui:param name="initialLocale"
+                  value="#{SciPublicationsProceedingsItemCreateStep.initialLocale}" />
+
+        <ui:param name="messages" 
+                  value="#{SciPublicationsProceedingsItemCreateStep.messages}" />
+
+        <ui:param name="nameValue"
+                  value="#{SciPublicationsProceedingsItemCreateStep.name}" />
+
+        <ui:param name="publicationCreateStepTitle"
+                  value="#{SciPublicationsUiMessageBundle['proceedings.createform.title']}" />
+
+        <ui:param name="selectedWorkflow"
+                  value="#{SciPublicationsProceedingsItemCreateStep.selectedWorkflow}" />
+
+        <ui:param name="title"
+                  value="#{SciPublicationsProceedingsItemCreateStep.title}" /> 
+        
+    </ui:composition>
+</html>
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/proceedings/edit-extended-properties.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/proceedings/edit-extended-properties.xhtml
new file mode 100644
index 0000000..0f970c4
--- /dev/null
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/proceedings/edit-extended-properties.xhtml
@@ -0,0 +1,33 @@
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
+      xmlns:librecms="http://xmlns.jcp.org/jsf/composite/components/librecms"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication-with-publisher-extented-properties.xhtml">
+
+        <ui:param name="authoringStep" 
+                  value="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@proceedings-extendedproperties" />
+
+        <ui:param name="authoringStepTitle"
+                  value="#{SciPublicationsUiMessageBundle.getMessage('proceedings.extendedproperties.header', [CmsSelectedDocumentModel.itemName])}" />
+
+        <ui:param name="editStepUrlFragement" 
+                  value="proceedings-extendedproperties" />
+
+        <ui:define name="publicationWithPublisherExtendedPropertiesList">
+
+        </ui:define>
+
+        <ui:define name="publicationWithPublisherExtendedPropertiesFormElements">
+
+        </ui:define>
+
+        <ui:define name="publicationWithPublisherExtendedPropertiesWidgets">
+
+        </ui:define>
+        
+    </ui:composition>
+    
+</html>
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/proceedings/edit-proceedings.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/proceedings/edit-proceedings.xhtml
new file mode 100644
index 0000000..a316942
--- /dev/null
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/proceedings/edit-proceedings.xhtml
@@ -0,0 +1,153 @@
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
+      xmlns:librecms="http://xmlns.jcp.org/jsf/composite/components/librecms"
+      xmlns:scicms="http://xmlns.jcp.org/jsf/composite/components/scicms"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication-with-publisher.xhtml">
+
+        <ui:param name="authoringStep" 
+                  value="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@proceedings-basicproperties" />
+
+        <ui:param name="authoringStepTitle"
+                  value="#{SciPublicationsUiMessageBundle.getMessage('proceedings.basicproperties.header', [SciCmsPublicationPropertiesStepModel.name])}" />
+
+        <ui:define name="publicationWithPublisherProperties">
+
+            <h3 class="mt-5">#{SciPublicationsUiMessageBundle['proceedings.basicproperties.papers.header']}</h3>
+
+            <c:if test="#{CmsSelectedDocumentModel.canEdit}">
+                <div class="text-right">
+                    <scicms:publicationPickerButton
+                        buttonText="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.papers.add.label']}"
+                        publicationPickerId="paper-picker"
+                        />
+                </div>
+
+                <scicms:publicationPicker
+                    actionUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@proceedings-basicproperties/papers"
+                    baseUrl="#{SciCmsPublicationPropertiesStepModel.baseUrl}"
+                    contentSection="#{ContentSectionModel.sectionName}"
+                    formParamName="paperIdentifier"
+                    publicationPickerId="paper-picker"
+                    publicationType="#{SciCmsProceedingsPropertiesStepModel.inProceedingsType}"
+                    />
+            </c:if>
+
+            <c:choose>
+                <c:when test="#{SciCmsProceedingsPropertiesStepModel.inProceedings.isEmpty()}">
+                    <p>#{SciPublicationsUiMessageBundle['proceedings.papers.none']}</p>
+                </c:when>
+                <c:otherwise>
+                    <table class="papers-table">
+                        <thead>
+                            <tr>
+                                <th>#{SciPublicationsUiMessageBundle['proceedings.basicproperties.papers.title']}</th>
+                                <th>#{SciPublicationsUiMessageBundle['proceedings.basicproperties.papers.start_page']}</th>
+                                <th>#{SciPublicationsUiMessageBundle['proceedings.basicproperties.papers.end_page']}</th>
+                                <th colspan="1">
+                                    #{SciPublicationsUiMessageBundle['proceedings.basicproperties.papers.actions']}
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <c:forEach items="#{SciCmsProceedingsPropertiesStepModel.inProceedings}"
+                                       var="paper">
+                                <tr>
+                                    <td>#{paper.title}</td>
+                                    <td>#{paper.startPage}</td>
+                                    <td>#{paper.endPage}</td>
+                                    <td>
+                                        <c:if test="#{CmsSelectedDocumentModel.canEdit}">
+                                            <libreccm:deleteDialog
+                                                actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@proceedings-basicproperties/papers/#{paper.inProceedingsUuid}/remove"
+                                                buttonText="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.papers.actions.remove']}"
+                                                cancelLabel="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.papers.actions.remove.cancel']}"
+                                                confirmLabel="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.papers.actions.remove.confirm']}"
+                                                dialogId="paper-#{paper.inProceedingsUuid}-remove-dialog"
+                                                dialogTitle="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.papers.actions.remove.title']}"
+                                                message="#{SciPublicationsUiMessageBundle.getMessage('proceedings.basicproperties.papers.actions.remove.message', [SciCmsPublicationPropertiesStepModel.name, paper.title])}"
+                                                />
+                                        </c:if>
+                                    </td>
+                                </tr>
+                            </c:forEach>
+                        </tbody>
+                    </table>
+                </c:otherwise>
+            </c:choose>
+
+            <h3 class="mt-5">#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.header']}</h3>
+            
+            <bootstrap:formGroupText
+                help="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.name.help']}"
+                inputId="name-of-conference"
+                label="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.name.label']}"
+                name="nameOfConference"
+                />
+            
+            <bootstrap:formGroupText
+                help="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.place.help']}"
+                inputId="place-of-conference"
+                label="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.place.label']}"
+                name="placeOfConference"
+                />
+            
+            <bootstrap:formGroupDate
+                help="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.startdate.help']}"
+                inputId="startdate"
+                label="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.startdate.label']}"
+                name="startDate"
+                />
+            
+            <bootstrap:formGroupDate
+                help="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.enddate.help']}"
+                inputId="end"
+                label="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.enddate.label']}"
+                name="endDate"
+                />
+            
+            <h4 class="mt-5">#{SciPublicationsUiMessageBundle['proceedings.basicproperties.organizer.header']}</h3>
+            <div class="mb-2">
+                <div class="text-right">
+                    <librecms:assetPickerButton
+                        assetPickerId="organizer-picker"
+                        buttonIcon="plus-circle"
+                        buttonText="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.set.label']}"
+                        />
+                </div>
+            </div>
+            <librecms:assetPicker 
+                    actionUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@proceedings-basicproperties/organizer"
+                    assetType="#{SciCmsProceedingsPropertiesStepModel.organizerType}"
+                    assetPickerId="organizer-picker"
+                    baseUrl="#{SciCmsPublicationPropertiesStepModel.baseUrl}"
+                    contentSection="#{ContentSectionModel.sectionName}"
+                    dialogTitle="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.select.dialog.title']}"
+                    formParamName="organizerIdentifier"
+                    />
+                <p>
+                    #{SciCmsProceedingsPropertiesStepModel.organizer}
+                </p>
+                <c:if test="#{SciCmsProceedingsPropertiesStepModel.organzierUuid != null}">
+                    <libreccm:deleteDialog
+                        actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@proceedings-basicproperties/organizer/@remove"
+                            buttonText="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.remove.label']}"
+                            cancelLabel="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.cancel']}"
+                            confirmLabel="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.confirm']}"
+                            dialogId="organizer-remove"
+                            dialogTitle="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.title']}"
+                            message="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.message']}"
+                            />
+                </c:if>
+
+        </ui:define>
+
+        <ui:define name="publicationScripts">
+            <script src="#{request.contextPath}/assets/@scipublications/publication-picker.js" />
+        </ui:define>
+
+    </ui:composition>
+</html>
diff --git a/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle.properties b/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle.properties
index 4814eda..8f07224 100644
--- a/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle.properties
+++ b/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle.properties
@@ -486,3 +486,43 @@ extendedproperties.edition.remove.text=Are you sure to remove the following edit
 extendedproperties.edition.remove.title=Remove edition label
 proceedings.createstep.description=Create a new Proceedings publication.
 inproceedings.createstep.description=Create a new in proceedings publication.
+proceedings.createform.submit=Create new Proceedings
+proceedings.basicproperties.header=Edit Proceedings {0}
+proceedings.basicproperties.papers.header=Papers
+proceedings.basicproperties.papers.add.label=Add paper
+proceedings.papers.none=No papers have been assigned to this proceedings publication yet.
+proceedings.basicproperties.papers.title=Title
+proceedings.basicproperties.papers.start_page=First page
+proceedings.basicproperties.papers.end_page=Last page
+proceedings.basicproperties.papers.actions=Actions
+proceedings.basicproperties.papers.actions.remove=Remove
+proceedings.basicproperties.papers.actions.remove.cancel=Cancel
+proceedings.basicproperties.papers.actions.remove.confirm=Remove paper
+proceedings.basicproperties.papers.actions.remove.title=Remove paper from Proceedings
+proceedings.basicproperties.papers.actions.remove.message=Are you sure to remove the paper {1} from the Proceedings {0}?
+proceedings.basicproperties.organizer.header=Organizer of Conference
+proceedings.basicproperties.conference.header=Conference
+proceedings.basicproperties.conference.name.help=The name of the conference.
+proceedings.basicproperties.conference.name.label=Conference
+proceedings.basicproperties.conference.place.help=The place of the conference.
+proceedings.basicproperties.conference.place.label=Place
+proceedings.basicproperties.conference.startdate.help=The start date of the conference.
+proceedings.basicproperties.conference.startdate.label=Start Date
+proceedings.basicproperties.conference.enddate.help=The end date of the conference.
+proceedings.basicproperties.conference.enddate.label=End Date
+inproceedings.createform.submit=Create Inproceedings
+inproceedings.createform.title=Create new inproceedings
+inproceedings.basicproperties.header=Edit Inproceedings {0}
+inproceedings.basicproperties.startpage.help=The first page of the paper in the Proceedings.
+inproceedings.basicproperties.startpage.label=Start Page
+inproceedings.basicproperties.endpage.help=The last page of the paper in the Procedings.
+inproceedings.basicproperties.endpage.label=Last Page
+inproceedings.basicproperties.proceedings=Proceedings
+inproceedings.basicproperties.proceedings.set.label=Set Proceedings
+inproceedings.basicproperties.proceedings.none=This paper is not assigned to a Proceedings publication.
+inproceedings.basicproperties.proceedings.remove=Remove paper from proceedings
+inproceedings.basicproperties.proceedings.remove.cancel=Cancel
+inproceedings.basicproperties.proceedings.remove.confirm=Remove
+inproceedings.basicproperties.proceedings.remove.title=Remove paper from Proceedings
+inproceedings.basicproperties.proceedings.remove.message=Are you sure to remove the paper {0} from the Proceedings {1}?
+inproceedings.extendedproperties.header=Edit extended properties of Inproceedings {0}
diff --git a/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle_de.properties b/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle_de.properties
index 92ea410..42b1402 100644
--- a/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle_de.properties
+++ b/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle_de.properties
@@ -486,3 +486,43 @@ extendedproperties.edition.remove.text=Sind Sie sicher, dass Sie die folgenden A
 extendedproperties.edition.remove.title=Angabe zur Ausgabe entfernen
 proceedings.createstep.description=Einen neuen Tagungsband anlegen.
 inproceedings.createstep.description=Einen neuen Tagungsbandbeitrag anlegen.
+proceedings.createform.submit=Neuen Tagungsband anlegen
+proceedings.basicproperties.header=Tagungsband {0} bearbeiten
+proceedings.basicproperties.papers.header=Beitr\u00e4ge
+proceedings.basicproperties.papers.add.label=Beitrag hinzuf\u00fcgen
+proceedings.papers.none=Diesem Tagungsband wurden noch keine Beitr\u00e4ge zugewiesen.
+proceedings.basicproperties.papers.title=Titel
+proceedings.basicproperties.papers.start_page=Erste Seite
+proceedings.basicproperties.papers.end_page=Letzte Seite
+proceedings.basicproperties.papers.actions=Aktionen
+proceedings.basicproperties.papers.actions.remove=Entfernen
+proceedings.basicproperties.papers.actions.remove.cancel=Abbrechen
+proceedings.basicproperties.papers.actions.remove.confirm=Beitrag entfernen
+proceedings.basicproperties.papers.actions.remove.title=Beitrag aus Tagungsband entfernen
+proceedings.basicproperties.papers.actions.remove.message=Sind Sie sicher, dass Sie den Beitrag {1} aus dem Tagungsband {0} entfernen wollen?
+proceedings.basicproperties.organizer.header=Veranstalter der Konferenz
+proceedings.basicproperties.conference.header=Konferenz
+proceedings.basicproperties.conference.name.help=Der Name der Konferenz.
+proceedings.basicproperties.conference.name.label=Konferenz
+proceedings.basicproperties.conference.place.help=Der Veranstaltungsort der Konferenz.
+proceedings.basicproperties.conference.place.label=Ort
+proceedings.basicproperties.conference.startdate.help=Das Datum an dem die Konferenz begonnen hat.
+proceedings.basicproperties.conference.startdate.label=Beginn der Konferenz
+proceedings.basicproperties.conference.enddate.help=Das Datum an dem die Konferenz geendet hat.
+proceedings.basicproperties.conference.enddate.label=Ende der Konferenz
+inproceedings.createform.submit=Tagungsbandbeitrag anlegen
+inproceedings.createform.title=Neuen Tagungsbandbeitrag anlegen
+inproceedings.basicproperties.header=Tagungsbandbeitrag {0} bearbeiten
+inproceedings.basicproperties.startpage.help=Die erste Seite des Beitrags im Tagungsband.
+inproceedings.basicproperties.startpage.label=Erste Seite
+inproceedings.basicproperties.endpage.help=Die letzte Seite des Beitrags im Tagungsband.
+inproceedings.basicproperties.endpage.label=Letzte Seite
+inproceedings.basicproperties.proceedings=Tagungsband
+inproceedings.basicproperties.proceedings.set.label=Tagungsband zuweisen
+inproceedings.basicproperties.proceedings.none=Dieser Beitrag ist keinem Tagungsband zugeordnet.
+inproceedings.basicproperties.proceedings.remove=Beitrag aus Tagungsband entfernen
+inproceedings.basicproperties.proceedings.remove.cancel=Abbrechen
+inproceedings.basicproperties.proceedings.remove.confirm=Entfernen
+inproceedings.basicproperties.proceedings.remove.title=Beitrag aus Tagungsband entfernen
+inproceedings.basicproperties.proceedings.remove.message=Sind Sie sicher, dass Sie den Beitrag {0} aus dem Tagungsband {1} entfernen wollen?
+inproceedings.extendedproperties.header=Tagungsbandbeitrag {0} bearbeiten