diff --git a/MCAudioSpectrumAnalyzer/Form1.Designer.cs b/MCAudioSpectrumAnalyzer/Form1.Designer.cs
index 223abb5..c55db33 100644
--- a/MCAudioSpectrumAnalyzer/Form1.Designer.cs
+++ b/MCAudioSpectrumAnalyzer/Form1.Designer.cs
@@ -29,11 +29,12 @@
         private void InitializeComponent()
         {
             this.button1 = new System.Windows.Forms.Button();
+            this.devicelist = new System.Windows.Forms.ComboBox();
             this.SuspendLayout();
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(417, 90);
+            this.button1.Location = new System.Drawing.Point(139, 12);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(75, 23);
             this.button1.TabIndex = 1;
@@ -41,20 +42,34 @@
             this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
+            // devicelist
+            // 
+            this.devicelist.FormattingEnabled = true;
+            this.devicelist.Location = new System.Drawing.Point(12, 12);
+            this.devicelist.Name = "devicelist";
+            this.devicelist.Size = new System.Drawing.Size(121, 21);
+            this.devicelist.TabIndex = 2;
+            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(733, 299);
+            this.ClientSize = new System.Drawing.Size(239, 50);
+            this.Controls.Add(this.devicelist);
             this.Controls.Add(this.button1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MaximizeBox = false;
             this.Name = "Form1";
-            this.Text = "Form1";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "Spectrum Analyzer";
             this.ResumeLayout(false);
 
         }
 
         #endregion
         private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.ComboBox devicelist;
     }
 }
 
diff --git a/MCAudioSpectrumAnalyzer/Form1.cs b/MCAudioSpectrumAnalyzer/Form1.cs
index 1e78a8a..6ee1283 100644
--- a/MCAudioSpectrumAnalyzer/Form1.cs
+++ b/MCAudioSpectrumAnalyzer/Form1.cs
@@ -21,13 +21,13 @@ namespace MCAudioSpectrumAnalyzer
         {
             InitializeComponent();
             Instance = this;
-            Analyzer = new Analyzer(new ProgressBar(), new ProgressBar(), new ComboBox());
+            Analyzer = new Analyzer(new ProgressBar(), new ProgressBar(), devicelist);
         }
 
         public void Set(List<byte> data)
         {
             if (data.Count < 16) return;
-            client.Send(data.ToArray(), data.Count, new IPEndPoint(IPAddress.Loopback, 5896)); //TODO: Make visualiser source selectable
+            client.Send(data.ToArray(), data.Count, new IPEndPoint(IPAddress.Loopback, 5896));
         }
         
         private UdpClient client = new UdpClient(AddressFamily.InterNetwork);