diff --git a/EditorControls/WFListEditor.Designer.cs b/EditorControls/WFListEditor.Designer.cs
index 2ebafe519..d3fd19f35 100644
--- a/EditorControls/WFListEditor.Designer.cs
+++ b/EditorControls/WFListEditor.Designer.cs
@@ -34,9 +34,9 @@ private void InitializeComponent()
             this.cmdAdd = new System.Windows.Forms.ToolStripButton();
             this.cmdAddNewPage = new System.Windows.Forms.ToolStripButton();
             this.cmdDelete = new System.Windows.Forms.ToolStripButton();
-            this.cmdLink = new System.Windows.Forms.ToolStripButton();
             this.cmdEditKey = new System.Windows.Forms.ToolStripButton();
             this.cmdEdit = new System.Windows.Forms.ToolStripButton();
+            this.cmdLink = new System.Windows.Forms.ToolStripButton();
             this.cmdGoToPage = new System.Windows.Forms.ToolStripButton();
             this.cmdMoveUp = new System.Windows.Forms.ToolStripButton();
             this.cmdMoveDown = new System.Windows.Forms.ToolStripButton();
@@ -58,7 +58,7 @@ private void InitializeComponent()
             // 
             this.ctlToolStrip.BackColor = System.Drawing.Color.White;
             this.ctlToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
-            this.ctlToolStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.ctlToolStrip.ImageScalingSize = new System.Drawing.Size(32, 32);
             this.ctlToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.cmdAdd,
             this.cmdAddNewPage,
@@ -94,14 +94,6 @@ private void InitializeComponent()
             resources.ApplyResources(this.cmdDelete, "cmdDelete");
             this.cmdDelete.Name = "cmdDelete";
             // 
-            // cmdLink
-            // 
-            this.cmdLink.AutoToolTip = false;
-            this.cmdLink.Image = global::TextAdventures.Quest.EditorControls.Properties.Resources.s_wf_link;
-            resources.ApplyResources(this.cmdLink, "cmdLink");
-            this.cmdLink.Name = "cmdLink";
-            this.cmdLink.Tag = "link";
-            // 
             // cmdEditKey
             // 
             this.cmdEditKey.AutoToolTip = false;
@@ -116,6 +108,14 @@ private void InitializeComponent()
             resources.ApplyResources(this.cmdEdit, "cmdEdit");
             this.cmdEdit.Name = "cmdEdit";
             // 
+            // cmdLink
+            // 
+            this.cmdLink.AutoToolTip = false;
+            this.cmdLink.Image = global::TextAdventures.Quest.EditorControls.Properties.Resources.s_wf_link;
+            resources.ApplyResources(this.cmdLink, "cmdLink");
+            this.cmdLink.Name = "cmdLink";
+            this.cmdLink.Tag = "link";
+            // 
             // cmdGoToPage
             // 
             this.cmdGoToPage.AutoToolTip = false;
diff --git a/EditorControls/WFListEditor.resx b/EditorControls/WFListEditor.resx
index f2f36a15d..c86c2789b 100644
--- a/EditorControls/WFListEditor.resx
+++ b/EditorControls/WFListEditor.resx
@@ -122,14 +122,14 @@
     <value>Fill</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="lstList.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 25</value>
+  <data name="lstList.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Microsoft Sans Serif, 7.875pt</value>
   </data>
-  <data name="lstList.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+  <data name="lstList.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 50</value>
   </data>
   <data name="lstList.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1076, 310</value>
+    <value>807, 222</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="lstList.TabIndex" type="System.Int32, mscorlib">
@@ -157,7 +157,7 @@
     <value>Magenta</value>
   </data>
   <data name="cmdAdd.Size" type="System.Drawing.Size, System.Drawing">
-    <value>23, 22</value>
+    <value>46, 44</value>
   </data>
   <data name="cmdAdd.ToolTipText" xml:space="preserve">
     <value>Add</value>
@@ -169,7 +169,7 @@
     <value>Magenta</value>
   </data>
   <data name="cmdAddNewPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>23, 22</value>
+    <value>46, 44</value>
   </data>
   <data name="cmdAddNewPage.ToolTipText" xml:space="preserve">
     <value>Add New Page</value>
@@ -181,7 +181,7 @@
     <value>Magenta</value>
   </data>
   <data name="cmdDelete.Size" type="System.Drawing.Size, System.Drawing">
-    <value>23, 22</value>
+    <value>46, 44</value>
   </data>
   <data name="cmdDelete.ToolTipText" xml:space="preserve">
     <value>Delete</value>
@@ -193,7 +193,7 @@
     <value>Magenta</value>
   </data>
   <data name="cmdEditKey.Size" type="System.Drawing.Size, System.Drawing">
-    <value>23, 22</value>
+    <value>46, 44</value>
   </data>
   <data name="cmdEditKey.ToolTipText" xml:space="preserve">
     <value>Edit Key</value>
@@ -205,7 +205,7 @@
     <value>Magenta</value>
   </data>
   <data name="cmdEdit.Size" type="System.Drawing.Size, System.Drawing">
-    <value>23, 22</value>
+    <value>46, 44</value>
   </data>
   <data name="cmdEdit.ToolTipText" xml:space="preserve">
     <value>Edit</value>
@@ -217,7 +217,7 @@
     <value>Magenta</value>
   </data>
   <data name="cmdLink.Size" type="System.Drawing.Size, System.Drawing">
-    <value>23, 22</value>
+    <value>46, 44</value>
   </data>
   <data name="cmdLink.ToolTipText" xml:space="preserve">
     <value>Link to Existing Page</value>
@@ -229,7 +229,7 @@
     <value>Magenta</value>
   </data>
   <data name="cmdGoToPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>23, 22</value>
+    <value>46, 44</value>
   </data>
   <data name="cmdGoToPage.ToolTipText" xml:space="preserve">
     <value>Go to Page</value>
@@ -241,7 +241,7 @@
     <value>Magenta</value>
   </data>
   <data name="cmdMoveUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>23, 22</value>
+    <value>46, 44</value>
   </data>
   <data name="cmdMoveUp.ToolTipText" xml:space="preserve">
     <value>Move Up</value>
@@ -253,7 +253,7 @@
     <value>Magenta</value>
   </data>
   <data name="cmdMoveDown.Size" type="System.Drawing.Size, System.Drawing">
-    <value>23, 22</value>
+    <value>46, 44</value>
   </data>
   <data name="cmdMoveDown.ToolTipText" xml:space="preserve">
     <value>Move Down</value>
@@ -265,7 +265,7 @@
     <value>0, 0, 0, 0</value>
   </data>
   <data name="ctlToolStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1076, 25</value>
+    <value>807, 50</value>
   </data>
   <data name="ctlToolStrip.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -289,13 +289,10 @@
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>8, 16</value>
-  </data>
-  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>6, 13</value>
   </data>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1076, 335</value>
+    <value>807, 272</value>
   </data>
   <data name="&gt;&gt;cmdAdd.Name" xml:space="preserve">
     <value>cmdAdd</value>
@@ -315,12 +312,6 @@
   <data name="&gt;&gt;cmdDelete.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;cmdLink.Name" xml:space="preserve">
-    <value>cmdLink</value>
-  </data>
-  <data name="&gt;&gt;cmdLink.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;cmdEditKey.Name" xml:space="preserve">
     <value>cmdEditKey</value>
   </data>
@@ -333,6 +324,12 @@
   <data name="&gt;&gt;cmdEdit.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;cmdLink.Name" xml:space="preserve">
+    <value>cmdLink</value>
+  </data>
+  <data name="&gt;&gt;cmdLink.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;cmdGoToPage.Name" xml:space="preserve">
     <value>cmdGoToPage</value>
   </data>
diff --git a/Quest/Main.vb b/Quest/Main.vb
index db7fd7c0f..019bf8494 100644
--- a/Quest/Main.vb
+++ b/Quest/Main.vb
@@ -12,6 +12,8 @@ Public Class Main
     Private m_language As String
 
     Public Sub New()
+        Application.EnableVisualStyles()
+
         LoadLanguage()
 
         ' This call is required by the Windows Form Designer.