diff --git a/Designer/Designer.csproj b/Designer/Designer.csproj
index 9550587dc..7736d700c 100644
--- a/Designer/Designer.csproj
+++ b/Designer/Designer.csproj
@@ -34,9 +34,6 @@
     <Reference Include="NStack">
       <HintPath>..\packages\NStack.Core.0.13.0\lib\netstandard1.5\NStack.dll</HintPath>
     </Reference>
-    <Reference Include="NStack">
-      <HintPath>..\packages\NStack.Core.0.13.0\lib\netstandard1.5\NStack.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
@@ -49,7 +46,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Designer/Program.cs b/Designer/Program.cs
index 4e6f516c6..a7d6a17f8 100644
--- a/Designer/Program.cs
+++ b/Designer/Program.cs
@@ -10,12 +10,18 @@ namespace Designer {
 	}
 
 	class MainClass {
+		static void Close ()
+		{
+			MessageBox.ErrorQuery (50, 7, "Error", "There is nothing to close", "Ok");
+		}
+
 		public static void Main (string [] args)
 		{
 			Application.Init ();
 
 			var menu = new MenuBar (new MenuBarItem [] {
 				new MenuBarItem ("_File", new MenuItem [] {
+					new MenuItem ("_Close", "", () => Close ()),
 					new MenuItem ("_Quit", "", () => { Application.RequestStop (); })
 				}),
 				new MenuBarItem ("_Edit", new MenuItem [] {
@@ -50,8 +56,15 @@ namespace Designer {
 				},
 			};
 
-			//Application.Top.Add (menu);
-			Application.Top.Add (login, password, loginText);
+			var passText = new TextField ("") {
+				Secret = true,
+				X = Pos.Left (loginText),
+				Y = Pos.Top (password),
+				Width = Dim.Width (loginText)
+			};
+
+			surface.Add (login, password, loginText, passText);
+			Application.Top.Add (menu, surface);
 			Application.Run ();
 		}
 	}
diff --git a/Designer/packages.config b/Designer/packages.config
deleted file mode 100644
index 325dbb1bf..000000000
--- a/Designer/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NStack.Core" version="0.13.0" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/Example/Example.csproj b/Example/Example.csproj
index 177094b04..5c012e208 100644
--- a/Example/Example.csproj
+++ b/Example/Example.csproj
@@ -31,10 +31,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="NStack">
-      <HintPath>..\packages\NStack.Core.0.13.0\lib\netstandard1.5\NStack.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="NStack">
       <HintPath>..\packages\NStack.Core.0.13.0\lib\netstandard1.5\NStack.dll</HintPath>
     </Reference>
@@ -48,8 +44,5 @@
       <Name>Terminal.Gui</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Example/packages.config b/Example/packages.config
deleted file mode 100644
index 325dbb1bf..000000000
--- a/Example/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NStack.Core" version="0.13.0" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj
index deb6f52b5..f1d586afc 100644
--- a/Terminal.Gui/Terminal.Gui.csproj
+++ b/Terminal.Gui/Terminal.Gui.csproj
@@ -58,7 +58,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NStack.Core" Version="0.13.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>