diff --git a/app/client/src/components/designSystems/appsmith/ChartComponent.tsx b/app/client/src/components/designSystems/appsmith/ChartComponent.tsx
index d1b4eb2a56..dcd02cf6aa 100644
--- a/app/client/src/components/designSystems/appsmith/ChartComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/ChartComponent.tsx
@@ -231,10 +231,20 @@ class ChartComponent extends React.Component<ChartComponentProps> {
   componentDidMount() {
     this.createGraph();
     FusionCharts.ready(() => {
-      this.chartInstance.render();
+      /* Component could be unmounted before FusionCharts is ready, 
+      this check ensure we don't render on unmounted component */
+      if (this.chartInstance) {
+        this.chartInstance.render();
+      }
     });
   }
 
+  componentWillUnmount() {
+    if (this.chartInstance) {
+      this.chartInstance = null;
+    }
+  }
+
   componentDidUpdate(prevProps: ChartComponentProps) {
     if (!_.isEqual(prevProps, this.props)) {
       const chartType = this.getChartType();
diff --git a/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx b/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
index e2dc29c485..81a06d3955 100644
--- a/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
@@ -291,7 +291,7 @@ export const TableHeaderWrapper = styled.div<{
   .show-page-items {
     display: ${props => (props.width < 700 ? "none" : "flex")};
   }
-  overflow-x: scroll;
+  overflow-x: auto;
   overflow-y: hidden;
   height: ${props => props.tableSizes.TABLE_HEADER_HEIGHT}px;
   min-height: ${props => props.tableSizes.TABLE_HEADER_HEIGHT}px;
@@ -325,7 +325,7 @@ export const TableIconWrapper = styled.div<{
   box-shadow: ${props =>
     props.selected ? `inset 0px 4px 0px ${Colors.GREEN}` : "none"};
   width: 48px;
-  height: 45px;
+  height: 42px;
   display: flex;
   align-items: center;
   justify-content: center;
diff --git a/app/client/src/constants/DefaultTheme.tsx b/app/client/src/constants/DefaultTheme.tsx
index 2990382b5d..eca68cb153 100644
--- a/app/client/src/constants/DefaultTheme.tsx
+++ b/app/client/src/constants/DefaultTheme.tsx
@@ -754,8 +754,8 @@ export const scrollbarLight = css<{ backgroundColor?: Color }>`
 
   scrollbar-width: thin;
   &::-webkit-scrollbar {
-    width: 6px;
-    height: 6px;
+    width: 4px;
+    height: 4px;
   }
   &::-webkit-scrollbar-track {
     box-shadow: inset 0 0 6px
diff --git a/app/client/src/widgets/TableWidget.tsx b/app/client/src/widgets/TableWidget.tsx
index 0795eeb547..72aec3cd76 100644
--- a/app/client/src/widgets/TableWidget.tsx
+++ b/app/client/src/widgets/TableWidget.tsx
@@ -41,21 +41,21 @@ export enum CompactModeTypes {
 export const TABLE_SIZES: { [key: string]: TableSizes } = {
   [CompactModeTypes.DEFAULT]: {
     COLUMN_HEADER_HEIGHT: 38,
-    TABLE_HEADER_HEIGHT: 45,
+    TABLE_HEADER_HEIGHT: 42,
     ROW_HEIGHT: 40,
-    ROW_FONT_SIZE: 12,
+    ROW_FONT_SIZE: 14,
   },
   [CompactModeTypes.SHORT]: {
     COLUMN_HEADER_HEIGHT: 38,
-    TABLE_HEADER_HEIGHT: 45,
+    TABLE_HEADER_HEIGHT: 42,
     ROW_HEIGHT: 20,
-    ROW_FONT_SIZE: 10,
+    ROW_FONT_SIZE: 12,
   },
   [CompactModeTypes.TALL]: {
     COLUMN_HEADER_HEIGHT: 38,
-    TABLE_HEADER_HEIGHT: 45,
+    TABLE_HEADER_HEIGHT: 42,
     ROW_HEIGHT: 60,
-    ROW_FONT_SIZE: 12,
+    ROW_FONT_SIZE: 18,
   },
 };