diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 3f87d2de8..ed9e61e67 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -444,7 +444,7 @@ tooltip.enable-provider-upon-saving=Enable Metadata Provider upon saving?
 tooltip.max-validity-interval=Defines the window within which the metadata is valid.
 tooltip.require-signed-root=If true, this fails to load metadata with no signature on the root XML element.
 tooltip.certificate-file=A key used to verify the signature. Conflicts with trustEngineRef and both of the child elements.
-tooltip.retained-roles=Retained Roles
+tooltip.retained-roles=Controls whether to keep entity descriptors that contain no roles
 tooltip.remove-roleless-entity-descriptors=Controls whether to keep entity descriptors that contain no roles.
 tooltip.remove-empty-entities-descriptors=Controls whether to keep entities descriptors that contain no entity descriptors.
 
diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
index 8b20b2efc..6d64dd72a 100644
--- a/backend/src/main/resources/i18n/messages_en.properties
+++ b/backend/src/main/resources/i18n/messages_en.properties
@@ -433,7 +433,7 @@ tooltip.enable-provider-upon-saving=Enable Metadata Provider upon saving?
 tooltip.max-validity-interval=Defines the window within which the metadata is valid.
 tooltip.require-signed-root=If true, this fails to load metadata with no signature on the root XML element.
 tooltip.certificate-file=A key used to verify the signature. Conflicts with trustEngineRef and both of the child elements.
-tooltip.retained-roles=Retained Roles
+tooltip.retained-roles=Controls whether to keep entity descriptors that contain no roles
 tooltip.remove-roleless-entity-descriptors=Controls whether to keep entity descriptors that contain no roles.
 tooltip.remove-empty-entities-descriptors=Controls whether to keep entities descriptors that contain no entity descriptors.
 
diff --git a/ui/src/app/metadata/domain/component/forms/finish-form.component.html b/ui/src/app/metadata/domain/component/forms/finish-form.component.html
index 28b9dda91..0e28beacc 100644
--- a/ui/src/app/metadata/domain/component/forms/finish-form.component.html
+++ b/ui/src/app/metadata/domain/component/forms/finish-form.component.html
@@ -52,7 +52,7 @@ <h3 class="tag tag-success tag-sm my-4">
                             <tbody>
                             <tr *ngFor="let contact of resolver.contacts">
                                 <td>{{ contact.name }}</td>
-                                <td>{{ contact.emailAddress }}</td>
+                                <td class="br-word">{{ contact.emailAddress }}</td>
                                 <td>{{ contact.type }}</td>
                             </tr>
                             </tbody>
diff --git a/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.html b/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.html
index e75ce8b7b..44954aa1d 100644
--- a/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.html
+++ b/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.html
@@ -85,7 +85,15 @@
                                 <info-icon [description]="'tooltip.mdui-logo-width' | translate"></info-icon>
                             </span>
                         </div>
-                        <input id="logoWidth" type="number" class="form-control" placeholder="" formControlName="logoWidth" step="1" role="textbox" />
+                        <input id="logoWidth"
+                            type="number"
+                            class="form-control"
+                            placeholder=""
+                            formControlName="logoWidth"
+                            step="1"
+                            role="textbox"
+                            min="0"
+                            onkeypress="return (event.charCode == 8 || event.charCode == 0 || event.charCode == 13) ? null : event.charCode >= 48 && event.charCode <= 57"/>
                         <small class="form-text text-secondary" translate="message.must-be-integer">Must be an integer equal to or greater than 0</small>
                     </div>
                 </div>
@@ -99,7 +107,15 @@
                                 <info-icon [description]="'tooltip.mdui-logo-height' | translate"></info-icon>
                             </span>
                         </div>
-                        <input id="logoHeight" type="number" class="form-control" placeholder="" formControlName="logoHeight" step="1" role="textbox" />
+                        <input id="logoHeight"
+                            type="number"
+                            class="form-control"
+                            placeholder=""
+                            formControlName="logoHeight"
+                            step="1"
+                            role="textbox"
+                            min="0"
+                            onkeypress="return (event.charCode == 8 || event.charCode == 0 || event.charCode == 13) ? null : event.charCode >= 48 && event.charCode <= 57" />
                         <small class="form-text text-secondary" translate="message.must-be-integer">Must be an integer equal to or greater than 0</small>
                     </div>
                 </div>
diff --git a/ui/src/app/metadata/resolver/container/upload-resolver.component.html b/ui/src/app/metadata/resolver/container/upload-resolver.component.html
index ebc62dd51..8bae4bc0d 100644
--- a/ui/src/app/metadata/resolver/container/upload-resolver.component.html
+++ b/ui/src/app/metadata/resolver/container/upload-resolver.component.html
@@ -36,7 +36,7 @@ <h3 class="tag tag-primary">
                     </ng-container>
                 </div>
                 <div class="form-group">
-                    <label translate="label.service-resolver-file" for="fileInput">Select Resolver Metadata File</label>
+                    <label translate="label.service-resolver-file">Select Resolver Metadata File</label>
                     <div class="custom-file d-block">
                         <input id="fileInput" type="file" name="file" class="custom-file-input" (change)="fileChange($event)" />
                         <label for="fileInput" class="custom-file-label">
diff --git a/ui/src/theme/typography.scss b/ui/src/theme/typography.scss
index 2e5d717d1..76c9bc107 100644
--- a/ui/src/theme/typography.scss
+++ b/ui/src/theme/typography.scss
@@ -2,4 +2,8 @@
     font-size: 2.5rem;
     font-weight: normal;
     line-height: 1.2;
-}
\ No newline at end of file
+}
+
+.br-word {
+    word-break: break-word;
+}