diff --git a/src/components/editor/entity/EditorEntityShow.vue b/src/components/editor/entity/EditorEntityShow.vue
index e0987dcf8..6e867115b 100644
--- a/src/components/editor/entity/EditorEntityShow.vue
+++ b/src/components/editor/entity/EditorEntityShow.vue
@@ -122,6 +122,9 @@
 
         props.entity.type === 'heading-two' ? 'text-center pb-3' : '',
         props.entity.type === 'heading-three' ? 'text-center pb-3' : '',
+
+        props.entity.type === 'page-break' ? 'pt-2' : '',
+        props.entity.type === 'line-break' ? 'pt-2' : '',
       ]"
     >
       <p>{{ update }}</p>
diff --git a/src/components/editor/entity/EditorEntityShowPopover.vue b/src/components/editor/entity/EditorEntityShowPopover.vue
index 8d80361ab..51f340007 100644
--- a/src/components/editor/entity/EditorEntityShowPopover.vue
+++ b/src/components/editor/entity/EditorEntityShowPopover.vue
@@ -147,7 +147,7 @@
             </svg>
           </HeroIcon>
         </template>
-        <p>{{ t('editor.aside.props.entity.up') }}</p>
+        <p>{{ t('editor.aside.entity.up') }}</p>
       </EditorEntityShowSelect>
       <EditorEntityShowSelect @click.prevent.stop="onDownEntity">
         <template #icon>
@@ -166,7 +166,7 @@
             </svg>
           </HeroIcon>
         </template>
-        <p>{{ t('editor.aside.props.entity.down') }}</p>
+        <p>{{ t('editor.aside.entity.down') }}</p>
       </EditorEntityShowSelect>
       <EditorEntityShowSelect @click.prevent.stop="onDeleteEntity">
         <template #icon>
@@ -185,7 +185,7 @@
             </svg>
           </HeroIcon>
         </template>
-        <p>{{ t('editor.aside.props.entity.delete') }}</p>
+        <p>{{ t('editor.aside.entity.delete') }}</p>
       </EditorEntityShowSelect>
     </section>
     <HeroIcon class="wb-icon" @mouseenter.prevent.stop="onAdjustEntityWrapper">
diff --git a/src/components/editor/main/EditorBase.vue b/src/components/editor/main/EditorBase.vue
index c46960b4e..56ceed323 100644
--- a/src/components/editor/main/EditorBase.vue
+++ b/src/components/editor/main/EditorBase.vue
@@ -1,7 +1,14 @@
 <template>
   <div
     ref="main"
-    class="w-full overflow-hidden h-screen bg-gray-100 dark:bg-gray-700"
+    class="
+      w-full
+      flex flex-col
+      overflow-hidden
+      h-screen
+      bg-gray-100
+      dark:bg-gray-700
+    "
     :class="[
       store.state.editor.configuration.draggable ? 'fixed' : 'inline-block',
     ]"
@@ -18,8 +25,8 @@
       class="
         flex flex-col
         w-full
-        overflow-y-auto
         max-h-screen
+        overflow-y-auto
         bg-gray-100
         dark:bg-gray-700
       "
diff --git a/src/components/editor/main/EditorBaseHeader.vue b/src/components/editor/main/EditorBaseHeader.vue
index ac906fbb8..9072581d3 100644
--- a/src/components/editor/main/EditorBaseHeader.vue
+++ b/src/components/editor/main/EditorBaseHeader.vue
@@ -1,10 +1,10 @@
 <template>
-  <div
+  <header
     class="
       flex
       justify-end
       items-center
-      relative
+      w-full
       bg-white-opacity
       dark:bg-black-opacity
     "
@@ -128,7 +128,7 @@
         />
       </svg>
     </HeroIcon>
-  </div>
+  </header>
 </template>
 
 <script setup lang="ts">