diff --git a/demo/Ursa.Demo/Pages/ElasticWrapPanelDemo.axaml b/demo/Ursa.Demo/Pages/ElasticWrapPanelDemo.axaml
index 652a204..ab665a0 100644
--- a/demo/Ursa.Demo/Pages/ElasticWrapPanelDemo.axaml
+++ b/demo/Ursa.Demo/Pages/ElasticWrapPanelDemo.axaml
@@ -22,15 +22,13 @@
                 LabelWidth="*">
             <u:FormGroup>
                 <u:FormItem Label="Orientation">
-                    <ComboBox ItemsSource="{Binding Orientations}" SelectedItem="{Binding SelectedOrientation}" />
+                    <u:EnumSelector EnumType="Orientation" Value="{Binding SelectedOrientation}" />
                 </u:FormItem>
                 <u:FormItem Label="HorizontalScrollBar">
-                    <ComboBox ItemsSource="{Binding HScrollBarVisibilities}"
-                              SelectedItem="{Binding HorizontalVisibility}" />
+                    <u:EnumSelector EnumType="ScrollBarVisibility" Value="{Binding HorizontalVisibility}" />
                 </u:FormItem>
                 <u:FormItem Label="VerticalScrollBar">
-                    <ComboBox ItemsSource="{Binding VScrollBarVisibilities}"
-                              SelectedIndex="{Binding VerticalVisibility}" />
+                    <u:EnumSelector EnumType="ScrollBarVisibility" Value="{Binding VerticalVisibility}" />
                 </u:FormItem>
                 <u:FormItem>
                     <u:FormItem.Label>
@@ -80,11 +78,11 @@
                         IsEnabled="{Binding !AutoHeight}"
                         Value="{Binding ItemSelfHeight}" />
                 </u:FormItem>
-                <u:FormItem Label="Horizontal Alignment">
-                    <ComboBox ItemsSource="{Binding CmbHAligns}" SelectedItem="{Binding CmbHAlign}" />
+                <u:FormItem Label="HorizontalAlignment">
+                    <u:EnumSelector EnumType="HorizontalAlignment" Value="{Binding CmbHAlign}" />
                 </u:FormItem>
-                <u:FormItem Label="Vertical Alignment">
-                    <ComboBox ItemsSource="{Binding CmbVAligns}" SelectedItem="{Binding CmbVAlign}" />
+                <u:FormItem Label="VerticalAlignment">
+                    <u:EnumSelector EnumType="VerticalAlignment" Value="{Binding CmbVAlign}" />
                 </u:FormItem>
             </u:FormGroup>
         </u:Form>
diff --git a/demo/Ursa.Demo/ViewModels/ElasticWrapPanelDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/ElasticWrapPanelDemoViewModel.cs
index 99b1203..12e0a36 100644
--- a/demo/Ursa.Demo/ViewModels/ElasticWrapPanelDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/ElasticWrapPanelDemoViewModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Primitives;
 using Avalonia.Layout;
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -7,50 +6,20 @@ namespace Ursa.Demo.ViewModels;
 
 public partial class ElasticWrapPanelDemoViewModel : ObservableObject
 {
-    [ObservableProperty]
-    private ObservableCollection<Orientation> _orientations = [Orientation.Horizontal, Orientation.Vertical];
-
     [ObservableProperty] private Orientation _selectedOrientation = Orientation.Horizontal;
-
-    [ObservableProperty] private ObservableCollection<ScrollBarVisibility> _hScrollBarVisibilities =
-    [
-        ScrollBarVisibility.Disabled, ScrollBarVisibility.Auto, ScrollBarVisibility.Hidden, ScrollBarVisibility.Visible
-    ];
-
-    [ObservableProperty] private ObservableCollection<ScrollBarVisibility> _vScrollBarVisibilities =
-    [
-        ScrollBarVisibility.Disabled, ScrollBarVisibility.Auto, ScrollBarVisibility.Hidden, ScrollBarVisibility.Visible
-    ];
-
     [ObservableProperty] private ScrollBarVisibility _horizontalVisibility = ScrollBarVisibility.Auto;
     [ObservableProperty] private ScrollBarVisibility _verticalVisibility = ScrollBarVisibility.Auto;
 
-    [ObservableProperty] private bool _isFillHorizontal = true;
-    [ObservableProperty] private bool _isFillVertical = false;
+    [ObservableProperty] private bool _isFillHorizontal;
+    [ObservableProperty] private bool _isFillVertical;
     [ObservableProperty] private double _itemWidth = 40d;
     [ObservableProperty] private double _itemHeight = 40d;
 
-    [ObservableProperty] private bool _autoWidth;
-    [ObservableProperty] private bool _autoHeight;
+    [ObservableProperty] private bool _autoWidth = true;
+    [ObservableProperty] private bool _autoHeight = true;
     [ObservableProperty] private double _itemSelfWidth = double.NaN;
     [ObservableProperty] private double _itemSelfHeight = double.NaN;
 
-    [ObservableProperty] private ObservableCollection<HorizontalAlignment> _cmbHAligns =
-    [
-        HorizontalAlignment.Stretch,
-        HorizontalAlignment.Left,
-        HorizontalAlignment.Center,
-        HorizontalAlignment.Right
-    ];
-
-    [ObservableProperty] private ObservableCollection<VerticalAlignment> _cmbVAligns =
-    [
-        VerticalAlignment.Stretch,
-        VerticalAlignment.Top,
-        VerticalAlignment.Center,
-        VerticalAlignment.Bottom
-    ];
-
     [ObservableProperty] private HorizontalAlignment _cmbHAlign = HorizontalAlignment.Stretch;
     [ObservableProperty] private VerticalAlignment _cmbVAlign = VerticalAlignment.Stretch;