diff --git a/docker-compose.yml b/docker-compose.yml
index 3ffd0bcd5e5..c0ebe2c4338 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -84,6 +84,7 @@ services:
     command: "npm run serve"
     volumes:
       - ".:/home/dev/openproject"
+      - "../commonmark-ckeditor-build/build/:/home/dev/openproject/frontend/src/vendor/ckeditor/"
     ports:
       - "4200:4200"
     environment:
diff --git a/frontend/src/global_styles/content/user-content/_figure.sass b/frontend/src/global_styles/content/user-content/_figure.sass
index c08c4fffc45..892e216beca 100644
--- a/frontend/src/global_styles/content/user-content/_figure.sass
+++ b/frontend/src/global_styles/content/user-content/_figure.sass
@@ -7,6 +7,7 @@
   width: 100%
   max-width: 100%
   position: relative
+  break-inside: avoid
 
   @include styled-scroll-bar
 
@@ -32,14 +33,14 @@
     flex-shrink: 1
     width: 100%
     display: flex
-    justify-content:  center
+    justify-content:  flex-start
+    overflow: auto
+    max-height: 100%
+
   &--description
     flex-basis: auto
     flex-grow: 1
     flex-shrink: 0
     padding: 0.75rem
-    width: 100%
+    max-width: 100%
     text-align: center
-
-  &.table
-    display: flex !important
diff --git a/frontend/src/global_styles/content/user-content/_image.sass b/frontend/src/global_styles/content/user-content/_image.sass
index 9852b8ba9e6..1234a656cff 100644
--- a/frontend/src/global_styles/content/user-content/_image.sass
+++ b/frontend/src/global_styles/content/user-content/_image.sass
@@ -1,3 +1,7 @@
 .op-uc-image
   max-width: 100%;
   max-height: 100%;
+
+  // Needed to override built-in ckeditor styles
+  @at-root .op-uc-container .image &
+    margin: 0
diff --git a/frontend/src/global_styles/content/user-content/_table.sass b/frontend/src/global_styles/content/user-content/_table.sass
index af3bcde4117..ed692623ed8 100644
--- a/frontend/src/global_styles/content/user-content/_table.sass
+++ b/frontend/src/global_styles/content/user-content/_table.sass
@@ -14,8 +14,8 @@
 
   &--cell
     text-align: left
+    min-width: 3em;
     padding: 0.75rem
-    word-break: break-all
 
     &:not(:last-child):not([colspan])
       border-right: 1px solid rgba(0, 0, 0, 0.1)
diff --git a/frontend/src/global_styles/content/user-content/_typography.sass b/frontend/src/global_styles/content/user-content/_typography.sass
index 7d51a05dbee..d0d76879eb5 100644
--- a/frontend/src/global_styles/content/user-content/_typography.sass
+++ b/frontend/src/global_styles/content/user-content/_typography.sass
@@ -3,7 +3,7 @@
 .op-uc-h3,
 .op-uc-h4,
 .op-uc-h5,
-.op-uc-h6,
+.op-uc-h6
   --falloff: var(--op-uc-heading-falloff)
   color: inherit
   line-height: 1.6em
@@ -19,6 +19,14 @@
   &:hover .op-uc-link_permalink
     display: inline-flex
 
+.op-uc-h1
+  margin-bottom: 0.5rem
+  border-bottom: 1px solid #dadada
+
+  .op-uc-container_reduced-headings
+    border-bottom: none
+    margin-bottom: 0
+
 .op-uc-h1
   font-size: var(--op-uc-heading-base)
 .op-uc-h2
@@ -31,14 +39,14 @@
   font-size: calc(var(--op-uc-heading-base) * var(--falloff) * var(--falloff) * var(--falloff) * var(--falloff))
   
 .op-uc-p
-  font: inherit;
+  font: inherit
   margin: 0
   line-height: 1.6em
   color: inherit
 
 .op-uc-blockquote
   display: block
-  margin: 0;
+  margin: 0
   border-left: 3px solid #e0e0e0
   padding: 0.8rem 1.2rem 0 1.2rem
   overflow: hidden
diff --git a/spec/features/work_packages/new/new_work_package_spec.rb b/spec/features/work_packages/new/new_work_package_spec.rb
index d5f6462ebfa..3f55f766467 100644
--- a/spec/features/work_packages/new/new_work_package_spec.rb
+++ b/spec/features/work_packages/new/new_work_package_spec.rb
@@ -308,7 +308,7 @@ describe 'new work package', js: true do
       create_work_package_globally(type_bug, project.name)
 
       date_field = wp_page.edit_field(:combinedDate)
-      date_field.expect_value("no start date - no end date")
+      date_field.expect_value("no start date - no finish date")
 
       click_on 'Cancel'
     end