diff --git a/src/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Views/MainView.fs b/src/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Views/MainView.fs
index fb79529c..6f9f3dda 100644
--- a/src/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Views/MainView.fs
+++ b/src/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Views/MainView.fs
@@ -2,7 +2,6 @@
 
 open Avalonia.Controls
 open Avalonia.FuncUI.DSL
-open Avalonia.FuncUI.Builder
 
 module MainView =
 
@@ -25,29 +24,45 @@ module MainView =
         TabControl.create [
             TabControl.tabStripPlacement Dock.Left
             TabControl.viewItems [
+                TabItem.create [
+                    TabItem.header "CalendarDatePicker Demo"
+                    TabItem.content (ViewBuilder.Create<CalendarDatePickerDemo.Host>([]))
+                ]
+                TabItem.create [
+                    TabItem.header "Canvas Demo"
+                    TabItem.content (ViewBuilder.Create<CanvasDemo.Host>([]))
+                ]
+                TabItem.create [
+                    TabItem.header "Context Menu Demo"
+                    TabItem.content (ViewBuilder.Create<ContextMenuDemo.Host>([]))
+                ]
                 TabItem.create [
                     TabItem.header "Data Template Demo"
                     TabItem.content (DataTemplateDemo.view state.dataTemplateState (DataTemplateDemoMsg >> dispatch))
                 ]
                 TabItem.create [
-                    TabItem.header "Grid Demo"
-                    TabItem.content (ViewBuilder.Create<GridDemo.Host>([]))
+                    TabItem.header "DatePicker Demo"
+                    TabItem.content (ViewBuilder.Create<DatePickerDemo.Host>([]))
                 ]
                 TabItem.create [
-                    TabItem.header "Gridsplitter Demo"
-                    TabItem.content (ViewBuilder.Create<GridSplitterDemo.Host>([]))
+                    TabItem.header "Drag+Drop Demo"
+                    TabItem.content (ViewBuilder.Create<DragDropDemo.Host>([]))
                 ]
                 TabItem.create [
-                    TabItem.header "WrapPanel Demo"
-                    TabItem.content (ViewBuilder.Create<WrapPanelDemo.Host>([]))
+                    TabItem.header "Flyout Demo"
+                    TabItem.content (ViewBuilder.Create<FlyoutDemo.Host>([]))
                 ]
                 TabItem.create [
-                    TabItem.header "ToolTip Demo"
-                    TabItem.content (ViewBuilder.Create<ToolTipDemo.Host>([]))
+                    TabItem.header "Grid Demo"
+                    TabItem.content (ViewBuilder.Create<GridDemo.Host>([]))
                 ]
                 TabItem.create [
-                    TabItem.header "TreeView Demo"
-                    TabItem.content (ViewBuilder.Create<TreeViewDemo.Host>([]))
+                    TabItem.header "Grid patch Demo"
+                    TabItem.content (ViewBuilder.Create<GridPatchDemo.Host>([]))
+                ]
+                TabItem.create [
+                    TabItem.header "Gridsplitter Demo"
+                    TabItem.content (ViewBuilder.Create<GridSplitterDemo.Host>([]))
                 ]
                 TabItem.create [
                     TabItem.header "NumericUpDown Demo"
@@ -58,16 +73,8 @@ module MainView =
                     TabItem.content (ViewBuilder.Create<SpinnerDemo.Host>([]))
                 ]
                 TabItem.create [
-                    TabItem.header "Canvas Demo"
-                    TabItem.content (ViewBuilder.Create<CanvasDemo.Host>([]))
-                ]
-                TabItem.create [
-                    TabItem.header "Context Menu Demo"
-                    TabItem.content (ViewBuilder.Create<ContextMenuDemo.Host>([]))
-                ]
-                TabItem.create [
-                    TabItem.header "Window Menu Demo"
-                    TabItem.content (ViewBuilder.Create<WindowMenuDemo.Host>([]))
+                    TabItem.header "SplitView Demo"
+                    TabItem.content (ViewBuilder.Create<SplitViewDemo.Host>([]))
                 ]
                 // ToDo: return it back when styles will be worked
                 //TabItem.create [
@@ -79,40 +86,32 @@ module MainView =
                     TabItem.content (ViewBuilder.Create<TextBoxDemo.Host>([]))
                 ]
                 TabItem.create [
-                    TabItem.header "CalendarDatePicker Demo"
-                    TabItem.content (ViewBuilder.Create<CalendarDatePickerDemo.Host>([]))
+                    TabItem.header "TickBar Demo"
+                    TabItem.content (ViewBuilder.Create<TickBarDemo.Host>([]))
                 ]
                 TabItem.create [
-                    TabItem.header "Grid patch Demo"
-                    TabItem.content (ViewBuilder.Create<GridPatchDemo.Host>([]))
+                    TabItem.header "TimePicker Demo"
+                    TabItem.content (ViewBuilder.Create<TimePickerDemo.Host>([]))
                 ]
                 TabItem.create [
                     TabItem.header "ToggleSwitch Demo"
                     TabItem.content (ViewBuilder.Create<ToggleSwitchDemo.Host>([]))
                 ]
                 TabItem.create [
-                    TabItem.header "DatePicker Demo"
-                    TabItem.content (ViewBuilder.Create<DatePickerDemo.Host>([]))
-                ]
-                TabItem.create [
-                    TabItem.header "TimePicker Demo"
-                    TabItem.content (ViewBuilder.Create<TimePickerDemo.Host>([]))
-                ]
-                TabItem.create [
-                    TabItem.header "SplitView Demo"
-                    TabItem.content (ViewBuilder.Create<SplitViewDemo.Host>([]))
+                    TabItem.header "ToolTip Demo"
+                    TabItem.content (ViewBuilder.Create<ToolTipDemo.Host>([]))
                 ]
                 TabItem.create [
-                    TabItem.header "TickBar Demo"
-                    TabItem.content (ViewBuilder.Create<TickBarDemo.Host>([]))
+                    TabItem.header "TreeView Demo"
+                    TabItem.content (ViewBuilder.Create<TreeViewDemo.Host>([]))
                 ]
                 TabItem.create [
-                    TabItem.header "Flyout Demo"
-                    TabItem.content (ViewBuilder.Create<FlyoutDemo.Host>([]))
+                    TabItem.header "Window Menu Demo"
+                    TabItem.content (ViewBuilder.Create<WindowMenuDemo.Host>([]))
                 ]
                 TabItem.create [
-                    TabItem.header "Drag+Drop Demo"
-                    TabItem.content (ViewBuilder.Create<DragDropDemo.Host>([]))
+                    TabItem.header "WrapPanel Demo"
+                    TabItem.content (ViewBuilder.Create<WrapPanelDemo.Host>([]))
                 ]
             ]
         ]