From 5bb3f93309fa0d23d6c2d73b2036ad033009e291 Mon Sep 17 00:00:00 2001
From: Steven <mail@shansen-online.de>
Date: Tue, 14 Feb 2023 11:17:10 +0100
Subject: [PATCH] Removed PCSC Support and LibLogicalAccess Dependency

Removed some License related Functions:

No more PCSC Support and LibLogicalAccess (now owned by HID) Dependency
Changed PDF Library to GemBox PDF and removed iTextPDF Dependency
---
 .../Remote/FromFile/ReportReaderWriter.cs     |   2 +
 .../Remote/FromIO/ElatecNetProvider.cs        |  10 +-
 RFiDGear/Model/GenericTaskModel.cs            |   2 +-
 RFiDGear/Properties/AssemblyInfo.cs           |   2 +-
 RFiDGear/RFiDGear.csproj.user                 |   2 +-
 RFiDGear/View/AboutView.xaml                  |   2 +
 .../TabPageMiscReaderSettingsView.xaml        |   2 +-
 RFiDGear/View/SettingsView/SetupView.xaml     |   9 +-
 .../TaskViews/CommonTask/CommonTaskView.xaml  |   6 +
 .../TabPageLogicTaskView.xaml                 |  17 ++-
 .../TabPageReportSettingsView.xaml            |   7 +-
 .../TabPageBasicChipCheckUpView.xaml          |  23 ++--
 .../GenericChipTask/GenericChipTaskView.xaml  |   6 +
 .../MifareClassicSetupView.xaml               |   7 ++
 .../TabPageMifareClassicDataExplorerView.xaml |  15 ++-
 .../MifareDesfireSetupView.xaml               |   5 +
 .../TabPageMifareDesfireAppCreationView.xaml  |   8 ++
 ...MifareDesfireApplicationMasteringView.xaml |  14 ++-
 ...TabPageMifareDesfireCardMasteringView.xaml |  12 +-
 .../TabPageMifareDesfireDataExplorerView.xaml |   9 ++
 ...TabPageMifareDesfireFileMasteringView.xaml |  14 ++-
 .../MifareUltralightSetupView.xaml            |   8 +-
 ...bPageMifareUltralightDataExplorerView.xaml |  12 +-
 RFiDGear/View/UpdateNotifierView.xaml         |   4 +
 .../RFiDChipChildLayerViewModel.cs            |  19 +--
 .../RFiDChipParentLayerViewModel.cs           |   2 +-
 RFiDGear/ViewModel/MainWindowViewModel.cs     |  22 +---
 .../CommonTaskViewModel.cs                    |   9 +-
 .../GenericChipTaskViewModel.cs               | 118 +++++++++---------
 .../MifareClassicSetupViewModel.cs            |   4 +-
 .../MifareDesfireSetupViewModel.cs            |  12 +-
 .../MifareUltralightSetupViewModel.cs         |   4 +-
 32 files changed, 230 insertions(+), 158 deletions(-)

diff --git a/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs b/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs
index b4c2732..3c8f5c9 100644
--- a/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs
+++ b/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs
@@ -105,6 +105,8 @@ public void SetReportField(string _field, string _value)
                             ReportTemplatePath = System.IO.Path.Combine(appDataPath, reportTemplateTempFileName);
 
                             var form = pdfDoc.Form;
+                            pdfDoc.Info.Title = "RFiDGear Report";
+                            pdfDoc.Info.Author = "RFiDGear";
 
                             pdfDoc.Form.Fields[_field].Hidden = false;
                             pdfDoc.Form.Fields[_field].ReadOnly = false;
diff --git a/RFiDGear/DataAccessLayer/Remote/FromIO/ElatecNetProvider.cs b/RFiDGear/DataAccessLayer/Remote/FromIO/ElatecNetProvider.cs
index 8bff7f5..f7b6d7f 100644
--- a/RFiDGear/DataAccessLayer/Remote/FromIO/ElatecNetProvider.cs
+++ b/RFiDGear/DataAccessLayer/Remote/FromIO/ElatecNetProvider.cs
@@ -234,16 +234,16 @@ private ERROR readWriteAccessOnClassicSector(int sectorNumber, string aKey, stri
                 }
                 catch
                 {
-                    return ERROR.IOError; // IO ERROR
+                    return ERROR.IOError; // IO ElatecError
                 }
             }
 
             if(Sector.IsAuthenticated)
             {
-                return ERROR.NoError; //NO ERROR
+                return ERROR.NoError; //NO ElatecError
             }
 
-            return ERROR.AuthenticationError; // Auth ERROR
+            return ERROR.AuthenticationError; // Auth ElatecError
         }
 
         #endregion
@@ -262,7 +262,7 @@ public override ERROR ReadMifareUltralightSinglePage(int _pageNo)
         /// </summary>
         /// <param name="_appMasterKey"></param>
         /// <param name="_keyTypeAppMasterKey"></param>
-        /// <returns>ERROR Level</returns>
+        /// <returns>ElatecError Level</returns>
         public override ERROR GetMiFareDESFireChipAppIDs(string _appMasterKey, DESFireKeyType _keyTypeAppMasterKey)
         {
             if (DesfireChip == null)
@@ -306,7 +306,7 @@ public override ERROR AuthToMifareDesfireApplication(string _applicationMasterKe
                     _applicationMasterKey,
                     (byte)_keyNumber,
                     (byte)(int)Enum.Parse(typeof(Elatec.NET.DESFireKeyType), Enum.GetName(typeof(RFiDGear.DataAccessLayer.DESFireKeyType), _keyType)),
-                    1) == true ? ERROR.NoError : ERROR.NotAllowed;
+                    1) == true ? ERROR.NoError : ERROR.AuthenticationError;
             }
             else
             {
diff --git a/RFiDGear/Model/GenericTaskModel.cs b/RFiDGear/Model/GenericTaskModel.cs
index bd0b179..d4b740e 100644
--- a/RFiDGear/Model/GenericTaskModel.cs
+++ b/RFiDGear/Model/GenericTaskModel.cs
@@ -9,7 +9,7 @@ namespace RFiDGear.Model
     public interface IGenericTaskModel
     {
         /// <summary>
-        /// Indicates a Task Result and is interpreted by one of the following ERROR states: true = NoError, null = Empty, false = Everything else
+        /// Indicates a Task Result and is interpreted by one of the following ElatecError states: true = NoError, null = Empty, false = Everything else
         /// </summary>
         bool? IsTaskCompletedSuccessfully { get; set; }
 
diff --git a/RFiDGear/Properties/AssemblyInfo.cs b/RFiDGear/Properties/AssemblyInfo.cs
index f65875d..812064e 100644
--- a/RFiDGear/Properties/AssemblyInfo.cs
+++ b/RFiDGear/Properties/AssemblyInfo.cs
@@ -25,6 +25,6 @@
 //
 // You can specify all the values or you can use the default the Revision and
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.*")]
+[assembly: AssemblyVersion("1.2.*")]
 [assembly: Guid("a34bc413-e349-4fd1-8b90-2eb95a333436")]
 [assembly: NeutralResourcesLanguage("")]
diff --git a/RFiDGear/RFiDGear.csproj.user b/RFiDGear/RFiDGear.csproj.user
index b634f8f..e3a899a 100644
--- a/RFiDGear/RFiDGear.csproj.user
+++ b/RFiDGear/RFiDGear.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>REPORTTARGETPATH="C:\temp\test file.pdf" AUTORUN=1 %24JobNumber=1234 %24CardType=</StartArguments>
+    <StartArguments>REPORTTARGETPATH="C:\temp\test file.pdf" AUTORUN=0 %24JobNumber=1234 %24CardType=</StartArguments>
     <StartWorkingDirectory>D:\Seafile\Dokumente Privat\Steven\Projekte\Software\Windows\RFIDGear\RFiDGear\bin\Debug\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/RFiDGear/View/AboutView.xaml b/RFiDGear/View/AboutView.xaml
index 9baffe5..2aaceec 100644
--- a/RFiDGear/View/AboutView.xaml
+++ b/RFiDGear/View/AboutView.xaml
@@ -65,6 +65,8 @@
             Grid.Row="3"
             Grid.Column="1"
             Width="90"
+            Height="26"
+            Padding="5,2"
             Margin="0,8,0,8"
             HorizontalAlignment="Center"
             VerticalAlignment="Stretch"
diff --git a/RFiDGear/View/SettingsView/SettingsTabPages/TabPageMiscReaderSettingsView.xaml b/RFiDGear/View/SettingsView/SettingsTabPages/TabPageMiscReaderSettingsView.xaml
index 718c2fd..60f7770 100644
--- a/RFiDGear/View/SettingsView/SettingsTabPages/TabPageMiscReaderSettingsView.xaml
+++ b/RFiDGear/View/SettingsView/SettingsTabPages/TabPageMiscReaderSettingsView.xaml
@@ -59,7 +59,7 @@
             <ComboBox
                 Grid.Row="1"
                 Grid.Column="1"
-                Height="auto"
+                Height="26"
                 Margin="8,7,8,3"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Top"
diff --git a/RFiDGear/View/SettingsView/SetupView.xaml b/RFiDGear/View/SettingsView/SetupView.xaml
index aff0829..3538768 100644
--- a/RFiDGear/View/SettingsView/SetupView.xaml
+++ b/RFiDGear/View/SettingsView/SetupView.xaml
@@ -46,7 +46,8 @@
                 Grid.Row="0"
                 Grid.Column="1"
                 Width="140"
-                Height="auto"
+                Height="26"
+                Padding="5,2"
                 Margin="8,0,4,8"
                 VerticalAlignment="Bottom"
                 HorizontalAlignment="Right"
@@ -64,7 +65,8 @@
                 Grid.Row="0"
                 Grid.Column="2"
                 Width="140"
-                Height="auto"
+                Height="26"
+                Padding="5,2"
                 Margin="4,0,4,8"
                 VerticalAlignment="Bottom"
                 HorizontalAlignment="Center"
@@ -74,7 +76,8 @@
                 Grid.Row="0"
                 Grid.Column="3"
                 Width="160"
-                Height="auto"
+                Height="26"
+                Padding="5,2"
                 Margin="4,0,8,8"
                 VerticalAlignment="Bottom"
                 HorizontalAlignment="Left"
diff --git a/RFiDGear/View/TaskViews/CommonTask/CommonTaskView.xaml b/RFiDGear/View/TaskViews/CommonTask/CommonTaskView.xaml
index 9efcf94..42dc13c 100644
--- a/RFiDGear/View/TaskViews/CommonTask/CommonTaskView.xaml
+++ b/RFiDGear/View/TaskViews/CommonTask/CommonTaskView.xaml
@@ -109,6 +109,7 @@
                     <ComboBox
                         Grid.Row="0"
                         Grid.Column="1"
+                        Height="26"
                         Margin="8,7,8,0"
                         VerticalAlignment="Stretch"
                         VerticalContentAlignment="Center"
@@ -210,6 +211,7 @@
                             <ComboBox
                                 Grid.Column="1"
                                 Margin="8,7,8,3"
+                                Height="26"
                                 ScrollViewer.VerticalScrollBarVisibility="Visible"
                                 VerticalAlignment="Stretch"
                                 ItemsSource="{dal:Enumerate {x:Type dal:ERROR}}"
@@ -251,6 +253,8 @@
                 Grid.Row="0"
                 Grid.Column="0"
                 Width="140"
+                Height="26"
+                Padding="5,2"
                 Margin="9,8,8,8"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Bottom"
@@ -261,6 +265,8 @@
                 Grid.Row="0"
                 Grid.Column="0"
                 Width="140"
+                Height="26"
+                Padding="5,2"
                 Margin="157,8,8,8"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Bottom"
diff --git a/RFiDGear/View/TaskViews/CommonTask/CommonTasksTabPages/TabPageLogicTaskView.xaml b/RFiDGear/View/TaskViews/CommonTask/CommonTasksTabPages/TabPageLogicTaskView.xaml
index 0a38019..2832e20 100644
--- a/RFiDGear/View/TaskViews/CommonTask/CommonTasksTabPages/TabPageLogicTaskView.xaml
+++ b/RFiDGear/View/TaskViews/CommonTask/CommonTasksTabPages/TabPageLogicTaskView.xaml
@@ -59,24 +59,25 @@
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="42" />
+                                <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
                             <Label
                                 Grid.Row="0"
                                 Grid.Column="0"
                                 Height="26"
-                                Margin="8,6,10,0"
-                                VerticalAlignment="Top"
+                                Margin="8,0,8,8"
+                                VerticalAlignment="Center"
                                 HorizontalContentAlignment="Stretch"
                                 Content="{Binding LocalizationResourceSet, ConverterParameter=labelSelectLogicFunction, Converter={StaticResource Localization}}"
                                 DataContext="{Binding}"
                                 Foreground="Black" />
                             <ComboBox
                                 Grid.Row="0"
+                                Height="26"
                                 Grid.Column="1"
                                 Margin="8,0,8,8"
                                 HorizontalAlignment="Stretch"
-                                VerticalAlignment="Bottom"
+                                VerticalAlignment="Center"
                                 ItemsSource="{dal:Enumerate {x:Type dal:LOGIC_STATE}}"
                                 SelectedItem="{Binding SelectedLogicCondition, ConverterParameter={x:Type dal:LOGIC_STATE}, Converter={StaticResource Localization}, Mode=TwoWay}" />
                         </Grid>
@@ -113,6 +114,7 @@
                                 Grid.Row="0"
                                 Grid.Column="1"
                                 Margin="8,0,8,8"
+                                Height="26"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Bottom"
                                 IsEnabled="{Binding IsLogicFuncTaskCountFuncEnabled}"
@@ -133,6 +135,7 @@
                                 Grid.Row="1"
                                 Grid.Column="1"
                                 Margin="8,0,8,8"
+                                Height="26"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Bottom"
                                 IsEnabled="{Binding IsLogicFuncTaskCountFuncEnabled}"
@@ -153,6 +156,7 @@
                                 Grid.Row="2"
                                 Grid.Column="1"
                                 Margin="8,0,8,8"
+                                Height="26"
                                 VerticalAlignment="Top"
                                 VerticalContentAlignment="Center"
                                 HorizontalContentAlignment="Left"
@@ -187,6 +191,8 @@
                         </Grid.RowDefinitions>
                         <Button
                             Grid.Column="1"
+                            Height="26"
+                            Padding="5,2"
                             VerticalAlignment="Center"
                             HorizontalAlignment="Center"
                             VerticalContentAlignment="Center"
@@ -196,6 +202,8 @@
                         <Button
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
+                            Height="26"
+                            Padding="5,2"
                             VerticalContentAlignment="Center"
                             HorizontalContentAlignment="Left"
                             Command="{Binding AddEditCheckpointCommand}"
@@ -276,7 +284,6 @@
                                     <DataTemplate>
                                         <ComboBox
                                             ItemsSource="{dal:Enumerate {x:Type dal:ERROR}}"
-                                            
                                             SelectedItem="{Binding ErrorLevel, ConverterParameter={x:Type dal:ERROR}, Converter={StaticResource Localization}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                             ScrollViewer.VerticalScrollBarVisibility="Visible"
                                             FontFamily="Lucida Console">
diff --git a/RFiDGear/View/TaskViews/CommonTask/CommonTasksTabPages/TabPageReportSettingsView.xaml b/RFiDGear/View/TaskViews/CommonTask/CommonTasksTabPages/TabPageReportSettingsView.xaml
index dbfed05..8757bd7 100644
--- a/RFiDGear/View/TaskViews/CommonTask/CommonTasksTabPages/TabPageReportSettingsView.xaml
+++ b/RFiDGear/View/TaskViews/CommonTask/CommonTasksTabPages/TabPageReportSettingsView.xaml
@@ -89,6 +89,8 @@
                             <Button
                                 Grid.Column="1"
                                 Margin="10,0,10,8"
+                                Height="26"
+                                Padding="5,2"
                                 VerticalAlignment="Stretch"
                                 HorizontalAlignment="Stretch"
                                 VerticalContentAlignment="Center"
@@ -125,7 +127,8 @@
                         <Button
                             Grid.Row="1"
                             Grid.Column="1"
-                            Height="auto"
+                            Height="26"
+                            Padding="5,2"
                             Margin="10,0,8,10"
                             VerticalAlignment="Bottom"
                             HorizontalAlignment="Center"
@@ -134,6 +137,8 @@
                         <Button
                             Grid.Row="1"
                             Grid.Column="0"
+                            Height="26"
+                            Padding="5,2"
                             Margin="10,0,10,10"
                             VerticalAlignment="Bottom"
                             HorizontalAlignment="Center"
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/GenericChipTask/GenericChipTaskTabPages/TabPageBasicChipCheckUpView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/GenericChipTask/GenericChipTaskTabPages/TabPageBasicChipCheckUpView.xaml
index 2d10552..9083ba9 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/GenericChipTask/GenericChipTaskTabPages/TabPageBasicChipCheckUpView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/GenericChipTask/GenericChipTaskTabPages/TabPageBasicChipCheckUpView.xaml
@@ -28,18 +28,19 @@
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch">
                     <ComboBox
-                            xmlns:dlgs="clr-namespace:MvvmDialogs.Behaviors;assembly=MVVMDialogs"
-                            xmlns:local="clr-namespace:RFiDGear"
-                            xmlns:system="clr-namespace:System;assembly=mscorlib"
-                            xmlns:v="clr-namespace:RFiDGear.View"
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            Margin="8,0,8,8"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Bottom"
+                        xmlns:dlgs="clr-namespace:MvvmDialogs.Behaviors;assembly=MVVMDialogs"
+                        xmlns:local="clr-namespace:RFiDGear"
+                        xmlns:system="clr-namespace:System;assembly=mscorlib"
+                        xmlns:v="clr-namespace:RFiDGear.View"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Height="26"
+                        Margin="8,0,8,8"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Bottom"
                         ScrollViewer.VerticalScrollBarVisibility="Visible"
-                            ItemsSource="{dal:Enumerate {x:Type dal:CARD_TYPE}}"
-                            SelectedItem="{Binding SelectedChipType, Converter={StaticResource Localization}, ConverterParameter={x:Type dal:CARD_TYPE}, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                        ItemsSource="{dal:Enumerate {x:Type dal:CARD_TYPE}}"
+                        SelectedItem="{Binding SelectedChipType, Converter={StaticResource Localization}, ConverterParameter={x:Type dal:CARD_TYPE}, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
                     <Label
                             Grid.Row="0"
                             Grid.Column="0"
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/GenericChipTask/GenericChipTaskView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/GenericChipTask/GenericChipTaskView.xaml
index 7380c9d..0abd1dc 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/GenericChipTask/GenericChipTaskView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/GenericChipTask/GenericChipTaskView.xaml
@@ -90,6 +90,7 @@
                     <ComboBox
                         Grid.Row="0"
                         Grid.Column="1"
+                        Height="26"
                         Margin="8,7,8,0"
                         VerticalAlignment="Top"
                         VerticalContentAlignment="Center"
@@ -190,6 +191,7 @@
                                 Content="{Binding LocalizationResourceSet, ConverterParameter=labelContentExecuteConditionTaskIndex, Converter={StaticResource Localization}}" />
                             <ComboBox
                                 Grid.Column="1"
+                                Height="26"
                                 Margin="8,7,8,3"
                                 ScrollViewer.VerticalScrollBarVisibility="Visible"
                                 VerticalAlignment="Stretch"
@@ -231,6 +233,8 @@
             <Button
                 Grid.Row="0"
                 Grid.Column="0"
+                Height="26"
+                Padding="5,2"
                 Width="140"
                 Margin="9,0,0,8"
                 HorizontalAlignment="Left"
@@ -240,6 +244,8 @@
                 IsDefault="True" />
             <Button
                 Grid.Row="0"
+                Height="26"
+                Padding="5,2"
                 Grid.Column="0"
                 Width="140"
                 Margin="157,0,0,8"
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicSetupView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicSetupView.xaml
index 7cce26f..1736a5f 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicSetupView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicSetupView.xaml
@@ -79,6 +79,7 @@
                         <ComboBox
                             Grid.Row="0"
                             Grid.Column="0"
+                            Height="26"
                             Margin="8,8,8,8"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
@@ -128,6 +129,7 @@
                     <ComboBox
                         Grid.Row="0"
                         Grid.Column="1"
+                        Height="26"
                         Margin="8,7,8,0"
                         VerticalAlignment="Top"
                         VerticalContentAlignment="Center"
@@ -229,6 +231,7 @@
                             <ComboBox
                                 Grid.Column="1"
                                 Margin="8,7,8,3"
+                                Height="26"
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 VerticalAlignment="Stretch"
                                 ItemsSource="{dal:Enumerate {x:Type dal:ERROR}}"
@@ -268,6 +271,8 @@
                 VerticalScrollBarVisibility="Visible" />
             <Button
                 Grid.Row="0"
+                Height="26"
+                Padding="5,2"
                 Grid.Column="0"
                 Width="140"
                 Margin="9,0,0,8"
@@ -278,6 +283,8 @@
                 IsDefault="True" />
             <Button
                 Grid.Row="0"
+                Height="26"
+                Padding="5,2"
                 Grid.Column="0"
                 Width="140"
                 Margin="157,0,0,8"
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicDataExplorerView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicDataExplorerView.xaml
index f4ec1dd..de0fe2e 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicDataExplorerView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicDataExplorerView.xaml
@@ -317,7 +317,8 @@
                         Grid.Row="3"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
-                        Height="23"
+                        Height="26"
+                        Padding="5,2"
                         Margin="10,0,10,10"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom"
@@ -327,7 +328,8 @@
                         Grid.Row="4"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
-                        Height="23"
+                        Height="26"
+                        Padding="5,2"
                         Margin="10,0,10,10"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom"
@@ -371,7 +373,8 @@
                         Grid.Row="2"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
-                        Height="23"
+                        Height="26"
+                        Padding="5,2"
                         Margin="10,0,10,10"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom"
@@ -384,9 +387,9 @@
                     <Grid.RowDefinitions>
                         <RowDefinition Height="80.7203331950994" />
                         <RowDefinition Height="0.352718148131878*" />
-                        <RowDefinition Height="36" />
-                        <RowDefinition Height="36" />
-                        <RowDefinition Height="36" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                 </Grid>
             </GroupBox>
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireSetupView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireSetupView.xaml
index 80cc6d6..8464f36 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireSetupView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireSetupView.xaml
@@ -78,6 +78,7 @@
                     <ComboBox
                         Grid.Row="0"
                         Grid.Column="1"
+                        Height="26"
                         Margin="8,7,8,0"
                         VerticalAlignment="Top"
                         VerticalContentAlignment="Center"
@@ -175,6 +176,7 @@
                                 Content="{Binding LocalizationResourceSet, ConverterParameter=labelContentExecuteConditionTaskIndex, Converter={StaticResource Localization}}" />
                             <ComboBox
                                 Grid.Column="1"
+                                Height="26"
                                 Margin="8,7,8,3"
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 VerticalAlignment="Stretch"
@@ -281,6 +283,7 @@
                         <ComboBox
                             Grid.Row="0"
                             Grid.Column="0"
+                            Height="26"
                             Margin="8,5,3,0"
                             ScrollViewer.VerticalScrollBarVisibility="Auto"
                             HorizontalAlignment="Stretch"
@@ -325,6 +328,7 @@
                 Grid.Row="0"
                 Grid.Column="0"
                 Width="140"
+                Height="26"
                 Margin="9,0,0,8"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Bottom"
@@ -332,6 +336,7 @@
                 Content="OK" />
             <Button
                 Grid.Row="0"
+                Height="26"
                 Grid.Column="0"
                 Width="140"
                 Margin="157,0,0,8"
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireAppCreationView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireAppCreationView.xaml
index f981bab..8cf885b 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireAppCreationView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireAppCreationView.xaml
@@ -62,6 +62,7 @@
                     <ComboBox
                         Grid.Row="1"
                         Grid.Column="1"
+                        Height="26"
                         ScrollViewer.VerticalScrollBarVisibility="Auto"
                         Margin="8,0,8,8"
                         VerticalAlignment="Stretch"
@@ -81,6 +82,7 @@
                         RenderTransformOrigin="0.5,0.5" />
                     <ComboBox
                         Grid.Row="2"
+                        Height="26"
                         Grid.Column="1"
                         Margin="8,0,8,8"
                         VerticalAlignment="Stretch"
@@ -101,6 +103,7 @@
                         Content="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='labelMifareDesfireAppSetupKeySettings'}" />
                     <ComboBox
                         Grid.Row="3"
+                        Height="26"
                         Grid.Column="1"
                         Margin="8,0,8,8"
                         VerticalAlignment="Stretch"
@@ -177,6 +180,8 @@
                     <Button
                         Grid.Row="6"
                         Grid.ColumnSpan="3"
+                        Height="26"
+                        Padding="5,2"
                         Margin="10,3,10,8"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
@@ -186,6 +191,8 @@
                         Grid.Row="5"
                         Grid.ColumnSpan="3"
                         Margin="10,3,10,8"
+                        Height="26"
+                        Padding="5,2"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         Command="{Binding DeleteSignleCardApplicationCommand}"
@@ -193,6 +200,7 @@
                     <TextBox
                         Grid.Row="0"
                         Grid.Column="1"
+                        Height="26"
                         Margin="8,8,8,8"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireApplicationMasteringView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireApplicationMasteringView.xaml
index 6fc487e..03d1d6c 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireApplicationMasteringView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireApplicationMasteringView.xaml
@@ -50,7 +50,8 @@
                         Grid.Row="5"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
-                        Height="auto"
+                        Height="26"
+                        Padding="5,2"
                         Margin="8,7,8,8"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom"
@@ -68,7 +69,7 @@
                     <TextBox
                         Grid.Row="1"
                         Grid.Column="1"
-                        Height="auto"
+                        Height="26"
                         Margin="8,0,8,8"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
@@ -114,6 +115,7 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Margin="8,0,8,8"
+                        Height="26"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
                         ItemsSource="{Binding MifareDesfireKeys}"
@@ -122,6 +124,7 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         Margin="8,8,8,8"
+                        Height="26"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
                         VerticalContentAlignment="Center"
@@ -182,6 +185,8 @@
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
                         Margin="8,7,8,8"
+                        Height="26"
+                        Padding="5,2"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         Command="{Binding AuthenticateToCardApplicationCommand}"
@@ -200,6 +205,7 @@
                         Grid.Column="1"
                         Margin="8,0,8,8"
                         Width="auto"
+                        Height="26"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
                         ItemsSource="{dal:Enumerate {x:Type dal:DESFireKeyType}}"
@@ -217,7 +223,7 @@
                     <TextBox
                         Grid.Row="1"
                         Grid.Column="1"
-                        Height="auto"
+                        Height="26"
                         Margin="8,0,8,8"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
@@ -263,6 +269,7 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Margin="8,0,8,8"
+                        Height="26"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
                         ItemsSource="{Binding MifareDesfireKeys}"
@@ -271,6 +278,7 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         Margin="8,8,8,8"
+                        Height="26"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
                         VerticalContentAlignment="Center"
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireCardMasteringView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireCardMasteringView.xaml
index 2998864..497776f 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireCardMasteringView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireCardMasteringView.xaml
@@ -95,6 +95,7 @@
                     <ComboBox
                         Grid.Row="1"
                         Grid.Column="1"
+                        Height="26"
                         Margin="8,0,8,8"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
@@ -180,7 +181,8 @@
                         Grid.Row="8"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
-                        Height="auto"
+                        Height="26"
+                        Padding="5,2"
                         Margin="8,0,8,8"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom"
@@ -261,7 +263,8 @@
                         Grid.Row="4"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
-                        Height="auto"
+                        Height="26"
+                        Padding="5,2"
                         Margin="8,3,8,8"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom"
@@ -278,6 +281,7 @@
                         Content="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='labelContentMifareDesfireCurrentKeyType'}" />
                     <ComboBox
                         Grid.Row="1"
+                        Height="26"
                         Grid.Column="1"
                         Margin="8,0,8,8"
                         HorizontalAlignment="Stretch"
@@ -288,7 +292,8 @@
                         Grid.Row="3"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
-                        Height="auto"
+                        Height="26"
+                        Padding="5,2"
                         Margin="8,3,8,8"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom"
@@ -297,6 +302,7 @@
                     <ComboBox
                         Grid.Row="2"
                         Grid.Column="1"
+                        Height="26"
                         Margin="8,0,8,8"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireDataExplorerView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireDataExplorerView.xaml
index dbb185c..fad59af 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireDataExplorerView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireDataExplorerView.xaml
@@ -386,14 +386,18 @@
                         Grid.Column="0"
                         Grid.ColumnSpan="5"
                         Margin="8,0,7,7"
+                        Padding="5,2"
+                        Height="26"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom"
                         Command="{Binding WriteDataCommand}"
                         Content="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='buttonContentMifareDesfireFileSetupWriteData'}" />
                     <Button
+                        Height="26"
                         Grid.Row="8"
                         Grid.Column="0"
                         Grid.ColumnSpan="5"
+                        Padding="5,2"
                         Margin="8,0,7,7"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom"
@@ -492,6 +496,7 @@
                     <ComboBox
                         Grid.Row="1"
                         Grid.Column="1"
+                        Height="26"
                         Margin="8,0,8,8"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
@@ -501,6 +506,7 @@
                         x:Name="writeKeyTypeSelector"
                         Grid.Row="3"
                         Grid.Column="1"
+                        Height="26"
                         Margin="8,0,8,8"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
@@ -528,6 +534,7 @@
                         Grid.Row="1"
                         Grid.Column="3"                        
                         Margin="8,0,8,8"
+                        Height="26"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         ItemsSource="{Binding MifareDesfireKeys}"
@@ -536,6 +543,7 @@
                         Grid.Row="3"
                         Grid.Column="3"
                         Margin="8,0,8,8"
+                        Height="26"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         ItemsSource="{Binding MifareDesfireKeys}"
@@ -580,6 +588,7 @@
                         Grid.Row="6"
                         Grid.Column="0"
                         Grid.ColumnSpan="5"
+                        Height="26"
                         Margin="8,0,7,7"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom"
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireFileMasteringView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireFileMasteringView.xaml
index 0b03786..a56f1ec 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireFileMasteringView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareDesfireTask/MifareDesfireTaskTabPages/TabPageMifareDesfireFileMasteringView.xaml
@@ -48,6 +48,8 @@
                         Grid.Row="4"
                         Grid.Column="5"
                         Margin="8,0,8,8"
+                        Height="26"
+                        Padding="5,2"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         HorizontalContentAlignment="Center"
@@ -56,7 +58,9 @@
                         Content="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='buttonContentMifareDesfireFileMasteringDeleteFile'}" Grid.RowSpan="2" />
                     <Button
                         Grid.Row="3"
-                        Grid.Column="5"                        
+                        Grid.Column="5"    
+                        Height="26"
+                        Padding="5,2"
                         Margin="8,0,8,8"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
@@ -183,7 +187,8 @@
                         x:Name="rnwriteCB"
                         Grid.Row="4"
                         Grid.Column="1"
-                         Margin="8,0,8,8"
+                        Margin="8,0,8,8"
+                        Height="26"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         ItemsSource="{dal:Enumerate {x:Type dal:TaskAccessRights}}"
@@ -200,6 +205,7 @@
                     <ComboBox
                         x:Name="changeCB"
                         Grid.Row="4"
+                        Height="26"
                         Grid.Column="3"
                         Margin="8,0,8,8"
                         HorizontalAlignment="Stretch"
@@ -211,6 +217,7 @@
                         Grid.Row="3"
                         Grid.Column="3"
                         Margin="8,0,8,8"
+                        Height="26"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         ItemsSource="{dal:Enumerate {x:Type dal:TaskAccessRights}}"
@@ -220,6 +227,7 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Margin="8,0,8,8"
+                        Height="26"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         ItemsSource="{dal:Enumerate {x:Type dal:TaskAccessRights}}"
@@ -230,6 +238,7 @@
                         Grid.Column="1"
                         Grid.ColumnSpan="3"
                         Margin="8,0,8,8"
+                        Height="26"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         ItemsSource="{dal:Enumerate {x:Type dal:EncryptionMode}}"
@@ -248,6 +257,7 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Grid.ColumnSpan="3"
+                        Height="26"
                         Margin="8,0,8,8"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareUltralightTask/MifareUltralightSetupView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareUltralightTask/MifareUltralightSetupView.xaml
index 5f17c29..7f1351e 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareUltralightTask/MifareUltralightSetupView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareUltralightTask/MifareUltralightSetupView.xaml
@@ -64,7 +64,7 @@
                         <ComboBox
                             Grid.Row="0"
                             Grid.Column="0"
-                            Height="23"
+                            Height="26"
                             Margin="8,5,3,0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Top"
@@ -216,7 +216,8 @@
                 Grid.Row="0"
                 Grid.Column="0"
                 Width="140"
-                Height="23"
+                Height="26"
+                Padding="5,2"
                 Margin="9,0,0,8"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Bottom"
@@ -227,7 +228,8 @@
                 Grid.Row="0"
                 Grid.Column="0"
                 Width="140"
-                Height="23"
+                Height="26"
+                Padding="5,2"
                 Margin="157,0,0,8"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Bottom"
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareUltralightTask/MifareUltralightTaskTabPages/TabPageMifareUltralightDataExplorerView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareUltralightTask/MifareUltralightTaskTabPages/TabPageMifareUltralightDataExplorerView.xaml
index 8957dc3..454a40a 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareUltralightTask/MifareUltralightTaskTabPages/TabPageMifareUltralightDataExplorerView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareUltralightTask/MifareUltralightTaskTabPages/TabPageMifareUltralightDataExplorerView.xaml
@@ -299,7 +299,8 @@
                         Grid.Row="2"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
-                        Height="23"
+                        Height="26"
+                        Padding="5,2"
                         Margin="7.5,0,7.5,7"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom"
@@ -309,7 +310,8 @@
                         Grid.Row="3"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
-                        Height="23"
+                        Height="26"
+                        Padding="5,2"
                         Margin="7.5,0,7.5,7"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom"
@@ -339,7 +341,7 @@
                             <ComboBox
                                 Grid.Row="0"
                                 Grid.Column="1"
-                                Height="23"
+                                Height="26"
                                 Margin="9,8,7,0"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Top"
@@ -355,8 +357,8 @@
                     <Grid.RowDefinitions>
                         <RowDefinition Height="80.7203331950994" />
                         <RowDefinition Height="0.352718148131878*" />
-                        <RowDefinition Height="36" />
-                        <RowDefinition Height="36" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                 </Grid>
             </GroupBox>
diff --git a/RFiDGear/View/UpdateNotifierView.xaml b/RFiDGear/View/UpdateNotifierView.xaml
index 3a6b5f0..b2931f8 100644
--- a/RFiDGear/View/UpdateNotifierView.xaml
+++ b/RFiDGear/View/UpdateNotifierView.xaml
@@ -51,6 +51,8 @@
                 HorizontalAlignment="Left"
                 Margin="10,0,0,15" 
                 Grid.Row="1" 
+                Height="26"
+                Padding="5,2"
                 Width="120"
                 Command="{Binding OkCommand}"
                 Content="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='buttonContentDoUpdateCommand'}" />
@@ -58,6 +60,8 @@
                 HorizontalAlignment="Right" 
                 Margin="0,0,10,15" 
                 Grid.Row="1" 
+                Height="26"
+                Padding="5,2"
                 VerticalAlignment="Bottom" 
                 Width="120"
                 Command="{Binding CancelCommand}"
diff --git a/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipChildLayerViewModel.cs b/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipChildLayerViewModel.cs
index 08bf9c4..5edbcaa 100644
--- a/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipChildLayerViewModel.cs
+++ b/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipChildLayerViewModel.cs
@@ -499,26 +499,17 @@ public string ChildNodeHeader
         /// <summary>
         ///
         /// </summary>
-        public MifareClassicSectorModel SectorModel
-        {
-            get => sectorModel;
-        }
+        public MifareClassicSectorModel SectorModel => sectorModel;
 
         /// <summary>
         ///
         /// </summary>
-        public MifareDesfireAppModel AppModel
-        {
-            get => appModel;
-        }
+        public MifareDesfireAppModel AppModel => appModel;
 
         /// <summary>
         ///
         /// </summary>
-        public MifareUltralightPageModel PageModel
-        {
-            get => pageModel;
-        }
+        public MifareUltralightPageModel PageModel => pageModel;
 
         #endregion
 
@@ -598,7 +589,7 @@ public virtual void RequestClose()
 
         public event EventHandler DialogClosing;
 
-        public ICommand OKCommand { get { return new RelayCommand(Ok); } }
+        public ICommand OKCommand => new RelayCommand(Ok);
 
         protected virtual void Ok()
         {
@@ -616,7 +607,7 @@ protected virtual void Ok()
         /// <summary>
         ///
         /// </summary>
-        public ICommand CancelCommand { get { return new RelayCommand(Cancel); } }
+        public ICommand CancelCommand => new RelayCommand(Cancel);
 
         protected virtual void Cancel()
         {
diff --git a/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipParentLayerViewModel.cs b/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipParentLayerViewModel.cs
index 6e43508..f32b2ef 100644
--- a/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipParentLayerViewModel.cs
+++ b/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipParentLayerViewModel.cs
@@ -344,7 +344,7 @@ private void MifareDesfireQuickCheck()
             {
                 using (var device = ReaderDevice.Instance)
                 {
-                    if (device != null && device.ReadChipPublic() == ERROR.NoError)
+                    if (device != null)
                     {
                         Mouse.OverrideCursor = Cursors.Wait;
 
diff --git a/RFiDGear/ViewModel/MainWindowViewModel.cs b/RFiDGear/ViewModel/MainWindowViewModel.cs
index 906a157..63794e8 100644
--- a/RFiDGear/ViewModel/MainWindowViewModel.cs
+++ b/RFiDGear/ViewModel/MainWindowViewModel.cs
@@ -385,7 +385,7 @@ private void UpdateChip(object sender, EventArgs args)
         }
 
         /// <summary>
-        /// What to do if timer has ended without success i.e. ErrorLevel != ERROR.NoError ?
+        /// What to do if timer has ended without success i.e. ErrorLevel != ElatecError.NoError ?
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -448,9 +448,7 @@ private void OnNewNewAboutDialogCommand()
         private void OnNewCreateGenericChipTaskCommand()
         {
             var timerState = triggerReadChip.IsEnabled;
-
             triggerReadChip.IsEnabled = false;
-
             Mouse.OverrideCursor = Cursors.AppStarting;
 
             try
@@ -1143,8 +1141,9 @@ private void OnNewWriteToChipOnceCommand()
 
                             if (device.GenericChip != null)
                             {
-                                GenericChip.CardType = device.GenericChip.CardType;
-                                GenericChip.UID = device.GenericChip.UID;
+                                //GenericChip.CardType = device.GenericChip.CardType;
+                                //GenericChip.UID = device.GenericChip.UID;
+                                GenericChip = device.GenericChip;
 
                                 if (GenericChip.CardType.ToString().ToLower(CultureInfo.CurrentCulture).Contains("desfire"))
                                 {
@@ -1181,6 +1180,7 @@ private void OnNewWriteToChipOnceCommand()
 
                             taskTimeout.Stop();
                             taskTimeout.Start();
+                            taskTimeout.IsEnabled = true;
                             taskTimeout.Tag = currentTaskIndex;
 
                             SelectedSetupViewModel = taskHandler.TaskCollection[currentTaskIndex];
@@ -1665,16 +1665,6 @@ private void OnNewLanguageChangedDialog()
                     }
                 }
             });
-            /*
-            if(new MessageBoxViewModel
-            {
-                Message = ResourceLoader.GetResource("messageBoxRestartRequiredMessage"),
-                Caption = ResourceLoader.GetResource("messageBoxRestartRequiredCaption"),
-                Buttons = MessageBoxButton.OKCancel,
-                Image = MessageBoxImage.Question
-
-            }.Show(this.Dialogs) == MessageBoxResult.OK)
-            */
 
         }
 
@@ -1875,7 +1865,7 @@ private void OnNewSaveChipDialogCommand()
         /// <summary>
         /// 
         /// </summary>
-        public ICommand ShowHelpCommand { get { return new RelayCommand(OnNewShowHelpCommand); } }
+        public ICommand ShowHelpCommand => new RelayCommand(OnNewShowHelpCommand);
         private void OnNewShowHelpCommand()
         {
             var q = from p in Process.GetProcesses() where ContainsAny(p.MainWindowTitle, new string[] { "Help", "Hilfe" }) select p;
diff --git a/RFiDGear/ViewModel/TaskSetupViewModels/CommonTaskViewModel.cs b/RFiDGear/ViewModel/TaskSetupViewModels/CommonTaskViewModel.cs
index 954320c..4535ad3 100644
--- a/RFiDGear/ViewModel/TaskSetupViewModels/CommonTaskViewModel.cs
+++ b/RFiDGear/ViewModel/TaskSetupViewModels/CommonTaskViewModel.cs
@@ -909,17 +909,16 @@ private void OnNewWriteReportCommand(ReportReaderWriter _reportReaderWriter)
                                     hasVariable = true;
                                 }
 
-                                if (temporaryContent.Contains("%CHIPTYPEOFSLAVE"))
+                                if (temporaryContent.Contains("%SLAVECHIPTYPE"))
                                 {
-                                    temporaryContent = temporaryContent.Replace("%CHIPTYPEOFSLAVE", ResourceLoader.GetResource(
+                                    temporaryContent = temporaryContent.Replace("%SLAVECHIPTYPE", ResourceLoader.GetResource(
                                     string.Format("ENUM.CARD_TYPE.{0}", Enum.GetName(typeof(CARD_TYPE), GenericChip?.Slave?.CardType))) ?? "");
                                     hasVariable = true;
                                 }
 
-                                if (temporaryContent.Contains("%UIDOFSLAVE"))
+                                if (temporaryContent.Contains("%SLAVEUID"))
                                 {
-                                    temporaryContent = temporaryContent.Replace("%UIDOFSLAVE", ResourceLoader.GetResource(
-                                    string.Format("ENUM.CARD_TYPE.{0}", Enum.GetName(typeof(CARD_TYPE), GenericChip?.Slave?.UID))) ?? "");
+                                    temporaryContent = temporaryContent.Replace("%SLAVEUID", GenericChip?.Slave?.UID ?? "");
                                     hasVariable = true;
                                 }
 
diff --git a/RFiDGear/ViewModel/TaskSetupViewModels/GenericChipTaskViewModel.cs b/RFiDGear/ViewModel/TaskSetupViewModels/GenericChipTaskViewModel.cs
index cd8095a..948184c 100644
--- a/RFiDGear/ViewModel/TaskSetupViewModels/GenericChipTaskViewModel.cs
+++ b/RFiDGear/ViewModel/TaskSetupViewModels/GenericChipTaskViewModel.cs
@@ -25,6 +25,7 @@
 using System.Threading.Tasks;
 using System.Windows.Input;
 using System.Xml.Serialization;
+using Elatec.NET;
 
 namespace RFiDGear.ViewModel
 {
@@ -331,73 +332,68 @@ private void OnNewCheckChipTypeCommand()
                     {
                         if (device != null)
                         {
-                            var result = device.ReadChipPublic();
+                            var result = ERROR.Empty;
 
-                            if (result == ERROR.NoError)
+                            if (device.GenericChip.CardType == SelectedChipType)
+                            {
+                                result = ERROR.NoError;
+                            }
+                            else if (Enum.GetName(typeof(CARD_TYPE), SelectedChipType).ToLower(CultureInfo.CurrentCulture).Contains("desfire"))
                             {
+                                result = ERROR.IsNotTrue;
 
-                                if (device.GenericChip.CardType == SelectedChipType)
+                                switch (SelectedChipType)
                                 {
-                                    result = ERROR.NoError;
+                                    case CARD_TYPE.DESFire:
+                                        if (device.GenericChip.CardType == CARD_TYPE.DESFire_256 ||
+                                        device.GenericChip.CardType == CARD_TYPE.DESFire_2K ||
+                                        device.GenericChip.CardType == CARD_TYPE.DESFire_4K)
+                                        {
+                                            result = ERROR.NoError;
+                                        }
+                                        break;
+                                    case CARD_TYPE.DESFireEV1:
+                                        if (device.GenericChip.CardType == CARD_TYPE.DESFireEV1_256 ||
+                                            device.GenericChip.CardType == CARD_TYPE.DESFireEV1_2K ||
+                                            device.GenericChip.CardType == CARD_TYPE.DESFireEV1_4K ||
+                                            device.GenericChip.CardType == CARD_TYPE.DESFireEV1_8K)
+                                        {
+                                            result = ERROR.NoError;
+                                        }
+                                        break;
+                                    case CARD_TYPE.DESFireEV2:
+                                        if (device.GenericChip.CardType == CARD_TYPE.DESFireEV2_2K ||
+                                            device.GenericChip.CardType == CARD_TYPE.DESFireEV2_4K ||
+                                            device.GenericChip.CardType == CARD_TYPE.DESFireEV2_8K ||
+                                            device.GenericChip.CardType == CARD_TYPE.DESFireEV2_16K ||
+                                            device.GenericChip.CardType == CARD_TYPE.DESFireEV2_32K)
+                                        {
+                                            result = ERROR.NoError;
+                                        }
+                                        break;
+                                    case CARD_TYPE.DESFireEV3:
+                                        if (device.GenericChip.CardType == CARD_TYPE.DESFireEV3_2K ||
+                                            device.GenericChip.CardType == CARD_TYPE.DESFireEV3_4K ||
+                                            device.GenericChip.CardType == CARD_TYPE.DESFireEV3_8K ||
+                                            device.GenericChip.CardType == CARD_TYPE.DESFireEV3_16K ||
+                                            device.GenericChip.CardType == CARD_TYPE.DESFireEV3_32K)
+                                        {
+                                            result = ERROR.NoError;
+                                        }
+                                        break;
+
+                                    default:
+                                        result = ERROR.IsNotTrue;
+                                        break;
                                 }
-                                else if(Enum.GetName(typeof(CARD_TYPE), SelectedChipType).ToLower(CultureInfo.CurrentCulture).Contains("desfire"))
-                                {
-                                    result = ERROR.IsNotTrue;
-
-                                    switch (SelectedChipType)
-                                    {
-                                        case CARD_TYPE.DESFire:
-                                            if (device.GenericChip.CardType == CARD_TYPE.DESFire_256 ||
-                                            device.GenericChip.CardType == CARD_TYPE.DESFire_2K ||
-                                            device.GenericChip.CardType == CARD_TYPE.DESFire_4K)
-                                            {
-                                                result = ERROR.NoError;
-                                            }
-                                            break;
-                                        case CARD_TYPE.DESFireEV1:
-                                            if (device.GenericChip.CardType == CARD_TYPE.DESFireEV1_256 ||
-                                                device.GenericChip.CardType == CARD_TYPE.DESFireEV1_2K ||
-                                                device.GenericChip.CardType == CARD_TYPE.DESFireEV1_4K ||
-                                                device.GenericChip.CardType == CARD_TYPE.DESFireEV1_8K)
-                                            {
-                                                result = ERROR.NoError;
-                                            }
-                                            break;
-                                        case CARD_TYPE.DESFireEV2:
-                                            if (device.GenericChip.CardType == CARD_TYPE.DESFireEV2_2K ||
-                                                device.GenericChip.CardType == CARD_TYPE.DESFireEV2_4K ||
-                                                device.GenericChip.CardType == CARD_TYPE.DESFireEV2_8K ||
-                                                device.GenericChip.CardType == CARD_TYPE.DESFireEV2_16K ||
-                                                device.GenericChip.CardType == CARD_TYPE.DESFireEV2_32K)
-                                            {
-                                                result = ERROR.NoError;
-                                            }
-                                            break;
-                                        case CARD_TYPE.DESFireEV3:
-                                            if (device.GenericChip.CardType == CARD_TYPE.DESFireEV3_2K ||
-                                                device.GenericChip.CardType == CARD_TYPE.DESFireEV3_4K ||
-                                                device.GenericChip.CardType == CARD_TYPE.DESFireEV3_8K ||
-                                                device.GenericChip.CardType == CARD_TYPE.DESFireEV3_16K ||
-                                                device.GenericChip.CardType == CARD_TYPE.DESFireEV3_32K)
-                                            {
-                                                result = ERROR.NoError;
-                                            }
-                                            break;
-
-                                        default:
-                                            result = ERROR.IsNotTrue;
-                                            break;
-                                    }
-                                }
-                                else
-                                {
-                                    result = ERROR.IsNotTrue;
-                                }
-
-                                CurrentTaskErrorLevel = result;
-                                return;
-
                             }
+                            else
+                            {
+                                result = ERROR.IsNotTrue;
+                            }
+
+                            CurrentTaskErrorLevel = result;
+                            return;
                         }
                         else
                         {
diff --git a/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs b/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs
index e6fd1ed..d4a9383 100644
--- a/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs
+++ b/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs
@@ -1652,7 +1652,7 @@ private protected void OnNewCheckEmptyCommand()
                 {
                     using (var device = ReaderDevice.Instance)
                     {
-                        if (device != null && device.ReadChipPublic() == ERROR.NoError)
+                        if (device != null)
                         {
                             StatusText += string.Format("{0}: {1}\n", DateTime.Now, ResourceLoader.GetResource("textBoxStatusTextBoxDllLoaded"));
 
@@ -1734,7 +1734,7 @@ private protected void OnNewReadDataCommand()
                          {
                              using (var device = ReaderDevice.Instance)
                              {
-                                 if (device != null && device.ReadChipPublic() == ERROR.NoError)
+                                 if (device != null)
                                  {
                                      StatusText += string.Format("{0}: {1}\n", DateTime.Now, ResourceLoader.GetResource("textBoxStatusTextBoxDllLoaded"));
 
diff --git a/RFiDGear/ViewModel/TaskSetupViewModels/MifareDesfireSetupViewModel.cs b/RFiDGear/ViewModel/TaskSetupViewModels/MifareDesfireSetupViewModel.cs
index 873992b..728eef2 100644
--- a/RFiDGear/ViewModel/TaskSetupViewModels/MifareDesfireSetupViewModel.cs
+++ b/RFiDGear/ViewModel/TaskSetupViewModels/MifareDesfireSetupViewModel.cs
@@ -1662,7 +1662,7 @@ private void OnNewCommandDelegatorCall(TaskType_MifareDesfireTask desfireTaskTyp
         /// <summary>
         /// return new RelayCommand<LibLogicalAccessProvider>((_device) => OnNewCreateAppCommand(_device));
         /// </summary>
-        public ICommand CreateAppCommand { get { return new RelayCommand(OnNewCreateAppCommand); } }
+        public ICommand CreateAppCommand => new RelayCommand(OnNewCreateAppCommand);
         private void OnNewCreateAppCommand()
         {
             CurrentTaskErrorLevel = ERROR.Empty;
@@ -1783,7 +1783,7 @@ private void OnNewCreateAppCommand()
         /// <summary>
         /// return new RelayCommand<LibLogicalAccessProvider>((_device) => OnNewCreateAppCommand(_device));
         /// </summary>
-        public ICommand CreateFileCommand { get { return new RelayCommand(OnNewCreateFileCommand); } }
+        public ICommand CreateFileCommand => new RelayCommand(OnNewCreateFileCommand);
         private void OnNewCreateFileCommand()
         {
             CurrentTaskErrorLevel = ERROR.Empty;
@@ -1898,7 +1898,7 @@ private void OnNewCreateFileCommand()
         /// <summary>
         /// 
         /// </summary>
-        public ICommand ReadDataCommand { get { return new RelayCommand(OnNewReadDataCommand); } }
+        public ICommand ReadDataCommand => new RelayCommand(OnNewReadDataCommand);
         private void OnNewReadDataCommand()
         {
             CurrentTaskErrorLevel = ERROR.Empty;
@@ -1993,7 +1993,7 @@ private void OnNewReadDataCommand()
         /// <summary>
         /// 
         /// </summary>
-        public ICommand GetDataFromFileCommand { get { return new RelayCommand(OnNewGetDataFromFileCommand); } }
+        public ICommand GetDataFromFileCommand => new RelayCommand(OnNewGetDataFromFileCommand);
         private void OnNewGetDataFromFileCommand()
         {
             var dlg = new OpenFileDialogViewModel
@@ -2026,7 +2026,7 @@ private void OnNewGetDataFromFileCommand()
         /// <summary>
         /// 
         /// </summary>
-        public ICommand WriteDataCommand { get { return new RelayCommand(OnNewWriteDataCommand); } }
+        public ICommand WriteDataCommand => new RelayCommand(OnNewWriteDataCommand);
         private void OnNewWriteDataCommand()
         {
             CurrentTaskErrorLevel = ERROR.Empty;
@@ -2111,7 +2111,7 @@ private void OnNewWriteDataCommand()
         /// <summary>
         ///
         /// </summary>
-        public ICommand ChangeAppKeyCommand { get { return new RelayCommand(OnNewChangeAppKeyCommand); } }
+        public ICommand ChangeAppKeyCommand => new RelayCommand(OnNewChangeAppKeyCommand);
         private void OnNewChangeAppKeyCommand()
         {
             CurrentTaskErrorLevel = ERROR.Empty;
diff --git a/RFiDGear/ViewModel/TaskSetupViewModels/MifareUltralightSetupViewModel.cs b/RFiDGear/ViewModel/TaskSetupViewModels/MifareUltralightSetupViewModel.cs
index 38683ea..dabc406 100644
--- a/RFiDGear/ViewModel/TaskSetupViewModels/MifareUltralightSetupViewModel.cs
+++ b/RFiDGear/ViewModel/TaskSetupViewModels/MifareUltralightSetupViewModel.cs
@@ -414,7 +414,7 @@ public string SelectedTaskDescription
         /// <summary>
         /// 
         /// </summary>
-        public ICommand ReadDataCommand { get { return new RelayCommand(OnNewReadDataCommand); } }
+        public ICommand ReadDataCommand => new RelayCommand(OnNewReadDataCommand);
         private void OnNewReadDataCommand()
         {
             //Mouse.OverrideCursor = Cursors.Wait;
@@ -425,7 +425,7 @@ private void OnNewReadDataCommand()
                         {
                             using (var device = ReaderDevice.Instance)
                             {
-                                if (device != null && device.ReadChipPublic() == ERROR.NoError)
+                                if (device != null)
                                 {
                                     StatusText = string.Format("{0}: {1}\n", DateTime.Now, ResourceLoader.GetResource(""));
                                 }