diff --git a/DebtMgr.csproj b/DebtMgr.csproj
index e883875..e789219 100644
--- a/DebtMgr.csproj
+++ b/DebtMgr.csproj
@@ -14,6 +14,8 @@
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -38,6 +40,10 @@
     <ApplicationIcon>Content\icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Costura, Version=1.6.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="CurrencyTextBoxControl">
       <HintPath>.\CurrencyTextBoxControl.dll</HintPath>
     </Reference>
@@ -163,7 +169,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="sqlite3.dll">
+    <EmbeddedResource Include="costura32\sqlite3.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
@@ -184,5 +190,17 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="FodyWeavers.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="packages\Fody.2.0.0\build\dotnet\Fody.targets" Condition="Exists('packages\Fody.2.0.0\build\dotnet\Fody.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\Fody.2.0.0\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.2.0.0\build\dotnet\Fody.targets'))" />
+    <Error Condition="!Exists('packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
+  </Target>
+  <Import Project="packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
 </Project>
\ No newline at end of file
diff --git a/FodyWeavers.xml b/FodyWeavers.xml
new file mode 100644
index 0000000..e93f026
--- /dev/null
+++ b/FodyWeavers.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <Costura>
+
+  </Costura>
+</Weavers>
\ No newline at end of file
diff --git a/View/Dialogs/DatabaseSelectorDialogView.xaml b/View/Dialogs/DatabaseSelectorDialogView.xaml
index 99523b1..398b2b3 100644
--- a/View/Dialogs/DatabaseSelectorDialogView.xaml
+++ b/View/Dialogs/DatabaseSelectorDialogView.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Title="Debt Manager - Select Database" Height="250" Width="400"
+        Title="Debt Manager - Select Database" Height="285" Width="400"
         KeyUp="Window_OnKeyUp">
     <Grid>
         <Grid.RowDefinitions>
@@ -15,16 +15,13 @@
             <RowDefinition Height="Auto"></RowDefinition>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="3*"></ColumnDefinition>
-            <ColumnDefinition Width="1*"></ColumnDefinition>
+            <ColumnDefinition Width="*"></ColumnDefinition>
         </Grid.ColumnDefinitions>
-        <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Content="Select existing Database" FontWeight="Bold" FontSize="18" Margin="0 20 0 0"></Label>
-        <TextBox Grid.Row="1" Grid.Column="0" FontSize="14" Margin="5 5 0 5" IsEnabled="False" Text="{Binding SelectDatabasePathText}"></TextBox>
-        <Button Grid.Row="1" Grid.Column="1" FontSize="14" Content="Browse" Margin="5" Command="{Binding SelectDatabaseButtonClick}"></Button>
-        <Separator Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="0 20"></Separator>
-        <Label Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Content="Create new Database" FontWeight="Bold" FontSize="18"></Label>
-        <TextBox Grid.Row="4" Grid.Column="0" FontSize="14" Margin="5 5 0 5" IsEnabled="False"></TextBox>
-        <Button Grid.Row="4" Grid.Column="1" FontSize="14" Content="Create" Margin="5" Command="{Binding CreateDatabaseButtonClick}"></Button>
+        <Label Grid.Row="0" Grid.Column="0" Content="Select existing Database" FontWeight="Bold" FontSize="18" Margin="0 20 0 0"></Label>
+        <Button Grid.Row="1" Grid.Column="1" FontSize="14" Content="Browse" Margin="5" Padding="10" Command="{Binding SelectDatabaseButtonClick}"></Button>
+        <Separator Grid.Row="2" Grid.Column="0" Margin="0 20"></Separator>
+        <Label Grid.Row="3" Grid.Column="0" Content="Create new Database" FontWeight="Bold" FontSize="18"></Label>
+        <Button Grid.Row="4" Grid.Column="1" FontSize="14" Content="Create" Margin="5" Padding="10" Command="{Binding CreateDatabaseButtonClick}"></Button>
 
     </Grid>
 </Window>
diff --git a/sqlite3.dll b/costura32/sqlite3.dll
similarity index 100%
rename from sqlite3.dll
rename to costura32/sqlite3.dll
diff --git a/packages.config b/packages.config
index bec897d..58f684c 100644
--- a/packages.config
+++ b/packages.config
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.3" targetFramework="net452" />
+  <package id="Costura.Fody" version="1.6.2" targetFramework="net46" developmentDependency="true" />
+  <package id="Fody" version="2.0.0" targetFramework="net46" developmentDependency="true" />
   <package id="MvvmLight" version="5.3.0.0" targetFramework="net452" />
   <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />