diff --git a/cypress/e2e/partner-admin/default-tests/listOrgs.spec.cy.js b/cypress/e2e/partner-admin/default-tests/listOrgs.spec.cy.js
index fd64b22c1..c7d45569e 100644
--- a/cypress/e2e/partner-admin/default-tests/listOrgs.spec.cy.js
+++ b/cypress/e2e/partner-admin/default-tests/listOrgs.spec.cy.js
@@ -22,7 +22,11 @@ describe('The partner admin user', () => {
   beforeEach(() => {
     cy.login(Cypress.env('partnerAdminUsername'), Cypress.env('partnerAdminPassword'));
     cy.wait(0.2 * timeout);
+    cy.navigateTo('/');
+    cy.wait(0.2 * timeout);
     cy.navigateTo(listOrgsUrl, { timeout: timeout });
+    // cy.get('button').contains('Organizations').click();
+    // cy.get('button').contains('List Organizations').click();
   });
 
   orgs.forEach((org) => {
diff --git a/src/components/reports/DistributionChartFacet.vue b/src/components/reports/DistributionChartFacet.vue
index ce99299ae..126bb5a43 100644
--- a/src/components/reports/DistributionChartFacet.vue
+++ b/src/components/reports/DistributionChartFacet.vue
@@ -132,19 +132,21 @@ const distributionChartFacet = (taskId) => {
           titleAnchor: 'middle',
           labelColor: 'navy',
           labelFontSize: 14,
-          labelFontStyle: 'bold',
-          labelAnchor: 'middle',
+          labelFontStyle: '',
+          labelAnchor: 'top',
           labelAngle: 0,
-          labelAlign: 'left',
+          labelAlign: 'right',
           labelOrient: 'left',
+          labelBaseline: 'line-bottom',
+          labelPadding: 0,
           labelExpr:
             props.facetMode.name === 'Grade'
-              ? "join(['Grade ',if(datum.value == '0', 'K', datum.value ), ], '')"
-              : 'slice(datum.value, 1, datum.value.length)',
+              ? "join(['Grade ',if(datum.value == 'Kindergarten', 'K', datum.value ), ], '')"
+              : 'split(slice(datum.value, 2, datum.value.length), " ")',
           labelLimit: 150,
-          labelSeparation: 5, // Set the spacing between lines in pixels
+          labelSeparation: 0, // Set the spacing between lines in pixels
         },
-        spacing: 10,
+        spacing: 18,
         sort: 'ascending',
       },
 
@@ -175,9 +177,13 @@ const distributionChartFacet = (taskId) => {
         aggregate: 'count',
         title: 'Count',
         axis: {
-          orient: 'right',
+          labelBaseline: 'right',
           titleFontSize: 14,
+          labelLimit: 180,
+          labelPadding: 8,
           labelFontSize: 14,
+          labelColor: 'navy',
+          labelFontStyle: '',
           format: '.0f',
         },
       },
diff --git a/src/components/reports/DistributionChartSupport.vue b/src/components/reports/DistributionChartSupport.vue
index 901f07cab..18027ef1c 100644
--- a/src/components/reports/DistributionChartSupport.vue
+++ b/src/components/reports/DistributionChartSupport.vue
@@ -188,17 +188,18 @@ const distributionBySupport = computed(() => {
               ]
             : 'ascending',
         axis: {
-          labelAngle: 0,
-          labelAlign: 'right',
+          labelBaseline: 'line-bottom',
           titleFontSize: 14,
-          labelLimit: 150,
+          labelLimit: 180,
+          labelPadding: 8,
           labelFontSize: 14,
           labelColor: 'navy',
-          labelFontStyle: 'bold',
+          labelFontStyle: '',
+          transform: [{ calculate: "split(datum.address, ' ')", as: 'address' }],
           labelExpr:
             props.facetMode.name === 'Grade'
               ? "join(['Grade ',if(datum.value == 'Kindergarten', 'K', datum.value ), ], '')"
-              : 'slice(datum.value, 1, datum.value.length)',
+              : 'split(slice(datum.value, 2, datum.value.length), " ")',
         },
       },
       yOffset: {