diff --git a/DisplayMagician.Shared/ProfileRepository.cs b/DisplayMagician.Shared/ProfileRepository.cs
index 3b2530d..d59feb9 100644
--- a/DisplayMagician.Shared/ProfileRepository.cs
+++ b/DisplayMagician.Shared/ProfileRepository.cs
@@ -347,15 +347,6 @@ namespace DisplayMagician.Shared
             // then we also need to reproduce the Icons
             if (ContainsProfile(profile))
             {
-
-
-                // rename the old Profile Icon to the new name
-                //string newSavedProfileIconCacheFilename = Path.Combine(_profileStorageJsonPath, String.Concat(@"profile-", profile.UUID, @".ico"));
-                //File.Move(profile.SavedProfileIconCacheFilename, newSavedProfileIconCacheFilename);
-
-                // Then update the profile too
-                //profile.SavedProfileIconCacheFilename = newSavedProfileIconCacheFilename;
-
                 // Save the Profiles JSON as it's different now
                 SaveProfiles();
 
@@ -599,7 +590,7 @@ namespace DisplayMagician.Shared
                             myPhysicalGPU.Foundry.ToString(),
                             myPhysicalGPU.GPUId.ToString(),
                             myPhysicalGPU.GPUType.ToString(),
-                            aGPUOutput.OutputId.ToString(),
+                            //aGPUOutput.OutputId.ToString(),
                             aConnectedDisplayDevice.ConnectionType.ToString(),
                             aConnectedDisplayDevice.DisplayId.ToString()
                         };
diff --git a/DisplayMagician/UIForms/DisplayProfileForm.Designer.cs b/DisplayMagician/UIForms/DisplayProfileForm.Designer.cs
index 889750a..8e3428c 100644
--- a/DisplayMagician/UIForms/DisplayProfileForm.Designer.cs
+++ b/DisplayMagician/UIForms/DisplayProfileForm.Designer.cs
@@ -36,7 +36,6 @@ namespace DisplayMagician.UIForms
             this.btn_apply = new System.Windows.Forms.Button();
             this.btn_back = new System.Windows.Forms.Button();
             this.btn_delete = new System.Windows.Forms.Button();
-            this.dv_profile = new DisplayMagician.Shared.UserControls.DisplayView();
             this.menu_profiles = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
@@ -55,6 +54,7 @@ namespace DisplayMagician.UIForms
             this.label1 = new System.Windows.Forms.Label();
             this.tt_selected = new System.Windows.Forms.ToolTip(this.components);
             this.lbl_save_profile = new System.Windows.Forms.Label();
+            this.dv_profile = new DisplayMagician.Shared.UserControls.DisplayView();
             this.menu_profiles.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pb_down_arrow)).BeginInit();
             this.SuspendLayout();
@@ -108,23 +108,6 @@ namespace DisplayMagician.UIForms
             this.btn_delete.UseVisualStyleBackColor = true;
             this.btn_delete.Click += new System.EventHandler(this.Delete_Click);
             // 
-            // dv_profile
-            // 
-            this.dv_profile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.dv_profile.BackColor = System.Drawing.Color.DimGray;
-            this.dv_profile.Font = new System.Drawing.Font("Consolas", 50F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.dv_profile.ForeColor = System.Drawing.Color.MidnightBlue;
-            this.dv_profile.Location = new System.Drawing.Point(0, 63);
-            this.dv_profile.Margin = new System.Windows.Forms.Padding(18);
-            this.dv_profile.Name = "dv_profile";
-            this.dv_profile.PaddingX = 100;
-            this.dv_profile.PaddingY = 100;
-            this.dv_profile.Profile = null;
-            this.dv_profile.Size = new System.Drawing.Size(976, 517);
-            this.dv_profile.TabIndex = 4;
-            this.dv_profile.Visible = false;
-            // 
             // menu_profiles
             // 
             this.menu_profiles.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -299,6 +282,22 @@ namespace DisplayMagician.UIForms
     "and click \'Save As\' to save this Display Profile.";
             this.lbl_save_profile.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // dv_profile
+            // 
+            this.dv_profile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.dv_profile.BackColor = System.Drawing.Color.DimGray;
+            this.dv_profile.Font = new System.Drawing.Font("Consolas", 50F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.dv_profile.ForeColor = System.Drawing.Color.MidnightBlue;
+            this.dv_profile.Location = new System.Drawing.Point(0, 63);
+            this.dv_profile.Margin = new System.Windows.Forms.Padding(18);
+            this.dv_profile.Name = "dv_profile";
+            this.dv_profile.PaddingX = 100;
+            this.dv_profile.PaddingY = 100;
+            this.dv_profile.Profile = null;
+            this.dv_profile.Size = new System.Drawing.Size(976, 517);
+            this.dv_profile.TabIndex = 4;
+            // 
             // DisplayProfileForm
             // 
             this.AcceptButton = this.btn_apply;
diff --git a/DisplayMagician/UIForms/DisplayProfileForm.cs b/DisplayMagician/UIForms/DisplayProfileForm.cs
index dc7ce9f..3affbbf 100644
--- a/DisplayMagician/UIForms/DisplayProfileForm.cs
+++ b/DisplayMagician/UIForms/DisplayProfileForm.cs
@@ -187,13 +187,9 @@ namespace DisplayMagician.UIForms
                 {
                     lbl_profile_shown_subtitle.Text = "This Display Profile can't be used as not all Displays are connected.";
                     btn_apply.Visible = false;
-                    dv_profile.Profile = null;
-
                 }
                 else
                 {
-                    dv_profile.Profile = profile;
-
                     if (ProfileRepository.IsActiveProfile(_selectedProfile))
                     {
                         btn_apply.Visible = false;
@@ -214,13 +210,12 @@ namespace DisplayMagician.UIForms
                 lbl_profile_shown_subtitle.Text = "The current Display configuration hasn't been saved as a Display Profile yet.";
                 btn_apply.Visible = false;
                 lbl_save_profile.Visible = true;
-                dv_profile.Profile = profile;
             }
 
             // Refresh the image list view
             //RefreshImageListView(profile);
 
-            // And finally show the profile in the display view
+            // And finally refresh the profile in the display view
             dv_profile.Profile = profile;
             dv_profile.Refresh();