diff --git a/libs/angular-accelerator/src/lib/components/page-header/page-header.component.html b/libs/angular-accelerator/src/lib/components/page-header/page-header.component.html
index 3cea622b..62538c88 100644
--- a/libs/angular-accelerator/src/lib/components/page-header/page-header.component.html
+++ b/libs/angular-accelerator/src/lib/components/page-header/page-header.component.html
@@ -1,4 +1,4 @@
-<div class="onecx-page-header" name="ocx-page-header-wrapper">
+<div class="onecx-page-header mb-4" name="ocx-page-header-wrapper">
   <ng-container *ngIf="showBreadcrumbs">
     <p-breadcrumb
       [model]="items"
diff --git a/libs/angular-accelerator/src/lib/components/page-header/page-header.component.stories.ts b/libs/angular-accelerator/src/lib/components/page-header/page-header.component.stories.ts
index 92226e86..8f776f77 100644
--- a/libs/angular-accelerator/src/lib/components/page-header/page-header.component.stories.ts
+++ b/libs/angular-accelerator/src/lib/components/page-header/page-header.component.stories.ts
@@ -1,4 +1,3 @@
-import { DatePipe } from '@angular/common'
 import { importProvidersFrom } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
@@ -122,8 +121,7 @@ const demoFields: ObjectDetailItem[] = [
   },
   {
     label: 'End Date',
-    value: new Date().toISOString(),
-    valuePipe: DatePipe,
+    value: '19.06.2024',
     icon: PrimeIcons.CALENDAR
   },
 ]
diff --git a/libs/portal-integration-angular/src/lib/core/components/content-container/content-container.component.spec.ts b/libs/portal-integration-angular/src/lib/core/components/content-container/content-container.component.spec.ts
index 73f19de0..12e8476c 100644
--- a/libs/portal-integration-angular/src/lib/core/components/content-container/content-container.component.spec.ts
+++ b/libs/portal-integration-angular/src/lib/core/components/content-container/content-container.component.spec.ts
@@ -24,7 +24,7 @@ describe('OcxContentContainerComponent', () => {
   })
 
   it('should render a horizontal layout container with md breakpoint by default', async () => {
-    const expectedClasses = ['flex', 'py-3', 'gap-3', 'flex-column', 'md:flex-row']
+    const expectedClasses = ['flex', 'gap-3', 'flex-column', 'md:flex-row']
     expect(await ocxContentContainerHarness.getLayoutClasses()).toEqual(expectedClasses)
     expect(await ocxContentContainerHarness.getLayout()).toEqual('horizontal')
     expect(await ocxContentContainerHarness.getBreakpoint()).toEqual('md')
@@ -33,7 +33,7 @@ describe('OcxContentContainerComponent', () => {
   it('should render a horizontal layout container while respecting a specified breakpoint', async () => {
     component.breakpoint = 'lg'
 
-    const expectedClassesLG = ['flex', 'py-3', 'gap-3', 'flex-column', 'lg:flex-row']
+    const expectedClassesLG = ['flex', 'gap-3', 'flex-column', 'lg:flex-row']
     expect(await ocxContentContainerHarness.getLayoutClasses()).toEqual(expectedClassesLG)
     expect(await ocxContentContainerHarness.getLayout()).toEqual('horizontal')
     expect(await ocxContentContainerHarness.getBreakpoint()).toEqual('lg')
@@ -42,7 +42,7 @@ describe('OcxContentContainerComponent', () => {
   it('should render a vertical layout container if specified', async () => {
     component.layout = 'vertical'
 
-    const expectedClasses = ['flex', 'py-3', 'gap-3', 'flex-column']
+    const expectedClasses = ['flex', 'gap-3', 'flex-column']
     expect(await ocxContentContainerHarness.getLayoutClasses()).toEqual(expectedClasses)
     expect(await ocxContentContainerHarness.getLayout()).toEqual('vertical')
     expect(await ocxContentContainerHarness.getBreakpoint()).toBeUndefined()
diff --git a/libs/portal-integration-angular/src/lib/core/components/page-content/page-content.component.html b/libs/portal-integration-angular/src/lib/core/components/page-content/page-content.component.html
index e892f81a..60f71421 100644
--- a/libs/portal-integration-angular/src/lib/core/components/page-content/page-content.component.html
+++ b/libs/portal-integration-angular/src/lib/core/components/page-content/page-content.component.html
@@ -1,3 +1,3 @@
-<div [class]="'mt-4 content-wrap ' + styleClass">
+<div [class]="'content-wrap ' + styleClass">
   <ng-content></ng-content>
 </div>
diff --git a/libs/portal-integration-angular/src/lib/core/components/page-content/page-content.component.ts b/libs/portal-integration-angular/src/lib/core/components/page-content/page-content.component.ts
index c2ec9920..7c597642 100644
--- a/libs/portal-integration-angular/src/lib/core/components/page-content/page-content.component.ts
+++ b/libs/portal-integration-angular/src/lib/core/components/page-content/page-content.component.ts
@@ -1,5 +1,7 @@
 import { Component, Input } from '@angular/core'
-
+/**
+ * @deprecated This component will be removed in favor of ocx-content and ocx-content-container in a future release.
+ */
 @Component({
   selector: 'ocx-page-content',
   templateUrl: './page-content.component.html',
diff --git a/libs/portal-integration-angular/src/lib/core/directives/content-container.directive.ts b/libs/portal-integration-angular/src/lib/core/directives/content-container.directive.ts
index 5f4cec71..2d5a983f 100644
--- a/libs/portal-integration-angular/src/lib/core/directives/content-container.directive.ts
+++ b/libs/portal-integration-angular/src/lib/core/directives/content-container.directive.ts
@@ -42,7 +42,7 @@ export class OcxContentContainerDirective implements OnInit, OnChanges {
       })
       removeClasses(classesToRemove)
     }
-    const sharedClasses = ['flex', 'py-3', 'gap-3', 'flex-column']
+    const sharedClasses = ['flex', 'gap-3', 'flex-column']
     removeResponsiveLayoutClasses()
     addClasses(sharedClasses)
     if (this.layout != 'vertical') {