diff --git a/DicomGrep/MainWindow.xaml b/DicomGrep/MainWindow.xaml
index 33c30a8..650e000 100644
--- a/DicomGrep/MainWindow.xaml
+++ b/DicomGrep/MainWindow.xaml
@@ -8,7 +8,7 @@
         xmlns:enums="clr-namespace:DicomGrep.Enums"
         xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         mc:Ignorable="d"
-        Title="Dicom Grep" Height="640" Width="960" MinWidth="300" MinHeight="200">
+        Title="{Binding Version, StringFormat='Dicom Grep v{0}'}" Height="640" Width="960" MinWidth="300" MinHeight="200">
     <Window.DataContext>
         <vm:MainViewModel/>
     </Window.DataContext>
diff --git a/DicomGrep/ViewModels/MainViewModel.cs b/DicomGrep/ViewModels/MainViewModel.cs
index 8040fbc..9b32124 100644
--- a/DicomGrep/ViewModels/MainViewModel.cs
+++ b/DicomGrep/ViewModels/MainViewModel.cs
@@ -11,6 +11,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -21,6 +22,8 @@ namespace DicomGrep.ViewModels
 {
     public class MainViewModel : ViewModelBase
     {
+        public string Version => Assembly.GetExecutingAssembly().GetName().Version.ToString();
+
         // todo: using DI
         private readonly SearchService searchService = new SearchService();
         private readonly DictionaryService dictionaryService = new DictionaryService();
diff --git a/DicomGrep/Views/DicomDictionaryLookupView.xaml b/DicomGrep/Views/DicomDictionaryLookupView.xaml
index 14cb2c3..3ac3327 100644
--- a/DicomGrep/Views/DicomDictionaryLookupView.xaml
+++ b/DicomGrep/Views/DicomDictionaryLookupView.xaml
@@ -35,7 +35,7 @@
             <TextBox Name="filter" TextChanged="Filter_TextChanged" Grid.Row="1" Grid.Column="1"/>
             <Button Name="pick" Content="Pick" Grid.Column="2" Grid.RowSpan="2" IsDefault="True" Click="pick_Click" Margin="8"/>
         </Grid>
-        <DataGrid Name="dataGridUid" ItemsSource="{Binding DicomDictionaryEntries, Mode=OneWay}"  AutoGenerateColumns="False"
+        <DataGrid Name="dataGridTags" ItemsSource="{Binding DicomDictionaryEntries, Mode=OneWay}"  AutoGenerateColumns="False"
                   SelectedItem="{Binding SelectedEntry, Mode=OneWayToSource}" SelectionMode="Single"
                   Grid.Row="1" MouseDoubleClick="dataGridUid_MouseDoubleClick">
             <DataGrid.Columns>
@@ -50,7 +50,7 @@
         </DataGrid>
         <StatusBar Grid.Row="2">
             <StatusBarItem>
-                <Label Content="{Binding ElementName=dataGridUid, Path=Items.Count}" ContentStringFormat="Tags: {0}"/>
+                <Label Content="{Binding ElementName=dataGridTags, Path=Items.Count}" ContentStringFormat="Tags: {0}"/>
             </StatusBarItem>
         </StatusBar>
     </Grid>
diff --git a/DicomGrep/Views/DicomDictionaryLookupView.xaml.cs b/DicomGrep/Views/DicomDictionaryLookupView.xaml.cs
index 4a5d063..bf5e071 100644
--- a/DicomGrep/Views/DicomDictionaryLookupView.xaml.cs
+++ b/DicomGrep/Views/DicomDictionaryLookupView.xaml.cs
@@ -39,7 +39,7 @@ private void Timer_Tick(object sender, EventArgs e)
 
             TextBox filterTextBox = filter;
             string filterText = filterTextBox.Text;
-            ICollectionView cv = CollectionViewSource.GetDefaultView(dataGridUid.ItemsSource);
+            ICollectionView cv = CollectionViewSource.GetDefaultView(dataGridTags.ItemsSource);
 
             if (!string.IsNullOrEmpty(filterText))
             {
diff --git a/DicomGrep/Views/SopClassLookupView.xaml b/DicomGrep/Views/SopClassLookupView.xaml
index 845b46f..d1923e9 100644
--- a/DicomGrep/Views/SopClassLookupView.xaml
+++ b/DicomGrep/Views/SopClassLookupView.xaml
@@ -32,12 +32,12 @@
             <TextBox Name="filter" TextChanged="Filter_TextChanged" Grid.Row="1" Grid.Column="1"/>
             <Button Name="pick" Content="Pick" Grid.Column="2" Grid.RowSpan="2" IsDefault="True" Click="pick_Click" Margin="8"/>
         </Grid>
-        <DataGrid Name="dataGridUid" ItemsSource="{Binding SOPClassUIDs, Mode=OneWay}"  AutoGenerateColumns="True"
+        <DataGrid Name="dataGridUids" ItemsSource="{Binding SOPClassUIDs, Mode=OneWay}"  AutoGenerateColumns="True"
                   SelectedItem="{Binding SelectedUID, Mode=OneWayToSource}" SelectionMode="Single"
                   Grid.Row="1" MouseDoubleClick="dataGridUid_MouseDoubleClick"/>
         <StatusBar Grid.Row="2">
             <StatusBarItem>
-                <Label Content="{Binding ElementName=dataGridUid, Path=Items.Count}" ContentStringFormat="UIDs: {0}"/>
+                <Label Content="{Binding ElementName=dataGridUids, Path=Items.Count}" ContentStringFormat="UIDs: {0}"/>
             </StatusBarItem>
         </StatusBar>
     </Grid>
diff --git a/DicomGrep/Views/SopClassLookupView.xaml.cs b/DicomGrep/Views/SopClassLookupView.xaml.cs
index 24bb5fb..fb6da54 100644
--- a/DicomGrep/Views/SopClassLookupView.xaml.cs
+++ b/DicomGrep/Views/SopClassLookupView.xaml.cs
@@ -39,7 +39,7 @@ private void Timer_Tick(object sender, EventArgs e)
 
             TextBox filterTextBox = filter;
             string filterText = filterTextBox.Text;
-            ICollectionView cv = CollectionViewSource.GetDefaultView(dataGridUid.ItemsSource);
+            ICollectionView cv = CollectionViewSource.GetDefaultView(dataGridUids.ItemsSource);
 
             if (!string.IsNullOrEmpty(filterText))
             {