diff --git a/src/dialogs/more-info/controls/more-info-person.ts b/src/dialogs/more-info/controls/more-info-person.ts
index ef8b3f803b..84fa6a733b 100644
--- a/src/dialogs/more-info/controls/more-info-person.ts
+++ b/src/dialogs/more-info/controls/more-info-person.ts
@@ -32,7 +32,7 @@ class MoreInfoPerson extends LitElement {
     return html`
       <ha-attributes
         .stateObj=${this.stateObj}
-        extraFilters="id,user_id,editable"
+        extra-filters="id,user_id,editable"
       ></ha-attributes>
       ${this.stateObj.attributes.latitude && this.stateObj.attributes.longitude
         ? html`
@@ -78,6 +78,9 @@ class MoreInfoPerson extends LitElement {
         margin: 36px 0 8px 0;
         text-align: right;
       }
+      ha-map {
+        margin-top: 16px;
+      }
     `;
   }
 }
diff --git a/src/dialogs/more-info/ha-more-info-dialog.ts b/src/dialogs/more-info/ha-more-info-dialog.ts
index bb217a732c..4d787863d8 100644
--- a/src/dialogs/more-info/ha-more-info-dialog.ts
+++ b/src/dialogs/more-info/ha-more-info-dialog.ts
@@ -26,10 +26,8 @@ import { navigate } from "../../common/navigate";
 import "../../components/ha-dialog";
 import "../../components/ha-header-bar";
 import "../../components/ha-svg-icon";
-import "../../components/state-history-charts";
 import { removeEntityRegistryEntry } from "../../data/entity_registry";
 import { showEntityEditorDialog } from "../../panels/config/entities/show-dialog-entity-editor";
-import "../../panels/logbook/ha-logbook";
 import { haStyleDialog } from "../../resources/styles";
 import "../../state-summary/state-card-content";
 import { HomeAssistant } from "../../types";
@@ -394,7 +392,9 @@ export class MoreInfoDialog extends LitElement {
           --dialog-content-padding: 0;
         }
 
-        state-card-content {
+        state-card-content,
+        ha-more-info-history,
+        ha-more-info-logbook:not(:last-child) {
           display: block;
           margin-bottom: 16px;
         }
diff --git a/src/dialogs/more-info/ha-more-info-history.ts b/src/dialogs/more-info/ha-more-info-history.ts
index 1dc70b68d4..93970b7b93 100644
--- a/src/dialogs/more-info/ha-more-info-history.ts
+++ b/src/dialogs/more-info/ha-more-info-history.ts
@@ -1,5 +1,4 @@
 import {
-  css,
   customElement,
   html,
   internalProperty,
@@ -13,7 +12,6 @@ import { throttle } from "../../common/util/throttle";
 import "../../components/state-history-charts";
 import { getRecentWithCache } from "../../data/cached-history";
 import { HistoryResult } from "../../data/history";
-import { haStyle } from "../../resources/styles";
 import { HomeAssistant } from "../../types";
 
 @customElement("ha-more-info-history")
@@ -88,18 +86,6 @@ export class MoreInfoHistory extends LitElement {
       this.hass!.language
     );
   }
-
-  static get styles() {
-    return [
-      haStyle,
-      css`
-        state-history-charts {
-          display: block;
-          margin-bottom: 16px;
-        }
-      `,
-    ];
-  }
 }
 
 declare global {
diff --git a/src/dialogs/more-info/ha-more-info-logbook.ts b/src/dialogs/more-info/ha-more-info-logbook.ts
index a3258133f2..6c559e7dae 100644
--- a/src/dialogs/more-info/ha-more-info-logbook.ts
+++ b/src/dialogs/more-info/ha-more-info-logbook.ts
@@ -152,8 +152,6 @@ export class MoreInfoLogbook extends LitElement {
         ha-logbook {
           max-height: 250px;
           overflow: auto;
-          display: block;
-          margin-top: 16px;
         }
         ha-circular-progress {
           display: flex;
diff --git a/src/panels/logbook/ha-logbook.ts b/src/panels/logbook/ha-logbook.ts
index 86e61d3535..9c5e85d5df 100644
--- a/src/panels/logbook/ha-logbook.ts
+++ b/src/panels/logbook/ha-logbook.ts
@@ -285,7 +285,7 @@ class HaLogbook extends LitElement {
       .narrow .entry {
         flex-direction: column;
         line-height: 1.5;
-        padding: 8px;
+        padding: 8px 0;
       }
 
       .narrow .icon-message ha-icon {