diff --git a/src/app/main/directive/base-value.directive.ts b/src/app/main/directive/base-value.directive.ts
index aa895ed362..76f2775f57 100644
--- a/src/app/main/directive/base-value.directive.ts
+++ b/src/app/main/directive/base-value.directive.ts
@@ -31,6 +31,11 @@ export abstract class BaseValueDirective {
      */
     @Input() valueRequiredValidator = true;
 
+    /**
+     * disable the comment field
+     */
+    @Input() commentDisabled? = false;
+
     shouldShowComment = false;
 
     /**
diff --git a/src/app/workspace/resource/properties/properties.component.html b/src/app/workspace/resource/properties/properties.component.html
index f9a4830052..28f645283c 100644
--- a/src/app/workspace/resource/properties/properties.component.html
+++ b/src/app/workspace/resource/properties/properties.component.html
@@ -117,23 +117,24 @@ <h3 class="label mat-title">
                 <div class="property-value">
                     <!-- the value(s) of the property -->
                     <div *ngFor="let val of prop.values">
-                        <dsp-display-edit *ngIf="val"
+                        <app-display-edit *ngIf="val"
                             #displayEdit
                             [parentResource]="resource.res"
                             [displayValue]="val"
                             [propArray]="resource.resProps"
+                            [canDelete]="deleteValueIsAllowed(prop)"
                             (referredResourceClicked)="openResource($event)"
                             (referredResourceHovered)="previewResource($event)">
-                        </dsp-display-edit>
+                        </app-display-edit>
                     </div>
                     <!-- Add value form -->
                     <div *ngIf="addValueFormIsVisible && propID === prop.propDef.id">
-                        <dsp-add-value #addValue
+                        <app-add-value #addValue
                             class="add-value"
                             [parentResource]="resource.res"
                             [resourcePropertyDefinition]="$any(resource.res.entityInfo.properties[prop.propDef.id])"
                             (operationCancelled)="hideAddValueForm()">
-                        </dsp-add-value>
+                        </app-add-value>
                     </div>
                     <!-- Add button -->
                     <div *ngIf="addValueIsAllowed(prop)">
diff --git a/src/app/workspace/resource/properties/properties.component.spec.ts b/src/app/workspace/resource/properties/properties.component.spec.ts
index d38582719f..d5e2b89e5e 100644
--- a/src/app/workspace/resource/properties/properties.component.spec.ts
+++ b/src/app/workspace/resource/properties/properties.component.spec.ts
@@ -28,7 +28,6 @@ import {
     EmitEvent,
     Events,
     PropertyInfoValues,
-    UserService,
     ValueOperationEventService
 } from '@dasch-swiss/dsp-ui';
 import { of, Subscription } from 'rxjs';
@@ -36,6 +35,7 @@ import { DspResource } from '../dsp-resource';
 import { PropertiesComponent } from './properties.component';
 import { IncomingService } from '../incoming.service';
 import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
+import { UserService } from '../services/user.service';
 
 /**
  * test host component to simulate parent component.
diff --git a/src/app/workspace/resource/properties/properties.component.ts b/src/app/workspace/resource/properties/properties.component.ts
index 86a26ccf16..15fd8776b7 100644
--- a/src/app/workspace/resource/properties/properties.component.ts
+++ b/src/app/workspace/resource/properties/properties.component.ts
@@ -1,5 +1,6 @@
 import { Component, EventEmitter, Inject, Input, OnChanges, OnDestroy, OnInit, Output } from '@angular/core';
 import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
+import { PageEvent } from '@angular/material/paginator';
 import {
     ApiResponseData,
     ApiResponseError,
@@ -25,24 +26,23 @@ import {
     UpdateResourceMetadataResponse,
     UserResponse
 } from '@dasch-swiss/dsp-js';
-import {
-    AddedEventValue,
-    DeletedEventValue,
-    Events,
-    UpdatedEventValues,
-    UserService,
-    ValueOperationEventService,
-    ValueService
-} from '@dasch-swiss/dsp-ui';
 import { Subscription } from 'rxjs';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ConfirmationWithComment, DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { NotificationService } from 'src/app/main/services/notification.service';
 import { DspResource } from '../dsp-resource';
-import { RepresentationConstants } from '../representation/file-representation';
 import { IncomingService } from '../incoming.service';
-import { PageEvent } from '@angular/material/paginator';
-import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
-import { NotificationService } from 'src/app/main/services/notification.service';
+import { RepresentationConstants } from '../representation/file-representation';
+import { UserService } from '../services/user.service';
+import {
+    AddedEventValue,
+    DeletedEventValue,
+    Events,
+    UpdatedEventValues,
+    ValueOperationEventService
+} from '../services/value-operation-event.service';
+import { ValueService } from '../services/value.service';
 
 // object of property information from ontology class, properties and property values
 export interface PropertyInfoValues {
@@ -434,6 +434,18 @@ export class PropertiesComponent implements OnInit, OnChanges, OnDestroy {
         }
     }
 
+    /**
+     * given a resource property, check if its cardinality allows a value to be deleted
+     *
+     * @param prop the resource property
+     */
+    deleteValueIsAllowed(prop: PropertyInfoValues): boolean {
+        const isAllowed = CardinalityUtil.deleteValueForPropertyAllowed(
+            prop.propDef.id, prop.values.length, this.resource.res.entityInfo.classes[this.resource.res.type]);
+
+        return isAllowed;
+    }
+
     /**
      * updates the UI in the event of an existing value being deleted
      *
diff --git a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.html b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.html
index 479aae4111..92bf2dba76 100644
--- a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.html
+++ b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.html
@@ -1,5 +1,6 @@
-<!-- Step1: form to select one project, one ontology, one resource with label -->
-<form *ngIf="selectResourceForm && showNextStepForm" [formGroup]="selectResourceForm" class="resource-instance-form stepOne form-content" (ngSubmit)="nextStep()">
+<!-- Step1: form to select one project, one ontology, one resource -->
+<form *ngIf="selectResourceForm && showNextStepForm" [formGroup]="selectResourceForm"
+    class="resource-instance-form stepOne form-content" (ngSubmit)="nextStep()">
 
     <!-- select one project -->
     <div *ngIf="usersProjects?.length > 0">
@@ -14,8 +15,7 @@
     <!-- select one ontology -->
     <span>
         <div *ngIf="ontologiesMetadata?.ontologies.length > 0">
-            <app-select-ontology
-                #selectOntology
+            <app-select-ontology #selectOntology
                 [formGroup]="selectResourceForm"
                 [ontologiesMetadata]="ontologiesMetadata"
                 [selectedOntology]="selectedOntology"
@@ -26,14 +26,11 @@
 
     <!-- select one resource -->
     <span *ngIf="resourceClasses?.length > 0">
-        <app-select-resource-class
-            #selectResourceClass
+        <app-select-resource-class #selectResourceClass
             [formGroup]="selectResourceForm"
             [resourceClassDefinitions]="resourceClasses"
             [selectedResourceClass]="selectedResourceClass"
-            [chosenResourceLabel]="resourceLabel"
-            (resourceClassSelected)="selectProperties($event)"
-            (resourceLabel)="getResourceLabel($event)">
+            (resourceClassSelected)="selectProperties($event)">
         </app-select-resource-class>
     </span>
 
@@ -42,7 +39,7 @@
     </span>
 
     <!-- action buttons: cancel and next -->
-    <div class="form-panel large-field">
+    <div class="form-panel form-action">
         <span>
             <button mat-button type="button" (click)="closeDialog.emit()">
                 {{ 'appLabels.form.action.cancel' | translate }}
@@ -50,12 +47,8 @@
         </span>
         <span class="fill-remaining-space"></span>
         <span>
-            <button
-                mat-raised-button
-                type="button"
-                color="primary"
-                [disabled]="!selectResourceForm.valid || this.errorMessage"
-                (click)="nextStep()" class="form-next">
+            <button mat-raised-button type="button" color="primary"
+                [disabled]="!selectResourceForm.valid || this.errorMessage" (click)="nextStep()" class="form-next">
                 Next
             </button>
         </span>
@@ -67,11 +60,14 @@
 <form *ngIf="propertiesParentForm && !showNextStepForm" [formGroup]="propertiesParentForm" class="resource-instance-form stepTwo form-content" (ngSubmit)="submitData()" appInvalidControlScroll>
 
     <!-- upload file -->
-    <app-upload *ngIf="hasFileValue" [parentForm]="propertiesParentForm" [representation]="hasFileValue" (fileInfo)="setFileValue($event)"></app-upload>
+    <app-upload *ngIf="hasFileValue"
+        [parentForm]="propertiesParentForm"
+        [representation]="hasFileValue"
+        (fileInfo)="setFileValue($event)">
+    </app-upload>
 
     <!-- create property values -->
-    <app-select-properties
-        #selectProps
+    <app-select-properties #selectProps
         [ontologyInfo]="ontologyInfo"
         [resourceClass]="selectedResourceClass"
         [properties]="properties"
@@ -80,10 +76,10 @@
     </app-select-properties>
 
     <!-- action buttons: previous, cancel and save -->
-    <div class="form-panel large-field btn-field">
+    <div class="form-panel form-action">
         <span>
             <button mat-button type="button" (click)="prevStep($event)">
-                {{ 'appLabels.form.action.back' | translate }}
+                &larr;&nbsp;{{ 'appLabels.form.action.back' | translate }}
             </button>
         </span>
         <button mat-button type="button" (click)="closeDialog.emit()">
diff --git a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.scss b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.scss
index 1ebe2436c4..ba1030cb4c 100644
--- a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.scss
+++ b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.scss
@@ -1,10 +1,17 @@
 .stepTwo {
     margin: 24px 56px !important;
+    width: calc(100% - 144px);
+
+    .btn-field {
+      margin-top: 48px;
+      margin-bottom: 0;
+    }
 }
 
-.btn-field {
-    width: 600px !important;
-    margin-left: 48px;
+.form-action {
+    width: 100%;
+    margin-top: 24px;
+    // margin-left: 48px;
 }
 
 .errorIfNoElement {
diff --git a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts
index 786e3de2a4..49d3212cfb 100644
--- a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts
+++ b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts
@@ -17,6 +17,7 @@ import {
     ApiResponseData,
     CreateIntValue,
     CreateResource,
+    CreateTextValueAsString,
     CreateValue,
     MockOntology,
     MockProjects,
@@ -35,7 +36,7 @@ import {
     UsersEndpointAdmin
 } from '@dasch-swiss/dsp-js';
 import { OntologyCache } from '@dasch-swiss/dsp-js/src/cache/ontology-cache/OntologyCache';
-import { DspActionModule, IntValueComponent, ValueService } from '@dasch-swiss/dsp-ui';
+import { DspActionModule, IntValueComponent, TextValueAsStringComponent, ValueService } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
@@ -75,6 +76,7 @@ class TestHostComponent implements OnInit {
 class MockSelectProjectComponent implements OnInit {
     @Input() formGroup: FormGroup;
     @Input() usersProjects: StoredProject[];
+    @Input() selectedProject?: string;
     @Output() projectSelected = new EventEmitter<string>();
 
     form: FormGroup;
@@ -102,6 +104,7 @@ class MockSelectProjectComponent implements OnInit {
 class MockSelectOntologyComponent implements OnInit {
     @Input() formGroup: FormGroup;
     @Input() ontologiesMetadata: OntologiesMetadata;
+    @Input() selectedOntology?: string;
     @Output() ontologySelected = new EventEmitter<string>();
 
     form: FormGroup;
@@ -129,16 +132,15 @@ class MockSelectOntologyComponent implements OnInit {
 class MockSelectResourceClassComponent implements OnInit {
     @Input() formGroup: FormGroup;
     @Input() resourceClassDefinitions: ResourceClassDefinition[];
+    @Input() selectedResourceClass?: string;
 
-    label: string;
     form: FormGroup;
 
     constructor(@Inject(FormBuilder) private _fb: FormBuilder) { }
 
     ngOnInit() {
         this.form = this._fb.group({
-            resources: [null, Validators.required],
-            label: [null, Validators.required]
+            resources: [null, Validators.required]
         });
 
         resolvedPromise.then(() => {
@@ -152,11 +154,23 @@ class MockSelectResourceClassComponent implements OnInit {
  * mock select-properties component to use in tests.
  */
 @Component({
-    selector: 'app-select-properties'
+    selector: 'app-select-properties',
+    template: `
+        <app-text-value-as-string #createVal
+            [mode]="'create'"
+            [commentDisabled]="true"
+            [valueRequiredValidator]="true"
+            [parentForm]="parentForm"
+            [formName]="'label'">
+        </app-text-value-as-string>
+    `
 })
 class MockSelectPropertiesComponent {
     @ViewChildren('switchProp') switchPropertiesComponent: QueryList<SwitchPropertiesComponent>;
 
+    // input for resource's label
+    @ViewChild('createVal') createValueComponent: BaseValueDirective;
+
     @Input() properties: ResourcePropertyDefinition[];
 
     @Input() ontologyInfo: ResourceClassAndPropertyDefinitions;
@@ -231,6 +245,46 @@ class MockCreateIntValueComponent implements OnInit {
     updateCommentVisibility(): void { }
 }
 
+/**
+ * mock value component to use in tests.
+ */
+@Component({
+    selector: 'app-text-value-as-string'
+})
+class MockCreateTextValueComponent implements OnInit {
+
+    @ViewChild('createVal') createValueComponent: TextValueAsStringComponent;
+
+    @Input() parentForm: FormGroup;
+
+    @Input() formName: string;
+
+    @Input() mode;
+
+    @Input() displayValue;
+
+    @Input() commentDisabled?: boolean;
+
+    @Input() valueRequiredValidator: boolean;
+
+    form: FormGroup;
+
+    valueFormControl: FormControl;
+    constructor(@Inject(FormBuilder) private _fb: FormBuilder) { }
+    ngOnInit(): void {
+        this.valueFormControl = new FormControl(null, [Validators.required]);
+        this.form = this._fb.group({
+            label: this.valueFormControl
+        });
+    }
+    getNewValue(): CreateValue {
+        const createTextVal = new CreateTextValueAsString();
+        createTextVal.text = 'My Label';
+        return createTextVal;
+    }
+    updateCommentVisibility(): void { }
+}
+
 describe('ResourceInstanceFormComponent', () => {
     let testHostComponent: TestHostComponent;
     let testHostFixture: ComponentFixture<TestHostComponent>;
@@ -264,7 +318,8 @@ describe('ResourceInstanceFormComponent', () => {
                 MockSelectResourceClassComponent,
                 MockSelectPropertiesComponent,
                 MockSwitchPropertiesComponent,
-                MockCreateIntValueComponent
+                MockCreateIntValueComponent,
+                MockCreateTextValueComponent
             ],
             imports: [
                 BrowserAnimationsModule,
@@ -462,7 +517,6 @@ describe('ResourceInstanceFormComponent', () => {
         expect(selectResourceClassComp).toBeTruthy();
 
         (selectResourceClassComp.componentInstance as MockSelectResourceClassComponent).form.controls.resources.setValue('http://0.0.0.0:3333/ontology/0001/anything/v2#Thing');
-        (selectResourceClassComp.componentInstance as MockSelectResourceClassComponent).form.controls.label.setValue('My Label');
 
         testHostComponent.resourceInstanceFormComponent.selectedResourceClass = (selectResourceClassComp.componentInstance as MockSelectResourceClassComponent).resourceClassDefinitions[1];
 
@@ -521,6 +575,9 @@ describe('ResourceInstanceFormComponent', () => {
 
         expect(selectPropertiesComp).toBeTruthy();
 
+        const label = new CreateTextValueAsString();
+        label.text = 'My Label';
+
         const props = {};
         const createVal = new CreateIntValue();
         createVal.int = 123;
diff --git a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.ts b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.ts
index 370a297253..0d524acc76 100644
--- a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.ts
+++ b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.ts
@@ -1,11 +1,12 @@
 import { Component, EventEmitter, Inject, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
 import {
     ApiResponseError,
     Constants,
     CreateFileValue,
     CreateResource,
+    CreateTextValueAsString,
     CreateValue,
     KnoraApiConnection,
     OntologiesMetadata, ReadOntology,
@@ -18,6 +19,7 @@ import {
 import { Subscription } from 'rxjs';
 import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { DefaultClass, DefaultResourceClasses } from 'src/app/project/ontology/default-data/default-resource-classes';
 import { ProjectService } from '../project.service';
 import { SelectOntologyComponent } from './select-ontology/select-ontology.component';
 import { SelectPropertiesComponent } from './select-properties/select-properties.component';
@@ -51,6 +53,9 @@ export class ResourceInstanceFormComponent implements OnInit, OnDestroy {
 
     showNextStepForm: boolean;
 
+    // we have to know, when the user went back in the form because of some automatic processes
+    userWentBack = false;
+
     usersProjects: StoredProject[];
     selectedProject: string;
     ontologiesMetadata: OntologiesMetadata;
@@ -62,6 +67,10 @@ export class ResourceInstanceFormComponent implements OnInit, OnDestroy {
     properties: ResourcePropertyDefinition[];
     ontologyInfo: ResourceClassAndPropertyDefinitions;
 
+    // get default resource class definitions to translate the subClassOf iri into human readable words
+    // list of default resource classes
+    defaultClasses: DefaultClass[] = DefaultResourceClasses.data;
+
     // selected resource class has a file value property: display the corresponding upload form
     hasFileValue: 'stillImage' | 'movingImage' | 'audio' | 'document' | 'text';
 
@@ -119,7 +128,7 @@ export class ResourceInstanceFormComponent implements OnInit, OnDestroy {
         this.showNextStepForm = !this.showNextStepForm;
 
         // use response to go further with properties
-        this.updateParent.emit({ title: this.resourceLabel, subtitle: 'Define the properties of the resource' });
+        this.updateParent.emit({ title: this.resourceLabel, subtitle: 'Set the property values of the resource' });
     }
 
     /**
@@ -129,6 +138,17 @@ export class ResourceInstanceFormComponent implements OnInit, OnDestroy {
         ev.preventDefault();
         this.updateParent.emit({ title: this.resourceLabel, subtitle: 'Create new resource' });
         this.showNextStepForm = true;
+        this.userWentBack = true;
+    }
+
+    /**
+     * reset the title if the user went back to the previous form and changes the selected values
+     * or if the user changes a selected value after s/he's already selected a res class
+     */
+    resetTitle() {
+        if (this.userWentBack || this.resourceLabel) {
+            this.updateParent.emit({ title: 'New resource', subtitle: 'Create new resource' });
+        }
     }
 
     submitData() {
@@ -137,7 +157,9 @@ export class ResourceInstanceFormComponent implements OnInit, OnDestroy {
 
             const createResource = new CreateResource();
 
-            createResource.label = this.resourceLabel;
+            const resLabelVal = <CreateTextValueAsString>this.selectPropertiesComponent.createValueComponent.getNewValue();
+
+            createResource.label = resLabelVal.text;
 
             createResource.type = this.selectedResourceClass.id;
 
@@ -198,6 +220,8 @@ export class ResourceInstanceFormComponent implements OnInit, OnDestroy {
      * @param projectIri
      */
     selectOntologies(projectIri: string) {
+        this.resetTitle();
+
         if (projectIri) {
             // if this method is called with the same value as the current selectedProject, there is no need to do anything
             if (projectIri !== this.selectedProject) {
@@ -249,6 +273,8 @@ export class ResourceInstanceFormComponent implements OnInit, OnDestroy {
      * @param ontologyIri
      */
     selectResourceClasses(ontologyIri: string) {
+        this.resetTitle();
+
         // reset errorMessage, it will be reassigned in the else clause if needed
         this.errorMessage = undefined;
 
@@ -303,13 +329,6 @@ export class ResourceInstanceFormComponent implements OnInit, OnDestroy {
         }
     }
 
-    /**
-     * get the resource label typed in the form in select-resource-class
-     * @param label
-     */
-    getResourceLabel(label: string) {
-        this.resourceLabel = label;
-    }
 
     /**
      * get all the properties of the selected resource class
@@ -330,6 +349,10 @@ export class ResourceInstanceFormComponent implements OnInit, OnDestroy {
 
                     this.selectedResourceClass = onto.classes[resourceClassIri];
 
+                    // set label from resource class
+                    const defaultClassLabel = this.defaultClasses.find(i => i.iri === this.selectedResourceClass.subClassOf[0]);
+                    this.resourceLabel = this.selectedResourceClass.label + (defaultClassLabel ? ' (' + defaultClassLabel.label + ')' : '');
+
                     // filter out all props that cannot be edited or are link props but also the hasFileValue props
                     this.properties = onto.getPropertyDefinitionsByType(ResourcePropertyDefinition).filter(
                         prop =>
@@ -354,6 +377,15 @@ export class ResourceInstanceFormComponent implements OnInit, OnDestroy {
                     if (!this.selectPropertiesComponent && this.properties.length === 0) {
                         this.errorMessage = 'No properties defined for the selected resource.';
                     }
+
+                    if (this.resourceClasses.length > 1 && !this.userWentBack) {
+                        // automatically go to the next step when a resource class is selected
+                        // but not in case the user went back to previous form
+                        this.nextStep();
+                    } else {
+                        // or update the title because the user select another res class
+                        this.updateParent.emit({ title: this.resourceLabel, subtitle: 'Create new resource' });
+                    }
                 },
                 (error: ApiResponseError) => {
                     this._errorHandler.showMessage(error);
diff --git a/src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.html b/src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.html
index ec75ca9a63..b59744c822 100644
--- a/src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.html
+++ b/src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.html
@@ -1,19 +1,38 @@
 <div class="properties-container">
     <div class="properties">
+        <!-- resource's label (defined in the base ontology) -->
+        <div class="property">
+            <div class="property-label">
+                <h3 class="label label-info mat-subheading-1"
+                    matTooltip="Each resource needs a (preferably unique) label. It will be a kind of resource identifier."
+                    matTooltipPosition="above">
+                    Resource label *
+                </h3>
+            </div>
+            <div class="property-value large-field">
+                <div class="value">
+                    <app-text-value-as-string #createVal
+                        [mode]="'create'"
+                        [commentDisabled]="true"
+                        [valueRequiredValidator]="true"
+                        [parentForm]="parentForm"
+                        [formName]="'label'">
+                    </app-text-value-as-string>
+                </div>
+            </div>
+        </div>
+
+        <!-- resource's properties (defined in the ontology) -->
         <div *ngFor="let prop of properties; let last = last;" [class.border-bottom]="!last">
             <div class="property" *ngIf="!prop.isLinkProperty || prop">
                 <div class="property-label">
-                    <span>
-                        <h3 class="label mat-subheading-1"
+                    <h3 class="label mat-subheading-1"
                         [class.label-info]="prop.comment"
                         [matTooltip]="prop.comment"
                         matTooltipPosition="above">
                         {{prop.label}}
+                        <span *ngIf="propertyValuesKeyValuePair[prop.id + '-cardinality'][0] === 1">*</span>
                     </h3>
-                    </span>
-                    <span *ngIf="propertyValuesKeyValuePair[prop.id + '-cardinality'][0] === 1" class="propIsRequired">
-                        *
-                    </span>
                 </div>
                 <div class="property-value large-field">
                     <div *ngFor="let val of propertyValuesKeyValuePair[prop.id]; let i=index">
diff --git a/src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.scss b/src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.scss
index 5dc2df2458..f54c0aefd1 100644
--- a/src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.scss
+++ b/src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.scss
@@ -15,90 +15,38 @@
     gap: 16px;
 
     .properties {
-        // grid-column: 1 / span 6;
-        margin-top: 16px;
+      grid-column: 1 / span 6;
 
-        .border-bottom {
-            width: 650px;
-        }
-
-        .property {
-            grid-row: 1 / 1;
-            display: grid;
-            grid-template-columns: repeat(4, 1fr);
-            gap: 16px;
-            margin-top: 16px;
-
-            .property-label,
-            .property-value {
-                padding: 2px;
-                overflow-wrap: break-word;
-            }
-
-            .property-label {
-                grid-column: 1 / span 1;
-
-                .label {
-                text-align: right;
-                display: block;
-                float: left;
-                width: 95%;
-                }
-
-                .label-info {
-                cursor: help;
-                }
+      .property {
+        grid-row: 1 / 1;
 
-                .propIsRequired {
-                  color: red;
-                  display: block;
-                  float: right;
-                  width: 5%;
-                }
-            }
+        display: grid;
+        grid-template-columns: repeat(4, 1fr);
+        gap: 16px;
 
-            .property-value {
-                grid-column: 2 / span 3;
-
-                // .value {
-                //   width: 90%;
-                //   vertical-align: top;
-                // }
-
-                .buttons {
-                  // width: 9%;
-                  // vertical-align: middle;
+        .property-label,
+        .property-value {
+          padding: 2px;
+          overflow-wrap: break-word;
+        }
 
-                  button {
-                    cursor: pointer;
-                    border: none;
-                    outline: none;
-                    background-color: transparent;
-                    color: #000000;
+        .property-label {
+          grid-column: 1 / span 1;
 
-                    .material-icons {
-                      font-size: 18px;
-                    }
+          .label {
+            text-align: right;
+            margin-top: 16px;;
+          }
 
-                    .mat-icon {
-                      width: 18px;
-                      height: 18px;
-                      vertical-align: middle;
-                    }
-                  }
-                }
+          .label-info {
+            cursor: help;
+          }
+        }
 
-                // .value,
-                // .buttons {
-                //   display: inline-block;
-                // }
-            }
+        .property-value {
+          grid-column: 2 / span 3;
+          margin-bottom: 0; // overwrite global value in this case
         }
+      }
     }
 }
-
-// TODO: maybe find a better way to do this
-// ::ng-deep .form-content .large-field {
-//   min-width: 0;
-// }
-
diff --git a/src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.ts b/src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.ts
index e6b95b792b..f2a3263744 100644
--- a/src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.ts
+++ b/src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit, QueryList, ViewChildren } from '@angular/core';
+import { Component, Input, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import {
     Cardinality,
@@ -9,7 +9,8 @@ import {
     ResourceClassDefinition,
     ResourcePropertyDefinition
 } from '@dasch-swiss/dsp-js';
-import { ValueService } from '@dasch-swiss/dsp-ui';
+import { BaseValueDirective } from 'src/app/main/directive/base-value.directive';
+import { ValueService } from '../../services/value.service';
 import { SwitchPropertiesComponent } from './switch-properties/switch-properties.component';
 
 @Component({
@@ -21,6 +22,8 @@ export class SelectPropertiesComponent implements OnInit {
 
     @ViewChildren('switchProp') switchPropertiesComponent: QueryList<SwitchPropertiesComponent>;
 
+    @ViewChild('createVal') createValueComponent: BaseValueDirective;
+
     @Input() properties: ResourcePropertyDefinition[];
 
     @Input() ontologyInfo: ResourceClassAndPropertyDefinitions;
@@ -67,7 +70,6 @@ export class SelectPropertiesComponent implements OnInit {
         this.parentResource.entityInfo = this.ontologyInfo;
     }
 
-
     /**
      * given a resource property, check if an add button should be displayed under the property values
      *
diff --git a/src/app/workspace/resource/resource-instance-form/select-resource-class/select-resource-class.component.html b/src/app/workspace/resource/resource-instance-form/select-resource-class/select-resource-class.component.html
index 46b253b7af..7d416b0d29 100644
--- a/src/app/workspace/resource/resource-instance-form/select-resource-class/select-resource-class.component.html
+++ b/src/app/workspace/resource/resource-instance-form/select-resource-class/select-resource-class.component.html
@@ -12,14 +12,4 @@
             <span class="custom-error-message">A resource must be selected.</span>
         </mat-error>
     </mat-form-field>
-    <mat-form-field class="large-field resLabel">
-        <mat-label>Resource label *</mat-label>
-        <input matInput formControlName="label" [value]="label" class="label">
-        <mat-error *ngIf="form.controls.label.hasError('pattern')">
-            <span class="custom-error-message">Your label must contain and start with at least one character or one number. Cannot start or end with a space.</span>
-        </mat-error>
-        <mat-error *ngIf="form.controls.label.hasError('required')">
-            <span class="custom-error-message">A resource label is required.</span>
-        </mat-error>
-    </mat-form-field>
 </span>
diff --git a/src/app/workspace/resource/resource-instance-form/select-resource-class/select-resource-class.component.spec.ts b/src/app/workspace/resource/resource-instance-form/select-resource-class/select-resource-class.component.spec.ts
index b8cacd0600..bcf563df08 100644
--- a/src/app/workspace/resource/resource-instance-form/select-resource-class/select-resource-class.component.spec.ts
+++ b/src/app/workspace/resource/resource-instance-form/select-resource-class/select-resource-class.component.spec.ts
@@ -1,17 +1,15 @@
 import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { Component, Inject, OnInit, ViewChild } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { MatSelectModule } from '@angular/material/select';
 import { MatSelectHarness } from '@angular/material/select/testing';
-import { MatInputHarness } from '@angular/material/input/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MockOntology, ResourceClassDefinition } from '@dasch-swiss/dsp-js';
 import { SelectResourceClassComponent } from './select-resource-class.component';
-import { By } from '@angular/platform-browser';
 
 /**
  * test host component to simulate parent component.
@@ -22,8 +20,7 @@ import { By } from '@angular/platform-browser';
             #selectResource
             [formGroup]="form"
             [resourceClassDefinitions]="resourceClasses"
-            (resourceClassSelected)="selectResourceClass($event)"
-            (resourceLabel)="getResourceLabel($event)">
+            (resourceClassSelected)="selectResourceClass($event)">
         </app-select-resource-class>`
 })
 class TestHostComponent implements OnInit {
@@ -33,7 +30,6 @@ class TestHostComponent implements OnInit {
     form: FormGroup;
     resourceClasses: ResourceClassDefinition[];
     selectedResourceIri: string;
-    resLabel: string;
 
     constructor(@Inject(FormBuilder) private _fb: FormBuilder) {
     }
@@ -54,9 +50,6 @@ class TestHostComponent implements OnInit {
         this.selectedResourceIri = resourceClassIri;
     }
 
-    getResourceLabel(label: string) {
-        this.resLabel = label;
-    }
 }
 
 describe('SelectResourceClassComponent', () => {
@@ -130,21 +123,6 @@ describe('SelectResourceClassComponent', () => {
 
     });
 
-    it('should fill in the label correctly', () => {
-
-        const labelInput = testHostFixture.debugElement.query(By.css('input.label'));
-
-        const el = labelInput.nativeElement;
-
-        expect(el.value).toEqual('');
-
-        el.value = 'resource label';
-
-        testHostFixture.detectChanges();
-
-        expect(el.value).toEqual('resource label');
-    });
-
     it('should emit the Iri of a selected resource class', async () => {
 
         expect(testHostComponent.selectedResourceIri).toBeUndefined();
@@ -163,18 +141,6 @@ describe('SelectResourceClassComponent', () => {
 
     });
 
-    it('should emit the label of the resource class', async () => {
-
-        const inputElement = await loader.getHarness(MatInputHarness.with({ selector: 'input.label' }));
-
-        expect(await inputElement.getValue()).toEqual('');
-        expect(testHostComponent.resLabel).toBeUndefined();
-
-        await inputElement.setValue('resource label');
-
-        expect(testHostComponent.resLabel).toEqual('resource label');
-    });
-
     it('should unsubscribe from from changes on destruction', () => {
 
         expect(testHostComponent.selectResource.resourceChangesSubscription.closed).toBe(false);
diff --git a/src/app/workspace/resource/resource-instance-form/select-resource-class/select-resource-class.component.ts b/src/app/workspace/resource/resource-instance-form/select-resource-class/select-resource-class.component.ts
index 178b1405b9..2d284c3074 100644
--- a/src/app/workspace/resource/resource-instance-form/select-resource-class/select-resource-class.component.ts
+++ b/src/app/workspace/resource/resource-instance-form/select-resource-class/select-resource-class.component.ts
@@ -29,22 +29,16 @@ export class SelectResourceClassComponent implements OnInit, OnDestroy, AfterVie
     @Input() selectedResourceClass?: ResourceClassDefinition;
 
     // optional input to provide the component with a pre-chosen label
-    @Input() chosenResourceLabel?: string;
+    // @Input() chosenResourceLabel?: string;
 
     @Output() resourceClassSelected = new EventEmitter<string>();
 
-    @Output() resourceLabel = new EventEmitter<string>();
-
-    label: string;
-
     form: FormGroup;
 
     checkPattern = '^\d*[a-zA-Z0-9\u00C0-\u024F\u1E00-\u1EFF_]+( [a-zA-Z0-9\u00C0-\u024F\u1E00-\u1EFF@_.]+)*$';
 
     resourceChangesSubscription: Subscription;
 
-    labelChangesSubscription: Subscription;
-
     constructor(@Inject(FormBuilder) private _fb: FormBuilder) {}
 
     ngOnInit(): void {
@@ -52,7 +46,7 @@ export class SelectResourceClassComponent implements OnInit, OnDestroy, AfterVie
         // build a form for the named graph selection
         this.form = this._fb.group({
             resources: [null, Validators.required],
-            label: [null, [Validators.required, Validators.pattern(this.checkPattern)]]
+            // label: [null, [Validators.required, Validators.pattern(this.checkPattern)]]
         });
 
         // emit Iri of the resource when selected
@@ -62,13 +56,6 @@ export class SelectResourceClassComponent implements OnInit, OnDestroy, AfterVie
             this.formGroup.addControl('resources', this.form);
         });
 
-        // emit label of the resource any time it is changed
-        this.labelChangesSubscription = this.form.controls.label.valueChanges.subscribe((data) => {
-            this.resourceLabel.emit(data);
-            this.formGroup.removeControl('resources');
-            this.formGroup.addControl('resources', this.form);
-        });
-
         resolvedPromise.then(() => {
             // add form to the parent form group
             this.formGroup.addControl('resources', this.form);
@@ -79,11 +66,6 @@ export class SelectResourceClassComponent implements OnInit, OnDestroy, AfterVie
             this.form.controls.resources.setValue(this.selectedResourceClass.id);
         }
 
-        // check if there is a pre-chosen label, if so, set the value of the form control to this value
-        if (this.chosenResourceLabel) {
-            this.form.controls.label.setValue(this.chosenResourceLabel);
-        }
-
     }
 
 
@@ -101,9 +83,6 @@ export class SelectResourceClassComponent implements OnInit, OnDestroy, AfterVie
             this.resourceChangesSubscription.unsubscribe();
         }
 
-        if (this.labelChangesSubscription !== undefined) {
-            this.labelChangesSubscription.unsubscribe();
-        }
     }
 
 }
diff --git a/src/app/workspace/resource/services/value-operation-event.service.ts b/src/app/workspace/resource/services/value-operation-event.service.ts
index ba1252653e..84da15c77d 100644
--- a/src/app/workspace/resource/services/value-operation-event.service.ts
+++ b/src/app/workspace/resource/services/value-operation-event.service.ts
@@ -10,7 +10,9 @@ import { filter, map } from 'rxjs/operators';
  * The ValueOperationEventService essentially creates a direct communication channel between
  * the emitting component and the listening component.
  */
-@Injectable() // must be provided on component level, i.e. resource view component.
+@Injectable({
+    providedIn: 'root'
+}) // must be provided on component level, i.e. resource view component.
 export class ValueOperationEventService {
 
     // create a subject to hold data which can be subscribed to.
diff --git a/src/app/workspace/resource/values/text-value/text-value-as-string/text-value-as-string.component.html b/src/app/workspace/resource/values/text-value/text-value-as-string/text-value-as-string.component.html
index efb8c7100e..ba7cd75e2a 100644
--- a/src/app/workspace/resource/values/text-value/text-value-as-string/text-value-as-string.component.html
+++ b/src/app/workspace/resource/values/text-value/text-value-as-string/text-value-as-string.component.html
@@ -17,7 +17,7 @@
                 <span class="custom-error-message">This value already exists for this property. Duplicate values are not allowed.</span>
             </mat-error>
         </mat-form-field>
-        <mat-form-field class="large-field value-component-comment">
+        <mat-form-field *ngIf="!commentDisabled" class="large-field value-component-comment">
             <textarea matInput
                       cdkTextareaAutosize
                       cdkAutosizeMinRows="1"