diff --git a/Src/Denovo/App.axaml b/Src/Denovo/App.axaml
index d0dda04..ef76690 100644
--- a/Src/Denovo/App.axaml
+++ b/Src/Denovo/App.axaml
@@ -87,7 +87,6 @@
       <Setter Property="Margin" Value="3"/>
       <Setter Property="MinHeight" Value="20"/>
       <Setter Property="Padding" Value="5,3,5,5"/>
-      <Setter Property="UseFloatingWatermark" Value="True"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
     </Style>
     <Style Selector="TextBox /template/ Border">
diff --git a/Src/Denovo/Views/ConfigurationView.axaml b/Src/Denovo/Views/ConfigurationView.axaml
index b4f4841..05ac971 100644
--- a/Src/Denovo/Views/ConfigurationView.axaml
+++ b/Src/Denovo/Views/ConfigurationView.axaml
@@ -12,15 +12,17 @@
   <Design.DataContext>
     <vm:ConfigurationViewModel/>
   </Design.DataContext>
+
   <UserControl.Styles>
     <Style Selector="TextBlock">
       <Setter Property="VerticalAlignment" Value="Center"/>
     </Style>
   </UserControl.Styles>
 
+
   <Grid RowDefinitions="*,auto">
     <TabControl>
-      <TabItem Header="Client Type">
+      <!--<TabItem Header="Client Type">
         <Grid RowDefinitions="auto,auto,*">
           <StackPanel Orientation="Horizontal" Margin="5" Spacing="5" Grid.Row="0">
             <TextBlock Text="Network:"/>
@@ -34,20 +36,20 @@
           </StackPanel>
           <TextBlock Text="{Binding Desc}" TextWrapping="Wrap" Margin="5" Grid.Row="2"/>
         </Grid>
-      </TabItem>
+      </TabItem>-->
 
       <TabItem Header="Paths">
         <Grid ColumnDefinitions="auto,*,auto" RowDefinitions="auto,auto">
-          <TextBlock Text="Blockchain path:" Margin="5" Grid.Column="0" Grid.Row="0"/>
+          <TextBlock Text="Blockchain path:"
+                     Margin="5"
+                     Grid.Column="0" Grid.Row="0"/>
           <TextBox Text="{Binding Config.BlockchainPath}"
                    Margin="5"
-                   Grid.Column="1"
-                   Grid.Row="0"/>
+                   Grid.Column="1" Grid.Row="0"/>
           <Button Content="Browse..."
                   Command="{Binding SetBlockchainDir}"
                   Margin="5"
-                  Grid.Column="2"
-                  Grid.Row="0"/>
+                  Grid.Column="2" Grid.Row="0"/>
 
           <TextBlock Text="Wallet path:" Margin="5" Grid.Column="0" Grid.Row="1"/>
           <TextBox Margin="5" Grid.Column="1" Grid.Row="1"/>
@@ -63,7 +65,11 @@
                     IsChecked="{Binding Config.Relay}"/>
           <StackPanel Orientation="Horizontal" Spacing="5">
             <TextBlock Text="Maximum number of connections:"/>
-            <TextBox Text="{Binding Config.MaxConnectionCount}" Width="50"/>
+            <NumericUpDown Value="{Binding Config.MaxConnectionCount}"
+                           Increment="1"
+                           Minimum="1"
+                           NumberFormat=""
+                           Width="70"/>
           </StackPanel>
           <StackPanel Orientation="Horizontal" Spacing="5">
             <TextBlock Text="User agent:"/>
@@ -71,10 +77,14 @@
           </StackPanel>
           <StackPanel Orientation="Horizontal" Spacing="5">
             <TextBlock Text="Initial peer discovery:"/>
-            <ComboBox ItemsSource="{Binding PeerDiscoveryOptions}" SelectedItem="{Binding Config.SelectedPeerDiscoveryOption}"
+            <ComboBox ItemsSource="{Binding PeerDiscoveryOptions}"
+                      SelectedItem="{Binding Config.SelectedPeerDiscoveryOption}"
                       Width="80"/>
           </StackPanel>
-          <TextBox Text="{Binding Config.PeerList}" AcceptsReturn="True" HorizontalAlignment="Left" Height="150" Width="400"/>
+          <TextBox Text="{Binding Config.PeerList}"
+                   AcceptsReturn="True"
+                   HorizontalAlignment="Left"
+                   Height="150" Width="400"/>
         </StackPanel>
       </TabItem>
     </TabControl>