diff --git a/EDSTest/DeviceView.Designer.cs b/EDSTest/DeviceView.Designer.cs
index 9ec437ff..92ed0421 100644
--- a/EDSTest/DeviceView.Designer.cs
+++ b/EDSTest/DeviceView.Designer.cs
@@ -28,16 +28,18 @@ protected override void Dispose(bool disposing)
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DeviceView));
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.deviceInfoView = new ODEditor.DeviceInfoView();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.deviceODView1 = new ODEditor.DeviceODView();
             this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.devicePDOView1 = new ODEditor.DevicePDOView();
             this.tabPage4 = new System.Windows.Forms.TabPage();
-            this.devicePDOView1 = new DevicePDOView();
-            this.devicePDOView2 = new DevicePDOView();
-
+            this.devicePDOView2 = new ODEditor.DevicePDOView();
+            this.imageList1 = new System.Windows.Forms.ImageList(this.components);
             this.tabControl1.SuspendLayout();
             this.tabPage2.SuspendLayout();
             this.tabPage1.SuspendLayout();
@@ -52,6 +54,7 @@ private void InitializeComponent()
             this.tabControl1.Controls.Add(this.tabPage3);
             this.tabControl1.Controls.Add(this.tabPage4);
             this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControl1.ImageList = this.imageList1;
             this.tabControl1.Location = new System.Drawing.Point(0, 0);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
@@ -61,10 +64,11 @@ private void InitializeComponent()
             // tabPage2
             // 
             this.tabPage2.Controls.Add(this.deviceInfoView);
-            this.tabPage2.Location = new System.Drawing.Point(4, 22);
+            this.tabPage2.ImageIndex = 1;
+            this.tabPage2.Location = new System.Drawing.Point(4, 23);
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(1114, 747);
+            this.tabPage2.Size = new System.Drawing.Size(1114, 746);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "Device Info";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -80,10 +84,11 @@ private void InitializeComponent()
             // tabPage1
             // 
             this.tabPage1.Controls.Add(this.deviceODView1);
-            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.ImageIndex = 0;
+            this.tabPage1.Location = new System.Drawing.Point(4, 23);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(1114, 747);
+            this.tabPage1.Size = new System.Drawing.Size(1114, 746);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "Object Dictionary";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -98,10 +103,11 @@ private void InitializeComponent()
             // tabPage3
             // 
             this.tabPage3.Controls.Add(this.devicePDOView1);
-            this.tabPage3.Location = new System.Drawing.Point(4, 22);
+            this.tabPage3.ImageIndex = 2;
+            this.tabPage3.Location = new System.Drawing.Point(4, 23);
             this.tabPage3.Name = "tabPage3";
             this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage3.Size = new System.Drawing.Size(1114, 747);
+            this.tabPage3.Size = new System.Drawing.Size(1114, 746);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "TX PDO Mapping";
             this.tabPage3.UseVisualStyleBackColor = true;
@@ -116,9 +122,10 @@ private void InitializeComponent()
             // tabPage4
             // 
             this.tabPage4.Controls.Add(this.devicePDOView2);
-            this.tabPage4.Location = new System.Drawing.Point(4, 22);
+            this.tabPage4.ImageIndex = 3;
+            this.tabPage4.Location = new System.Drawing.Point(4, 23);
             this.tabPage4.Name = "tabPage4";
-            this.tabPage4.Size = new System.Drawing.Size(1114, 747);
+            this.tabPage4.Size = new System.Drawing.Size(1114, 746);
             this.tabPage4.TabIndex = 3;
             this.tabPage4.Text = "RX PDO Mapping";
             this.tabPage4.UseVisualStyleBackColor = true;
@@ -130,6 +137,15 @@ private void InitializeComponent()
             this.devicePDOView2.Size = new System.Drawing.Size(973, 695);
             this.devicePDOView2.TabIndex = 0;
             // 
+            // imageList1
+            // 
+            this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+            this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+            this.imageList1.Images.SetKeyName(0, "ListBox_686.png");
+            this.imageList1.Images.SetKeyName(1, "notebook_16xLG.png");
+            this.imageList1.Images.SetKeyName(2, "Output_16xLG.png");
+            this.imageList1.Images.SetKeyName(3, "SingleInput_8170_16x.png");
+            // 
             // DeviceView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -147,8 +163,6 @@ private void InitializeComponent()
         }
 
         #endregion
-
-        private System.Windows.Forms.TabControl tabControl1;
         private System.Windows.Forms.TabPage tabPage2;
         private System.Windows.Forms.TabPage tabPage1;
         private System.Windows.Forms.TabPage tabPage3;
@@ -157,5 +171,7 @@ private void InitializeComponent()
         private DeviceODView deviceODView1;
         private System.Windows.Forms.TabPage tabPage4;
         private DevicePDOView devicePDOView2;
+        private System.Windows.Forms.ImageList imageList1;
+        private System.Windows.Forms.TabControl tabControl1;
     }
 }
diff --git a/EDSTest/DeviceView.resx b/EDSTest/DeviceView.resx
index 1af7de15..72acc27f 100644
--- a/EDSTest/DeviceView.resx
+++ b/EDSTest/DeviceView.resx
@@ -117,4 +117,60 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk
+        CgAAAk1TRnQBSQFMAgEBBAEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
+        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
+        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
+        AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
+        AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
+        AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
+        ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
+        AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
+        AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
+        AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
+        AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
+        AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
+        AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
+        AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
+        AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
+        ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
+        Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
+        AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
+        AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
+        AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
+        ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
+        Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
+        AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
+        AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
+        AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
+        AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
+        AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
+        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8AJQAL9AUA
+        C/QFABD0AQAO9AEAAfQJFAH0BQAB9AkUAfQFAAH0DhQB9AEAAfQMFAH0AQAB9AEUCfQFAAH0ARQJ9AUA
+        AfQOFAH0AQAC9AEUCfQBFAH0AQAB9AEUAfQDAAb0BAAB9AEUAfQNAAH0AhQH9AEUAeoB8QHqARQB9AEA
+        AfQCFAn0ARQB9AEAAfQBFAH0BAAB9AMUAfcB9AMAAfQBFAH0BAAB9AH3AxQB7wH0AgAB9AIUAfQEFAL0
+        ARQBvAH0AbwBFAH0AQAC9AEUCfQBFAH0AQAB9AEUAfQEAAH0Ae8DFAHsAfQCAAH0ARQB9AMAAfQB7AMU
+        Ae8B9AMAAfQCFAf0BRQB9AEAAfQCFAn0ARQB9AEAAfQBFAf0Ae8DFAHsAfQBAAH0ARQB9AIAAfQB7AMU
+        Ae8G9AIUAfQDFAn0AQAC9AEUCfQBFAH0AQAB9AEUAvQKFAHsAvQBFAH0AQAB9AHsChQB9AIUB/QFFAH0
+        AQAB9AIUCfQBFAH0AQAB9AEUAvQKFAHsAvQBFAH0AQAB9AHsChQB9AIUAfQFFAf0AQAC9AEUCfQBFAH0
+        AQAB9AEUB/QB7wMUAewB9AEAAfQBFAH0AgAB9AHsAxQB7wb0AhQH9AUUAfQBAAH0AhQC9AUUAvQBFAH0
+        AQAB9AEUAfQEAAH0Ae8DFAHsAfQCAAH0ARQB9AMAAfQB7AMUAe8B9AMAAfQCFAH0AxQD9AEUAbwB9AG8
+        ARQB9AEAAvQBFAL0BRQC9AEUAfQBAAH0ARQB9AQAAfQDFAH3AfQDAAH0ARQB9AQAAfQB9wMUAe8B9AIA
+        AfQCFAf0ARQB6gHxAeoBFAH0AQAB9AIUCfQBFAH0AQAB9AEUAfQDAAb0BAAB9AEUAfQCAAr0AQAB9A4U
+        AfQBAAL0ARQJ9AEUAfQBAAH0ARQJ9AUAAfQBFAn0BQAB9A4UAfQBAAH0DBQB9AEAAfQJFAH0BQAB9AkU
+        AfQFABD0AQAO9AEAC/QFAAv0BQABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEBFgAD/4EA
+        BP8BAAEfAQABHwIAAYABAQEAAR8BAAEfAgABgAEBAQABHwEAAR8CAAGAAQEBHAEPAR8B/wIAAYABAQEe
+        AQcBHgEDAgABgAEBAR4BAwEcAQcCAAGAAQEBAAEBARgDAAGAAQECAAEQAwABgAEBAgABEAMAAYABAQEA
+        AQEBGAMAAYABAQEeAQMBHAEHAgABgAEBAR4BBwEeAQMCAAGAAQEBHAEPARgBAQIAAYABAQEAAR8BAAEf
+        AgABgAEBAQABHwEAAR8CAAGAAQEBAAEfAQABHws=
+</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/EDSTest/EDSEditorGUI.csproj b/EDSTest/EDSEditorGUI.csproj
index cbca8611..f65ee74d 100644
--- a/EDSTest/EDSEditorGUI.csproj
+++ b/EDSTest/EDSEditorGUI.csproj
@@ -179,6 +179,10 @@
     <None Include="Resources\Index_8287_16x.png" />
     <None Include="Resources\GenericVSEditor_9905.png" />
     <None Include="Resources\EventLog_5735.png" />
+    <None Include="Resources\ListBox_686.png" />
+    <None Include="Resources\notebook_16xLG.png" />
+    <None Include="Resources\move_to_bottom.png" />
+    <None Include="Resources\move_to_top.png" />
     <Content Include="style.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/EDSTest/Properties/Resources.Designer.cs b/EDSTest/Properties/Resources.Designer.cs
index 7795848c..f972f369 100644
--- a/EDSTest/Properties/Resources.Designer.cs
+++ b/EDSTest/Properties/Resources.Designer.cs
@@ -170,6 +170,16 @@ internal static System.Drawing.Bitmap InsertColumn_5626 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ListBox_686 {
+            get {
+                object obj = ResourceManager.GetObject("ListBox_686", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/EDSTest/Properties/Resources.resx b/EDSTest/Properties/Resources.resx
index 5e0ac552..ad4fc858 100644
--- a/EDSTest/Properties/Resources.resx
+++ b/EDSTest/Properties/Resources.resx
@@ -163,6 +163,9 @@
   <data name="Index_8287_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Index_8287_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ListBox_686" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ListBox_686.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="PrintPreviewControl_698" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\PrintPreviewControl_698.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
diff --git a/EDSTest/Resources/ListBox_686.png b/EDSTest/Resources/ListBox_686.png
new file mode 100644
index 00000000..0ae2a9e6
Binary files /dev/null and b/EDSTest/Resources/ListBox_686.png differ
diff --git a/EDSTest/Resources/move_to_bottom.png b/EDSTest/Resources/move_to_bottom.png
new file mode 100644
index 00000000..02fd011e
Binary files /dev/null and b/EDSTest/Resources/move_to_bottom.png differ
diff --git a/EDSTest/Resources/move_to_top.png b/EDSTest/Resources/move_to_top.png
new file mode 100644
index 00000000..0028d71c
Binary files /dev/null and b/EDSTest/Resources/move_to_top.png differ
diff --git a/EDSTest/Resources/notebook_16xLG.png b/EDSTest/Resources/notebook_16xLG.png
new file mode 100644
index 00000000..badf6df3
Binary files /dev/null and b/EDSTest/Resources/notebook_16xLG.png differ