diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
index 771f18ba4b..35bffad185 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -29,7 +29,7 @@
                         <tr *ngFor="let schema of (metadataSchemas | async)?.payload?.page"
                             [ngClass]="{'table-primary' : isActive(schema) | async}">
                             <td>
-                                <label>
+                                <label class="mb-0">
                                     <input type="checkbox"
                                            [checked]="isSelected(schema) | async"
                                            (change)="selectMetadataSchema(schema, $event)"
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.scss b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.scss
index 98d8659570..4fbb788780 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.scss
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.scss
@@ -1,3 +1,7 @@
 .selectable-row:hover {
   cursor: pointer;
 }
+
+:host ::ng-deep #metadatadataschemagroup {
+  display: flex;
+}
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
index 1a867928f5..557741df80 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -34,14 +34,14 @@
               <tr *ngFor="let field of fields?.page"
                   [ngClass]="{'table-primary' : isActive(field) | async}">
                 <td>
-                  <label>
+                  <label class="mb-0">
                     <input type="checkbox"
                            [checked]="isSelected(field) | async"
                            (change)="selectMetadataField(field, $event)">
                   </label>
                 </td>
                 <td class="selectable-row" (click)="editField(field)">{{field.id}}</td>
-                <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
+                <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}<label *ngIf="field.qualifier" class="mb-0">.</label>{{field.qualifier}}</td>
                 <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
               </tr>
               </tbody>
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.scss b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.scss
index 98d8659570..49e0384661 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.scss
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.scss
@@ -1,3 +1,8 @@
 .selectable-row:hover {
   cursor: pointer;
 }
+
+:host ::ng-deep #metadatadatafieldgroup {
+  display: flex;
+  flex-wrap: wrap;
+}
diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html
index 36f7034f4d..6b1fdb9ff6 100644
--- a/src/app/shared/log-in/log-in.component.html
+++ b/src/app/shared/log-in/log-in.component.html
@@ -1,5 +1,5 @@
 <ds-themed-loading *ngIf="(loading | async) || (isAuthenticated | async)" class="m-5"></ds-themed-loading>
-<div *ngIf="!(loading | async) && !(isAuthenticated | async)" class="px-4 py-3 login-container">
+<div *ngIf="!(loading | async) && !(isAuthenticated | async)" class="px-4 py-3 mx-auto login-container">
   <ng-container *ngFor="let authMethod of (authMethods); let i = index">
     <div *ngIf="i === 1" class="text-center mt-2">
       <span class="align-middle">{{"login.form.or-divider" | translate}}</span>
diff --git a/src/app/shared/log-in/log-in.component.scss b/src/app/shared/log-in/log-in.component.scss
index caaeef3dc7..2d836b0f18 100644
--- a/src/app/shared/log-in/log-in.component.scss
+++ b/src/app/shared/log-in/log-in.component.scss
@@ -1,3 +1,8 @@
 .login-container {
   max-width: 350px;
 }
+
+a {
+  white-space: normal;
+  padding: .25rem .75rem;
+}