diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index a11c927..fc0f60a 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,5 +69,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.3.3")> 
-<Assembly: AssemblyFileVersion("2.1.3.3")> 
+<Assembly: AssemblyVersion("2.1.4.1")> 
+<Assembly: AssemblyFileVersion("2.1.4.1")> 
diff --git a/SideEntityControl/SideEntityControlV.xaml b/SideEntityControl/SideEntityControlV.xaml
index 9e50d62..991582b 100644
--- a/SideEntityControl/SideEntityControlV.xaml
+++ b/SideEntityControl/SideEntityControlV.xaml
@@ -3,9 +3,19 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
    
-   <StackPanel>
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
 
-      <Grid Margin="0,0,0,5" Visibility="{Binding Legenda_Visibility}">
+      <Grid Visibility="{Binding Legenda_Visibility}"
+            Grid.Row="0"
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1.8*"/>
             <ColumnDefinition Width="0.6*"/>
@@ -16,37 +26,43 @@
          <TextBlock Text="T" Grid.Column="2" HorizontalAlignment="Center"/>
       </Grid>
 
-      <ItemsControl ItemsSource="{Binding SideEntityList}">
-         <ItemsControl.ItemTemplate>
-            <DataTemplate>
-               <Grid Margin="0,0,0,2">
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="3*"/>
-                     <ColumnDefinition Width="2*"/>
-                  </Grid.ColumnDefinitions>
-                  <TextBlock Text="{Binding sEntityName}"
-                             VerticalAlignment="Center"/>
-                  <CheckBox IsChecked="{Binding bIsChecked}"
-                            Grid.Column="1"
-                            Visibility="{Binding Check_Visibility}"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"/>
-                  <UniformGrid Grid.Column="1" Columns="2" Rows="1">
-                     <EgtWPFLib5:EgtTextBox Text="{Binding GrphSideAngle}"
-                                            Visibility="{Binding Value_Visibility}"
-                                            VerticalAlignment="Center"
-                                            Margin="0,0,2.5,0"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding GrphSideHeel}"
-                                            Visibility="{Binding Value_Visibility}"
-                                            VerticalAlignment="Center"
-                                            Margin="2.5,0,0,0"/>
-                  </UniformGrid>
-               </Grid>
-            </DataTemplate>
-         </ItemsControl.ItemTemplate>
-      </ItemsControl>
-
-      <Grid Margin="0,0,0,5" Visibility="{Binding Parameter1_Visibility}">
+      <ScrollViewer VerticalScrollBarVisibility="Auto"
+                    Padding="3"
+                    Grid.Row="1">
+         <ItemsControl ItemsSource="{Binding SideEntityList}">
+            <ItemsControl.ItemTemplate>
+               <DataTemplate>
+                  <Grid Margin="0,0,0,2">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="3*"/>
+                        <ColumnDefinition Width="2*"/>
+                     </Grid.ColumnDefinitions>
+                     <TextBlock Text="{Binding sEntityName}"
+                                VerticalAlignment="Center"/>
+                     <CheckBox IsChecked="{Binding bIsChecked}"
+                               Grid.Column="1"
+                               Visibility="{Binding Check_Visibility}"
+                               HorizontalAlignment="Center"
+                               VerticalAlignment="Center"/>
+                     <UniformGrid Grid.Column="1" Columns="2" Rows="1">
+                        <EgtWPFLib5:EgtTextBox Text="{Binding GrphSideAngle}"
+                                               Visibility="{Binding Value_Visibility}"
+                                               VerticalAlignment="Center"
+                                               Margin="0,0,2.5,0"/>
+                        <EgtWPFLib5:EgtTextBox Text="{Binding GrphSideHeel}"
+                                               Visibility="{Binding Value_Visibility}"
+                                               VerticalAlignment="Center"
+                                               Margin="2.5,0,0,0"/>
+                     </UniformGrid>
+                  </Grid>
+               </DataTemplate>
+            </ItemsControl.ItemTemplate>
+         </ItemsControl>
+      </ScrollViewer>
+      
+      <Grid Visibility="{Binding Parameter1_Visibility}"
+            Grid.Row="2"
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1.8*"/>
             <ColumnDefinition Width="1.2*"/>
@@ -58,6 +74,7 @@
       </Grid>
 
       <Grid Visibility="{Binding Parameter23_Visibility}"
+            Grid.Row="3"
             Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1.8*"/>
@@ -70,6 +87,7 @@
       </Grid>
 
       <Grid Visibility="{Binding Parameter23_Visibility}"
+            Grid.Row="4"
             Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1.8*"/>
@@ -82,6 +100,7 @@
       </Grid>
 
       <Grid Visibility="{Binding Parameter23_Visibility}"
+            Grid.Row="5"
             Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1.8*"/>
@@ -93,6 +112,6 @@
                                 Grid.Column="1"/>
       </Grid>
 
-   </StackPanel>
+   </Grid>
    
 </UserControl>