diff --git a/resources/js/wysiwyg-tinymce/fixes.js b/resources/js/wysiwyg-tinymce/fixes.js
index b6d627ff7..9e5cce43c 100644
--- a/resources/js/wysiwyg-tinymce/fixes.js
+++ b/resources/js/wysiwyg-tinymce/fixes.js
@@ -144,11 +144,13 @@ export function handleTableCellRangeEvents(editor) {
             cell.removeAttribute('align');
             cleanChildAlignment(cell);
         },
-        JustifyRight: this.JustifyLeft,
-        JustifyCenter: this.JustifyLeft,
-        JustifyFull: this.JustifyLeft,
     };
 
+    // Copy justify left action to other alignment actions
+    actionByCommand.JustifyRight = actionByCommand.JustifyLeft;
+    actionByCommand.JustifyCenter = actionByCommand.JustifyLeft;
+    actionByCommand.JustifyFull = actionByCommand.JustifyLeft;
+
     editor.on('ExecCommand', event => {
         const action = actionByCommand[event.command];
         if (action) {
diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 37329c42c..48bf885ff 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -36,11 +36,9 @@
     @endif
 
     @if(userCan('comment-create-all') || $commentTree->canUpdateAny())
-        @push('post-app-scripts')
-            <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}"></script>
+        @push('body-end')
+            <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}" defer></script>
             @include('form.editor-translations')
-        @endpush
-        @push('post-app-html')
             @include('entities.selector-popup')
         @endpush
     @endif
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index ddecb8e76..a6d908fc0 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -35,8 +35,6 @@
     <!-- OpenSearch -->
     <link rel="search" type="application/opensearchdescription+xml" title="{{ setting('app-name') }}" href="{{ url('/opensearch.xml') }}">
 
-    @yield('head')
-
     <!-- Custom Styles & Head Content -->
     @include('layouts.parts.custom-styles')
     @include('layouts.parts.custom-head')
@@ -70,14 +68,10 @@
         </div>
     </div>
 
-    @yield('bottom')
-    @stack('post-app-html')
-
     @if($cspNonce ?? false)
-        <script src="{{ versioned_asset('dist/app.js') }}" nonce="{{ $cspNonce }}"></script>
+        <script src="{{ versioned_asset('dist/app.js') }}" type="module" nonce="{{ $cspNonce }}"></script>
     @endif
-    @yield('scripts')
-    @stack('post-app-scripts')
+    @stack('body-end')
 
     @include('layouts.parts.base-body-end')
 </body>