diff --git a/MACAddressTool/Form1.Designer.cs b/MACAddressTool/Form1.Designer.cs
index 3924d11..5a0268e 100644
--- a/MACAddressTool/Form1.Designer.cs
+++ b/MACAddressTool/Form1.Designer.cs
@@ -41,9 +41,10 @@ private void InitializeComponent()
             // 
             // RandomButton
             // 
-            this.RandomButton.Location = new System.Drawing.Point(331, 76);
+            this.RandomButton.Location = new System.Drawing.Point(580, 85);
+            this.RandomButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.RandomButton.Name = "RandomButton";
-            this.RandomButton.Size = new System.Drawing.Size(57, 21);
+            this.RandomButton.Size = new System.Drawing.Size(101, 24);
             this.RandomButton.TabIndex = 0;
             this.RandomButton.Text = "Random";
             this.RandomButton.UseVisualStyleBackColor = true;
@@ -51,36 +52,40 @@ private void InitializeComponent()
             // 
             // CurrentMacTextBox
             // 
-            this.CurrentMacTextBox.Location = new System.Drawing.Point(229, 77);
+            this.CurrentMacTextBox.Location = new System.Drawing.Point(343, 84);
+            this.CurrentMacTextBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.CurrentMacTextBox.Name = "CurrentMacTextBox";
-            this.CurrentMacTextBox.Size = new System.Drawing.Size(96, 20);
+            this.CurrentMacTextBox.Size = new System.Drawing.Size(229, 25);
             this.CurrentMacTextBox.TabIndex = 1;
             this.CurrentMacTextBox.TextChanged += new System.EventHandler(this.CurrentMacTextBox_TextChanged);
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 52);
+            this.label1.Location = new System.Drawing.Point(16, 60);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(211, 13);
+            this.label1.Size = new System.Drawing.Size(343, 15);
             this.label1.TabIndex = 2;
             this.label1.Text = "Current MAC-address (reported by adapter):";
             // 
             // ActualMacLabel
             // 
             this.ActualMacLabel.AutoSize = true;
-            this.ActualMacLabel.Location = new System.Drawing.Point(229, 52);
+            this.ActualMacLabel.Location = new System.Drawing.Point(305, 60);
+            this.ActualMacLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ActualMacLabel.Name = "ActualMacLabel";
-            this.ActualMacLabel.Size = new System.Drawing.Size(35, 13);
+            this.ActualMacLabel.Size = new System.Drawing.Size(55, 15);
             this.ActualMacLabel.TabIndex = 3;
             this.ActualMacLabel.Text = "label2";
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(48, 80);
+            this.label3.Location = new System.Drawing.Point(17, 90);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(175, 13);
+            this.label3.Size = new System.Drawing.Size(295, 15);
             this.label3.TabIndex = 4;
             this.label3.Text = "Current MAC-address (from registry):";
             // 
@@ -88,17 +93,19 @@ private void InitializeComponent()
             // 
             this.AdaptersComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.AdaptersComboBox.FormattingEnabled = true;
-            this.AdaptersComboBox.Location = new System.Drawing.Point(15, 13);
+            this.AdaptersComboBox.Location = new System.Drawing.Point(20, 15);
+            this.AdaptersComboBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.AdaptersComboBox.Name = "AdaptersComboBox";
-            this.AdaptersComboBox.Size = new System.Drawing.Size(373, 21);
+            this.AdaptersComboBox.Size = new System.Drawing.Size(661, 23);
             this.AdaptersComboBox.TabIndex = 5;
             this.AdaptersComboBox.SelectedIndexChanged += new System.EventHandler(this.AdaptersComboBox_SelectedIndexChanged);
             // 
             // UpdateButton
             // 
-            this.UpdateButton.Location = new System.Drawing.Point(15, 123);
+            this.UpdateButton.Location = new System.Drawing.Point(20, 142);
+            this.UpdateButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.UpdateButton.Name = "UpdateButton";
-            this.UpdateButton.Size = new System.Drawing.Size(151, 37);
+            this.UpdateButton.Size = new System.Drawing.Size(201, 43);
             this.UpdateButton.TabIndex = 6;
             this.UpdateButton.Text = "Update to value";
             this.UpdateButton.UseVisualStyleBackColor = true;
@@ -106,9 +113,10 @@ private void InitializeComponent()
             // 
             // ClearButton
             // 
-            this.ClearButton.Location = new System.Drawing.Point(254, 123);
+            this.ClearButton.Location = new System.Drawing.Point(478, 142);
+            this.ClearButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.ClearButton.Name = "ClearButton";
-            this.ClearButton.Size = new System.Drawing.Size(134, 37);
+            this.ClearButton.Size = new System.Drawing.Size(204, 43);
             this.ClearButton.TabIndex = 7;
             this.ClearButton.Text = "Clear Value";
             this.ClearButton.UseVisualStyleBackColor = true;
@@ -116,9 +124,10 @@ private void InitializeComponent()
             // 
             // RereadButton
             // 
-            this.RereadButton.Location = new System.Drawing.Point(331, 48);
+            this.RereadButton.Location = new System.Drawing.Point(580, 55);
+            this.RereadButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.RereadButton.Name = "RereadButton";
-            this.RereadButton.Size = new System.Drawing.Size(57, 21);
+            this.RereadButton.Size = new System.Drawing.Size(101, 24);
             this.RereadButton.TabIndex = 8;
             this.RereadButton.Text = "Update";
             this.RereadButton.UseVisualStyleBackColor = true;
@@ -126,9 +135,9 @@ private void InitializeComponent()
             // 
             // Form1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(404, 176);
+            this.ClientSize = new System.Drawing.Size(707, 203);
             this.Controls.Add(this.RereadButton);
             this.Controls.Add(this.ClearButton);
             this.Controls.Add(this.UpdateButton);
@@ -139,6 +148,7 @@ private void InitializeComponent()
             this.Controls.Add(this.CurrentMacTextBox);
             this.Controls.Add(this.RandomButton);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.MaximizeBox = false;
             this.Name = "Form1";
             this.Text = "MAC Address tool";
diff --git a/MACAddressTool/Form1.cs b/MACAddressTool/Form1.cs
index 14c2123..8cf31eb 100644
--- a/MACAddressTool/Form1.cs
+++ b/MACAddressTool/Form1.cs
@@ -13,7 +13,7 @@
 using Microsoft.Win32;
 using System.Net.NetworkInformation;
 using System.Text.RegularExpressions;
-
+using System.Threading;
 
 namespace MACAddressTool
 {
@@ -110,14 +110,17 @@ public string RegistryKey
             /// <summary>
             /// Get the NetworkAddress registry value of this adapter.
             /// </summary>
-            public string RegistryMac {
+            public string RegistryMac
+            {
                 get
                 {
                     try
                     {
                         using (RegistryKey regkey = Registry.LocalMachine.OpenSubKey(this.RegistryKey, false))
                         {
-                            return regkey.GetValue("NetworkAddress").ToString();
+                            var value = regkey.GetValue("NetworkAddress");
+                            if (value != null) return regkey.GetValue("NetworkAddress").ToString();
+                            else return null;
                         }
                     }
                     catch
@@ -176,7 +179,7 @@ public bool SetRegistryMac(string value)
                             regkey.SetValue("NetworkAddress", value, RegistryValueKind.String);
                         else
                             regkey.DeleteValue("NetworkAddress");
-                        
+
 
                         return true;
                     }
@@ -278,8 +281,9 @@ public Form1()
             InitializeComponent();
         }
 
-        private void Form1_Load(object sender, EventArgs e)
+        private List<Adapter> get_adapters_list()
         {
+            List<Adapter> adapters = new List<Adapter> { };
             /* Windows generally seems to add a number of non-physical devices, of which
              * we would not want to change the address. Most of them have an impossible
              * MAC address. */
@@ -287,10 +291,31 @@ private void Form1_Load(object sender, EventArgs e)
                     a => Adapter.IsValidMac(a.GetPhysicalAddress().GetAddressBytes(), true)
                 ).OrderByDescending(a => a.Speed))
             {
-                AdaptersComboBox.Items.Add(new Adapter(adapter));
+                adapters.Add(new Adapter(adapter));
             }
-            
+            return adapters;
+        }
+
+        private void Form1_Load(object sender, EventArgs e)
+        {
+            AdaptersComboBox.Items.Add("Loading...");
             AdaptersComboBox.SelectedIndex = 0;
+            AdaptersComboBox.Enabled = false;
+            Thread t = new Thread(() =>
+            {
+                var adapters = get_adapters_list();
+                AdaptersComboBox.Invoke((MethodInvoker)delegate
+                {
+                    AdaptersComboBox.Items.Clear();
+                    foreach (Adapter adapter in adapters)
+                    {
+                        AdaptersComboBox.Items.Add(adapter);
+                        AdaptersComboBox.Enabled = true;
+                        AdaptersComboBox.SelectedIndex = 0;
+                    }
+                });
+            });
+            t.Start();
         }
 
         /// <summary>
@@ -299,8 +324,12 @@ private void Form1_Load(object sender, EventArgs e)
         private void UpdateAddresses()
         {
             Adapter a = AdaptersComboBox.SelectedItem as Adapter;
-            this.CurrentMacTextBox.Text = a.RegistryMac;
-            this.ActualMacLabel.Text = a.Mac;
+            if (a != null)
+            {
+                this.CurrentMacTextBox.Text = a.RegistryMac;
+                this.ActualMacLabel.Text = a.Mac;
+            }
+
         }
 
         private void AdaptersComboBox_SelectedIndexChanged(object sender, EventArgs e)
diff --git a/MACAddressTool/MACAddressTool.csproj b/MACAddressTool/MACAddressTool.csproj
index a832cc3..34cf04a 100644
--- a/MACAddressTool/MACAddressTool.csproj
+++ b/MACAddressTool/MACAddressTool.csproj
@@ -11,6 +11,22 @@
     <AssemblyName>MAC Address Tool</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>C:\Programs\MacAddressTool\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,6 +50,21 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>BD6BABBFEBA46A13A8376FE300A123EA72E78D00</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>MACAddressTool_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>false</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>false</SignManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -62,10 +93,18 @@
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.manifest" />
+    <None Include="MACAddressTool_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MACAddressTool/app.manifest b/MACAddressTool/app.manifest
index 7024a5f..a1705aa 100644
--- a/MACAddressTool/app.manifest
+++ b/MACAddressTool/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
@@ -18,29 +18,26 @@
         -->
         <requestedExecutionLevel level="highestAvailable" uiAccess="false" />
       </requestedPrivileges>
+      <applicationRequestMinimum>
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+        <PermissionSet ID="Custom" SameSite="site" Unrestricted="true" />
+      </applicationRequestMinimum>
     </security>
   </trustInfo>
-
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!-- A list of all Windows versions that this application is designed to work with. 
       Windows will automatically select the most compatible environment.-->
-
       <!-- If your application is designed to work with Windows Vista, uncomment the following supportedOS node-->
       <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>-->
-
       <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
       <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
-
       <!-- If your application is designed to work with Windows 8, uncomment the following supportedOS node-->
       <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>-->
-
       <!-- If your application is designed to work with Windows 8.1, uncomment the following supportedOS node-->
       <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>-->
-
     </application>
   </compatibility>
-
   <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
   <!-- <dependency>
     <dependentAssembly>
@@ -54,5 +51,4 @@
         />
     </dependentAssembly>
   </dependency>-->
-
-</asmv1:assembly>
+</asmv1:assembly>
\ No newline at end of file