diff --git a/libs/ui/src/lib/fire-calculator/fire-calculator.component.stories.ts b/libs/ui/src/lib/fire-calculator/fire-calculator.component.stories.ts
index 809af3e77..0ad868ff9 100644
--- a/libs/ui/src/lib/fire-calculator/fire-calculator.component.stories.ts
+++ b/libs/ui/src/lib/fire-calculator/fire-calculator.component.stories.ts
@@ -25,15 +25,15 @@ export default {
       imports: [
         CommonModule,
         FormsModule,
+        GfFireCalculatorComponent,
         GfValueComponent,
         MatButtonModule,
+        MatDatepickerModule,
         MatFormFieldModule,
         MatInputModule,
-        MatDatepickerModule,
         NgxSkeletonLoaderModule,
         NoopAnimationsModule,
-        ReactiveFormsModule,
-        GfFireCalculatorComponent
+        ReactiveFormsModule
       ],
       providers: [FireCalculatorService, provideNativeDateAdapter()]
     })
diff --git a/libs/ui/src/lib/line-chart/line-chart.component.stories.ts b/libs/ui/src/lib/line-chart/line-chart.component.stories.ts
index f6e4c5f0b..9770074d2 100644
--- a/libs/ui/src/lib/line-chart/line-chart.component.stories.ts
+++ b/libs/ui/src/lib/line-chart/line-chart.component.stories.ts
@@ -10,7 +10,7 @@ export default {
   component: GfLineChartComponent,
   decorators: [
     moduleMetadata({
-      imports: [GfLineChartComponent, CommonModule, NgxSkeletonLoaderModule]
+      imports: [CommonModule, GfLineChartComponent, NgxSkeletonLoaderModule]
     })
   ]
 } as Meta<GfLineChartComponent>;
diff --git a/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.stories.ts b/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.stories.ts
index 966cf9e53..90aa0cee8 100644
--- a/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.stories.ts
+++ b/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.stories.ts
@@ -12,8 +12,8 @@ export default {
   decorators: [
     moduleMetadata({
       imports: [
-        GfPortfolioProportionChartComponent,
         CommonModule,
+        GfPortfolioProportionChartComponent,
         NgxSkeletonLoaderModule
       ]
     })
diff --git a/libs/ui/src/lib/trend-indicator/trend-indicator.component.stories.ts b/libs/ui/src/lib/trend-indicator/trend-indicator.component.stories.ts
index f9da3e7ad..1db9e2995 100644
--- a/libs/ui/src/lib/trend-indicator/trend-indicator.component.stories.ts
+++ b/libs/ui/src/lib/trend-indicator/trend-indicator.component.stories.ts
@@ -28,8 +28,8 @@ export const Default: Story = {
 
 export const Delayed: Story = {
   args: {
-    marketState: 'delayed',
-    dateRange: '1d'
+    dateRange: '1d',
+    marketState: 'delayed'
   }
 };
 
@@ -47,7 +47,7 @@ export const Up: Story = {
 
 export const MarketClosed: Story = {
   args: {
-    marketState: 'closed',
-    dateRange: '1d'
+    dateRange: '1d',
+    marketState: 'closed'
   }
 };
diff --git a/libs/ui/src/lib/value/value.component.stories.ts b/libs/ui/src/lib/value/value.component.stories.ts
index 17c7d9d0e..ff9f5a259 100644
--- a/libs/ui/src/lib/value/value.component.stories.ts
+++ b/libs/ui/src/lib/value/value.component.stories.ts
@@ -40,9 +40,9 @@ export const Label: Story = {
 
 export const PerformancePositive: Story = {
   args: {
-    locale: 'en-US',
     colorizeSign: true,
     isPercent: true,
+    locale: 'en-US',
     value: 0.0136810853673890378
   },
   name: 'Performance (positive)'
@@ -50,9 +50,9 @@ export const PerformancePositive: Story = {
 
 export const PerformanceNegative: Story = {
   args: {
-    locale: 'en-US',
     colorizeSign: true,
     isPercent: true,
+    locale: 'en-US',
     value: -0.0136810853673890378
   },
   name: 'Performance (negative)'
@@ -60,9 +60,9 @@ export const PerformanceNegative: Story = {
 
 export const PerformanceCloseToZero: Story = {
   args: {
-    locale: 'en-US',
     colorizeSign: true,
     isPercent: true,
+    locale: 'en-US',
     value: -2.388915360475e-8
   },
   name: 'Performance (negative zero)'