diff --git a/ImageChecker/Controls/MultiSelectDataGrid.xaml.cs b/ImageChecker/Controls/MultiSelectDataGrid.xaml.cs
index 4edbda0..95f7ac1 100644
--- a/ImageChecker/Controls/MultiSelectDataGrid.xaml.cs
+++ b/ImageChecker/Controls/MultiSelectDataGrid.xaml.cs
@@ -6,7 +6,6 @@ namespace ImageChecker.Controls;
 
 public partial class MultiSelectDataGrid : DataGrid
 {
-
     public MultiSelectDataGrid()
     {
         SelectionChanged += MultiSelectDataGrid_SelectionChanged;
@@ -16,7 +15,6 @@ void MultiSelectDataGrid_SelectionChanged(object sender, SelectionChangedEventAr
     {
         SelectedItemsList = SelectedItems;
     }
-    #region SelectedItemsList
 
     public IList SelectedItemsList
     {
@@ -24,8 +22,5 @@ public IList SelectedItemsList
         set => SetValue(SelectedItemsListProperty, value);
     }
 
-    public static readonly DependencyProperty SelectedItemsListProperty =
-            DependencyProperty.Register("SelectedItemsList", typeof(IList), typeof(MultiSelectDataGrid), new PropertyMetadata(null));
-
-    #endregion
+    public static readonly DependencyProperty SelectedItemsListProperty = DependencyProperty.Register(nameof(SelectedItemsList), typeof(IList), typeof(MultiSelectDataGrid), new PropertyMetadata(null));
 }
diff --git a/ImageChecker/Converter/InverseBoolConverter.cs b/ImageChecker/Converter/InverseBoolConverter.cs
index 97b5e88..bc1a813 100644
--- a/ImageChecker/Converter/InverseBoolConverter.cs
+++ b/ImageChecker/Converter/InverseBoolConverter.cs
@@ -2,7 +2,7 @@
 
 namespace ImageChecker.Converter;
 
-class InverseBoolConverter : IValueConverter
+public class InverseBoolConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
     {
diff --git a/ImageChecker/Switch/SwitchConverter.cs b/ImageChecker/Converter/SwitchConverter.cs
similarity index 52%
rename from ImageChecker/Switch/SwitchConverter.cs
rename to ImageChecker/Converter/SwitchConverter.cs
index 5cd2f46..b2a9600 100644
--- a/ImageChecker/Switch/SwitchConverter.cs
+++ b/ImageChecker/Converter/SwitchConverter.cs
@@ -1,7 +1,9 @@
-using System.Windows.Data;
+using System;
+using System.Collections.Generic;
+using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace ImageChecker.Switch;
+namespace ImageChecker.Converter;
 
 /// <summary>
 /// A converter that accepts <see cref="SwitchConverterCase"/>s and converts them to the 
@@ -10,11 +12,14 @@ namespace ImageChecker.Switch;
 [ContentProperty("Cases")]
 public class SwitchConverter : IValueConverter
 {
+    // Converter instances.
+    private List<SwitchConverterCase> _cases;
+
     #region Public Properties.
     /// <summary>
     /// Gets or sets an array of <see cref="SwitchConverterCase"/>s that this converter can use to produde values from.
     /// </summary>
-    public List<SwitchConverterCase> Cases { get; set; }
+    public List<SwitchConverterCase> Cases { get { return _cases; } set { _cases = value; } }
     public object Default { get; set; }
     #endregion
     #region Construction.
@@ -24,7 +29,7 @@ public class SwitchConverter : IValueConverter
     public SwitchConverter()
     {
         // Create the cases array.
-        Cases = new List<SwitchConverterCase>();
+        _cases = new List<SwitchConverterCase>();
     }
     #endregion
 
@@ -40,40 +45,66 @@ public SwitchConverter()
     /// </returns>
     public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
     {
-        bool isSame;
+        try
+        {
+            bool isSame;
 
-        if (Cases != null && Cases.Count > 0)
-            for (int i = 0; i < Cases.Count; i++)
-            {
-                SwitchConverterCase targetCase = Cases[i];
+            if (_cases != null && _cases.Count > 0)
+                for (var i = 0; i < _cases.Count; i++)
+                {
+                    var targetCase = _cases[i];
 
 
-                if (value == null && targetCase.When == null)
-                    return targetCase.Then;
+                    if (value == null && targetCase.When == null)
+                        return targetCase.Then;
 
-                if (value != null && targetCase.When != null)
-                {
-                    if ((value.GetType().IsValueType || value.GetType() == typeof(string)) && (targetCase.When.GetType().IsValueType || targetCase.When.GetType() == typeof(string)))
+                    if (value != null && targetCase.When != null)
                     {
-                        isSame = (value.ToString() == targetCase.When.ToString());
+                        if (bool.TryParse(value.ToString(), out var bValue) && bool.TryParse(targetCase.When.ToString(), out var bWhenValue))
+                        {
+                            isSame = bValue == bWhenValue;
+                        }
+                        else if ((value.GetType().IsValueType || value.GetType() == typeof(string)) && (targetCase.When.GetType().IsValueType || targetCase.When.GetType() == typeof(string)))
+                        {
+                            isSame = value.ToString() == targetCase.When.ToString();
 
-                        // wenn beide numeric sind, dann a - b == 0?
-                        if (!isSame && Decimal.TryParse(value.ToString(), out var a) && Decimal.TryParse(targetCase.When.ToString(), out var b))
+                            // wenn beide numeric sind, dann a - b == 0?
+                            if (!isSame && decimal.TryParse(value.ToString(), out var a) && decimal.TryParse(targetCase.When.ToString(), out var b))
+                            {
+                                isSame = a - b == 0;
+                            }
+                            else if (!isSame && targetCase.When.GetType().IsEnum)
+                            {
+                                try
+                                {
+                                    isSame = System.Convert.ToInt64(value) == System.Convert.ToInt64(targetCase.When);
+                                }
+                                catch (Exception)
+                                {
+                                    isSame = false;
+                                }
+                            }
+                        }
+                        else if (value is Type == false && targetCase.When is Type t)
+                        { // der value ist kein type, aber der case.when ist ein type. dann prüfen, ob der type des values zum type im case.when passt.
+                            isSame = t.IsAssignableFrom(value?.GetType());
+                        }
+                        else
                         {
-                            isSame = (a - b == 0);
+                            isSame = value.Equals(targetCase.When);
                         }
-                    }
-                    else
-                    {
-                        isSame = value.Equals(targetCase.When);
-                    }
 
-                    if (isSame)
-                    {
-                        return targetCase.Then;
+                        if (isSame)
+                        {
+                            return targetCase.Then;
+                        }
                     }
                 }
-            }
+        }
+        catch (Exception)
+        {
+            return Default;
+        }
 
         return Default;
     }
@@ -101,18 +132,18 @@ public object ConvertBack(object value, Type targetType, object parameter, Syste
 public class SwitchConverterCase
 {
     // case instances.
-    object _when;
-    object _then;
+    private object _when;
+    private object _then;
 
     #region Public Properties.
     /// <summary>
     /// Gets or sets the condition of the case.
     /// </summary>
-    public object When { get => _when; set => _when = value; }
+    public object When { get { return _when; } set { _when = value; } }
     /// <summary>
     /// Gets or sets the results of this case when run through a <see cref="SwitchConverter"/>
     /// </summary>
-    public object Then { get => _then; set => _then = value; }
+    public object Then { get { return _then; } set { _then = value; } }
     #endregion
     #region Construction.
     /// <summary>
@@ -135,10 +166,10 @@ public SwitchConverterCase(object when, object then)
     #endregion
 
     /// <summary>
-    /// Returns a <see cref="System.String"/> that represents this instance.
+    /// Returns a <see cref="string"/> that represents this instance.
     /// </summary>
     /// <returns>
-    /// A <see cref="System.String"/> that represents this instance.
+    /// A <see cref="string"/> that represents this instance.
     /// </returns>
     public override string ToString()
     {
diff --git a/ImageChecker/Icon/fullscreen.png b/ImageChecker/Icon/fullscreen.png
new file mode 100644
index 0000000..f028b31
Binary files /dev/null and b/ImageChecker/Icon/fullscreen.png differ
diff --git a/ImageChecker/ImageChecker.csproj b/ImageChecker/ImageChecker.csproj
index ff450c7..dd06d75 100644
--- a/ImageChecker/ImageChecker.csproj
+++ b/ImageChecker/ImageChecker.csproj
@@ -9,7 +9,7 @@
 	<ImplicitUsings>enable</ImplicitUsings>
     <PackageProjectUrl>https://github.com/marcelgoldstein/ImageChecker</PackageProjectUrl>
     <RepositoryUrl>https://github.com/marcelgoldstein/ImageChecker</RepositoryUrl>
-    <AssemblyVersion>1.0.9.1</AssemblyVersion>
+    <AssemblyVersion>1.0.9.2</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/ImageChecker/View/ErrorFiles.xaml b/ImageChecker/View/ErrorFiles.xaml
index c7affeb..b4f67e5 100644
--- a/ImageChecker/View/ErrorFiles.xaml
+++ b/ImageChecker/View/ErrorFiles.xaml
@@ -23,11 +23,10 @@
             </AlternationConverter>
 
             <Style x:Key="alternatingWithBinding" TargetType="{x:Type ListBoxItem}">
-                <Setter Property="Background" 
-              Value="{Binding RelativeSource={RelativeSource Self},
-                     Path=(ItemsControl.AlternationIndex),
-                     Converter={StaticResource BackgroundConverter}}"/>
-
+                <Setter 
+                    Property="Background" 
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(ItemsControl.AlternationIndex), Converter={StaticResource BackgroundConverter}}"
+                    />
             </Style>
 
         </Grid.Resources>
@@ -54,8 +53,15 @@
             </Button>
         </Grid>
 
-        <ListBox Margin="5,0,5,5" Grid.Row="1" ItemsSource="{Binding ErrorFiles}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center" 
-                 AlternationCount="2" ItemContainerStyle="{StaticResource alternatingWithBinding}">
+        <ListBox 
+            Margin="5,0,5,5" 
+            Grid.Row="1" 
+            ItemsSource="{Binding ErrorFiles}" 
+            HorizontalContentAlignment="Stretch" 
+            VerticalContentAlignment="Center" 
+            AlternationCount="2" 
+            ItemContainerStyle="{StaticResource alternatingWithBinding}"
+            >
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <Grid >
@@ -66,11 +72,18 @@
                         </Grid.ColumnDefinitions>
 
                         <Grid.InputBindings>
-                            <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding RelativeSource={RelativeSource AncestorType=ListBox}, Path=DataContext.OpenImageCommand}" CommandParameter="{Binding }" />
+                            <MouseBinding 
+                                MouseAction="LeftDoubleClick" 
+                                Command="{Binding RelativeSource={RelativeSource AncestorType=ListBox}, Path=DataContext.OpenImageCommand}" 
+                                CommandParameter="{Binding }" 
+                                />
                         </Grid.InputBindings>
-                        
 
-                        <TextBlock Text="{Binding Name}" Grid.Column="0" VerticalAlignment="Center">
+                        <TextBlock 
+                            Text="{Binding Name}" 
+                            Grid.Column="0" 
+                            VerticalAlignment="Center"
+                            >
                             <TextBlock.ToolTip>
                                 <StackPanel Orientation="Vertical">
                                     <TextBlock Text="{Binding FullName}" />
@@ -78,15 +91,28 @@
                                 </StackPanel>
                             </TextBlock.ToolTip>
                         </TextBlock>
-                        
-                        
 
-                        <Button ToolTip="open containing folder" Grid.Column="1" Width="22" Grid.Row="0" Grid.RowSpan="2" Margin="0,0,5,0" 
-                                Command="{Binding DataContext.OpenFolderCommand, RelativeSource={RelativeSource AncestorType=ListBox}}" CommandParameter="{Binding }" >
+                        <Button 
+                            ToolTip="open containing folder" 
+                            Grid.Column="1" 
+                            Width="22" 
+                            Grid.Row="0" 
+                            Grid.RowSpan="2" 
+                            Margin="0,0,5,0" 
+                            Command="{Binding DataContext.OpenFolderCommand, RelativeSource={RelativeSource AncestorType=ListBox}}" 
+                            CommandParameter="{Binding }"
+                            >
                             <Image Source="/ImageChecker;component/Icon/openFolder.png" />
                         </Button>
-                        <Button ToolTip="delete file" Grid.Column="2" Width="22" Grid.Row="0" Grid.RowSpan="2" 
-                                Command="{Binding DataContext.DeleteFileCommand, RelativeSource={RelativeSource AncestorType=ListBox}}" CommandParameter="{Binding }" >
+                        <Button 
+                            ToolTip="delete file" 
+                            Grid.Column="2" 
+                            Width="22" 
+                            Grid.Row="0" 
+                            Grid.RowSpan="2" 
+                            Command="{Binding DataContext.DeleteFileCommand, RelativeSource={RelativeSource AncestorType=ListBox}}" 
+                            CommandParameter="{Binding }"
+                            >
                             <Image Source="/ImageChecker;component/Icon/trash.png" />
                         </Button>
                     </Grid>
diff --git a/ImageChecker/View/ImageChecker.xaml b/ImageChecker/View/ImageChecker.xaml
index f067127..32d7f53 100644
--- a/ImageChecker/View/ImageChecker.xaml
+++ b/ImageChecker/View/ImageChecker.xaml
@@ -4,16 +4,22 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-    xmlns:switch="clr-namespace:ImageChecker.Switch"
     xmlns:behavior="clr-namespace:ImageChecker.Behavior"
     xmlns:converter="clr-namespace:ImageChecker.Converter"
     mc:Ignorable="d" 
-    Height="Auto" Width="Auto" MinHeight="320" MinWidth="600" d:DesignWidth="600" d:DesignHeight="320" 
-    AllowDrop="True" behavior:DropBehavior.PreviewDropCommand="{Binding DropFolderCommand}"
+    Height="Auto" Width="Auto" MinHeight="320" MinWidth="600" 
+    d:DesignWidth="600" d:DesignHeight="320" 
+    AllowDrop="True" 
+    behavior:DropBehavior.PreviewDropCommand="{Binding DropFolderCommand}"
     xmlns:viewmodel="clr-namespace:ImageChecker.ViewModel"
     d:DataContext="{d:DesignInstance Type=viewmodel:VMImageChecker}"
     >
     <Grid>
+        <Grid.Resources>
+            <converter:InverseBoolConverter x:Key="InverseBoolConverter" />
+            <converter:BooleanAllFalseToTrueConverter x:Key="BooleanAllFalseToTrueConverter" />
+        </Grid.Resources>
+        
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" MinHeight="57" />
@@ -28,25 +34,43 @@
             VerticalAlignment="Top"
             HorizontalAlignment="Right"
             Margin="0,1,7,-14"
-            Click="btnMenu_Click"
+            Click="BtnMenu_Click"
             Width="32"
             Height="18"
             Padding="0"
             >
             <Button.Content>
-                <Image Source="/Icon/burgermenu.png" Stretch="Fill"/>
+                <Image 
+                    Source="/Icon/burgermenu.png" 
+                    Stretch="Fill"
+                    />
             </Button.Content>
             <Button.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Header="Project Page" Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type ContextMenu}}, Path=PlacementTarget.DataContext.OpenProjectPageCommand, Mode=OneWay}"/>
-                    <MenuItem Header="Open Application Temp Folder" Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type ContextMenu}}, Path=PlacementTarget.DataContext.OpenApplicationTempFolderCommand, Mode=OneWay}"/>
+                    <MenuItem 
+                        Header="Project Page" 
+                        Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type ContextMenu}}, Path=PlacementTarget.DataContext.OpenProjectPageCommand, Mode=OneWay}" 
+                        ToolTip="Opens the project page on github.com in your browser."
+                        />
+                    <MenuItem 
+                        Header="Open Application Temp Folder" 
+                        Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type ContextMenu}}, Path=PlacementTarget.DataContext.OpenApplicationTempFolderCommand, Mode=OneWay}" 
+                        ToolTip="Opens the temp-files directory for the current process. Temporary files are stored here and get cleaned up when the application is closed."
+                        />
                 </ContextMenu>
             </Button.ContextMenu>
         </Button>
         
-        <GroupBox Margin="5,5,5,0" Grid.Row="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" >
+        <GroupBox 
+            Margin="5,5,5,0" 
+            Grid.Row="1" 
+            VerticalAlignment="Stretch" 
+            HorizontalAlignment="Stretch"
+            >
             <GroupBox.Header>
-                <Grid>
+                <Grid 
+                    ToolTip="Directories added here are getting processed. You may drag and drop elements here."
+                    >
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="20"/>
@@ -55,20 +79,60 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Folders" Grid.Column="0"/>
-                    <Button ToolTip="Add Directory" Command="{Binding OpenFolderAddDialogCommand}" Grid.Column="2" Margin="2,0" Height="19" BorderThickness="0" Background="Transparent">
-                        <Image Source="/ImageChecker;component/Icon/add_folder.png" Stretch="Uniform" />
+                    <TextBlock 
+                        Text="Folders" 
+                        Grid.Column="0"
+                        />
+                    <Button 
+                        ToolTip="add directory" 
+                        Command="{Binding OpenFolderAddDialogCommand}" 
+                        Grid.Column="2" 
+                        Margin="2,0" 
+                        Height="19" 
+                        BorderThickness="0" 
+                        Background="Transparent"
+                        >
+                        <Image 
+                            Source="/ImageChecker;component/Icon/add_folder.png" 
+                            Stretch="Uniform" 
+                            />
                     </Button>
-                    <Button ToolTip="Remove Directory" Grid.Column="3" Command="{Binding RemoveFolderCommand}" Margin="2,0" Height="19" BorderThickness="0" Background="Transparent">
-                        <Image Source="/ImageChecker;component/Icon/remove_folder.png" Stretch="Uniform" />
+                    <Button 
+                        ToolTip="remove selected directory" 
+                        Grid.Column="3" 
+                        Command="{Binding RemoveFolderCommand}" 
+                        Margin="2,0" 
+                        Height="19" 
+                        BorderThickness="0" 
+                        Background="Transparent"
+                        >
+                        <Image 
+                            Source="/ImageChecker;component/Icon/remove_folder.png" 
+                            Stretch="Uniform" 
+                            />
                     </Button>
-                    <Button ToolTip="Clear Directories" Grid.Column="4" Command="{Binding ClearFoldersCommand}" Margin="2,0" Height="19" BorderThickness="0" Background="Transparent">
-                        <Image Source="/ImageChecker;component/Icon/clear_folders.png" Stretch="Uniform" />
+                    <Button 
+                        ToolTip="clear directories" 
+                        Grid.Column="4" 
+                        Command="{Binding ClearFoldersCommand}" 
+                        Margin="2,0" 
+                        Height="19" 
+                        BorderThickness="0" 
+                        Background="Transparent"
+                        >
+                        <Image 
+                            Source="/ImageChecker;component/Icon/clear_folders.png" 
+                            Stretch="Uniform" 
+                            />
                     </Button>
-                    <CheckBox Content="include subdirectories" Grid.Column="5" Margin="5,0" VerticalAlignment="Center" IsChecked="{Binding IncludeSubdirectories, Mode=TwoWay}">
-                        <CheckBox.Resources>
-                            <converter:BooleanAllFalseToTrueConverter x:Key="BooleanAllFalseToTrueConverter" />
-                        </CheckBox.Resources>
+                    <CheckBox 
+                        Content="include subdirectories" 
+                        Grid.Column="5" 
+                        Margin="5,0" 
+                        VerticalAlignment="Center" 
+                        IsChecked="{Binding IncludeSubdirectories, Mode=TwoWay}" 
+                        ToolTip="When set all subdirectories of the added directories are included as well - otherwise only the top-level directory`s files."
+                        >
                         <CheckBox.IsEnabled>
                             <MultiBinding Converter="{StaticResource BooleanAllFalseToTrueConverter}">
                                 <Binding Path="WorkerRenameFiles.IsRenamingFiles" />
@@ -78,37 +142,115 @@
                     </CheckBox>
                 </Grid>
             </GroupBox.Header>
-            <ListBox x:Name="lbDirectories" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0"
+            <ListBox 
+                x:Name="lbDirectories" 
+                ScrollViewer.VerticalScrollBarVisibility="Auto" 
+                BorderThickness="0"
 				ItemsSource="{Binding Folders}" DisplayMemberPath="FullName"
-                SelectedItem="{Binding SelectedFolder, Mode=TwoWay}"/>
+                SelectedItem="{Binding SelectedFolder, Mode=TwoWay}"
+                />
         </GroupBox>
         
-        <GroupBox Header="Rename Files" Margin="5,0" Grid.Row="2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" >
+        <GroupBox 
+            Margin="5,0" 
+            Grid.Row="2" 
+            VerticalAlignment="Stretch" 
+            HorizontalAlignment="Stretch"
+            >
+            <GroupBox.Header>
+                <TextBlock 
+                    Text="Rename Files" 
+                    ToolTip="With this function you can quickly rename files. Filenames are appended/overriden by a random text." 
+                    />
+            </GroupBox.Header>
             <Grid>
+                <Grid.Resources>
+                    <converter:SwitchConverter x:Key="TrueToStrikethroughConverter" Default="{x:Null}">
+                        <converter:SwitchConverterCase When="true" Then="Strikethrough" />
+                    </converter:SwitchConverter>
+                </Grid.Resources>
+                
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto"/>
                     <RowDefinition Height="Auto"/>
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="155"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
 
-                <Label Content="filenames shorter than" Margin="5" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"/>
+                <TextBlock 
+                    Margin="5" 
+                    Grid.Row="0" 
+                    Grid.Column="0" 
+                    VerticalAlignment="Center" 
+                    ToolTip="With this option you can filter which files are getting processed." 
+                    TextDecorations="{Binding ElementName=chIgnoreFilenameLength, Path=IsChecked, Converter={StaticResource TrueToStrikethroughConverter}}"
+                    >
+                    <TextBlock.Text>
+                        <MultiBinding StringFormat="{}filenames shorter than: {0}">
+                            <Binding ElementName="sliderFilenameLength" Path="Value" />
+                        </MultiBinding>
+                    </TextBlock.Text>
+                </TextBlock>
                 <Grid Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <Slider Grid.Column="0" VerticalAlignment="Center" Minimum="1" Maximum="100" AutoToolTipPlacement="TopLeft" Value="{Binding WorkerRenameFiles.FileNameLength, Mode=TwoWay}" Margin="5" SmallChange="1" IsMoveToPointEnabled="True" IsSnapToTickEnabled="True" HorizontalAlignment="Stretch"/>
-                    <CheckBox Grid.Column="1" Content="all" ToolTip="ignores the given length" Margin="5" VerticalAlignment="Center" IsChecked="{Binding WorkerRenameFiles.RenameAll, Mode=TwoWay}" HorizontalAlignment="Right"/>
+                    
+                    <Slider 
+                        x:Name="sliderFilenameLength"
+                        Grid.Column="0" 
+                        VerticalAlignment="Center" 
+                        Minimum="1" 
+                        Maximum="100" 
+                        AutoToolTipPlacement="TopLeft" 
+                        Value="{Binding WorkerRenameFiles.FileNameLength, Mode=TwoWay}" 
+                        Margin="5" 
+                        SmallChange="1" 
+                        IsMoveToPointEnabled="True"
+                        IsSnapToTickEnabled="True" 
+                        HorizontalAlignment="Stretch" 
+                        ToolTip="The minimum filename length for a file to be included."
+                        IsEnabled="{Binding ElementName=chIgnoreFilenameLength, Path=IsChecked, Converter={StaticResource InverseBoolConverter}}"
+                        />
+                    
+                    <CheckBox 
+                        x:Name="chIgnoreFilenameLength" 
+                        Grid.Column="1" 
+                        Content="all" 
+                        ToolTip="Ignores the filename length and includes all files." 
+                        Margin="5" 
+                        VerticalAlignment="Center" 
+                        IsChecked="{Binding WorkerRenameFiles.RenameAll, Mode=TwoWay}" 
+                        HorizontalAlignment="Right"
+                        />
                 </Grid>
                 
                 <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal">
-                    <CheckBox Content="keep original names" ToolTip="appends or replaces filenames" Margin="5" VerticalAlignment="Center" IsChecked="{Binding WorkerRenameFiles.KeepOriginalNames, Mode=TwoWay}"/>
-                    <CheckBox Content="loop" ToolTip="starts over and over again" Margin="5" VerticalAlignment="Center" IsChecked="{Binding WorkerRenameFiles.Loop, Mode=TwoWay}"/>
-                    <CheckBox Content="endless" ToolTip="starts over and over again (even if no files processing)" Margin="5" VerticalAlignment="Center" IsChecked="{Binding WorkerRenameFiles.LoopEndless, Mode=TwoWay}"/>
+                    <CheckBox 
+                        Content="append filenames" 
+                        ToolTip="When set filenames are appended - otherwise the complete filenames gets overriden." 
+                        Margin="5" 
+                        VerticalAlignment="Center" 
+                        IsChecked="{Binding WorkerRenameFiles.KeepOriginalNames, Mode=TwoWay}"
+                        />
+                    <CheckBox 
+                        Content="loop" 
+                        ToolTip="When set executes as long as files are getting included by the given filter criteria." 
+                        Margin="5" 
+                        VerticalAlignment="Center" 
+                        IsChecked="{Binding WorkerRenameFiles.Loop, Mode=TwoWay}"
+                        />
+                    <CheckBox 
+                        Content="endless" 
+                        ToolTip="When set the loop option keeps executing even when no files are beeing processed. This can be handy when files are getting added/changed." 
+                        Margin="5" 
+                        VerticalAlignment="Center" 
+                        IsChecked="{Binding WorkerRenameFiles.LoopEndless, Mode=TwoWay}"
+                        />
                     
                 </StackPanel>
 
@@ -119,15 +261,34 @@
                         <ColumnDefinition/>
                     </Grid.ColumnDefinitions>
                     <Grid.Resources>
-                        <switch:SwitchConverter x:Key="PauseRenameText" >
-                            <switch:SwitchConverterCase When="False" Then="Pause" />
-                            <switch:SwitchConverterCase When="True" Then="Unpause" />
-                        </switch:SwitchConverter>
+                        <converter:SwitchConverter x:Key="PauseRenameText" >
+                            <converter:SwitchConverterCase When="False" Then="Pause" />
+                            <converter:SwitchConverterCase When="True" Then="Unpause" />
+                        </converter:SwitchConverter>
                     </Grid.Resources>
-                    <Button Content="Start" Margin="5" Command="{Binding StartRenameCommand}"/>
-                    <Button Content="{Binding WorkerRenameFiles.IsRenamingFilesPaused, Converter={StaticResource PauseRenameText}, FallbackValue='Pause'}" Margin="5" Grid.Column="1" 
-                            Command="{Binding PauseRenameCommand}" CommandParameter="{Binding WorkerRenameFiles.IsRenamingFilesPaused}"/>
-                    <Button Content="Cancel" Margin="5" Grid.Column="2" Command="{Binding CancelRenameCommand}"/>
+                    <Button 
+                        Content="Start" 
+                        Margin="5" 
+                        Command="{Binding StartRenameCommand}" 
+                        ToolTip="Starts the file rename execution with the given parameters. Parameters can be changed while executing to take effect in the next run." 
+                        ToolTipService.ShowOnDisabled="True"
+                        />
+                    <Button 
+                        Content="{Binding WorkerRenameFiles.IsRenamingFilesPaused, Converter={StaticResource PauseRenameText}, FallbackValue='Pause'}" 
+                        Margin="5" 
+                        Grid.Column="1" 
+                        Command="{Binding PauseRenameCommand}" CommandParameter="{Binding WorkerRenameFiles.IsRenamingFilesPaused}" 
+                        ToolTip="Pauses/Unpauses the current execution run." 
+                        ToolTipService.ShowOnDisabled="True"
+                        />
+                    <Button 
+                        Content="Cancel" 
+                        Margin="5" 
+                        Grid.Column="2" 
+                        Command="{Binding CancelRenameCommand}"
+                        ToolTip="Cancels the current execution run." 
+                        ToolTipService.ShowOnDisabled="True"
+                        />
 
                 </Grid>
             </Grid>
@@ -145,6 +306,57 @@
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
 
+                <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="30"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock 
+                        Text="prescale option" 
+                        VerticalAlignment="Center" 
+                        Grid.Column="0" 
+                        Margin="5,0,5,5" 
+                        ToolTip="Defines the size of the fingerprints that are taken from the original images. The higher the better is the result but also the processing takes more time."
+                        />
+                    <ComboBox 
+                        Grid.Column="1" 
+                        Margin="5" 
+                        Width="100" 
+                        IsEnabled="{Binding WorkerImageComparison.IsComparingImages, Converter={StaticResource InverseBoolConverter}}"
+                        ItemsSource="{Binding PreScaleOptions}" DisplayMemberPath="Item2" SelectedValuePath="Item1"
+                        SelectedItem="{Binding SelectedPreScaleOption, Mode=TwoWay}"
+                        ToolTip="Defines the size of the fingerprints that are taken from the original images. The higher the better is the result but also the processing takes more time."
+                        />
+
+                    <TextBlock
+                        Text="{Binding ElementName=sliderSimilarityThreshold, Path=Value, StringFormat='{}similarity threshold: {0}'}" 
+                        Grid.Column="3" 
+                        VerticalAlignment="Center" 
+                        Margin="5,0,5,5"
+                        Width="130"
+                        ToolTip="Specifies how similar images need to be to get included in the presented result view. This option can be changed anytime (before/while/after processing) to take effect."
+                        />
+                    <Slider
+                        x:Name="sliderSimilarityThreshold"
+                        Grid.Column="4" 
+                        VerticalAlignment="Center" 
+                        Minimum="0" 
+                        Maximum="100" 
+                        AutoToolTipPlacement="TopLeft" 
+                        Value="{Binding Threshold, Mode=TwoWay}" 
+                        Margin="5" 
+                        SmallChange="1" 
+                        IsMoveToPointEnabled="True" 
+                        IsSnapToTickEnabled="True" 
+                        HorizontalAlignment="Stretch"
+                        ToolTip="Specifies how similar images need to be to get included in the presented result view. This option can be changed anytime (before/while/after processing) to take effect."
+                        />
+                </Grid>
+
                 <Grid Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3">
                     <Grid.RowDefinitions>
                         <RowDefinition/>
@@ -156,70 +368,85 @@
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
                     <Grid.Resources>
-                        <switch:SwitchConverter x:Key="PauseImageComparisonText" >
-                            <switch:SwitchConverterCase When="False" Then="Pause" />
-                            <switch:SwitchConverterCase When="True" Then="Unpause" />
-                        </switch:SwitchConverter>
+                        <converter:SwitchConverter x:Key="PauseImageComparisonText" >
+                            <converter:SwitchConverterCase When="False" Then="Pause" />
+                            <converter:SwitchConverterCase When="True" Then="Unpause" />
+                        </converter:SwitchConverter>
                         
-                        <switch:SwitchConverter x:Key="ShowErrorFilesVisibility">
-                            <switch:SwitchConverterCase When="False" Then="Collapsed" />
-                            <switch:SwitchConverterCase When="True" Then="Visible" />
-                        </switch:SwitchConverter>
+                        <converter:SwitchConverter x:Key="ShowErrorFilesVisibility">
+                            <converter:SwitchConverterCase When="False" Then="Collapsed" />
+                            <converter:SwitchConverterCase When="True" Then="Visible" />
+                        </converter:SwitchConverter>
                     </Grid.Resources>
                     
-                    <Button Content="Start" Margin="5" Grid.Column="0" Command="{Binding StartImageComparisonCommand}"/>
-                    <Button Content="{Binding WorkerImageComparison.IsComparingImagesPaused, Converter={StaticResource PauseImageComparisonText}, FallbackValue='Pause'}" Margin="5" Grid.Column="1" 
-                            Command="{Binding PauseImageComparisonCommand}" CommandParameter="{Binding WorkerImageComparison.IsComparingImagesPaused}"/>
-                    <Button Content="Cancel" Margin="5" Grid.Column="2" Command="{Binding CancelImageComparisonCommand}"/>
+                    <Button 
+                        Content="Start" 
+                        Margin="5" 
+                        Grid.Column="0" 
+                        Command="{Binding StartImageComparisonCommand}"
+                        ToolTip="Starts the image comparison execution with the given parameters." 
+                        ToolTipService.ShowOnDisabled="True"
+                        />
+                    <Button 
+                        Content="{Binding WorkerImageComparison.IsComparingImagesPaused, Converter={StaticResource PauseImageComparisonText}, FallbackValue='Pause'}" 
+                        Margin="5" 
+                        Grid.Column="1" 
+                        Command="{Binding PauseImageComparisonCommand}" 
+                        CommandParameter="{Binding WorkerImageComparison.IsComparingImagesPaused}"
+                        ToolTip="Pauses/Unpauses the current execution run." 
+                        ToolTipService.ShowOnDisabled="True"
+                        />
+                    <Button 
+                        Content="Cancel" 
+                        Margin="5" 
+                        Grid.Column="2" 
+                        Command="{Binding CancelImageComparisonCommand}"
+                        ToolTip="Cancels the current execution run." 
+                        ToolTipService.ShowOnDisabled="True"
+                        />
                     
-                    <Button Grid.Column="3" Margin="5" ToolTip="handle files that could not be processed as image" 
-                            Command="{Binding ShowErrorFilesCommand}"
-                            Visibility="{Binding WorkerImageComparison.HasErrorFiles, Converter={StaticResource ShowErrorFilesVisibility}}">
-                        <Image Source="/ImageChecker;component/Icon/error.png" Height="16" Width="16"/>
-                    </Button>
-
-                    
-                    
-                </Grid>
-
-                <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0">
-                    <Grid.Resources>
-                        <converter:InverseBoolConverter x:Key="InverseBoolConverter" />
-                    </Grid.Resources>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="30"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <TextBlock Text="prescale option" VerticalAlignment="Center" Grid.Column="0" Margin="5,0,5,5"/>
-                    <ComboBox Grid.Column="1" Margin="5" Width="100" IsEnabled="{Binding WorkerImageComparison.IsComparingImages, Converter={StaticResource InverseBoolConverter}}"
-                              ItemsSource="{Binding PreScaleOptions}" DisplayMemberPath="Item2" SelectedValuePath="Item1"
-                              SelectedItem="{Binding SelectedPreScaleOption, Mode=TwoWay}"/>
-                    
-                    <TextBlock Text="similarity threshold" Grid.Column="3" VerticalAlignment="Center" Margin="5,0,5,5"/>
-                    <Slider Grid.Column="4" VerticalAlignment="Center" Minimum="0" Maximum="100" AutoToolTipPlacement="TopLeft" Value="{Binding Threshold, Mode=TwoWay}" 
-                            Margin="5" SmallChange="1" IsMoveToPointEnabled="True" IsSnapToTickEnabled="True" HorizontalAlignment="Stretch"
+                    <Button 
+                        Grid.Column="3"
+                        Margin="5" 
+                        ToolTip="Handle files that could not be processed as an image." 
+                        Command="{Binding ShowErrorFilesCommand}"
+                        Visibility="{Binding WorkerImageComparison.HasErrorFiles, Converter={StaticResource ShowErrorFilesVisibility}}"
+                        >
+                        <Image 
+                            Source="/ImageChecker;component/Icon/error.png" 
+                            Height="16" 
+                            Width="16"
                             />
-                            <!--IsEnabled="{Binding WorkerImageComparison.IsComparingImages, Converter={StaticResource InverseBoolConverter}}"-->
-                    <!--<CheckBox Content="pre-resize images" Margin="5,0,5,5" IsChecked="{Binding PreResizeImages, Mode=TwoWay}" IsEnabled="{Binding WorkerImageComparison.IsComparingImages, Converter={StaticResource InverseBoolConverter}}"/>-->    
-                </Grid>
-                
+                    </Button>
+                </Grid>                
 
-                <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2">
-                    <Button Margin="5,0,5,5" ToolTip="opens a new window presenting the results" 
-                            Command="{Binding ShowResultsCommand}" Content="{Binding WorkerImageComparison.SelectedPossibleDuplicatesCountMessage, FallbackValue='show results'}" />
+                <Grid 
+                    Grid.Row="2" 
+                    Grid.Column="0" 
+                    Grid.ColumnSpan="2"
+                    >
+                    <Button 
+                        Margin="5,0,5,5" 
+                        ToolTip="Opens a new window presenting the results." 
+                        Command="{Binding ShowResultsCommand}" 
+                        Content="{Binding WorkerImageComparison.SelectedPossibleDuplicatesCountMessage, FallbackValue='show results'}" 
+                        />
                 </Grid>
-                
-
             </Grid>
         </GroupBox>
 
-        <ProgressBar Grid.Row="4" Margin="5" Height="20" 
-                     Minimum="{Binding ProgressMinimum}" Maximum="{Binding ProgressMaximum}" Value="{Binding ProgressValue}"/>
-        <TextBlock Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Center"
-                   Text="{Binding ProgressText, FallbackValue='0 / X'}"/>
+        <ProgressBar 
+            Grid.Row="4" 
+            Margin="5" 
+            Height="20" 
+            Minimum="{Binding ProgressMinimum}" 
+            Maximum="{Binding ProgressMaximum}" Value="{Binding ProgressValue}"
+            />
+        <TextBlock 
+            Grid.Row="4" 
+            VerticalAlignment="Center" 
+            HorizontalAlignment="Center"
+            Text="{Binding ProgressText, FallbackValue='0 / X'}"
+            />
     </Grid>
 </UserControl>
diff --git a/ImageChecker/View/ImageChecker.xaml.cs b/ImageChecker/View/ImageChecker.xaml.cs
index 5f84cd2..6752127 100644
--- a/ImageChecker/View/ImageChecker.xaml.cs
+++ b/ImageChecker/View/ImageChecker.xaml.cs
@@ -13,7 +13,7 @@ public ImageCheckerView()
     #endregion Contructor
 
     #region EventHandler
-    private void btnMenu_Click(object sender, System.Windows.RoutedEventArgs e)
+    private void BtnMenu_Click(object sender, System.Windows.RoutedEventArgs e)
     {
         if (sender is Button btn)
         {
diff --git a/ImageChecker/View/ResultView.xaml b/ImageChecker/View/ResultView.xaml
index 4e65caf..6fd43f3 100644
--- a/ImageChecker/View/ResultView.xaml
+++ b/ImageChecker/View/ResultView.xaml
@@ -4,9 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-    xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
     xmlns:behaviors="clr-namespace:ImageChecker.Behavior"
-    xmlns:switch="clr-namespace:ImageChecker.Switch"
     xmlns:controls="clr-namespace:ImageChecker.Controls"
     xmlns:dataclasses="clr-namespace:ImageChecker.DataClass"
     xmlns:converter="clr-namespace:ImageChecker.Converter"
@@ -17,10 +15,10 @@
     xmlns:viewmodel="clr-namespace:ImageChecker.ViewModel"
     d:DataContext="{d:DesignInstance Type=viewmodel:VMResultView}"
     >
-    
     <UserControl.Resources>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
     </UserControl.Resources>
+    
     <UserControl.InputBindings>
         <KeyBinding Command="{Binding DeleteFileCommand}" CommandParameter="{Binding SelectedResult.FileA.File}" Key="Left" />
         <KeyBinding Command="{Binding DeleteFileCommand}" CommandParameter="{Binding SelectedResult.FileB.File}" Key="Right" />
@@ -50,11 +48,12 @@
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type Button}">
                             <ContentPresenter 
-                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                    Margin="{TemplateBinding Padding}" 
-                    RecognizesAccessKey="True" 
-                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                                Margin="{TemplateBinding Padding}" 
+                                RecognizesAccessKey="True" 
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                />
                         </ControlTemplate>
                     </Setter.Value>
                 </Setter>
@@ -65,11 +64,12 @@
 
             <SolidColorBrush x:Key="DeleteFileBackground" Color="#FFFF4848"/>
             <SolidColorBrush x:Key="ExterminationModeBackground" Color="#FFA40000"/>
-            
-            
         </Grid.Resources>
 
-        <Grid Grid.Row="0" Visibility="{Binding FilterActivated, Converter={StaticResource BooleanToVisibilityConverter}}">
+        <Grid 
+            Grid.Row="0" 
+            Visibility="{Binding FilterActivated, Converter={StaticResource BooleanToVisibilityConverter}}"
+            >
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="*"/>
@@ -78,7 +78,6 @@
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
 
-
             <TextBlock Text="filename" Grid.Column="0" Margin="5,5,5,0" VerticalAlignment="Center"/>
             <TextBox Grid.Column="1" Margin="5,5,5,0" Text="{Binding FileFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" >
                 <TextBox.InputBindings>
@@ -88,10 +87,16 @@
             </TextBox>
             
             <TextBlock Text="status" Grid.Column="3" Margin="5,5,5,0" VerticalAlignment="Center"/>
-            <ComboBox Grid.Column="4" Margin="5,5,5,0" MinWidth="120"
-                      ItemsSource="{Binding StatusFilters}" DisplayMemberPath="Text" SelectedValuePath="ID" SelectedItem="{Binding SelectedStatusFilter}" 
-                      behaviors:ComboboxSelectionChangedBehavior.Command="{Binding ApplyFiltersCommand}"/>
-            
+            <ComboBox 
+                Grid.Column="4" 
+                Margin="5,5,5,0" 
+                MinWidth="120"
+                ItemsSource="{Binding StatusFilters}" 
+                DisplayMemberPath="Text" 
+                SelectedValuePath="ID" 
+                SelectedItem="{Binding SelectedStatusFilter}" 
+                behaviors:ComboboxSelectionChangedBehavior.Command="{Binding ApplyFiltersCommand}"
+                />
         </Grid>
         
         <Grid Grid.Row="1" >
@@ -105,49 +110,85 @@
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
 
-            <TextBlock Grid.Column="0" Text="{Binding ProcessedFilesCount, StringFormat='{}processed files = {0}', FallbackValue='processed files = 0'}" VerticalAlignment="Center" Margin="5"/>
-            <TextBlock Grid.Column="2" Text="{Binding FoundDuplicatesCount, StringFormat='{}found duplicates = {0}', FallbackValue='found duplicates = 0'}" VerticalAlignment="Center" Margin="5"/>
-            <TextBlock Grid.Column="4" Text="{Binding UnsolvedDuplicatesCount, StringFormat='{}unsolved = {0}', FallbackValue='unsolved = 0'}" VerticalAlignment="Center" Margin="5" Foreground="Red"/>
-            <TextBlock Grid.Column="6" Text="{Binding SolvedDuplicatesCount, StringFormat='{}solved = {0}', FallbackValue='solved = 0'}" VerticalAlignment="Center" Margin="5" Foreground="Green"/>
+            <TextBlock 
+                Grid.Column="0" 
+                Text="{Binding ProcessedFilesCount, StringFormat='{}processed files = {0}', FallbackValue='processed files = 0'}" 
+                VerticalAlignment="Center" 
+                Margin="5"
+                />
+            <TextBlock 
+                Grid.Column="2" 
+                Text="{Binding FoundDuplicatesCount, StringFormat='{}found duplicates = {0}', FallbackValue='found duplicates = 0'}" VerticalAlignment="Center" Margin="5"/>
+            <TextBlock 
+                Grid.Column="4" 
+                Text="{Binding UnsolvedDuplicatesCount, StringFormat='{}unsolved = {0}', FallbackValue='unsolved = 0'}" 
+                VerticalAlignment="Center"
+                Margin="5" 
+                Foreground="Red"/>
+            <TextBlock 
+                Grid.Column="6" 
+                Text="{Binding SolvedDuplicatesCount, StringFormat='{}solved = {0}', FallbackValue='solved = 0'}" 
+                VerticalAlignment="Center" 
+                Margin="5" 
+                Foreground="Green"/>
         </Grid>
         
-        <controls:MultiSelectDataGrid Grid.Row="2" ItemsSource="{Binding ResultsView.View}" IsSynchronizedWithCurrentItem="True"
-                                        SelectedItem="{Binding SelectedResult, Mode=TwoWay}" 
-                                        Margin="5,5,5,0" AutoGenerateColumns="False" CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" 
-                                        ClipToBounds="True" IsReadOnly="True" SelectionMode="Extended" 
-                                        SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
-                                        behaviors:ScrollIntoViewBehavior.ScrollIntoView="True"
-                                        behaviors:DataGridSyncSelectedCellBehavior.SyncSelectedCell="True">
+        <controls:MultiSelectDataGrid 
+            Grid.Row="2" 
+            ItemsSource="{Binding ResultsView.View}" 
+            IsSynchronizedWithCurrentItem="True"
+            SelectedItem="{Binding SelectedResult, Mode=TwoWay}" 
+            Margin="5,5,5,0" 
+            AutoGenerateColumns="False" 
+            CanUserDeleteRows="False" 
+            CanUserResizeRows="False" 
+            CanUserAddRows="False" 
+            ClipToBounds="True" 
+            IsReadOnly="True" 
+            SelectionMode="Extended" 
+            SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
+            behaviors:ScrollIntoViewBehavior.ScrollIntoView="True"
+            behaviors:DataGridSyncSelectedCellBehavior.SyncSelectedCell="True"
+            >
             <controls:MultiSelectDataGrid.Resources>
-                <switch:SwitchConverter x:Key="StateIconConverter" Default="/ImageChecker;component/Icon/unsolved.png" >
-                    <switch:SwitchConverterCase When="{x:Static dataclasses:ImageCompareResult+StateEnum.Solved}" Then="/ImageChecker;component/Icon/solved.png"/>
-                </switch:SwitchConverter>
-                <switch:SwitchConverter x:Key="StateTextConverter" Default="unsolved" >
-                    <switch:SwitchConverterCase When="{x:Static dataclasses:ImageCompareResult+StateEnum.Solved}" Then="solved"/>
-                </switch:SwitchConverter>
+                <converter:SwitchConverter x:Key="StateIconConverter" Default="/ImageChecker;component/Icon/unsolved.png" >
+                    <converter:SwitchConverterCase When="{x:Static dataclasses:ImageCompareResult+StateEnum.Solved}" Then="/ImageChecker;component/Icon/solved.png"/>
+                </converter:SwitchConverter>
+                <converter:SwitchConverter x:Key="StateTextConverter" Default="unsolved" >
+                    <converter:SwitchConverterCase When="{x:Static dataclasses:ImageCompareResult+StateEnum.Solved}" Then="solved"/>
+                </converter:SwitchConverter>
             </controls:MultiSelectDataGrid.Resources>
 
             <controls:MultiSelectDataGrid.ContextMenu>
                 <ContextMenu>
                     <ContextMenu.Items>
-                        <MenuItem Header="CutSmallerOnes" Height="22"
-                                  CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.SelectedItems}"
-                                  Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.CutSmallerOnesCommand}" >
+                        <MenuItem 
+                            Header="CutSmallerOnes" 
+                            Height="22"
+                            CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.SelectedItems}"
+                            Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.CutSmallerOnesCommand}" 
+                            >
                             <MenuItem.Icon>
                                 <Image Source="/ImageChecker;component/Icon/cut.png" />
                             </MenuItem.Icon>
                         </MenuItem>
 
-                        <MenuItem Header="RestoreImages" Height="22"
-                                  CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.SelectedItems}"
-                                  Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.RestoreSelectedImagesCommand}" >
+                        <MenuItem 
+                            Header="RestoreImages" 
+                            Height="22"
+                            CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.SelectedItems}"
+                            Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.RestoreSelectedImagesCommand}" 
+                            >
                             <MenuItem.Icon>
                                 <Image Source="/ImageChecker;component/Icon/restore.png" />
                             </MenuItem.Icon>
                         </MenuItem>
 
-                        <MenuItem Header="Filter" Height="22"
-                                  Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.ActivateFiltersCommand}" >
+                        <MenuItem 
+                            Header="Filter" 
+                            Height="22"
+                            Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.ActivateFiltersCommand}" 
+                            >
                             <MenuItem.Icon>
                                 <Image Source="/ImageChecker;component/Icon/filter.png" />
                             </MenuItem.Icon>
@@ -158,14 +199,26 @@
 
 
             <controls:MultiSelectDataGrid.Columns>
-                <DataGridTextColumn Header="Image1" Binding="{Binding FileA.File.Name, Mode=OneWay}" Width="*" MinWidth="150" CanUserSort="False">
+                <DataGridTextColumn 
+                    Header="Image1" 
+                    Binding="{Binding FileA.File.Name, Mode=OneWay}" 
+                    Width="*" 
+                    MinWidth="150" 
+                    CanUserSort="False"
+                    >
                     <DataGridTextColumn.CellStyle>
                         <Style TargetType="DataGridCell">
                             <Setter Property="ToolTip" Value="{Binding FileA.File.FullName, Mode=OneWay}" />
                         </Style>
                     </DataGridTextColumn.CellStyle>
                 </DataGridTextColumn>
-                <DataGridTextColumn Header="Image2" Binding="{Binding FileB.File.Name, Mode=OneWay}" Width="*" MinWidth="150" CanUserSort="False">
+                <DataGridTextColumn 
+                    Header="Image2" 
+                    Binding="{Binding FileB.File.Name, Mode=OneWay}" 
+                    Width="*" 
+                    MinWidth="150" 
+                    CanUserSort="False"
+                    >
                     <DataGridTextColumn.CellStyle>
                         <Style TargetType="DataGridCell">
                             <Setter Property="ToolTip" Value="{Binding FileB.File.FullName, Mode=OneWay}" />
@@ -173,37 +226,53 @@
                     </DataGridTextColumn.CellStyle>
                 </DataGridTextColumn>
 
-                <DataGridTextColumn Header="similarity" Binding="{Binding FLANN, StringFormat={}{0:0.00} %}" MinWidth="60"/>
+                <DataGridTextColumn 
+                    Header="similarity" 
+                    Binding="{Binding FLANN, StringFormat={}{0:0.00} %}" 
+                    MinWidth="60"
+                    />
                 
                 <DataGridTemplateColumn Header="" >
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <Image Stretch="Uniform" Source="{Binding State, Converter={StaticResource StateIconConverter}}" Height="16"
-                                   ToolTip="{Binding State, Converter={StaticResource StateTextConverter}}"/>
+                            <Image 
+                                Stretch="Uniform" 
+                                Source="{Binding State, Converter={StaticResource StateIconConverter}}" 
+                                Height="16"
+                                ToolTip="{Binding State, Converter={StaticResource StateTextConverter}}"
+                                />
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
             </controls:MultiSelectDataGrid.Columns>
         </controls:MultiSelectDataGrid>
 
-        <GridSplitter Grid.Row="3" Height="10" HorizontalAlignment="Stretch" Margin="5,0" IsTabStop="False">
+        <GridSplitter 
+            Grid.Row="3" 
+            Height="10" 
+            HorizontalAlignment="Stretch" 
+            Margin="5,0" 
+            IsTabStop="False">
             <GridSplitter.Template>
                 <ControlTemplate TargetType="{x:Type GridSplitter}">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Background="{TemplateBinding Background}"
-                            CornerRadius="3">
-                        <Canvas RenderOptions.EdgeMode="Aliased" UseLayoutRounding="True"
-                                Height="6" VerticalAlignment="Center"
-                                Width="50" HorizontalAlignment="Center">
-                            <Line X1="0" X2="50" Y1="0" Y2="0"
-                                  Stroke="White" StrokeThickness="1"/>
-                            <Line X1="0" X2="50" Y1="1" Y2="1"
-                                  Stroke="#A0A0A0" StrokeThickness="1"/>
-                            <Line X1="0" X2="50" Y1="4" Y2="4"
-                                  Stroke="White" StrokeThickness="1"/>
-                            <Line X1="0" X2="50" Y1="5" Y2="5"
-                                  Stroke="#A0A0A0" StrokeThickness="1"/>
+                    <Border 
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="3"
+                        >
+                        <Canvas 
+                            RenderOptions.EdgeMode="Aliased" 
+                            UseLayoutRounding="True"
+                            Height="6" 
+                            VerticalAlignment="Center"
+                            Width="50" 
+                            HorizontalAlignment="Center"
+                            >
+                            <Line X1="0" X2="50" Y1="0" Y2="0" Stroke="White" StrokeThickness="1"/>
+                            <Line X1="0" X2="50" Y1="1" Y2="1" Stroke="#A0A0A0" StrokeThickness="1"/>
+                            <Line X1="0" X2="50" Y1="4" Y2="4" Stroke="White" StrokeThickness="1"/>
+                            <Line X1="0" X2="50" Y1="5" Y2="5" Stroke="#A0A0A0" StrokeThickness="1"/>
                         </Canvas>
                     </Border>
                 </ControlTemplate>
@@ -221,15 +290,15 @@
             <Grid.Resources>
                 <converter:SizeCompareBorderVisibilityConverter x:Key="SizeCompareBorderVisibilityConverter" />
 
-                <switch:SwitchConverter x:Key="ImageBorderBrushA" Default="LightGray">
-                    <switch:SwitchConverterCase When="FileA" Then="Red" />
-                    <switch:SwitchConverterCase When="FileB" Then="Green" />
-                </switch:SwitchConverter>
+                <converter:SwitchConverter x:Key="ImageBorderBrushA" Default="LightGray">
+                    <converter:SwitchConverterCase When="FileA" Then="Red" />
+                    <converter:SwitchConverterCase When="FileB" Then="Green" />
+                </converter:SwitchConverter>
 
-                <switch:SwitchConverter x:Key="ImageBorderBrushB" Default="LightGray">
-                    <switch:SwitchConverterCase When="FileB" Then="Red" />
-                    <switch:SwitchConverterCase When="FileA" Then="Green" />
-                </switch:SwitchConverter>
+                <converter:SwitchConverter x:Key="ImageBorderBrushB" Default="LightGray">
+                    <converter:SwitchConverterCase When="FileB" Then="Red" />
+                    <converter:SwitchConverterCase When="FileA" Then="Green" />
+                </converter:SwitchConverter>
                 
                 
             </Grid.Resources>
@@ -240,7 +309,12 @@
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
 
-                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="15" FontWeight="Bold">
+                <TextBlock 
+                    HorizontalAlignment="Center" 
+                    VerticalAlignment="Center" 
+                    FontSize="15" 
+                    FontWeight="Bold"
+                    >
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Resolution: {0} x {1}" FallbackValue="Resolution:">
                             <Binding Path="SelectedResult.FileA.BitmapImage.PixelWidth" />
@@ -248,10 +322,20 @@
                         </MultiBinding>
                     </TextBlock.Text>
                 </TextBlock>
-                <Button Grid.Row="1" Command="{Binding ImageClickCommand}" CommandParameter="{Binding SelectedResult.FileA}" Style="{StaticResource EmptyButtonStyle}" 
-                        ContextMenuService.ShowOnDisabled="True" IsTabStop="False">
+                <Button 
+                    Grid.Row="1" 
+                    Command="{Binding ImageClickCommand}" 
+                    CommandParameter="{Binding SelectedResult.FileA}" 
+                    Style="{StaticResource EmptyButtonStyle}" 
+                    ContextMenuService.ShowOnDisabled="True" 
+                    IsTabStop="False"
+                    >
                     <Grid>
-                        <Border BorderBrush="{Binding SelectedResult.SmallerOne, Converter={StaticResource ImageBorderBrushA}}" BorderThickness="5" Margin="-5">
+                        <Border 
+                            BorderBrush="{Binding SelectedResult.SmallerOne, Converter={StaticResource ImageBorderBrushA}}" 
+                            BorderThickness="5" 
+                            Margin="-5"
+                            >
                             <Border.Visibility>
                                 <MultiBinding Converter="{StaticResource SizeCompareBorderVisibilityConverter}">
                                     <Binding Path="IsExterminationModeActive" />
@@ -259,37 +343,69 @@
                                 </MultiBinding>
                             </Border.Visibility>
                         </Border>
-                        <Image Source="{Binding SelectedResult.FileA.BitmapImage, FallbackValue={StaticResource DefaultImage}, Converter={StaticResource NullReplaceImageConverter}}" Stretch="Uniform" />
+                        <Image 
+                            Source="{Binding SelectedResult.FileA.BitmapImage, FallbackValue={StaticResource DefaultImage}, Converter={StaticResource NullReplaceImageConverter}}" 
+                            Stretch="Uniform" 
+                            />
                     </Grid>
                     
 
                     <Button.ContextMenu>
                         <ContextMenu>
                             <ContextMenu.Items>
-                                <MenuItem Header="restore" ToolTip="restore deleted image" ToolTipService.ShowOnDisabled="True" Height="22"
-                                        CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileA}"
-                                        Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.RestoreImageCommand}">
+                                <MenuItem 
+                                    Header="open" 
+                                    ToolTip="opens the file" 
+                                    ToolTipService.ShowOnDisabled="True" 
+                                    Height="22"
+                                    Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.OpenFileCommand}"
+                                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileA}"
+                                    >
+                                    <MenuItem.Icon>
+                                        <Image Source="/ImageChecker;component/Icon/fullscreen.png" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem 
+                                    Header="restore" 
+                                    ToolTip="restores the deleted file from backup" 
+                                    ToolTipService.ShowOnDisabled="True" 
+                                    Height="22"
+                                    Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.RestoreImageCommand}"
+                                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileA}"
+                                    >
                                     <MenuItem.Icon>
                                         <Image Source="/ImageChecker;component/Icon/restore.png" />
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem Header="save as" Height="22"
-                                        CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileA}"
-                                        Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SaveAsImageCommand}">
+                                <MenuItem 
+                                    Header="save as"
+                                    ToolTip="save the file at the selected path"
+                                    Height="22"
+                                    Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SaveAsImageCommand}"
+                                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileA}"
+                                    >
                                     <MenuItem.Icon>
                                         <Image Source="/ImageChecker;component/Icon/saveAs.png" />
                                     </MenuItem.Icon>
                                 </MenuItem>                                
-                                <MenuItem Header="open in folder" Height="22"
-                                        CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileA.File}"
-                                        Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.OpenFolderCommand}">
+                                <MenuItem 
+                                    Header="show in folder"
+                                    ToolTip="shows the file in file explorer"
+                                    Height="22"
+                                    Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.OpenFolderCommand}"
+                                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileA.File}"
+                                    >
                                     <MenuItem.Icon>
                                         <Image Source="/ImageChecker;component/Icon/openFolder.png" />
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem Header="cut file to clipboard" Height="22"
-                                        CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileA}"
-                                        Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.CutFileCommand}">
+                                <MenuItem 
+                                    Header="cut file to clipboard"
+                                    ToolTip="cuts the file into clipboard for pasting"
+                                    Height="22"
+                                    Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.CutFileCommand}"
+                                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileA}"
+                                    >
                                     <MenuItem.Icon>
                                         <Image Source="/ImageChecker;component/Icon/cut.png" />
                                     </MenuItem.Icon>
@@ -327,33 +443,97 @@
                     </Border.Background>
                 </Border>
 
-                <TextBlock Text="{Binding SelectedResult.FLANN, StringFormat={}{0:0.00} %, FallbackValue= 100.00 %}" Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="0" 
-                           VerticalAlignment="Center" HorizontalAlignment="Center" FontWeight="ExtraBold" Margin="2" FontSize="20"/>
+                <TextBlock 
+                    Text="{Binding SelectedResult.FLANN, StringFormat={}{0:0.00} %, FallbackValue= 100.00 %}" 
+                    Grid.Column="0" 
+                    Grid.ColumnSpan="3" 
+                    Grid.Row="0" 
+                    VerticalAlignment="Center" 
+                    HorizontalAlignment="Center" 
+                    FontWeight="ExtraBold" 
+                    Margin="2" 
+                    FontSize="20"
+                    />
 
-                <ToggleButton Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="2" Margin="5" Focusable="False"
-                              Background="{DynamicResource ExterminationModeBackground}" FontWeight="Medium" 
-                              IsChecked="{Binding IsExterminationModeActive, Mode=TwoWay}" 
-                              ToolTip="Marks both images, indicating which is the bigger/smaller one">
+                <ToggleButton 
+                    Grid.Column="0" 
+                    Grid.ColumnSpan="3" 
+                    Grid.Row="2" 
+                    Margin="5" 
+                    Focusable="False"
+                    Background="{DynamicResource ExterminationModeBackground}" 
+                    FontWeight="Medium" 
+                    IsChecked="{Binding IsExterminationModeActive, Mode=TwoWay}"
+                    >
+                    <!--ToolTip="When activated:&#x0d;&#x0a;&#x0d;&#x0a;Marks both images, indicating which is the bigger/smaller one.&#x0d;&#x0a;Red border => smaller&#x0d;&#x0a;Green border => 
+                    bigger&#x0d;&#x0a;Gray border => identical&#x0d;&#x0a;&#x0d;&#x0a;A click on an image deletes it instead of opening. With Arrow-Key 'Left' and 'Right' the left or right image is deleted.
+                    &#x0d;&#x0a;&#x0d;&#x0a;After a deletion the selected result item gets position to the next unsolved item."-->
+                    <ToggleButton.ToolTip>
+                        <StackPanel Orientation="Vertical">
+                            <TextBlock Text="When activated:" TextDecorations="Baseline"/>
+                            <TextBlock />
+                            <TextBlock Text="Marks both images, indicating which is the bigger/smaller one:"/>
+                            <TextBlock Text="- Red border => smaller" Foreground="Red"/>
+                            <TextBlock Text="- Green border => bigger" Foreground="Green"/>
+                            <TextBlock Text="- Gray border => identical" Foreground="LightGray"/>
+                            <TextBlock />
+                            <TextBlock Text="A click on an image deletes it instead of opening. With Arrow-Key 'Left' and 'Right' the left or right image is deleted."/>
+                            <TextBlock />
+                            <TextBlock Text="After a deletion the selected result item gets position to the next unsolved item."/>
+                        </StackPanel>
+                    </ToggleButton.ToolTip>
+                    
                     <ToggleButton.Resources>
-                        <switch:SwitchConverter x:Key="ExterminationModeToTextConverter" Default="OFF">
-                            <switch:SwitchConverterCase When="True" Then="ON" />
-                        </switch:SwitchConverter>
+                        <converter:SwitchConverter x:Key="ExterminationModeToTextConverter" Default="OFF">
+                            <converter:SwitchConverterCase When="True" Then="ON" />
+                        </converter:SwitchConverter>
                     </ToggleButton.Resources>
+                    
                     <StackPanel Orientation="Vertical">
-                        <TextBlock Text="Extermination Mode" HorizontalAlignment="Center"/>
-                        <TextBlock Text="{Binding IsExterminationModeActive, Converter={StaticResource ExterminationModeToTextConverter}}" HorizontalAlignment="Center" FontWeight="ExtraBlack" FontSize="16"/>
+                        <TextBlock 
+                            Text="Quick Mode" 
+                            HorizontalAlignment="Center"
+                            />
+                        <TextBlock 
+                            Text="{Binding IsExterminationModeActive, Converter={StaticResource ExterminationModeToTextConverter}}" 
+                            HorizontalAlignment="Center" 
+                            FontWeight="ExtraBlack" 
+                            FontSize="16"
+                            />
                     </StackPanel>
                 </ToggleButton>
                 
-                <Button Command="{Binding DeleteFileCommand}" CommandParameter="{Binding SelectedResult.FileA}" Focusable="False"
-                        Grid.Column="0" Grid.Row="5" Margin="2,2,2,2" 
-                        ToolTip="delete image" Background="{DynamicResource DeleteFileBackground}" >
-                    <Image Source="/ImageChecker;component/Icon/deleteFile.png" Stretch="Uniform" Margin="2"/>
+                <Button 
+                    Command="{Binding DeleteFileCommand}" 
+                    CommandParameter="{Binding SelectedResult.FileA}" 
+                    Focusable="False"
+                    Grid.Column="0" 
+                    Grid.Row="5" 
+                    Margin="2,2,2,2" 
+                    ToolTip="Deletes the left image." 
+                    Background="{DynamicResource DeleteFileBackground}" 
+                    >
+                    <Image 
+                        Source="/ImageChecker;component/Icon/deleteFile.png" 
+                        Stretch="Uniform" 
+                        Margin="2"
+                        />
                 </Button>
-                <Button Command="{Binding DeleteFileCommand}" CommandParameter="{Binding SelectedResult.FileB}" Focusable="False"
-                        Grid.Column="2" Grid.Row="5" Margin="2,2,2,2"
-                        ToolTip="delete image" Background="{DynamicResource DeleteFileBackground}" >
-                    <Image Source="/ImageChecker;component/Icon/deleteFile.png" Stretch="Uniform" Margin="2"/>
+                <Button 
+                    Command="{Binding DeleteFileCommand}" 
+                    CommandParameter="{Binding SelectedResult.FileB}" 
+                    Focusable="False"
+                    Grid.Column="2" 
+                    Grid.Row="5" 
+                    Margin="2,2,2,2"
+                    ToolTip="Deletes the right image." 
+                    Background="{DynamicResource DeleteFileBackground}"
+                    >
+                    <Image 
+                        Source="/ImageChecker;component/Icon/deleteFile.png" 
+                        Stretch="Uniform" 
+                        Margin="2"
+                        />
                 </Button>
             </Grid>
 
@@ -363,7 +543,12 @@
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
 
-                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="15" FontWeight="Bold">
+                <TextBlock 
+                    HorizontalAlignment="Center" 
+                    VerticalAlignment="Center" 
+                    FontSize="15" 
+                    FontWeight="Bold"
+                    >
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Resolution: {0} x {1}" FallbackValue="Resolution:">
                             <Binding Path="SelectedResult.FileB.BitmapImage.PixelWidth" />
@@ -372,10 +557,19 @@
                     </TextBlock.Text>
                 </TextBlock>
 
-                <Button Grid.Row="1" Command="{Binding ImageClickCommand}" CommandParameter="{Binding SelectedResult.FileB}" Style="{StaticResource EmptyButtonStyle}" 
-                        ContextMenuService.ShowOnDisabled="True" IsTabStop="False">
+                <Button 
+                    Grid.Row="1" 
+                    Command="{Binding ImageClickCommand}" 
+                    CommandParameter="{Binding SelectedResult.FileB}" 
+                    Style="{StaticResource EmptyButtonStyle}" 
+                    ContextMenuService.ShowOnDisabled="True" 
+                    IsTabStop="False"
+                    >
                     <Grid>
-                        <Border BorderBrush="{Binding SelectedResult.SmallerOne, Converter={StaticResource ImageBorderBrushB}}" BorderThickness="5" Margin="-5">
+                        <Border
+                            BorderBrush="{Binding SelectedResult.SmallerOne, Converter={StaticResource ImageBorderBrushB}}"
+                            BorderThickness="5" 
+                            Margin="-5">
                             <Border.Visibility>
                                 <MultiBinding Converter="{StaticResource SizeCompareBorderVisibilityConverter}">
                                     <Binding Path="IsExterminationModeActive" />
@@ -383,37 +577,68 @@
                                 </MultiBinding>
                             </Border.Visibility>
                         </Border>
-                        <Image Source="{Binding SelectedResult.FileB.BitmapImage, FallbackValue={StaticResource DefaultImage}, Converter={StaticResource NullReplaceImageConverter}}" Stretch="Uniform" />
+                        <Image 
+                            Source="{Binding SelectedResult.FileB.BitmapImage, FallbackValue={StaticResource DefaultImage}, Converter={StaticResource NullReplaceImageConverter}}" 
+                            Stretch="Uniform" 
+                            />
                     </Grid>
-                    
 
                     <Button.ContextMenu>
                         <ContextMenu>
                             <ContextMenu.Items>
-                                <MenuItem Header="restore" ToolTip="restore deleted image" ToolTipService.ShowOnDisabled="True" Height="22"
-                                        CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileB}"
-                                        Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.RestoreImageCommand}">
+                                <MenuItem 
+                                    Header="open" 
+                                    ToolTip="opens the file" 
+                                    ToolTipService.ShowOnDisabled="True" 
+                                    Height="22"
+                                    Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.OpenFileCommand}"
+                                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileA}"
+                                    >
+                                    <MenuItem.Icon>
+                                        <Image Source="/ImageChecker;component/Icon/fullscreen.png" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem 
+                                    Header="restore" 
+                                    ToolTip="restores the deleted file from backup" 
+                                    ToolTipService.ShowOnDisabled="True" 
+                                    Height="22"
+                                    Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.RestoreImageCommand}"
+                                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileB}"
+                                    >
                                     <MenuItem.Icon>
                                         <Image Source="/ImageChecker;component/Icon/restore.png" />
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem Header="save as" Height="22"
-                                        CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileB}"
-                                        Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SaveAsImageCommand}">
+                                <MenuItem 
+                                    Header="save as"
+                                    ToolTip="save the file at the selected path"
+                                    Height="22"
+                                    Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SaveAsImageCommand}"
+                                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileB}"
+                                    >
                                     <MenuItem.Icon>
                                         <Image Source="/ImageChecker;component/Icon/saveAs.png" />
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem Header="open in folder" Height="22"
-                                        CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileB.File}"
-                                        Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.OpenFolderCommand}">
+                                <MenuItem 
+                                    Header="show in folder"
+                                    ToolTip="shows the file in file explorer"
+                                    Height="22"
+                                    Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.OpenFolderCommand}"
+                                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileB.File}"
+                                    >
                                     <MenuItem.Icon>
                                         <Image Source="/ImageChecker;component/Icon/openFolder.png" />
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem Header="cut file to clipboard" Height="22"
-                                        CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileB}"
-                                        Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.CutFileCommand}">
+                                <MenuItem 
+                                    Header="cut file to clipboard"
+                                    ToolTip="cuts the file into clipboard for pasting"
+                                    Height="22"
+                                    Command="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.CutFileCommand}"
+                                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=PlacementTarget.DataContext.SelectedResult.FileB}"
+                                    >
                                     <MenuItem.Icon>
                                         <Image Source="/ImageChecker;component/Icon/cut.png" />
                                     </MenuItem.Icon>
diff --git a/ImageChecker/ViewModel/VMResultView.cs b/ImageChecker/ViewModel/VMResultView.cs
index 11a83bf..12ba64a 100644
--- a/ImageChecker/ViewModel/VMResultView.cs
+++ b/ImageChecker/ViewModel/VMResultView.cs
@@ -652,20 +652,17 @@ public ICommand ImageClickCommand
         }
     }
 
-    public async Task ImageClickAsync(object p)
+    public async Task ImageClickAsync(object fileImage)
     {
-        if (p is FileImage fileImage)
+        if (fileImage is FileImage fi)
         {
             if (IsExterminationModeActive)
             {
-                await DeleteFileAsync(fileImage);
+                await DeleteFileAsync(fi);
             }
             else
             {
-                if (fileImage.File is FileInfo fi)
-                {
-                    Process.Start(new ProcessStartInfo(fi.FullName) { UseShellExecute = true });
-                }
+                await OpenFileAsync(fi);
             }
         }
     }
@@ -680,10 +677,7 @@ private bool CanImageClick(object p)
             }
             else
             {
-                if (fileImage.File is FileInfo fi)
-                {
-                    return File.Exists(CommonConst.LONG_PATH_PREFIX + fi.FullName);
-                }
+                return CanOpenFile(fileImage);
             }
         }
 
@@ -691,6 +685,48 @@ private bool CanImageClick(object p)
     }
     #endregion ImageClick
 
+    #region OpenFile
+    private ICommand _openFileCommand;
+    public ICommand OpenFileCommand
+    {
+        get
+        {
+            if (_openFileCommand == null)
+            {
+                _openFileCommand = new RelayCommand(async p => await OpenFileAsync(p),
+                    p => CanOpenFile(p));
+            }
+            return _openFileCommand;
+        }
+    }
+
+    public async Task OpenFileAsync(object fileImage)
+    {
+        if (fileImage is FileImage fi)
+        {
+            if (File.Exists(CommonConst.LONG_PATH_PREFIX + fi.Filepath))
+            {
+                Process.Start(new ProcessStartInfo(CommonConst.LONG_PATH_PREFIX + fi.Filepath) { UseShellExecute = true });
+            }
+            else if (File.Exists(CommonConst.LONG_PATH_PREFIX + fi.BackupFilePath))
+            {
+                Process.Start(new ProcessStartInfo(CommonConst.LONG_PATH_PREFIX + fi.BackupFilePath) { UseShellExecute = true });
+            }
+        }
+    }
+
+    private bool CanOpenFile(object fileImage)
+    {
+        if (fileImage is FileImage fi == false)
+            return false;
+
+        if (File.Exists(CommonConst.LONG_PATH_PREFIX + fi.Filepath) == false && File.Exists(CommonConst.LONG_PATH_PREFIX + fi.BackupFilePath) == false)
+            return false;
+
+        return true;
+    }
+    #endregion OpenFile
+
     #region CutFile
     private ICommand _cutFileCommand;
     public ICommand CutFileCommand