diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/articleincollectedvolume/edit-articleincollectedvolume.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/articleincollectedvolume/edit-articleincollectedvolume.xhtml
index 844da37..9bbc2ba 100644
--- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/articleincollectedvolume/edit-articleincollectedvolume.xhtml
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/articleincollectedvolume/edit-articleincollectedvolume.xhtml
@@ -21,7 +21,7 @@
                 </div>
             </c:if>
         </ui:define>
-        
+
         <ui:define name="publicationBasicPropertiesForm">
 
             <bootstrap:formGroupNumber 
@@ -99,18 +99,19 @@
                     <p>
                         #{SciCmsArticleInCollectedVolumePropertiesStepModel.collectedVolumeTitle}
                     </p>
+                    <c:if test="#{CmsSelectedDocumentModel.canEdit and SciCmsArticleInCollectedVolumePropertiesStepModel.collectedVolumeTitle == null}">
+                        <libreccm:deleteDialog
+                            actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@articleincollectedvolume-basicproperties/collectedvolume/remove"
+                            buttonText="#{SciPublicationsUiMessageBundle['articleincollectedvolume.basicproperties.collectedvolume.remove']}"
+                            cancelLabel="#{SciPublicationsUiMessageBundle['articleincollectedvolume.basicproperties.collectedvolume.remove.cancel']}"
+                            confirmLabel="#{SciPublicationsUiMessageBundle['articleincollectedvolume.basicproperties.collectedvolume.remove.confirm']}"
+                            dialogId="remove-collectedvolume-dialog"
+                            dialogTitle="#{SciPublicationsUiMessageBundle['articleincollectedvolume.basicproperties.collectedvolume.remove.title']}"
+                            message="#{SciPublicationsUiMessageBundle.getMessage('articleincollectedvolume.basicproperties.collectedvolume.remove.message', [CmsSelectedDocumentModel.name, SciCmsArticleInCollectedVolumePropertiesStepModel.collectedVolumeTitle])}"
+                            />
+                    </c:if>
                 </c:otherwise>
-                <c:if test="#{CmsSelectedDocumentModel.canEdit and SciCmsArticleInCollectedVolumePropertiesStepModel.collectedVolumeTitle == null}">
-                    <libreccm:deleteDialog
-                        actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@articleincollectedvolume-basicproperties/collectedvolume/remove"
-                        buttonText="#{SciPublicationsUiMessageBundle['articleincollectedvolume.basicproperties.collectedvolume.remove']}"
-                        cancelLabel="#{SciPublicationsUiMessageBundle['articleincollectedvolume.basicproperties.collectedvolume.remove.cancel']}"
-                        confirmLabel="#{SciPublicationsUiMessageBundle['articleincollectedvolume.basicproperties.collectedvolume.remove.confirm']}"
-                        dialogId="remove-collectedvolume-dialog"
-                        dialogTitle="#{SciPublicationsUiMessageBundle['articleincollectedvolume.basicproperties.collectedvolume.remove.title']}"
-                        message="#{SciPublicationsUiMessageBundle.getMessage('articleincollectedvolume.basicproperties.collectedvolume.remove.message', [CmsSelectedDocumentModel.name, SciCmsArticleInCollectedVolumePropertiesStepModel.collectedVolumeTitle])}"
-                        />
-                </c:if>
+
             </c:choose>
 
         </ui:define>
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/expertise/edit-expertise.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/expertise/edit-expertise.xhtml
index 8b13789..6fb2d82 100644
--- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/expertise/edit-expertise.xhtml
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/expertise/edit-expertise.xhtml
@@ -1 +1,145 @@
+<!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}/@expertise-basicproperties" />
+
+        <ui:param name="authoringStepTitle"
+                  value="#{SciPublicationsUiMessageBundle.getMessage('expertise.basicproperties.header', [SciCmsPublicationPropertiesStepModel.name])}" />
+
+        <ui:define name="publicationMessages">
+            <c:if test="#{ordererNotFound != null}">
+                <div class="alert alert-warning" role="alert">
+                    #{SciPublicationsUiMessageBundle.getMessage('expertise.basicproperties.errors.orderer_not_found', [ordererNotFound])}
+                </div>
+            </c:if>
+
+            <c:if test="#{organizationNotFound != null}">
+                <div class="alert alert-warning" role="alert">
+                    #{SciPublicationsUiMessageBundle.getMessage('expertise.basicproperties.errors.organization_not_found', [organizationNotFound])}
+                </div>
+            </c:if>
+        </ui:define>
+        
+        <ui:define name="publicationBasicPropertiesForm">
+            <bootstrap:formGroupText 
+                help="#{SciPublicationsUiMessageBundle['expertise.basicproperties.place.help']}"
+                inputId="place"
+                label="#{SciPublicationsUiMessageBundle['expertise.basicproperties.place.label']}"
+                name="place"
+                />
+            
+            <bootstrap:formGroupNumber
+                help="#{SciPublicationsUiMessageBundle['expertise.basicproperties.numberofpages.help']}"
+                inputId="number-of-pages"
+                label="#{SciPublicationsUiMessageBundle['expertise.basicproperties.numberofpages.label']}"
+                name="numberOfPages"
+                />
+            
+        </ui:define>
+        
+        <ui:define name="publicationBasicPropertiesDl">
+            <div>
+                <dt>#{SciPublicationsUiMessageBundle['expertise.basicproperties.place.label']}</dt>
+                <dd>#{SciCmsExpertisePropertiesStepModel.place}</dd>
+            </div>
+            <div>
+                <dt>#{SciPublicationsUiMessageBundle['expertise.basicproperties.numberofpages.label']}</dt>
+                <dd>#{SciCmsExpertisePropertiesStepModel.numberOfPages}</dd>
+            </div>
+        </ui:define>
+        
+        <ui:define name="publicationProperties">
+            
+            <h3 class="mt-5">#{SciPublicationsUiMessageBundle['experise.basicproperties.orderer']}</h3>
+            
+            <c:if test="#{CmsSelectedDocumentModel.canEdit}">
+                <librecms:assetPickerButton
+                    assetPickerId="orderer-picker"
+                    buttonIcon="pen"
+                    buttonText="#{SciPublicationsUiMessageBundle['expertise.basicproperties.orderer.set']}"
+                    />
+                <librecms:assetPicker
+                    actionUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@expertise-basicproperties/orderer"
+                    assetPickerId="orderer-picker"
+                    assetType="#{SciCmsExpertisePropertiesStepModel.ordererType}"
+                    baseUrl="#{SciCmsPublicationPropertiesStepModel.baseUrl}"
+                    contentSection="#{ContentSectionModel.sectionName}"
+                    formParamName="ordererIdentifier"
+                    />
+            </c:if>
+            
+            <c:choose>
+                <c:when test="#{SciCmsExpertisePropertiesStepModel.orderer == null}">
+                    <p>#{SciPublicationsUiMessageBundle['expertise.basicproperties.orderer.none']}</p>
+                </c:when>
+                <c:otherwise>
+                    <p>
+                        #{SciCmsExpertisePropertiesStepModel.orderer}
+                    </p>
+                    <c:if test="#{CmsSelectedDocumentModel.canEdit}">
+                        <libreccm:deleteDialog
+                            actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@expertise-basicproperties/orderer/remove"
+                            buttonText="#{SciPublicationsUiMessageBundle['experise.basicproperties.orderer.remove']}"
+                            cancelLabel="#{SciPublicationsUiMessageBundle['experise.basicproperties.orderer.remove.cancel']}"
+                            confirmLabel="#{SciPublicationsUiMessageBundle['experise.basicproperties.orderer.confirm']}"
+                            dialogId="remove-orderer-dialog"
+                            dialogTitle="#{SciPublicationsUiMessageBundle['experise.basicproperties.orderer.title']}"
+                            message="#{SciPublicationsUiMessageBundle.getMessage('experise.basicproperties.orderer.message', [CmsSelectedDocumentModel.name, SciCmsExpertisePropertiesStepModel.orderer])}"
+                            />
+                    </c:if>
+                </c:otherwise>
+            </c:choose>
+            
+            <h3 class="mt-5">#{SciPublicationsUiMessageBundle['experise.basicproperties.organization']}</h3>
+            
+            <c:if test="#{CmsSelectedDocumentModel.canEdit}">
+                <librecms:assetPickerButton
+                    assetPickerId="organization-picker"
+                    buttonIcon="pen"
+                    buttonText="#{SciPublicationsUiMessageBundle['expertise.basicproperties.organization.set']}"
+                    />
+                <librecms:assetPicker
+                    actionUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@expertise-basicproperties/organization"
+                    assetPickerId="organization-picker"
+                    assetType="#{SciCmsExpertisePropertiesStepModel.organizationType}"
+                    baseUrl="#{SciCmsPublicationPropertiesStepModel.baseUrl}"
+                    contentSection="#{ContentSectionModel.sectionName}"
+                    formParamName="organizationIdentifier"
+                    />
+            </c:if>
+            
+              <c:choose>
+                <c:when test="#{SciCmsExpertisePropertiesStepModel.organization == null}">
+                    <p>#{SciPublicationsUiMessageBundle['expertise.basicproperties.organization.none']}</p>
+                </c:when>
+                <c:otherwise>
+                    <p>
+                        #{SciCmsExpertisePropertiesStepModel.organization}
+                    </p>
+                    <c:if test="#{CmsSelectedDocumentModel.canEdit}">
+                        <libreccm:deleteDialog
+                            actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@expertise-basicproperties/organization/remove"
+                            buttonText="#{SciPublicationsUiMessageBundle['experise.basicproperties.organization.remove']}"
+                            cancelLabel="#{SciPublicationsUiMessageBundle['experise.basicproperties.organization.remove.cancel']}"
+                            confirmLabel="#{SciPublicationsUiMessageBundle['experise.basicproperties.organization.confirm']}"
+                            dialogId="remove-organization-dialog"
+                            dialogTitle="#{SciPublicationsUiMessageBundle['experise.basicproperties.organization.title']}"
+                            message="#{SciPublicationsUiMessageBundle.getMessage('experise.basicproperties.organization.message', [CmsSelectedDocumentModel.name, SciCmsExpertisePropertiesStepModel.organization])}"
+                            />
+                    </c:if>
+                </c:otherwise>
+            </c:choose>
+            
+        </ui:define>
+
+    </ui:composition>
+
+</html>
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/expertise/edit-extended-properties.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/expertise/edit-extended-properties.xhtml
new file mode 100644
index 0000000..d3e0447
--- /dev/null
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/expertise/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-extended-properties.xhtml">
+
+         <ui:param name="authoringStep" 
+                  value="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@expertise-extendedproperties" />
+        
+         <ui:param name="authoringStepTitle"
+                  value="#{SciPublicationsUiMessageBundle.getMessage('expertise.extendedproperties.header', [CmsSelectedDocumentModel.itemName])}" />
+
+        <ui:param name="editStepUrlFragement" 
+                  value="expertise-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/org/scientificcms/publications/ui/SciPublicationsBundle.properties b/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle.properties
index 621975a..4580858 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
@@ -566,3 +566,27 @@ expertiseitem.createstep.description=Create a new expertise publication.
 expertise.createform.submit=Create
 expertise.createform.title=Create a new Expertise
 articleinjournal.extendedproperties.header=Edit extended properties of article in journal {0}
+expertise.basicproperties.header=Basic Properties of Expertise {0}
+expertise.basicproperties.errors.orderer_not_found=The selected orderer {0} was not found.
+expertise.basicproperties.errors.organization_not_found=The selected organization {0} was not found.
+expertise.basicproperties.place.help=The place where the expertise was published.
+expertise.basicproperties.place.label=Place
+expertise.basicproperties.numberofpages.help=The number of pages of the expertise.
+expertise.basicproperties.numberofpages.label=Number of pages
+experise.basicproperties.orderer=Orderer
+expertise.basicproperties.orderer.set=Set orderer
+expertise.basicproperties.orderer.none=No orderer has been assigned to this expertise yet.
+experise.basicproperties.orderer.remove=Remove orderer
+experise.basicproperties.orderer.remove.cancel=Cancel
+experise.basicproperties.orderer.confirm=Remove orderer
+experise.basicproperties.orderer.title=Confirm removal of orderer
+experise.basicproperties.orderer.message=Are you sure to remove the orderer {1} from the expertise {0}?
+experise.basicproperties.organization=Organization
+expertise.basicproperties.organization.set=Set organization
+expertise.basicproperties.organization.none=No organization has been assigned to this expertise yet.
+experise.basicproperties.organization.remove=Remove organization
+experise.basicproperties.organization.remove.cancel=Cancel
+experise.basicproperties.organization.confirm=Remove organization
+experise.basicproperties.organization.title=Confirm Removal of organization
+experise.basicproperties.organization.message=Are you sure to remove the organization {1} from the experise {0}?
+expertise.extendedproperties.header=Extended properties of Expertise {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 f8b486f..59bb1ec 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
@@ -566,3 +566,27 @@ expertiseitem.createstep.description=Ein neues Gutachten anlegen.
 expertise.createform.submit=Anlegen
 expertise.createform.title=Neues Gutachten anlegen
 articleinjournal.extendedproperties.header=Erweiterte Eigenschaften des Zeitschriftenbeitrags {0} bearbeiten
+expertise.basicproperties.header=Basiseigenschaften des Gutachtens {0}
+expertise.basicproperties.errors.orderer_not_found=Der ausgew\u00e4hlte Auftraggeber {0} wurde nicht gefunden.
+expertise.basicproperties.errors.organization_not_found=Die ausgew\u00e4hlte Organisation {0} wurde nicht gefunden.
+expertise.basicproperties.place.help=Der Erscheinungsort des Gutachtens.
+expertise.basicproperties.place.label=Erscheinungsort
+expertise.basicproperties.numberofpages.help=Die Anzahl der Seiten des Gutachtens.
+expertise.basicproperties.numberofpages.label=Anzahl der Seiten
+experise.basicproperties.orderer=Auftraggeber
+expertise.basicproperties.orderer.set=Auftraggeber festlegen
+expertise.basicproperties.orderer.none=F\u00fcr dieses Gutachten wurde noch kein Auftraggeber festgelegt.
+experise.basicproperties.orderer.remove=Auftraggeber entfernen
+experise.basicproperties.orderer.remove.cancel=Abbrechen
+experise.basicproperties.orderer.confirm=Auftraggeber entfernen
+experise.basicproperties.orderer.title=Entfernen des Auftraggebers best\u00e4tigen
+experise.basicproperties.orderer.message=Sind Sie sicher, dass Sie den Auftraggeber {1} vom Gutachten {0} entfernen wollen?
+experise.basicproperties.organization=Organisation
+expertise.basicproperties.organization.set=Organisation festlegen
+expertise.basicproperties.organization.none=Es wurde noch keine Organisation f\u00fcr dieses Gutachten festgelegt.
+experise.basicproperties.organization.remove=Organisation entfernen
+experise.basicproperties.organization.remove.cancel=Abbrechen
+experise.basicproperties.organization.confirm=Organization entfernen
+experise.basicproperties.organization.title=Entfernen der Organization best\u00e4tigen
+experise.basicproperties.organization.message=Sind Sie sicher, dass Sie die Organisation {1} vom Gutachten {0} entfernen wollen?
+expertise.extendedproperties.header=Erweiterte Eigenschaften des Gutachtens {0}