diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo
index 08e0a2d..173e10b 100644
Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ
diff --git a/GBAPokemonGameEditor/AttackEditor.Designer.vb b/GBAPokemonGameEditor/AttackEditor.Designer.vb
index 7856f43..fb76153 100644
--- a/GBAPokemonGameEditor/AttackEditor.Designer.vb
+++ b/GBAPokemonGameEditor/AttackEditor.Designer.vb
@@ -116,36 +116,41 @@ Partial Class AttackEditor
         Me.GroupBox1.Controls.Add(Me.AttackListIndex)
         Me.GroupBox1.Controls.Add(Me.Label20)
         Me.GroupBox1.Controls.Add(Me.ComboBox3)
-        Me.GroupBox1.Location = New System.Drawing.Point(12, 23)
+        Me.GroupBox1.Location = New System.Drawing.Point(16, 28)
+        Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(137, 101)
+        Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox1.Size = New System.Drawing.Size(183, 124)
         Me.GroupBox1.TabIndex = 23
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Attack Selection:"
         '
         'Button15
         '
-        Me.Button15.Location = New System.Drawing.Point(6, 74)
+        Me.Button15.Location = New System.Drawing.Point(8, 91)
+        Me.Button15.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Button15.Name = "Button15"
-        Me.Button15.Size = New System.Drawing.Size(120, 23)
+        Me.Button15.Size = New System.Drawing.Size(160, 28)
         Me.Button15.TabIndex = 26
         Me.Button15.Text = "Decap. all names!"
         Me.Button15.UseVisualStyleBackColor = True
         '
         'AttackListIndex
         '
-        Me.AttackListIndex.Location = New System.Drawing.Point(46, 46)
+        Me.AttackListIndex.Location = New System.Drawing.Point(61, 57)
+        Me.AttackListIndex.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.AttackListIndex.Name = "AttackListIndex"
         Me.AttackListIndex.ReadOnly = True
-        Me.AttackListIndex.Size = New System.Drawing.Size(40, 20)
+        Me.AttackListIndex.Size = New System.Drawing.Size(52, 22)
         Me.AttackListIndex.TabIndex = 25
         '
         'Label20
         '
         Me.Label20.AutoSize = True
-        Me.Label20.Location = New System.Drawing.Point(6, 49)
+        Me.Label20.Location = New System.Drawing.Point(8, 60)
+        Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(36, 13)
+        Me.Label20.Size = New System.Drawing.Size(45, 17)
         Me.Label20.TabIndex = 24
         Me.Label20.Text = "Index:"
         '
@@ -154,47 +159,53 @@ Partial Class AttackEditor
         Me.ComboBox3.AllowDrop = True
         Me.ComboBox3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
         Me.ComboBox3.FormattingEnabled = True
-        Me.ComboBox3.Location = New System.Drawing.Point(6, 19)
+        Me.ComboBox3.Location = New System.Drawing.Point(8, 23)
+        Me.ComboBox3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.ComboBox3.Name = "ComboBox3"
-        Me.ComboBox3.Size = New System.Drawing.Size(121, 21)
+        Me.ComboBox3.Size = New System.Drawing.Size(160, 24)
         Me.ComboBox3.TabIndex = 23
         '
         'GroupBox2
         '
         Me.GroupBox2.Controls.Add(Me.Button1)
         Me.GroupBox2.Controls.Add(Me.TextBox1)
-        Me.GroupBox2.Location = New System.Drawing.Point(12, 126)
+        Me.GroupBox2.Location = New System.Drawing.Point(16, 155)
+        Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(137, 74)
+        Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox2.Size = New System.Drawing.Size(183, 91)
         Me.GroupBox2.TabIndex = 24
         Me.GroupBox2.TabStop = False
         Me.GroupBox2.Text = "Rename Attack"
         '
         'Button1
         '
-        Me.Button1.Location = New System.Drawing.Point(6, 45)
+        Me.Button1.Location = New System.Drawing.Point(8, 55)
+        Me.Button1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(121, 23)
+        Me.Button1.Size = New System.Drawing.Size(161, 28)
         Me.Button1.TabIndex = 1
         Me.Button1.Text = "Rename"
         Me.Button1.UseVisualStyleBackColor = True
         '
         'TextBox1
         '
-        Me.TextBox1.Location = New System.Drawing.Point(6, 21)
+        Me.TextBox1.Location = New System.Drawing.Point(8, 26)
+        Me.TextBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox1.MaxLength = 12
         Me.TextBox1.Name = "TextBox1"
-        Me.TextBox1.Size = New System.Drawing.Size(120, 20)
+        Me.TextBox1.Size = New System.Drawing.Size(159, 22)
         Me.TextBox1.TabIndex = 0
         '
         'TabControl1
         '
         Me.TabControl1.Controls.Add(Me.TabPage1)
         Me.TabControl1.Controls.Add(Me.TabPage2)
-        Me.TabControl1.Location = New System.Drawing.Point(170, 28)
+        Me.TabControl1.Location = New System.Drawing.Point(227, 34)
+        Me.TabControl1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TabControl1.Name = "TabControl1"
         Me.TabControl1.SelectedIndex = 0
-        Me.TabControl1.Size = New System.Drawing.Size(468, 408)
+        Me.TabControl1.Size = New System.Drawing.Size(624, 502)
         Me.TabControl1.TabIndex = 25
         '
         'TabPage1
@@ -229,10 +240,11 @@ Partial Class AttackEditor
         Me.TabPage1.Controls.Add(Me.Label2)
         Me.TabPage1.Controls.Add(Me.Effects)
         Me.TabPage1.Controls.Add(Me.Label1)
-        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage1.Location = New System.Drawing.Point(4, 25)
+        Me.TabPage1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TabPage1.Name = "TabPage1"
-        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(460, 382)
+        Me.TabPage1.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.TabPage1.Size = New System.Drawing.Size(616, 473)
         Me.TabPage1.TabIndex = 0
         Me.TabPage1.Text = "Attack Data"
         Me.TabPage1.UseVisualStyleBackColor = True
@@ -241,17 +253,19 @@ Partial Class AttackEditor
         '
         Me.Label21.AutoSize = True
         Me.Label21.ForeColor = System.Drawing.SystemColors.ControlText
-        Me.Label21.Location = New System.Drawing.Point(284, 337)
+        Me.Label21.Location = New System.Drawing.Point(379, 415)
+        Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label21.Name = "Label21"
-        Me.Label21.Size = New System.Drawing.Size(43, 13)
+        Me.Label21.Size = New System.Drawing.Size(56, 17)
         Me.Label21.TabIndex = 29
         Me.Label21.Text = "Length:"
         '
         'Button6
         '
-        Me.Button6.Location = New System.Drawing.Point(367, 356)
+        Me.Button6.Location = New System.Drawing.Point(489, 438)
+        Me.Button6.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Button6.Name = "Button6"
-        Me.Button6.Size = New System.Drawing.Size(67, 20)
+        Me.Button6.Size = New System.Drawing.Size(89, 25)
         Me.Button6.TabIndex = 28
         Me.Button6.Text = "Save"
         Me.Button6.UseVisualStyleBackColor = True
@@ -264,34 +278,39 @@ Partial Class AttackEditor
         Me.GroupBox3.Controls.Add(Me.ComboBox8)
         Me.GroupBox3.Controls.Add(Me.Label19)
         Me.GroupBox3.Controls.Add(Me.Label18)
-        Me.GroupBox3.Location = New System.Drawing.Point(21, 225)
+        Me.GroupBox3.Location = New System.Drawing.Point(28, 277)
+        Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.GroupBox3.Name = "GroupBox3"
-        Me.GroupBox3.Size = New System.Drawing.Size(179, 106)
+        Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox3.Size = New System.Drawing.Size(239, 130)
         Me.GroupBox3.TabIndex = 27
         Me.GroupBox3.TabStop = False
         Me.GroupBox3.Text = "Extras"
         '
         'TextBox15
         '
-        Me.TextBox15.Location = New System.Drawing.Point(77, 73)
+        Me.TextBox15.Location = New System.Drawing.Point(103, 90)
+        Me.TextBox15.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox15.Name = "TextBox15"
-        Me.TextBox15.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox15.Size = New System.Drawing.Size(52, 22)
         Me.TextBox15.TabIndex = 6
         '
         'Label22
         '
         Me.Label22.AutoSize = True
-        Me.Label22.Location = New System.Drawing.Point(7, 78)
+        Me.Label22.Location = New System.Drawing.Point(9, 96)
+        Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label22.Name = "Label22"
-        Me.Label22.Size = New System.Drawing.Size(62, 13)
+        Me.Label22.Size = New System.Drawing.Size(81, 17)
         Me.Label22.TabIndex = 5
         Me.Label22.Text = "Pad Byte 3:"
         '
         'TextBox14
         '
-        Me.TextBox14.Location = New System.Drawing.Point(77, 14)
+        Me.TextBox14.Location = New System.Drawing.Point(103, 17)
+        Me.TextBox14.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox14.Name = "TextBox14"
-        Me.TextBox14.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox14.Size = New System.Drawing.Size(52, 22)
         Me.TextBox14.TabIndex = 4
         '
         'ComboBox8
@@ -299,34 +318,38 @@ Partial Class AttackEditor
         Me.ComboBox8.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.ComboBox8.FormattingEnabled = True
         Me.ComboBox8.Items.AddRange(New Object() {"Physical", "Special", "Status"})
-        Me.ComboBox8.Location = New System.Drawing.Point(77, 44)
+        Me.ComboBox8.Location = New System.Drawing.Point(103, 54)
+        Me.ComboBox8.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.ComboBox8.Name = "ComboBox8"
-        Me.ComboBox8.Size = New System.Drawing.Size(93, 21)
+        Me.ComboBox8.Size = New System.Drawing.Size(123, 24)
         Me.ComboBox8.TabIndex = 3
         '
         'Label19
         '
         Me.Label19.AutoSize = True
-        Me.Label19.Location = New System.Drawing.Point(7, 44)
+        Me.Label19.Location = New System.Drawing.Point(9, 54)
+        Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label19.Name = "Label19"
-        Me.Label19.Size = New System.Drawing.Size(52, 13)
+        Me.Label19.Size = New System.Drawing.Size(69, 17)
         Me.Label19.TabIndex = 1
         Me.Label19.Text = "Category:"
         '
         'Label18
         '
         Me.Label18.AutoSize = True
-        Me.Label18.Location = New System.Drawing.Point(7, 19)
+        Me.Label18.Location = New System.Drawing.Point(9, 23)
+        Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label18.Name = "Label18"
-        Me.Label18.Size = New System.Drawing.Size(62, 13)
+        Me.Label18.Size = New System.Drawing.Size(81, 17)
         Me.Label18.TabIndex = 0
         Me.Label18.Text = "Pad Byte 1:"
         '
         'Button2
         '
-        Me.Button2.Location = New System.Drawing.Point(376, 204)
+        Me.Button2.Location = New System.Drawing.Point(501, 251)
+        Me.Button2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(67, 20)
+        Me.Button2.Size = New System.Drawing.Size(89, 25)
         Me.Button2.TabIndex = 26
         Me.Button2.Text = "Repoint"
         Me.Button2.UseVisualStyleBackColor = True
@@ -334,42 +357,47 @@ Partial Class AttackEditor
         'Label10
         '
         Me.Label10.AutoSize = True
-        Me.Label10.Location = New System.Drawing.Point(284, 232)
+        Me.Label10.Location = New System.Drawing.Point(379, 286)
+        Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(63, 13)
+        Me.Label10.Size = New System.Drawing.Size(83, 17)
         Me.Label10.TabIndex = 25
         Me.Label10.Text = "Description:"
         '
         'TextBox7
         '
-        Me.TextBox7.Location = New System.Drawing.Point(287, 257)
+        Me.TextBox7.Location = New System.Drawing.Point(383, 316)
+        Me.TextBox7.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox7.Multiline = True
         Me.TextBox7.Name = "TextBox7"
-        Me.TextBox7.Size = New System.Drawing.Size(147, 74)
+        Me.TextBox7.Size = New System.Drawing.Size(195, 90)
         Me.TextBox7.TabIndex = 24
         '
         'TextBox6
         '
-        Me.TextBox6.Location = New System.Drawing.Point(287, 204)
+        Me.TextBox6.Location = New System.Drawing.Point(383, 251)
+        Me.TextBox6.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox6.Name = "TextBox6"
-        Me.TextBox6.Size = New System.Drawing.Size(83, 20)
+        Me.TextBox6.Size = New System.Drawing.Size(109, 22)
         Me.TextBox6.TabIndex = 23
         '
         'Label9
         '
         Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(284, 185)
+        Me.Label9.Location = New System.Drawing.Point(379, 228)
+        Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(99, 13)
+        Me.Label9.Size = New System.Drawing.Size(132, 17)
         Me.Label9.TabIndex = 22
         Me.Label9.Text = "Description Pointer:"
         '
         'CheckBox6
         '
         Me.CheckBox6.AutoSize = True
-        Me.CheckBox6.Location = New System.Drawing.Point(287, 162)
+        Me.CheckBox6.Location = New System.Drawing.Point(383, 199)
+        Me.CheckBox6.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.CheckBox6.Name = "CheckBox6"
-        Me.CheckBox6.Size = New System.Drawing.Size(150, 17)
+        Me.CheckBox6.Size = New System.Drawing.Size(192, 21)
         Me.CheckBox6.TabIndex = 21
         Me.CheckBox6.Text = "Is affected by King's Rock"
         Me.CheckBox6.UseVisualStyleBackColor = True
@@ -377,19 +405,21 @@ Partial Class AttackEditor
         'CheckBox5
         '
         Me.CheckBox5.AutoSize = True
-        Me.CheckBox5.Location = New System.Drawing.Point(287, 139)
+        Me.CheckBox5.Location = New System.Drawing.Point(383, 171)
+        Me.CheckBox5.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.CheckBox5.Name = "CheckBox5"
-        Me.CheckBox5.Size = New System.Drawing.Size(159, 17)
+        Me.CheckBox5.Size = New System.Drawing.Size(193, 21)
         Me.CheckBox5.TabIndex = 20
-        Me.CheckBox5.Text = "Is affected by Bright Powder"
+        Me.CheckBox5.Text = "Is affected by Mirror Move"
         Me.CheckBox5.UseVisualStyleBackColor = True
         '
         'CheckBox4
         '
         Me.CheckBox4.AutoSize = True
-        Me.CheckBox4.Location = New System.Drawing.Point(287, 116)
+        Me.CheckBox4.Location = New System.Drawing.Point(383, 143)
+        Me.CheckBox4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.CheckBox4.Name = "CheckBox4"
-        Me.CheckBox4.Size = New System.Drawing.Size(127, 17)
+        Me.CheckBox4.Size = New System.Drawing.Size(162, 21)
         Me.CheckBox4.TabIndex = 19
         Me.CheckBox4.Text = "Is affected by Snatch"
         Me.CheckBox4.UseVisualStyleBackColor = True
@@ -397,9 +427,10 @@ Partial Class AttackEditor
         'CheckBox3
         '
         Me.CheckBox3.AutoSize = True
-        Me.CheckBox3.Location = New System.Drawing.Point(287, 93)
+        Me.CheckBox3.Location = New System.Drawing.Point(383, 114)
+        Me.CheckBox3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.CheckBox3.Name = "CheckBox3"
-        Me.CheckBox3.Size = New System.Drawing.Size(147, 17)
+        Me.CheckBox3.Size = New System.Drawing.Size(188, 21)
         Me.CheckBox3.TabIndex = 18
         Me.CheckBox3.Text = "Is affected by Magic Coat"
         Me.CheckBox3.UseVisualStyleBackColor = True
@@ -407,9 +438,10 @@ Partial Class AttackEditor
         'CheckBox2
         '
         Me.CheckBox2.AutoSize = True
-        Me.CheckBox2.Location = New System.Drawing.Point(287, 69)
+        Me.CheckBox2.Location = New System.Drawing.Point(383, 85)
+        Me.CheckBox2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.CheckBox2.Name = "CheckBox2"
-        Me.CheckBox2.Size = New System.Drawing.Size(127, 17)
+        Me.CheckBox2.Size = New System.Drawing.Size(163, 21)
         Me.CheckBox2.TabIndex = 17
         Me.CheckBox2.Text = "Is affected by Protect"
         Me.CheckBox2.UseVisualStyleBackColor = True
@@ -417,26 +449,29 @@ Partial Class AttackEditor
         'CheckBox1
         '
         Me.CheckBox1.AutoSize = True
-        Me.CheckBox1.Location = New System.Drawing.Point(287, 46)
+        Me.CheckBox1.Location = New System.Drawing.Point(383, 57)
+        Me.CheckBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.CheckBox1.Name = "CheckBox1"
-        Me.CheckBox1.Size = New System.Drawing.Size(98, 17)
+        Me.CheckBox1.Size = New System.Drawing.Size(123, 21)
         Me.CheckBox1.TabIndex = 16
         Me.CheckBox1.Text = "Makes Contact"
         Me.CheckBox1.UseVisualStyleBackColor = True
         '
         'TextBox5
         '
-        Me.TextBox5.Location = New System.Drawing.Point(110, 197)
+        Me.TextBox5.Location = New System.Drawing.Point(147, 242)
+        Me.TextBox5.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox5.Name = "TextBox5"
-        Me.TextBox5.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox5.Size = New System.Drawing.Size(52, 22)
         Me.TextBox5.TabIndex = 15
         '
         'Label8
         '
         Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(18, 200)
+        Me.Label8.Location = New System.Drawing.Point(24, 246)
+        Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(41, 13)
+        Me.Label8.Size = New System.Drawing.Size(56, 17)
         Me.Label8.TabIndex = 14
         Me.Label8.Text = "Priority:"
         '
@@ -445,65 +480,73 @@ Partial Class AttackEditor
         Me.ComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.ComboBox2.FormattingEnabled = True
         Me.ComboBox2.Items.AddRange(New Object() {"Selected target ", "Depends on the attack ", "2", "3", "Random target ", "5", "6", "7", "Both foes", "9", "10", "11", "12", "13", "14", "15", "User", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "Both foes and partner", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "60", "61", "62", "63", "Opponent field"})
-        Me.ComboBox2.Location = New System.Drawing.Point(110, 172)
+        Me.ComboBox2.Location = New System.Drawing.Point(147, 212)
+        Me.ComboBox2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.ComboBox2.Name = "ComboBox2"
-        Me.ComboBox2.Size = New System.Drawing.Size(161, 21)
+        Me.ComboBox2.Size = New System.Drawing.Size(213, 24)
         Me.ComboBox2.TabIndex = 13
         '
         'Label7
         '
         Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(18, 175)
+        Me.Label7.Location = New System.Drawing.Point(24, 215)
+        Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(41, 13)
+        Me.Label7.Size = New System.Drawing.Size(54, 17)
         Me.Label7.TabIndex = 12
         Me.Label7.Text = "Target:"
         '
         'TextBox4
         '
-        Me.TextBox4.Location = New System.Drawing.Point(110, 146)
+        Me.TextBox4.Location = New System.Drawing.Point(147, 180)
+        Me.TextBox4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox4.Name = "TextBox4"
-        Me.TextBox4.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox4.Size = New System.Drawing.Size(52, 22)
         Me.TextBox4.TabIndex = 11
         '
         'Label6
         '
         Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(18, 149)
+        Me.Label6.Location = New System.Drawing.Point(24, 183)
+        Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(86, 13)
+        Me.Label6.Size = New System.Drawing.Size(110, 17)
         Me.Label6.TabIndex = 10
         Me.Label6.Text = "Effect Accuracy:"
         '
         'TextBox3
         '
-        Me.TextBox3.Location = New System.Drawing.Point(110, 120)
+        Me.TextBox3.Location = New System.Drawing.Point(147, 148)
+        Me.TextBox3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox3.Name = "TextBox3"
-        Me.TextBox3.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox3.Size = New System.Drawing.Size(52, 22)
         Me.TextBox3.TabIndex = 9
         '
         'Label5
         '
         Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(18, 123)
+        Me.Label5.Location = New System.Drawing.Point(24, 151)
+        Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(24, 13)
+        Me.Label5.Size = New System.Drawing.Size(30, 17)
         Me.Label5.TabIndex = 8
         Me.Label5.Text = "PP:"
         '
         'TextBox2
         '
-        Me.TextBox2.Location = New System.Drawing.Point(110, 94)
+        Me.TextBox2.Location = New System.Drawing.Point(147, 116)
+        Me.TextBox2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox2.Name = "TextBox2"
-        Me.TextBox2.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox2.Size = New System.Drawing.Size(52, 22)
         Me.TextBox2.TabIndex = 7
         '
         'Label4
         '
         Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(18, 97)
+        Me.Label4.Location = New System.Drawing.Point(24, 119)
+        Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(55, 13)
+        Me.Label4.Size = New System.Drawing.Size(70, 17)
         Me.Label4.TabIndex = 6
         Me.Label4.Text = "Accuracy:"
         '
@@ -512,33 +555,37 @@ Partial Class AttackEditor
         Me.ComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.ComboBox1.FormattingEnabled = True
         Me.ComboBox1.Items.AddRange(New Object() {"Normal", "Fighting", "Flying", "Poison", "Ground", "Rock", "Bug", "Ghost", "Steel", "???", "Fire", "Water", "Grass", "Electric", "Psychic", "Ice", "Dragon", "Dark"})
-        Me.ComboBox1.Location = New System.Drawing.Point(110, 65)
+        Me.ComboBox1.Location = New System.Drawing.Point(147, 80)
+        Me.ComboBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.ComboBox1.Name = "ComboBox1"
-        Me.ComboBox1.Size = New System.Drawing.Size(161, 21)
+        Me.ComboBox1.Size = New System.Drawing.Size(213, 24)
         Me.ComboBox1.TabIndex = 5
         '
         'Label3
         '
         Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(18, 73)
+        Me.Label3.Location = New System.Drawing.Point(24, 90)
+        Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(34, 13)
+        Me.Label3.Size = New System.Drawing.Size(44, 17)
         Me.Label3.TabIndex = 4
         Me.Label3.Text = "Type:"
         '
         'BasePower
         '
-        Me.BasePower.Location = New System.Drawing.Point(110, 40)
+        Me.BasePower.Location = New System.Drawing.Point(147, 49)
+        Me.BasePower.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.BasePower.Name = "BasePower"
-        Me.BasePower.Size = New System.Drawing.Size(40, 20)
+        Me.BasePower.Size = New System.Drawing.Size(52, 22)
         Me.BasePower.TabIndex = 3
         '
         'Label2
         '
         Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(18, 47)
+        Me.Label2.Location = New System.Drawing.Point(24, 58)
+        Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(67, 13)
+        Me.Label2.Size = New System.Drawing.Size(87, 17)
         Me.Label2.TabIndex = 2
         Me.Label2.Text = "Base Power:"
         '
@@ -547,17 +594,19 @@ Partial Class AttackEditor
         Me.Effects.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.Effects.FormattingEnabled = True
         Me.Effects.Items.AddRange(New Object() {"No Effect", "Puts target to sleep", "Poisons target", "Absorbs half of inflicted damage", "Burns Targer", "Freezes target", "Paralyzes target", "User Faints", "Absorbs half damage on sleeping target", "Mirror Move", "Raises user's Attack", "Raises user's Defense", "Raises user's Speed", "Raises user's Special Attack", "Raises user's Special Defense", "15", "Raises user's Evasion", "Attack Never Misses", "Lowers opponent's Attack", "Lowers opponent's Defense", "Lowers opponent's Speed", "Lowers opponent's Special Attack", "Lowers opponent's Special Defense", "Lowers opponent's Accuracy", "Lowers opponent's Evasion", "Haze", "Bide", "Thrash/Petal Dance/Outrage", "Opponent's Pokemon forced out", "Happens 2-5 times", "Conversion", "May cause flinching", "Recover half of maximum HP", "Badly poison target", "Pay Day", "Light screen", "may freeze, paralyze, or burn", "Rest", "1-hit KO", "Two turns plus high critical hit ratio", "Cuts target's HP in half", "Always do 40", "Bind/Fire Spin/Clamp/Whirlpool effect", "High critical hit ratio", "Hits twice", "If miss, then user receives 1/8 of damage it would have dealt", "Stops stat changes", "Raises user's critical-hit ratio", "1/4 Recoil", "Confuses Target", "sharply raises users Attack", "sharply raises users Defense", "sharply raises users Speed", "sharply raises users Special Attack", "sharply raises users Special Defense", "55", "56", "Transform", "Sharply reduces foe's Attack", "Sharply reduces foe's Defense", "Sharply reduces foe's Speed", "Sharply reduces foe's Special Attack", "Sharply reduces fow's Special Defense", "63", "64", "Reflect", "Poisons target", "Paralyzes target", "Lower opponent's Attack", "Lower opponent's Defense", "Lower opponent's Speed", "Lower opponent's Special Attack", "Lower opponent's Special Defense", "Lower opponent's Accuracy", "74", "Two-Turn may cause Flinching", "May confuse target", "Two-Turn may cause Poison", "Doesn't miss, User goes second", "Substitute", "Immobile next turn", "Raises user attack everytime user is hit", "Mimic", "Metronome", "84", "85", "86", "87", "88", "89", "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "100", "101", "102", "103", "104", "105", "106", "107", "108", "109", "110", "111", "112", "113", "114", "115", "116", "117", "118", "119", "120", "121", "122", "123", "124", "125", "126", "127", "128", "129", "130", "131", "132", "133", "134", "135", "136", "137", "138", "139", "140", "141", "142", "143", "144", "145", "146", "147", "148", "149", "150", "151", "152", "153", "154", "155", "156", "157", "158", "159", "160", "161", "162", "163", "164", "165", "166", "167", "168", "169", "170", "171", "172", "173", "174", "175", "176", "177", "178", "179", "180", "181", "182", "183", "184", "185", "186", "187", "188", "189", "190", "191", "192", "193", "194", "195", "196", "197", "198", "199", "200", "201", "202", "203", "204", "205", "206", "207", "208", "209", "210", "211", "212", "213", "214", "215", "216", "217", "218", "219", "220", "221", "222", "223", "224", "225", "226", "227", "228", "229", "230", "231", "232", "233", "234", "235", "236", "237", "238", "239", "240", "241", "242", "243", "244", "245", "246", "247", "248", "249", "250", "251", "252", "253", "254", "255"})
-        Me.Effects.Location = New System.Drawing.Point(110, 16)
+        Me.Effects.Location = New System.Drawing.Point(147, 20)
+        Me.Effects.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Effects.Name = "Effects"
-        Me.Effects.Size = New System.Drawing.Size(333, 21)
+        Me.Effects.Size = New System.Drawing.Size(443, 24)
         Me.Effects.TabIndex = 1
         '
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(18, 19)
+        Me.Label1.Location = New System.Drawing.Point(24, 23)
+        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(38, 13)
+        Me.Label1.Size = New System.Drawing.Size(48, 17)
         Me.Label1.TabIndex = 0
         Me.Label1.Text = "Effect:"
         '
@@ -574,10 +623,11 @@ Partial Class AttackEditor
         Me.TabPage2.Controls.Add(Me.Label12)
         Me.TabPage2.Controls.Add(Me.ComboBox4)
         Me.TabPage2.Controls.Add(Me.Label11)
-        Me.TabPage2.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage2.Location = New System.Drawing.Point(4, 25)
+        Me.TabPage2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TabPage2.Name = "TabPage2"
-        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(460, 382)
+        Me.TabPage2.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.TabPage2.Size = New System.Drawing.Size(616, 473)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Contest Data"
         Me.TabPage2.UseVisualStyleBackColor = True
@@ -591,18 +641,21 @@ Partial Class AttackEditor
         Me.GroupBox5.Controls.Add(Me.TextBox10)
         Me.GroupBox5.Controls.Add(Me.TextBox11)
         Me.GroupBox5.Controls.Add(Me.Label16)
-        Me.GroupBox5.Location = New System.Drawing.Point(6, 138)
+        Me.GroupBox5.Location = New System.Drawing.Point(8, 170)
+        Me.GroupBox5.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.GroupBox5.Name = "GroupBox5"
-        Me.GroupBox5.Size = New System.Drawing.Size(448, 138)
+        Me.GroupBox5.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox5.Size = New System.Drawing.Size(597, 170)
         Me.GroupBox5.TabIndex = 22
         Me.GroupBox5.TabStop = False
         Me.GroupBox5.Text = "Move Effect"
         '
         'Button5
         '
-        Me.Button5.Location = New System.Drawing.Point(306, 91)
+        Me.Button5.Location = New System.Drawing.Point(408, 112)
+        Me.Button5.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Button5.Name = "Button5"
-        Me.Button5.Size = New System.Drawing.Size(120, 33)
+        Me.Button5.Size = New System.Drawing.Size(160, 41)
         Me.Button5.TabIndex = 20
         Me.Button5.Text = "Save Effect"
         Me.Button5.UseVisualStyleBackColor = True
@@ -610,9 +663,10 @@ Partial Class AttackEditor
         'Label15
         '
         Me.Label15.AutoSize = True
-        Me.Label15.Location = New System.Drawing.Point(11, 20)
+        Me.Label15.Location = New System.Drawing.Point(15, 25)
+        Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label15.Name = "Label15"
-        Me.Label15.Size = New System.Drawing.Size(38, 13)
+        Me.Label15.Size = New System.Drawing.Size(48, 17)
         Me.Label15.TabIndex = 14
         Me.Label15.Text = "Effect:"
         '
@@ -621,86 +675,97 @@ Partial Class AttackEditor
         Me.ComboBox6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.ComboBox6.FormattingEnabled = True
         Me.ComboBox6.Items.AddRange(New Object() {"The appeal effect of this move is constant.", "Prevents the user from being startled.", "Startles the previous appealer by the jam effect.", "Startles all previous appealers by the jam effect.", "Affects appealers other than startling them.", "Appeal effect may change.", "The appeal order changes for the next round. "})
-        Me.ComboBox6.Location = New System.Drawing.Point(103, 17)
+        Me.ComboBox6.Location = New System.Drawing.Point(137, 21)
+        Me.ComboBox6.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.ComboBox6.Name = "ComboBox6"
-        Me.ComboBox6.Size = New System.Drawing.Size(323, 21)
+        Me.ComboBox6.Size = New System.Drawing.Size(429, 24)
         Me.ComboBox6.TabIndex = 15
         '
         'Label17
         '
         Me.Label17.AutoSize = True
-        Me.Label17.Location = New System.Drawing.Point(11, 48)
+        Me.Label17.Location = New System.Drawing.Point(15, 59)
+        Me.Label17.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label17.Name = "Label17"
-        Me.Label17.Size = New System.Drawing.Size(43, 13)
+        Me.Label17.Size = New System.Drawing.Size(56, 17)
         Me.Label17.TabIndex = 16
         Me.Label17.Text = "Appeal:"
         '
         'TextBox10
         '
-        Me.TextBox10.Location = New System.Drawing.Point(103, 71)
+        Me.TextBox10.Location = New System.Drawing.Point(137, 87)
+        Me.TextBox10.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox10.Name = "TextBox10"
-        Me.TextBox10.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox10.Size = New System.Drawing.Size(52, 22)
         Me.TextBox10.TabIndex = 19
         '
         'TextBox11
         '
-        Me.TextBox11.Location = New System.Drawing.Point(103, 45)
+        Me.TextBox11.Location = New System.Drawing.Point(137, 55)
+        Me.TextBox11.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox11.Name = "TextBox11"
-        Me.TextBox11.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox11.Size = New System.Drawing.Size(52, 22)
         Me.TextBox11.TabIndex = 17
         '
         'Label16
         '
         Me.Label16.AutoSize = True
-        Me.Label16.Location = New System.Drawing.Point(11, 74)
+        Me.Label16.Location = New System.Drawing.Point(15, 91)
+        Me.Label16.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label16.Name = "Label16"
-        Me.Label16.Size = New System.Drawing.Size(29, 13)
+        Me.Label16.Size = New System.Drawing.Size(38, 17)
         Me.Label16.TabIndex = 18
         Me.Label16.Text = "Jam:"
         '
         'TextBox13
         '
-        Me.TextBox13.Location = New System.Drawing.Point(201, 105)
+        Me.TextBox13.Location = New System.Drawing.Point(268, 129)
+        Me.TextBox13.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox13.Name = "TextBox13"
-        Me.TextBox13.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox13.Size = New System.Drawing.Size(52, 22)
         Me.TextBox13.TabIndex = 21
         '
         'TextBox12
         '
-        Me.TextBox12.Location = New System.Drawing.Point(155, 105)
+        Me.TextBox12.Location = New System.Drawing.Point(207, 129)
+        Me.TextBox12.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox12.Name = "TextBox12"
-        Me.TextBox12.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox12.Size = New System.Drawing.Size(52, 22)
         Me.TextBox12.TabIndex = 20
         '
         'TextBox8
         '
-        Me.TextBox8.Location = New System.Drawing.Point(109, 105)
+        Me.TextBox8.Location = New System.Drawing.Point(145, 129)
+        Me.TextBox8.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox8.Name = "TextBox8"
-        Me.TextBox8.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox8.Size = New System.Drawing.Size(52, 22)
         Me.TextBox8.TabIndex = 13
         '
         'Label13
         '
         Me.Label13.AutoSize = True
-        Me.Label13.Location = New System.Drawing.Point(17, 108)
+        Me.Label13.Location = New System.Drawing.Point(23, 133)
+        Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label13.Name = "Label13"
-        Me.Label13.Size = New System.Drawing.Size(48, 13)
+        Me.Label13.Size = New System.Drawing.Size(63, 17)
         Me.Label13.TabIndex = 12
         Me.Label13.Text = "Combos:"
         '
         'TextBox9
         '
-        Me.TextBox9.Location = New System.Drawing.Point(109, 79)
+        Me.TextBox9.Location = New System.Drawing.Point(145, 97)
+        Me.TextBox9.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TextBox9.Name = "TextBox9"
-        Me.TextBox9.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox9.Size = New System.Drawing.Size(52, 22)
         Me.TextBox9.TabIndex = 11
         '
         'Label14
         '
         Me.Label14.AutoSize = True
-        Me.Label14.Location = New System.Drawing.Point(17, 82)
+        Me.Label14.Location = New System.Drawing.Point(23, 101)
+        Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(91, 13)
+        Me.Label14.Size = New System.Drawing.Size(121, 17)
         Me.Label14.TabIndex = 10
         Me.Label14.Text = "Combo Identifiers:"
         '
@@ -709,17 +774,19 @@ Partial Class AttackEditor
         Me.ComboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.ComboBox5.FormattingEnabled = True
         Me.ComboBox5.Items.AddRange(New Object() {"Cool", "Beauty", "Cute", "Smart", "Tough"})
-        Me.ComboBox5.Location = New System.Drawing.Point(109, 42)
+        Me.ComboBox5.Location = New System.Drawing.Point(145, 52)
+        Me.ComboBox5.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.ComboBox5.Name = "ComboBox5"
-        Me.ComboBox5.Size = New System.Drawing.Size(323, 21)
+        Me.ComboBox5.Size = New System.Drawing.Size(429, 24)
         Me.ComboBox5.TabIndex = 7
         '
         'Label12
         '
         Me.Label12.AutoSize = True
-        Me.Label12.Location = New System.Drawing.Point(17, 49)
+        Me.Label12.Location = New System.Drawing.Point(23, 60)
+        Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(34, 13)
+        Me.Label12.Size = New System.Drawing.Size(44, 17)
         Me.Label12.TabIndex = 6
         Me.Label12.Text = "Type:"
         '
@@ -728,25 +795,28 @@ Partial Class AttackEditor
         Me.ComboBox4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.ComboBox4.FormattingEnabled = True
         Me.ComboBox4.Items.AddRange(New Object() {"A highly appealing move.", "After this move, the user is more easily startled.", "Makes a great appeal, but allows no more to the end.", "Can be repeatedly used without boring the JUDGE.", "Can avoid being startled by others once.", "Can avoid being startled by others.", "Can avoid being startled by others a little.", "After this move, the user is less likely to be startled.", "Slightly startles the POKéMON in front.", "Slightly startles those that have made appeals.", "Startles the POKéMON that appealed before the user.", "Startles all POKéMON that have done their appeals.", "Badly startles the POKéMON in front.", "Badly startles those that have made appeals.", "Startles the POKéMON that appealed before the user.", "Startles all POKéMON that have done their appeals.", "Shifts the JUDGE's attention from others.", "Startles the POKéMON that has the JUDGE's attention.", "Jams the others, and misses one turn of appeals.", "Startles POKéMON that made a same-type appeal.", "Badly startles POKéMON that made COOL appeals.", "Badly startles POKéMON that made BEAUTY appeals.", "Badly startles POKéMON that made CUTE appeals.", "Badly startles POKéMON that made SMART appeals.", "Badly startles POKéMON that made TOUGH appeals.", "Makes one POKéMON after the user nervous.", "Makes all POKéMON after the user nervous.", "Worsens the condition of those that made appeals.", "Badly startles POKéMON in good condition.", "The appeal works great if performed first.", "The appeal works great if performed last.", "Makes the appeal as good as those before it.", "Makes the appeal as good as the one before it.", "The appeal works better the later it is performed.", "The appeal's quality varies depending on its timing.", "Works well if it's the same type as the one before.", "Works well if different in type than the one before.", "Affected by how well the appeal in front goes.", "Ups the user's condition. Helps prevent nervousness.", "The appeal works well if the user's condition is good.", "The next appeal can be made earlier next turn.", "The next appeal can be made later next turn.", "Makes the next turn's order more easily scrambled.", "Scrambles the order of appeals on the next turn.", "An appeal that excites the audience in any CONTEST.", "Badly startles all POKéMON that made good appeals.", "The appeal works best the more the crowd is excited.", "Temporarily stops the crowd from growing excited."})
-        Me.ComboBox4.Location = New System.Drawing.Point(109, 15)
+        Me.ComboBox4.Location = New System.Drawing.Point(145, 18)
+        Me.ComboBox4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.ComboBox4.Name = "ComboBox4"
-        Me.ComboBox4.Size = New System.Drawing.Size(323, 21)
+        Me.ComboBox4.Size = New System.Drawing.Size(429, 24)
         Me.ComboBox4.TabIndex = 3
         '
         'Label11
         '
         Me.Label11.AutoSize = True
-        Me.Label11.Location = New System.Drawing.Point(17, 18)
+        Me.Label11.Location = New System.Drawing.Point(23, 22)
+        Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label11.Name = "Label11"
-        Me.Label11.Size = New System.Drawing.Size(77, 13)
+        Me.Label11.Size = New System.Drawing.Size(100, 17)
         Me.Label11.TabIndex = 2
         Me.Label11.Text = "Description ID:"
         '
         'Button3
         '
-        Me.Button3.Location = New System.Drawing.Point(18, 287)
+        Me.Button3.Location = New System.Drawing.Point(24, 353)
+        Me.Button3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(120, 23)
+        Me.Button3.Size = New System.Drawing.Size(160, 28)
         Me.Button3.TabIndex = 26
         Me.Button3.Text = "Save"
         Me.Button3.UseVisualStyleBackColor = True
@@ -755,78 +825,87 @@ Partial Class AttackEditor
         '
         Me.GroupBox4.Controls.Add(Me.Button4)
         Me.GroupBox4.Controls.Add(Me.AnimationPointer)
-        Me.GroupBox4.Location = New System.Drawing.Point(12, 204)
+        Me.GroupBox4.Location = New System.Drawing.Point(16, 251)
+        Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.GroupBox4.Name = "GroupBox4"
-        Me.GroupBox4.Size = New System.Drawing.Size(137, 77)
+        Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox4.Size = New System.Drawing.Size(183, 95)
         Me.GroupBox4.TabIndex = 27
         Me.GroupBox4.TabStop = False
         Me.GroupBox4.Text = "Animation Pointer"
         '
         'Button4
         '
-        Me.Button4.Location = New System.Drawing.Point(6, 45)
+        Me.Button4.Location = New System.Drawing.Point(8, 55)
+        Me.Button4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Button4.Name = "Button4"
-        Me.Button4.Size = New System.Drawing.Size(121, 23)
+        Me.Button4.Size = New System.Drawing.Size(161, 28)
         Me.Button4.TabIndex = 1
         Me.Button4.Text = "Repoint"
         Me.Button4.UseVisualStyleBackColor = True
         '
         'AnimationPointer
         '
-        Me.AnimationPointer.Location = New System.Drawing.Point(6, 20)
+        Me.AnimationPointer.Location = New System.Drawing.Point(8, 25)
+        Me.AnimationPointer.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.AnimationPointer.Name = "AnimationPointer"
-        Me.AnimationPointer.Size = New System.Drawing.Size(121, 20)
+        Me.AnimationPointer.Size = New System.Drawing.Size(160, 22)
         Me.AnimationPointer.TabIndex = 0
         '
         'ProgressBar
         '
-        Me.ProgressBar.Location = New System.Drawing.Point(12, 442)
+        Me.ProgressBar.Location = New System.Drawing.Point(16, 544)
+        Me.ProgressBar.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.ProgressBar.Name = "ProgressBar"
-        Me.ProgressBar.Size = New System.Drawing.Size(626, 23)
+        Me.ProgressBar.Size = New System.Drawing.Size(835, 28)
         Me.ProgressBar.TabIndex = 28
         Me.ProgressBar.Visible = False
         '
         'Button7
         '
-        Me.Button7.Location = New System.Drawing.Point(18, 319)
+        Me.Button7.Location = New System.Drawing.Point(24, 393)
+        Me.Button7.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Button7.Name = "Button7"
-        Me.Button7.Size = New System.Drawing.Size(120, 23)
+        Me.Button7.Size = New System.Drawing.Size(160, 28)
         Me.Button7.TabIndex = 29
         Me.Button7.Text = "Import Attack"
         Me.Button7.UseVisualStyleBackColor = True
         '
         'Button8
         '
-        Me.Button8.Location = New System.Drawing.Point(18, 348)
+        Me.Button8.Location = New System.Drawing.Point(24, 428)
+        Me.Button8.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Button8.Name = "Button8"
-        Me.Button8.Size = New System.Drawing.Size(120, 23)
+        Me.Button8.Size = New System.Drawing.Size(160, 28)
         Me.Button8.TabIndex = 30
         Me.Button8.Text = "Import All"
         Me.Button8.UseVisualStyleBackColor = True
         '
         'Button9
         '
-        Me.Button9.Location = New System.Drawing.Point(18, 406)
+        Me.Button9.Location = New System.Drawing.Point(24, 500)
+        Me.Button9.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Button9.Name = "Button9"
-        Me.Button9.Size = New System.Drawing.Size(120, 23)
+        Me.Button9.Size = New System.Drawing.Size(160, 28)
         Me.Button9.TabIndex = 32
         Me.Button9.Text = "Export All"
         Me.Button9.UseVisualStyleBackColor = True
         '
         'Button10
         '
-        Me.Button10.Location = New System.Drawing.Point(18, 377)
+        Me.Button10.Location = New System.Drawing.Point(24, 464)
+        Me.Button10.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Button10.Name = "Button10"
-        Me.Button10.Size = New System.Drawing.Size(120, 23)
+        Me.Button10.Size = New System.Drawing.Size(160, 28)
         Me.Button10.TabIndex = 31
         Me.Button10.Text = "Export Attack"
         Me.Button10.UseVisualStyleBackColor = True
         '
         'AttackEditor
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(650, 474)
+        Me.ClientSize = New System.Drawing.Size(867, 583)
         Me.Controls.Add(Me.Button9)
         Me.Controls.Add(Me.Button10)
         Me.Controls.Add(Me.Button8)
@@ -839,6 +918,7 @@ Partial Class AttackEditor
         Me.Controls.Add(Me.GroupBox1)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.MaximizeBox = False
         Me.Name = "AttackEditor"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
index 92e1397..e71c055 100644
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
@@ -16,7 +16,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>PQ+yf34CB2BEtwbOTHQdgNPiv4b3FAmxLTWNzjG9CCs=</dsig:DigestValue>
+        <dsig:DigestValue>h21/oRf+OrZ0SKL2Eze383c55aiU/Jcj/l/9Ah+uiSQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
index dbf3dcc..55e3aff 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe differ
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
index acc77f1..7fa533b 100644
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2044416">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2046464">
       <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>2uVXpPNpIU6YVqG+TXlkah4XM4qDKs9S/RZjH41ut6k=</dsig:DigestValue>
+        <dsig:DigestValue>tfWFhScAg+LRxfX58UOy3LgHaPfSRDHg41EYHZstFYo=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
index 4d254e1..698bafc 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb differ
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
index 92e1397..e71c055 100644
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
@@ -16,7 +16,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>PQ+yf34CB2BEtwbOTHQdgNPiv4b3FAmxLTWNzjG9CCs=</dsig:DigestValue>
+        <dsig:DigestValue>h21/oRf+OrZ0SKL2Eze383c55aiU/Jcj/l/9Ah+uiSQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
index acc77f1..7fa533b 100644
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2044416">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2046464">
       <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>2uVXpPNpIU6YVqG+TXlkah4XM4qDKs9S/RZjH41ut6k=</dsig:DigestValue>
+        <dsig:DigestValue>tfWFhScAg+LRxfX58UOy3LgHaPfSRDHg41EYHZstFYo=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
index e5b9888..a5c4406 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
index 92e1397..e71c055 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
@@ -16,7 +16,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>PQ+yf34CB2BEtwbOTHQdgNPiv4b3FAmxLTWNzjG9CCs=</dsig:DigestValue>
+        <dsig:DigestValue>h21/oRf+OrZ0SKL2Eze383c55aiU/Jcj/l/9Ah+uiSQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
index dbf3dcc..55e3aff 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
index acc77f1..7fa533b 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2044416">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2046464">
       <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>2uVXpPNpIU6YVqG+TXlkah4XM4qDKs9S/RZjH41ut6k=</dsig:DigestValue>
+        <dsig:DigestValue>tfWFhScAg+LRxfX58UOy3LgHaPfSRDHg41EYHZstFYo=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
index 4d254e1..698bafc 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ