diff --git a/EduNetworkBuilder/NetworkCardEditor.Designer.cs b/EduNetworkBuilder/NetworkCardEditor.Designer.cs
index 3581eda..ddc9c9b 100644
--- a/EduNetworkBuilder/NetworkCardEditor.Designer.cs
+++ b/EduNetworkBuilder/NetworkCardEditor.Designer.cs
@@ -121,6 +121,7 @@
             // 
             // lblLinkStatus
             // 
+            this.lblLinkStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.lblLinkStatus.AutoSize = true;
             this.lblLinkStatus.Location = new System.Drawing.Point(32, 169);
             this.lblLinkStatus.Name = "lblLinkStatus";
diff --git a/EduNetworkBuilder/NetworkCardEditor.cs b/EduNetworkBuilder/NetworkCardEditor.cs
index 59b6936..c71f848 100644
--- a/EduNetworkBuilder/NetworkCardEditor.cs
+++ b/EduNetworkBuilder/NetworkCardEditor.cs
@@ -17,6 +17,7 @@ namespace EduNetworkBuilder
         NetworkCard MyNicToEdit;
         Button btnVPNEnd = null;
         TextBox tbVPNEncrypt = null;
+        TextBox tbSSID = null;
         Label lblVPNEnd = null;
         Label lblVPNEncrypt = null;
 
@@ -30,7 +31,9 @@ namespace EduNetworkBuilder
         {
             InitializeComponent();
             LanguagifyComponents();
-
+            //***************
+            //****  VPN  ****
+            //***************
             if (NicToEdit.GetNicType == NicType.tun || NicToEdit.GetNicType == NicType.vpn)
             {
                 AutoSize = false;
@@ -64,6 +67,34 @@ namespace EduNetworkBuilder
                 Refresh();
                 //AutoSize = true;
             }
+            //******************
+            //***  WIRELESS  ***
+            //******************
+            if (NicToEdit.GetNicType == NicType.wlan || NicToEdit.GetNicType == NicType.wport)
+            {
+                AutoSize = false;
+                tbSSID = new TextBox();
+                tbSSID.Location = new Point(TBMacAddress.Location.X, cbDHCP.Location.Y + 28);
+
+                lblVPNEnd = new Label();
+                lblVPNEnd.Location = new Point(10, tbSSID.Location.Y);
+                lblVPNEnd.Text = "SSID:";
+                Controls.Add(tbSSID);
+                Controls.Add(lblVPNEnd);
+                this.Height = lblVPNEnd.Location.Y + lblVPNEnd.Height + 80;
+
+                tbVPNEncrypt = new TextBox();
+                tbVPNEncrypt.Location = new Point(TBMacAddress.Location.X, tbSSID.Location.Y + 28);
+
+                lblVPNEncrypt = new Label();
+                lblVPNEncrypt.Location = new Point(10, tbVPNEncrypt.Location.Y);
+                lblVPNEncrypt.Text = "Wireless Key:";
+                Controls.Add(tbVPNEncrypt);
+                Controls.Add(lblVPNEncrypt);
+                this.Height = tbVPNEncrypt.Location.Y + tbVPNEncrypt.Height + 80;
+                Refresh();
+                //AutoSize = true;
+            }
             TBMacAddress.Enabled = false;
             tbNicName.Enabled = false;
             tbNicType.Enabled = false;
@@ -116,6 +147,10 @@ namespace EduNetworkBuilder
                     btnval = MyNicToEdit.TunnelEndpoint.GetIPString;
                 btnVPNEnd.Text = btnval;
             }
+            if(tbSSID != null)
+            {
+                tbSSID.Text = MyNicToEdit.SSID;
+            }
             if(tbVPNEncrypt != null)
             {
                 tbVPNEncrypt.Text = MyNicToEdit.EncryptionKey;