diff --git a/web/src/app/app/(primary_layout)/datasets/[datasetId]/page.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/page.tsx
index 2353e74e6..a0992582f 100644
--- a/web/src/app/app/(primary_layout)/datasets/[datasetId]/page.tsx
+++ b/web/src/app/app/(primary_layout)/datasets/[datasetId]/page.tsx
@@ -1,9 +1,8 @@
-'use client';
 import React from 'react';
 import { permanentRedirect } from 'next/navigation';
 import { BusterRoutes, createBusterRoute } from '@/routes';
 
-export default async function DashboardPage(props: { params: Promise<{ datasetId: string }> }) {
+export default async function DatasetPage(props: { params: Promise<{ datasetId: string }> }) {
   const params = await props.params;
 
   const { datasetId } = params;
diff --git a/web/src/components/ui/table/AppDataGrid/TanStackDataGrid/DataGridHeader.tsx b/web/src/components/ui/table/AppDataGrid/TanStackDataGrid/DataGridHeader.tsx
index 549b03cf7..8fc214aca 100644
--- a/web/src/components/ui/table/AppDataGrid/TanStackDataGrid/DataGridHeader.tsx
+++ b/web/src/components/ui/table/AppDataGrid/TanStackDataGrid/DataGridHeader.tsx
@@ -54,7 +54,11 @@ const DraggableHeader: React.FC<DraggableHeaderProps> = ({
       style={style}
       className={cn(
         'group bg-background relative border-r select-none last:border-r-0',
-        header.column.getIsResizing() ? 'bg-primary/10' : 'hover:bg-item-hover',
+        sortable || resizable
+          ? header.column.getIsResizing()
+            ? 'bg-primary/10'
+            : 'hover:bg-item-hover'
+          : '',
         isOverTarget && 'bg-primary/10 border-primary inset border border-r! border-dashed'
       )}
       // onClick toggles sorting if enabled
diff --git a/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/dateConfig.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/dateConfig.ts
index 2f134d8d2..d7b20a2f6 100644
--- a/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/dateConfig.ts
+++ b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/dateConfig.ts
@@ -145,6 +145,11 @@ export const getDefaultDateOptions = (now: Date) => {
 
 export const getDefaultDayOfWeekOptions = (now: Date) => {
   return [
+    {
+      label: 'Auto Format',
+      value: 'auto'
+    },
+    NO_FORMATTING_ITEM,
     {
       label: formatDate({
         date: now,
@@ -171,6 +176,11 @@ export const getDefaultDayOfWeekOptions = (now: Date) => {
 
 export const getDefaultMonthOptions = (now: Date) => {
   return [
+    {
+      label: 'Auto Format',
+      value: 'auto'
+    },
+    NO_FORMATTING_ITEM,
     {
       label: formatDate({
         date: now,
@@ -197,6 +207,11 @@ export const getDefaultMonthOptions = (now: Date) => {
 
 export const getDefaultQuarterOptions = (now: Date) => {
   return [
+    {
+      label: 'Auto Format',
+      value: 'auto'
+    },
+    NO_FORMATTING_ITEM,
     { label: formatDate({ date: now, format: 'YYYY [Q]Q' }), value: 'YYYY [Q]Q' },
     { label: formatDate({ date: now, format: 'Q' }), value: 'Q' }
   ];
diff --git a/web/src/routes/busterRoutes/busterAppRoutes.ts b/web/src/routes/busterRoutes/busterAppRoutes.ts
index c32550a43..f8897b2e1 100644
--- a/web/src/routes/busterRoutes/busterAppRoutes.ts
+++ b/web/src/routes/busterRoutes/busterAppRoutes.ts
@@ -16,7 +16,6 @@ export enum BusterAppRoutes {
   APP_LOGS = '/app/logs',
   APP_DATASETS = '/app/datasets',
   APP_DATASETS_ID = '/app/datasets/:datasetId',
-
   APP_DATASETS_ID_OVERVIEW = '/app/datasets/:datasetId/overview',
   APP_DATASETS_ID_PERMISSIONS_OVERVIEW = '/app/datasets/:datasetId/permissions/overview',
   APP_DATASETS_ID_PERMISSIONS_PERMISSION_GROUPS = '/app/datasets/:datasetId/permissions/permission-groups',