diff --git a/eDosStation/About.xaml b/eDosStation/About.xaml
index 3174dea..5f9b3ec 100644
--- a/eDosStation/About.xaml
+++ b/eDosStation/About.xaml
@@ -21,7 +21,7 @@
                         <Image Source="/Images/EPD-MK3.png" VerticalAlignment="Center" Stretch="None" />
                         <Run BaselineAlignment="Center">eDos EPD station</Run>
                 </Paragraph>
-                <Paragraph>2021 Version
+                <Paragraph>2021-2022 Version
                     <TextBlock Name="aVersion" Text="1.1" />
                 </Paragraph>
                 <Table BorderBrush="#FF1E8CED" BorderThickness="1"  >
diff --git a/eDosStation/EntryBadge.xaml b/eDosStation/EntryBadge.xaml
index e7a8ab3..98a0412 100644
--- a/eDosStation/EntryBadge.xaml
+++ b/eDosStation/EntryBadge.xaml
@@ -124,43 +124,50 @@
                         </Grid>
                     </Border>
                     <StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Stretch"   >
-                        <StackPanel>
-                        <ScrollViewer VerticalScrollBarVisibility="Visible"  Style="{Binding Mode=OneWay, Source={StaticResource CustomScrollViewer}}" MaxHeight="753" Name="scrollTask" Visibility="Visible" >
-                            <ListBox ItemsSource="{Binding Mode=OneWay}" SelectedValuePath="ID_Task" SelectionChanged="ListBox_SelectionChanged" ScrollViewer.CanContentScroll="False"  >
-                                <ListBox.ItemsPanel >
-                                    <ItemsPanelTemplate  >
-                                        <telerik:RadUniformGrid Columns="3" IsItemsHost="True"   />
-                                    </ItemsPanelTemplate>
-                                </ListBox.ItemsPanel>
-                                <ListBox.ItemTemplate>
-                                    <DataTemplate>
-                                        <StackPanel Orientation="Horizontal" TextBlock.FontSize="20" Margin="5,5,5,5" Height="20" >
-                                            <TextBlock Text="{Binding TaskType_CODE}" Width="60" TextWrapping="NoWrap" FontSize="18"  >
-                                                <TextBlock.Style>
-                                                    <Style TargetType="TextBlock">
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding EPDRad}" Value="BG">
-                                                                <Setter Property="Background" Value="LightGray"></Setter>
-                                                            </DataTrigger>
-                                                            <DataTrigger Binding="{Binding EPDRad}" Value="NG">
-                                                                <Setter Property="Background" Value="Black"></Setter>
-                                                                <Setter Property="Foreground" Value="White"></Setter>
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </TextBlock.Style>
-                                            </TextBlock>
-                                            <TextBlock Text="{Binding Task_Name}" Width="410" FontSize="17" TextWrapping="Wrap" />
-                                        </StackPanel>
-                                    </DataTemplate>
-                                </ListBox.ItemTemplate>
-                            </ListBox>
-                            <!--<telerik:RadMultiColumnComboBox DisplayMemberPath="Task_Name" Width="700" HorizontalAlignment="Stretch"  >
+                        <Border MaxHeight="700">
+                            <ScrollViewer VerticalScrollBarVisibility="Visible"  Name="scrollTask" Visibility="Visible"  >
+                                <ListBox ItemsSource="{Binding Mode=OneWay}" SelectedValuePath="ID_Task" SelectionChanged="ListBox_SelectionChanged" ScrollViewer.CanContentScroll="False"  >
+                                    <ListBox.ItemContainerStyle>
+                                        <Style TargetType="{x:Type ListBoxItem}">
+                                            <Setter Property="HorizontalContentAlignment" Value="Left"/>
+                                            <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                        </Style>
+                                    </ListBox.ItemContainerStyle>
+                                    <ListBox.ItemsPanel >
+                                        <ItemsPanelTemplate  >
+                                            <telerik:RadUniformGrid Columns="3" IsItemsHost="True"   />
+                                        </ItemsPanelTemplate>
+                                    </ListBox.ItemsPanel>
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <StackPanel Orientation="Horizontal" TextBlock.FontSize="20" Margin="5,5,5,5" Height="20"  >
+                                                <TextBlock Text="{Binding TaskType_CODE}" Width="60" TextWrapping="NoWrap" FontSize="18" HorizontalAlignment="Left"  >
+                                                    <TextBlock.Style>
+                                                        <Style TargetType="TextBlock">
+                                                            <Style.Triggers>
+                                                                <DataTrigger Binding="{Binding EPDRad}" Value="BG">
+                                                                    <Setter Property="Background" Value="LightGray"></Setter>
+                                                                </DataTrigger>
+                                                                <DataTrigger Binding="{Binding EPDRad}" Value="NG">
+                                                                    <Setter Property="Background" Value="Black"></Setter>
+                                                                    <Setter Property="Foreground" Value="White"></Setter>
+                                                                </DataTrigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </TextBlock.Style>
+                                                </TextBlock>
+                                                <TextBlock Text="{Binding Task_Name}" Width="410" FontSize="17" TextWrapping="Wrap" HorizontalAlignment="Left" Margin="10,0,0,0" />
+                                            </StackPanel>
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
+                                <!--<telerik:RadMultiColumnComboBox DisplayMemberPath="Task_Name" Width="700" HorizontalAlignment="Stretch"  >
                             <telerik:RadMultiColumnComboBox.ItemsSourceProvider>
                             <telerik:GridViewItemsSourceProvider ItemsSource="{Binding}" />
                             </telerik:RadMultiColumnComboBox.ItemsSourceProvider>
                             </telerik:RadMultiColumnComboBox>-->
-                        </ScrollViewer>
+                            </ScrollViewer>
+                        </Border>
                         <Grid Name="numPanel" Width="600" Height="300" Visibility="Collapsed" >
                                 <Grid.RowDefinitions>
                                     <RowDefinition />
@@ -196,7 +203,7 @@
                                 <Button Content="&lt;X" Grid.Row="4" Grid.Column="2"  Name="numPanelDel"  Tag="B"  Click="numPanel_Click" />
                                 <Button Content="ENTER" Grid.Row="4" Grid.Column="3"  Name="numPanelEnter"  Tag="E"  Click="numPanel_Click" />
                             </Grid>
-                        </StackPanel>
+                        
                     </StackPanel>
                     <Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Margin="10,10,10,10" TextBlock.FontSize="12" TextBlock.LineHeight="12" Name="gridTaskSummary"  >
                         <Grid.RowDefinitions>
@@ -228,7 +235,7 @@
                         </Image>
                         <TextBlock  Grid.Row="1" Grid.Column="1"   >
                             <Run FontWeight="Bold" Text="Task: "/>
-                            <Run Text="{Binding ID_Task,Mode=OneWay}" />
+                            <Run Text="{Binding TaskType_CODE,Mode=OneWay}" />
                         </TextBlock>
                         <TextBlock  Grid.Row="1" Grid.Column="2"   >
                             <Run FontWeight="Bold" Text="Hp07Dose: "/>
diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs
index 4c5ec19..4a7ef8a 100644
--- a/eDosStation/EntryBadge.xaml.cs
+++ b/eDosStation/EntryBadge.xaml.cs
@@ -852,4 +852,6 @@ namespace eDosStation
                 MessageBox.Show("No PersID found on badge " + e.UID, "Error", MessageBoxButton.OK);
         }
     }
+
+    // Style="{Binding Mode=OneWay, Source={StaticResource CustomScrollViewer}}"
 }
diff --git a/eDosStation/Properties/AssemblyInfo.cs b/eDosStation/Properties/AssemblyInfo.cs
index e87ddba..02b0ed8 100644
--- a/eDosStation/Properties/AssemblyInfo.cs
+++ b/eDosStation/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.0.0")]
-[assembly: AssemblyFileVersion("2.5.0.0")]
+[assembly: AssemblyVersion("2.5.1.0")]
+[assembly: AssemblyFileVersion("2.5.1.0")]
diff --git a/eDosStation/eDosDict.xaml b/eDosStation/eDosDict.xaml
index 8f57d49..a1e3017 100644
--- a/eDosStation/eDosDict.xaml
+++ b/eDosStation/eDosDict.xaml
@@ -165,11 +165,11 @@
                 <ControlTemplate TargetType="{x:Type ScrollViewer}">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
+                            <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition />
+                            <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <ScrollContentPresenter Grid.Column="0"   />