diff --git a/src/app/components/algorithms/algorithm-properties/algorithm-properties.component.html b/src/app/components/algorithms/algorithm-properties/algorithm-properties.component.html
index 9a883dba..34e6096e 100644
--- a/src/app/components/algorithms/algorithm-properties/algorithm-properties.component.html
+++ b/src/app/components/algorithms/algorithm-properties/algorithm-properties.component.html
@@ -1,6 +1,6 @@
 <div class="p-4">
   <div class="row">
-    <div class="col-xl-4 col-lg-12">
+    <div class="col-lg-6 col-sm-12">
       <mat-card class="m-2">
         <app-text-input name="Name"
                         [value]="frontendAlgorithm.name"
@@ -10,7 +10,8 @@
         ></app-text-input>
       </mat-card>
     </div>
-    <div class="col-xl-4 col-lg-12">
+
+    <div class="col-lg-6 col-sm-12">
       <mat-card class="m-2">
         <app-text-input name="Acronym"
                         [value]="frontendAlgorithm.acronym"
@@ -20,13 +21,79 @@
         ></app-text-input>
       </mat-card>
     </div>
+  </div>
+
+  <div class="row" *ngIf="algorithm.computationModel === 'QUANTUM' && frontendAlgorithm.computationModel === 'QUANTUM'">
     <div class="col-xl-4 col-lg-12">
+      <mat-card class="m-2">
+        <app-select-input name="Quantum computation model"
+                          [value]="algorithm.quantumComputationModel"
+                          [choices]="availableQuantumComputationModelOptions"
+                          (onChange)="onPropertyChanged($event,   'quantumComputationModel')"
+                          (onSaveChanges)="onChangesSaved($event,   'quantumComputationModel')">
+        </app-select-input>
+      </mat-card>
+    </div>
+
+    <div class="col-xl-4 col-lg-12">
+      <mat-card class="m-2">
+        <app-text-input name="Speedup"
+                        [value]="frontendAlgorithm.speedUp"
+                        [baseValue]="algorithm.speedUp"
+                        (onChange)="onPropertyChanged($event, 'speedUp')"
+                        (onSaveChanges)="onChangesSaved($event, 'speedUp')"></app-text-input>
+      </mat-card>
+    </div>
+
+    <div class="col-xl-4 col-lg-12">
+      <mat-card class="m-2">
+        <app-checkbox-input name="NISQ ready"
+                            [value]="frontendAlgorithm.nisqReady"
+                            [baseValue]="algorithm.nisqReady"
+                            (onChange)="onPropertyChanged($event, 'nisqReady')"
+                            (onSaveChanges)="onChangesSaved($event, 'nisqReady')">
+        </app-checkbox-input>
+      </mat-card>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-lg-6 col-sm-12">
+      <mat-card class="m-2">
+        <app-problem-type-tree #problemTypeTree
+                               [title]='"Problem types"'
+                               [treeData]="problemTypeTreeData"
+                               [linkObject]="problemTypeLinkObject"
+                               [allowDelete]="true"
+                               (onAddElement)="onAddProblemType.emit($event)"
+                               (onRemoveElement)="onRemoveProblemType.emit($event)"
+                               (onExpandParents)="getParentsForNode($event)"
+                               (onSearchTextChanged)="searchUnlinkedProblemTypes($event)"></app-problem-type-tree>
+      </mat-card>
+    </div>
+
+    <div class="col-lg-6 col-sm-12">
+      <mat-card class="m-2">
+        <app-chip-collection [title]="'Application areas'"
+                             [elements]="linkedApplicationAreas"
+                             [displayVariable]="'name'"
+                             [useToAddLinks]="true"
+                             [linkObject]=applicationAreaLinkObject
+                             (onLinkElement)="addApplicationAreaEvent($event)"
+                             (onUnlinkElement)="removeApplicationAreaEvent($event)"
+                             (onSearchTextChanged)="searchUnlinkedApplicationAreas($event)"></app-chip-collection>
+      </mat-card>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-12">
       <mat-card class="m-2">
         <app-text-input name="Intent"
                         [value]="frontendAlgorithm.intent"
                         [baseValue]="algorithm.intent"
                         [multiline]="true"
-                        [maxLines]="5"
+                        [maxLines]="50"
                         (onChange)="onPropertyChanged($event, 'intent')"
                         (onSaveChanges)="onChangesSaved($event, 'intent')"
         ></app-text-input>
@@ -35,108 +102,89 @@
   </div>
 
   <div class="row">
-    <div class="col-xl-4 col-lg-12">
+    <div class="col-12">
+      <mat-card class="m-2">
+        <app-text-input name="Problem"
+                        [value]="frontendAlgorithm.problem"
+                        [baseValue]="algorithm.problem"
+                        [multiline]="true"
+                        [maxLines]="50"
+                        (onChange)="onPropertyChanged($event, 'problem')"
+                        (onSaveChanges)="onChangesSaved($event, 'problem')"
+        ></app-text-input>
+      </mat-card>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-12">
+      <mat-card class="m-2">
+        <app-text-input name="Solution"
+                        [value]="frontendAlgorithm.solution"
+                        [baseValue]="algorithm.solution"
+                        [multiline]="true"
+                        [maxLines]="50"
+                        (onChange)="onPropertyChanged($event, 'solution')"
+                        (onSaveChanges)="onChangesSaved($event, 'solution')"></app-text-input>
+      </mat-card>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-12">
       <mat-card class="m-2">
         <app-text-input name="Input format"
                         [value]="frontendAlgorithm.inputFormat"
                         [baseValue]="algorithm.inputFormat"
                         [multiline]="true"
-                        [maxLines]="5"
+                        [maxLines]="10"
                         (onChange)="onPropertyChanged($event, 'inputFormat')"
                         (onSaveChanges)="onChangesSaved($event, 'inputFormat')"></app-text-input>
       </mat-card>
     </div>
+  </div>
 
-    <div class="col-xl-4 col-lg-12">
+  <div class="row">
+    <div class="col-12">
       <mat-card class="m-2">
         <app-text-input name="Parameters"
                         [value]="frontendAlgorithm.algoParameter"
                         [baseValue]="algorithm.inputFormat"
                         [multiline]="true"
-                        [maxLines]="5"
+                        [maxLines]="10"
                         (onChange)="onPropertyChanged($event, 'algoParameter')"
                         (onSaveChanges)="onChangesSaved($event, 'algoParameter')"></app-text-input>
       </mat-card>
     </div>
+  </div>
 
-    <div class="col-xl-4 col-lg-12">
+  <div class="row">
+    <div class="col-12">
       <mat-card class="m-2">
         <app-text-input name="Output format"
                         [value]="frontendAlgorithm.outputFormat"
                         [baseValue]="algorithm.outputFormat"
                         [multiline]="true"
-                        [maxLines]="5"
+                        [maxLines]="10"
                         (onChange)="onPropertyChanged($event, 'outputFormat')"
                         (onSaveChanges)="onChangesSaved($event, 'outputFormat')"></app-text-input>
       </mat-card>
     </div>
   </div>
-  <div class="row">
-    <div class="col-xl-4 col-lg-12">
-      <mat-card class="m-2">
-        <app-text-input name="Solution"
-                        [value]="frontendAlgorithm.solution"
-                        [baseValue]="algorithm.solution"
-                        [multiline]="true"
-                        [maxLines]="5"
-                        (onChange)="onPropertyChanged($event, 'solution')"
-                        (onSaveChanges)="onChangesSaved($event, 'solution')"></app-text-input>
-      </mat-card>
-    </div>
 
-    <div class="col-xl-4 col-lg-12">
+  <div class="row">
+    <div class="col-12">
       <mat-card class="m-2">
         <app-text-input name="Assumptions"
                         [value]="frontendAlgorithm.assumptions"
                         [baseValue]="algorithm.assumptions"
                         [multiline]="true"
-                        [maxLines]="5"
+                        [maxLines]="50"
                         (onChange)="onPropertyChanged($event, 'assumptions')"
                         (onSaveChanges)="onChangesSaved($event, 'assumptions')"></app-text-input>
       </mat-card>
     </div>
-    <div class="col-xl-4 col-lg-12">
-      <mat-card class="m-2">
-        <app-text-input name="Problem"
-                        [value]="frontendAlgorithm.problem"
-                        [baseValue]="algorithm.problem"
-                        [multiline]="true"
-                        [maxLines]="5"
-                        (onChange)="onPropertyChanged($event, 'problem')"
-                        (onSaveChanges)="onChangesSaved($event, 'problem')"
-        ></app-text-input>
-      </mat-card>
-    </div>
   </div>
-  <div class="row">
-    <div class="col-lg-6 col-sm-12">
-      <mat-card class="m-2">
-        <app-problem-type-tree #problemTypeTree
-                               [title]='"Problem types"'
-                               [treeData]="problemTypeTreeData"
-                               [linkObject]="problemTypeLinkObject"
-                               [allowDelete]="true"
-                               (onAddElement)="onAddProblemType.emit($event)"
-                               (onRemoveElement)="onRemoveProblemType.emit($event)"
-                               (onExpandParents)="getParentsForNode($event)"
-                               (onSearchTextChanged)="searchUnlinkedProblemTypes($event)"></app-problem-type-tree>
-      </mat-card>
-    </div>
-
-    <div class="col-lg-6 col-sm-12">
-      <mat-card class="m-2">
-        <app-chip-collection [title]="'Application areas'"
-                             [elements]="linkedApplicationAreas"
-                             [displayVariable]="'name'"
-                             [useToAddLinks]="true"
-                             [linkObject]=applicationAreaLinkObject
-                             (onLinkElement)="addApplicationAreaEvent($event)"
-                             (onUnlinkElement)="removeApplicationAreaEvent($event)"
-                             (onSearchTextChanged)="searchUnlinkedApplicationAreas($event)"></app-chip-collection>
-      </mat-card>
-    </div>
-  </div>
-
 
   <div class="row">
     <div class="col-12">
@@ -150,43 +198,4 @@
       </mat-card>
     </div>
   </div>
-
-  <div *ngIf="algorithm.computationModel === 'QUANTUM' && frontendAlgorithm.computationModel === 'QUANTUM'">
-    <div class="row">
-      <div class="col-lg-6 col-sm-12">
-        <mat-card class="m-2">
-          <app-text-input name="Speedup"
-                          [value]="frontendAlgorithm.speedUp"
-                          [baseValue]="algorithm.speedUp"
-                          (onChange)="onPropertyChanged($event, 'speedUp')"
-                          (onSaveChanges)="onChangesSaved($event, 'speedUp')"></app-text-input>
-        </mat-card>
-      </div>
-
-      <div class="col-lg-6 col-sm-12">
-        <mat-card class="m-2">
-          <app-checkbox-input name="NISQ ready"
-                              [value]="frontendAlgorithm.nisqReady"
-                              [baseValue]="algorithm.nisqReady"
-                              (onChange)="onPropertyChanged($event, 'nisqReady')"
-                              (onSaveChanges)="onChangesSaved($event, 'nisqReady')">
-          </app-checkbox-input>
-        </mat-card>
-      </div>
-    </div>
-
-    <!-- TODO: finish Sketch -->
-    <div class="row">
-      <div class="col-lg-6 col-sm-12">
-        <mat-card class="m-2">
-          <app-select-input name="Quantum computation model"
-                            [value]="algorithm.quantumComputationModel"
-                            [choices]="availableQuantumComputationModelOptions"
-                            (onChange)="onPropertyChanged($event,   'quantumComputationModel')"
-                            (onSaveChanges)="onChangesSaved($event,   'quantumComputationModel')">
-          </app-select-input>
-        </mat-card>
-      </div>
-    </div>
-  </div>
 </div>
diff --git a/src/app/components/algorithms/implementation-properties/implementation-properties.component.html b/src/app/components/algorithms/implementation-properties/implementation-properties.component.html
index ef5bc7c4..51b79039 100644
--- a/src/app/components/algorithms/implementation-properties/implementation-properties.component.html
+++ b/src/app/components/algorithms/implementation-properties/implementation-properties.component.html
@@ -1,6 +1,6 @@
 <div class="p-4">
   <div class="row">
-    <div class="col-lg-4 col-sm-12">
+    <div class="col-lg-6 col-sm-12">
       <mat-card class="m-2">
         <app-text-input
           name="Name"
@@ -8,23 +8,11 @@
           (onSaveChanges)="onChangesSaved($event,'name')"
           [value]="frontendImplementation.name"
           [baseValue]="implementation.name"
-          [multiline]="true"
         ></app-text-input>
       </mat-card>
     </div>
-    <div class="col-lg-4 col-sm-12">
-      <mat-card class="m-2">
-        <app-text-input
-          name="Description"
-          (onChange)="onPropertyChanged($event,'description')"
-          (onSaveChanges)="onChangesSaved($event,'description')"
-          [value]="frontendImplementation.description"
-          [baseValue]="implementation.description"
-          [multiline]="true"
-        ></app-text-input>
-      </mat-card>
-    </div>
-    <div class="col-lg-4 col-sm-12">
+
+    <div class="col-lg-6 col-sm-12">
       <mat-card class="m-2">
         <app-text-input
           name="Contributors"
@@ -32,14 +20,13 @@
           (onSaveChanges)="onChangesSaved($event,'contributors')"
           [value]="frontendImplementation.contributors"
           [baseValue]="implementation.contributors"
-          [multiline]="true"
         ></app-text-input>
       </mat-card>
     </div>
   </div>
 
   <div class="row">
-    <div class="col-lg-4 col-sm-12">
+    <div class="col-lg-6 col-sm-12">
       <mat-card class="m-2">
         <app-text-input
           name="Version"
@@ -47,23 +34,11 @@
           (onSaveChanges)="onChangesSaved($event,'version')"
           [value]="frontendImplementation.version"
           [baseValue]="implementation.version"
-          [multiline]="true"
-        ></app-text-input>
-      </mat-card>
-    </div>
-    <div class="col-lg-4 col-sm-12">
-      <mat-card class="m-2">
-        <app-text-input
-          name="Dependencies"
-          (onChange)="onPropertyChanged($event,'dependencies')"
-          (onSaveChanges)="onChangesSaved($event,'dependencies')"
-          [value]="frontendImplementation.dependencies"
-          [baseValue]="implementation.dependencies"
-          [multiline]="true"
         ></app-text-input>
       </mat-card>
     </div>
-    <div class="col-lg-4 col-sm-12">
+
+    <div class="col-lg-6 col-sm-12">
       <mat-card class="m-2">
         <app-text-input
           name="License"
@@ -71,46 +46,91 @@
           (onSaveChanges)="onChangesSaved($event,'license')"
           [value]="frontendImplementation.license"
           [baseValue]="implementation.license"
-          [multiline]="true"
         ></app-text-input>
       </mat-card>
     </div>
   </div>
+
+  <div class="row">
+    <div class="col-12">
+      <mat-card class="m-2">
+        <app-text-input
+                name="Dependencies"
+                (onChange)="onPropertyChanged($event,'dependencies')"
+                (onSaveChanges)="onChangesSaved($event,'dependencies')"
+                [value]="frontendImplementation.dependencies"
+                [baseValue]="implementation.dependencies"
+                [maxLines]="50"
+                [multiline]="true"
+        ></app-text-input>
+      </mat-card>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-12">
+      <mat-card class="m-2">
+        <app-text-input
+                name="Description"
+                (onChange)="onPropertyChanged($event,'description')"
+                (onSaveChanges)="onChangesSaved($event,'description')"
+                [value]="frontendImplementation.description"
+                [baseValue]="implementation.description"
+                [maxLines]="50"
+                [multiline]="true"
+        ></app-text-input>
+      </mat-card>
+    </div>
+  </div>
+
   <div class="row">
-    <div class="col-xl-4 col-lg-12">
+    <div class="col-12">
       <mat-card class="m-2">
         <app-text-input
-          name="Input Format"
-          (onChange)="onPropertyChanged($event,'inputFormat')"
-          (onSaveChanges)="onChangesSaved($event,'inputFormat')"
-          [value]="frontendImplementation.inputFormat"
-          [baseValue]="implementation.inputFormat"
+                name="Input Format"
+                (onChange)="onPropertyChanged($event,'inputFormat')"
+                (onSaveChanges)="onChangesSaved($event,'inputFormat')"
+                [value]="frontendImplementation.inputFormat"
+                [baseValue]="implementation.inputFormat"
+                [multiline]="true"
+                [maxLines]="10"
         ></app-text-input>
       </mat-card>
     </div>
-    <div class="col-xl-4 col-lg-12">
+  </div>
+
+  <div class="row">
+    <div class="col-12">
       <mat-card class="m-2">
         <app-text-input
-          name="Parameter"
-          (onChange)="onPropertyChanged($event,'parameter')"
-          (onSaveChanges)="onChangesSaved($event,'parameter')"
-          [value]="frontendImplementation.parameter"
-          [baseValue]="implementation.parameter"
+                name="Parameter"
+                (onChange)="onPropertyChanged($event,'parameter')"
+                (onSaveChanges)="onChangesSaved($event,'parameter')"
+                [value]="frontendImplementation.parameter"
+                [baseValue]="implementation.parameter"
+                [multiline]="true"
+                [maxLines]="10"
         ></app-text-input>
       </mat-card>
     </div>
-    <div class="col-xl-4 col-lg-12">
+  </div>
+
+  <div class="row">
+    <div class="col-12">
       <mat-card class="m-2">
         <app-text-input
-          name="Output Format"
-          (onChange)="onPropertyChanged($event,'outputFormat')"
-          (onSaveChanges)="onChangesSaved($event,'outputFormat')"
-          [value]="frontendImplementation.outputFormat"
-          [baseValue]="implementation.outputFormat"
+                name="Output Format"
+                (onChange)="onPropertyChanged($event,'outputFormat')"
+                (onSaveChanges)="onChangesSaved($event,'outputFormat')"
+                [value]="frontendImplementation.outputFormat"
+                [baseValue]="implementation.outputFormat"
+                [multiline]="true"
+                [maxLines]="10"
         ></app-text-input>
       </mat-card>
     </div>
   </div>
+
   <div class="row">
     <div class="col-lg-12 col-sm-12">
       <mat-card class="m-2">
diff --git a/src/app/components/execution-environments/cloud-services/cloud-service-properties/cloud-service-properties.component.html b/src/app/components/execution-environments/cloud-services/cloud-service-properties/cloud-service-properties.component.html
index 5c4bc5a2..4348c446 100644
--- a/src/app/components/execution-environments/cloud-services/cloud-service-properties/cloud-service-properties.component.html
+++ b/src/app/components/execution-environments/cloud-services/cloud-service-properties/cloud-service-properties.component.html
@@ -1,18 +1,5 @@
 <div class="p-4">
   <div class="row">
-    <div class="col-lg-6 col-sm-12">
-      <mat-card class="m-2">
-        <app-text-input
-          name="Description"
-          [multiline]="true"
-          [maxLines]="5"
-          [value]="cloudService.description"
-          (onChange)="onPropertyChanged($event,   'description')"
-          (onSaveChanges)="onChangesSaved($event, 'description')"
-        ></app-text-input>
-      </mat-card>
-    </div>
-
     <div class="col-lg-6 col-sm-12">
       <mat-card class="m-2">
         <app-text-input
@@ -23,30 +10,47 @@
         ></app-text-input>
       </mat-card>
     </div>
-  </div>
 
-  <div class="row">
     <div class="col-lg-6 col-sm-12">
       <mat-card class="m-2">
         <app-text-input
-          name="URL"
-          [isLink]="true"
-          [value]="cloudService.url"
-          (onChange)="onPropertyChanged($event, 'url')"
-          (onSaveChanges)="onChangesSaved($event, 'url')"
+                name="URL"
+                [isLink]="true"
+                [value]="cloudService.url"
+                (onChange)="onPropertyChanged($event, 'url')"
+                (onSaveChanges)="onChangesSaved($event, 'url')"
         ></app-text-input>
       </mat-card>
     </div>
+  </div>
 
-    <div class="col-lg-6 col-sm-12">
+  <div class="row">
+    <div class="col-12">
       <mat-card class="m-2">
         <app-text-input
           name="Cost Model"
           [value]="cloudService.costModel"
+          [multiline]="true"
+          [maxLines]="10"
           (onChange)="onPropertyChanged($event, 'costModel')"
           (onSaveChanges)="onChangesSaved($event, 'costModel')"
         ></app-text-input>
       </mat-card>
     </div>
   </div>
+
+  <div class="row">
+    <div class="col-12">
+      <mat-card class="m-2">
+        <app-text-input
+                name="Description"
+                [multiline]="true"
+                [maxLines]="50"
+                [value]="cloudService.description"
+                (onChange)="onPropertyChanged($event,   'description')"
+                (onSaveChanges)="onChangesSaved($event, 'description')"
+        ></app-text-input>
+      </mat-card>
+    </div>
+  </div>
 </div>