diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 90edf9bc7..f82153ce6 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -166,10 +166,10 @@ label.x509-certificates=X509 Certificates
 label.certificate-name-display-only=Certificate Name (Display Only)
 label.certificate=Certificate
 label.assertion-consumer-services=Assertion Consumer Services
-label.assertion-consumer-service-location=Assertion Consumer Service Location
+label.assertion-consumer-service-location=Location
 label.assertion-consumer-service-endpoint=Assertion Consumer Service Endpoints
 label.default=(default)
-label.assertion-consumer-service-location-binding=Assertion Consumer Service Location Binding
+label.assertion-consumer-service-location-binding=Location Binding
 label.relying-party-overrides=Relying Party Overrides
 label.sign-the-assertion=Sign the Assertion?
 label.turn-off-encryption-of-response=Turn off Encryption of Response?
diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
index 8f5cd4f14..8eb45a024 100644
--- a/backend/src/main/resources/i18n/messages_en.properties
+++ b/backend/src/main/resources/i18n/messages_en.properties
@@ -159,10 +159,10 @@ label.x509-certificates=X509 Certificates
 label.certificate-name-display-only=Certificate Name (Display Only)
 label.certificate=Certificate
 label.assertion-consumer-services=Assertion Consumer Services
-label.assertion-consumer-service-location=Assertion Consumer Service Location
+label.assertion-consumer-service-location=Location
 label.assertion-consumer-service-endpoint=Assertion Consumer Service Endpoints
 label.default=(default)
-label.assertion-consumer-service-location-binding=Assertion Consumer Service Location Binding
+label.assertion-consumer-service-location-binding=Location Binding
 label.relying-party-overrides=Relying Party Overrides
 label.sign-the-assertion=Sign the Assertion?
 label.turn-off-encryption-of-response=Turn off Encryption of Response?
diff --git a/ui/src/app/metadata/domain/component/summary-property.component.html b/ui/src/app/metadata/domain/component/summary-property.component.html
index 832f268b3..c65c9c271 100644
--- a/ui/src/app/metadata/domain/component/summary-property.component.html
+++ b/ui/src/app/metadata/domain/component/summary-property.component.html
@@ -24,9 +24,11 @@
                         <tr *ngFor="let value of property.value">
                             <td *ngFor="let prop of getKeys(property.items)"
                                 [ngbPopover]="value[prop]"
+                                popoverClass="popover-lg"
                                 triggers="mouseenter:mouseleave"
                                 container="body"
-                                placement="top">
+                                placement="top"
+                                class="break-all">
                                 {{ value[prop] }}
                             </td>
                         </tr>
diff --git a/ui/src/app/schema-form/widget/check/checklist.component.html b/ui/src/app/schema-form/widget/check/checklist.component.html
index cb1dbf022..6d13a1886 100644
--- a/ui/src/app/schema-form/widget/check/checklist.component.html
+++ b/ui/src/app/schema-form/widget/check/checklist.component.html
@@ -23,7 +23,7 @@
                                 role="checkbox"
                                 aria-checked="false"
                             />
-                            <label class="custom-control-label" for="input-{{ i }}">
+                            <label class="custom-control-label" [for]="formProperty._canonicalPath + '.' + i">
                                 <span class="sr-only">
                                     <translate-i18n key="action.toggle">Toggle</translate-i18n> {{ attr.label | translate }}
                                 </span>
diff --git a/ui/src/theme/utility.scss b/ui/src/theme/utility.scss
index 358b75b2c..0f8bea642 100644
--- a/ui/src/theme/utility.scss
+++ b/ui/src/theme/utility.scss
@@ -12,4 +12,8 @@
 
 .w-40 {
     width: 40%;
-}
\ No newline at end of file
+}
+
+.break-all {
+    word-break: break-all;
+}