diff --git a/public/locales/en.json b/public/locales/en.json
index d7ed6eac..cd44daea 100644
--- a/public/locales/en.json
+++ b/public/locales/en.json
@@ -6,7 +6,7 @@
     "signInButton": "Sign in"
   },
   "ComponentList": {
-    "tableComponentHeader": "Component",
+    "tableComponentHeader": "Name",
     "tableVersionHeader": "Version"
   },
   "FluxList": {
@@ -20,7 +20,7 @@
     "tableCreatedHeader": "Created"
   },
   "ManagedResources": {
-    "headerManagedResources": "Resources",
+    "header": "Managed Resources",
     "tableHeaderKind": "Kind",
     "tableHeaderName": "Name",
     "tableHeaderCreated": "Created",
@@ -126,7 +126,10 @@
     "title": "Projects"
   },
   "ControlPlaneView": {
-    "accessError": "Managed Control Plane does not have access information yet"
+    "accessError": "Managed Control Plane does not have access information yet",
+    "componentsTitle": "Components",
+    "crossplaneTitle": "Crossplane",
+    "gitOpsTitle": "GitOps"
   },
   "ToastContext": {
     "errorMessage": "useToast must be used within a ToastProvider"
@@ -147,7 +150,7 @@
     "tableHeaderHealthy": "Healthy"
   },
   "ProvidersConfig": {
-    "headerProvidersConfig": "Providers Config"
+    "header": "Provider Configs"
   },
   "validationErrors": {
     "required": "This field is required!",
diff --git a/src/components/ControlPlane/ComponentList.tsx b/src/components/ControlPlane/ComponentList.tsx
index 36a85d07..a34aa794 100644
--- a/src/components/ControlPlane/ComponentList.tsx
+++ b/src/components/ControlPlane/ComponentList.tsx
@@ -49,6 +49,7 @@ export default function ComponentList({ mcp }: { mcp: ControlPlaneType }) {
         columns={componentTableColumns}
         minRows={0}
         data={data}
+        style={{marginLeft: "12px", marginRight: "12px"}}
       />
     </div>
   );
diff --git a/src/components/ControlPlane/ManagedResources.tsx b/src/components/ControlPlane/ManagedResources.tsx
index c2342f32..255c7faa 100644
--- a/src/components/ControlPlane/ManagedResources.tsx
+++ b/src/components/ControlPlane/ManagedResources.tsx
@@ -106,12 +106,13 @@ export function ManagedResources() {
 
   return (
     <>
-      <Title level="H4">{t('ManagedResources.headerManagedResources')}</Title>
+      <Title level="H4">{t('ManagedResources.header')}</Title>
 
       {error && <IllustratedError error={error} />}
 
       {!error && (
         <AnalyticalTable
+          style={{ margin: '12px' }}
           columns={columns}
           data={rows}
           minRows={1}
diff --git a/src/components/ControlPlane/ProvidersConfig.tsx b/src/components/ControlPlane/ProvidersConfig.tsx
index 4c4dd8de..74646ac5 100644
--- a/src/components/ControlPlane/ProvidersConfig.tsx
+++ b/src/components/ControlPlane/ProvidersConfig.tsx
@@ -12,7 +12,7 @@ export function ProvidersConfig() {
 
   return (
     <>
-      <Title level='H4'>{t('ProvidersConfig.headerProvidersConfig')}</Title>
+      <Title level='H4'>{t('ProvidersConfig.header')}</Title>
         <AnalyticalTable
           columns={columns}
           data={[]}
diff --git a/src/components/Shared/ConfiguredAnalyticsTable.tsx b/src/components/Shared/ConfiguredAnalyticsTable.tsx
index 89b2d0f7..84e19961 100644
--- a/src/components/Shared/ConfiguredAnalyticsTable.tsx
+++ b/src/components/Shared/ConfiguredAnalyticsTable.tsx
@@ -23,6 +23,7 @@ export default function ConfiguredAnalyticsTable(props: Props) {
       scaleWidthMode={AnalyticalTableScaleWidthMode.Smart}
       loading={props.isLoading}
       filterable
+      style={{margin: "12px"}}
     />
   );
 }
diff --git a/src/index.css b/src/index.css
index aa404973..93326d9c 100644
--- a/src/index.css
+++ b/src/index.css
@@ -86,6 +86,10 @@
   margin-bottom: -30px;
 }
 
+.cp-panel {
+  margin: 12px;
+}
+
 .cp-panel-crossplane {
   background-color: #FFC933;
 }
diff --git a/src/views/ControlPlanes/ControlPlaneView.tsx b/src/views/ControlPlanes/ControlPlaneView.tsx
index b11f74d8..722f68a5 100644
--- a/src/views/ControlPlanes/ControlPlaneView.tsx
+++ b/src/views/ControlPlanes/ControlPlaneView.tsx
@@ -88,13 +88,18 @@ export default function ControlPlaneView() {
           <ObjectPageSection
             className="cp-page-section-components"
             id="components"
-            titleText="Components"
+            titleText={t('ControlPlaneView.componentsTitle')}
             hideTitleText
           >
             <Panel
+              className="cp-panel"
               headerLevel="H2"
               headerText="Panel"
-              header={<Title level="H3">Components</Title>}
+              header={
+                <Title level="H3">
+                  {t('ControlPlaneView.componentsTitle')}
+                </Title>
+              }
               noAnimation
             >
               <ComponentList mcp={mcp} />
@@ -103,14 +108,18 @@ export default function ControlPlaneView() {
           <ObjectPageSection
             className="cp-page-section-crossplane"
             id="crossplane"
-            titleText="Crossplane"
+            titleText={t('ControlPlaneView.crossplaneTitle')}
             hideTitleText
           >
             <Panel
-              className="cp-panel-crossplane"
+              className="cp-panel cp-panel-crossplane"
               headerLevel="H3"
               headerText="Panel"
-              header={<Title level="H3">Crossplane</Title>}
+              header={
+                <Title level="H3">
+                  {t('ControlPlaneView.crossplaneTitle')}
+                </Title>
+              }
               noAnimation
             >
               <ProvidersList />
@@ -119,14 +128,16 @@ export default function ControlPlaneView() {
           <ObjectPageSection
             className="cp-page-section-gitops"
             id="gitops"
-            titleText="GitOps"
+            titleText={t('ControlPlaneView.gitOpsTitle')}
             hideTitleText
           >
             <Panel
-              className="cp-panel-gitops"
+              className="cp-panel cp-panel-gitops"
               headerLevel="H3"
               headerText="Panel"
-              header={<Title level="H3">GitOps</Title>}
+              header={
+                <Title level="H3">{t('ControlPlaneView.gitOpsTitle')}</Title>
+              }
               noAnimation
             >
               <FluxList />