diff --git a/Src/Denovo/App.axaml b/Src/Denovo/App.axaml
index 37f7b19..d0dda04 100644
--- a/Src/Denovo/App.axaml
+++ b/Src/Denovo/App.axaml
@@ -1,17 +1,40 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Denovo"
+             xmlns:vm="clr-namespace:Denovo.ViewModels"
+             xmlns:views="clr-namespace:Denovo.Views"
              x:Class="Denovo.App"
-			 RequestedThemeVariant="Default">
-	
-  <Application.DataTemplates>
-    <local:ViewLocator/>
-  </Application.DataTemplates>
+             RequestedThemeVariant="Default">
 
   <Application.Styles>
-	  <SimpleTheme/>
+    <SimpleTheme/>
   </Application.Styles>
 
+  <Application.DataTemplates>
+    <DataTemplate DataType="{x:Type vm:AboutViewModel}">
+      <views:AboutView/>
+    </DataTemplate>
+    <DataTemplate DataType="{x:Type vm:ConfigurationViewModel}">
+      <views:ConfigurationView/>
+    </DataTemplate>
+    <DataTemplate DataType="{x:Type vm:EciesViewModel}">
+      <views:EciesView/>
+    </DataTemplate>
+    <DataTemplate DataType="{x:Type vm:MinerViewModel}">
+      <views:MinerView/>
+    </DataTemplate>
+    <DataTemplate DataType="{x:Type vm:PushTxViewModel}">
+      <views:PushTxView/>
+    </DataTemplate>
+    <DataTemplate DataType="{x:Type vm:VerifyTxViewModel}">
+      <views:VerifyTxView/>
+    </DataTemplate>
+    <DataTemplate DataType="{x:Type vm:WifHelperViewModel}">
+      <views:WifHelperView/>
+    </DataTemplate>
+  </Application.DataTemplates>
+
+
   <Application.Styles>
     <Style Selector="Button">
       <Setter Property="MinHeight" Value="35"/>
diff --git a/Src/Denovo/ViewLocator.cs b/Src/Denovo/ViewLocator.cs
index eb0253f..4a60aae 100644
--- a/Src/Denovo/ViewLocator.cs
+++ b/Src/Denovo/ViewLocator.cs
@@ -10,6 +10,7 @@
 
 namespace Denovo
 {
+    [Obsolete]
     public class ViewLocator : IDataTemplate
     {
         public bool SupportsRecycling => false;
diff --git a/Src/Denovo/Views/AboutView.axaml b/Src/Denovo/Views/AboutView.axaml
index 4ebba25..ddd4394 100644
--- a/Src/Denovo/Views/AboutView.axaml
+++ b/Src/Denovo/Views/AboutView.axaml
@@ -4,6 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="clr-namespace:Denovo.ViewModels;assembly=Denovo"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:CompileBindings="True"
+             x:DataType="vm:AboutViewModel"
              x:Class="Denovo.Views.AboutView"
              FontFamily="Comic Sans MS" FontSize="16">
 
diff --git a/Src/Denovo/Views/ConfigurationView.axaml b/Src/Denovo/Views/ConfigurationView.axaml
index b375282..b4f4841 100644
--- a/Src/Denovo/Views/ConfigurationView.axaml
+++ b/Src/Denovo/Views/ConfigurationView.axaml
@@ -4,8 +4,10 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="clr-namespace:Denovo.ViewModels;assembly=Denovo"
              mc:Ignorable="d" d:DesignHeight="600" d:DesignWidth="600"
+             x:CompileBindings="True"
+             x:DataType="vm:ConfigurationViewModel"
              x:Class="Denovo.Views.ConfigurationView"
-             FontSize="16">
+             FontSize="14">
 
   <Design.DataContext>
     <vm:ConfigurationViewModel/>
diff --git a/Src/Denovo/Views/EciesView.axaml b/Src/Denovo/Views/EciesView.axaml
index 93b7dad..690956b 100644
--- a/Src/Denovo/Views/EciesView.axaml
+++ b/Src/Denovo/Views/EciesView.axaml
@@ -4,6 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="clr-namespace:Denovo.ViewModels;assembly=Denovo"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:CompileBindings="True"
+             x:DataType="vm:EciesViewModel"
              x:Class="Denovo.Views.EciesView"
              FontSize="14">
 
diff --git a/Src/Denovo/Views/MainWindow.axaml b/Src/Denovo/Views/MainWindow.axaml
index 178af49..cb48d61 100644
--- a/Src/Denovo/Views/MainWindow.axaml
+++ b/Src/Denovo/Views/MainWindow.axaml
@@ -3,10 +3,11 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:vm="clr-namespace:Denovo.ViewModels;assembly=Denovo"
+        x:CompileBindings="True"
+        x:DataType="vm:MainWindowViewModel"
         x:Class="Denovo.Views.MainWindow"
         FontSize="14"
-        Height="690"
-        Width="700"
+        Height="690" Width="700"
         Title="MainWindow">
 
   <Design.DataContext>
@@ -59,7 +60,7 @@
                 </StackPanel>
                 <TextBlock Text="{Binding NodeStatus.StartHeight}"/>
                 <TextBlock Text="{Binding NodeStatus.UserAgent}"/>
-                <TextBlock Text="{Binding NodeStatus.Violation}"/>
+                <!--<TextBlock Text="{Binding NodeStatus.Violation}"/>-->
               </StackPanel>
             </DataTemplate>
           </ListBox.ItemTemplate>
@@ -73,8 +74,8 @@
     </Grid>
 
     <Grid ColumnDefinitions="200,*" Background="GhostWhite" Margin="0,5,0,0" Grid.Row="2">
-      <TextBlock Text="{Binding State}" Margin="3" Grid.Column="0"/>
-      <ProgressBar Value="{Binding Progress}" Margin="3" Grid.Column="1"/>
+      <!--<TextBlock Text="{Binding State}" Margin="3" Grid.Column="0"/>-->
+      <!--<ProgressBar Value="{Binding Progress}" Margin="3" Grid.Column="1"/>-->
     </Grid>
   </Grid>
 </Window>
diff --git a/Src/Denovo/Views/MinerView.axaml b/Src/Denovo/Views/MinerView.axaml
index 64b3655..994ed08 100644
--- a/Src/Denovo/Views/MinerView.axaml
+++ b/Src/Denovo/Views/MinerView.axaml
@@ -4,7 +4,10 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="clr-namespace:Denovo.ViewModels;assembly=Denovo"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Denovo.Views.MinerView">
+             x:CompileBindings="True"
+             x:DataType="vm:MinerViewModel"
+             x:Class="Denovo.Views.MinerView"
+             FontSize="14">
 
   <Design.DataContext>
     <vm:MinerViewModel/>
diff --git a/Src/Denovo/Views/PushTxView.axaml b/Src/Denovo/Views/PushTxView.axaml
index b00bdde..833516e 100644
--- a/Src/Denovo/Views/PushTxView.axaml
+++ b/Src/Denovo/Views/PushTxView.axaml
@@ -4,7 +4,10 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="clr-namespace:Denovo.ViewModels;assembly=Denovo"
              mc:Ignorable="d" d:DesignWidth="650" d:DesignHeight="450"
-             x:Class="Denovo.Views.PushTxView">
+             x:CompileBindings="True"
+             x:DataType="vm:PushTxViewModel"
+             x:Class="Denovo.Views.PushTxView"
+             FontSize="14">
 
   <Design.DataContext>
     <vm:PushTxViewModel/>
diff --git a/Src/Denovo/Views/VerifyTxView.axaml b/Src/Denovo/Views/VerifyTxView.axaml
index 4ba1868..f7b6c1d 100644
--- a/Src/Denovo/Views/VerifyTxView.axaml
+++ b/Src/Denovo/Views/VerifyTxView.axaml
@@ -3,7 +3,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="clr-namespace:Denovo.ViewModels;assembly=Denovo"
+             xmlns:models="clr-namespace:Denovo.Models;assembly=Denovo"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="550"
+             x:CompileBindings="True"
+             x:DataType="vm:VerifyTxViewModel"
              x:Class="Denovo.Views.VerifyTxView"
              FontSize="14">
 
@@ -46,7 +49,7 @@
         </ItemsPanelTemplate>
       </ItemsControl.ItemsPanel>
       <ItemsControl.ItemTemplate>
-        <DataTemplate>
+        <DataTemplate x:DataType="models:UtxoModel">
           <StackPanel Orientation="Horizontal">
             <TextBox Text="{Binding TxId}"
                      TextWrapping="NoWrap"
diff --git a/Src/Denovo/Views/WifHelperView.axaml b/Src/Denovo/Views/WifHelperView.axaml
index 302bc91..3990e6a 100644
--- a/Src/Denovo/Views/WifHelperView.axaml
+++ b/Src/Denovo/Views/WifHelperView.axaml
@@ -4,6 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="clr-namespace:Denovo.ViewModels;assembly=Denovo"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:CompileBindings="True"
+             x:DataType="vm:WifHelperViewModel"
              x:Class="Denovo.Views.WifHelperView"
              FontSize="14">