diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs
index c77097a95e..9793d65b77 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs
@@ -24,7 +24,6 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(212, 90),
 				Buttons = new[]
 				{
-					//TODO: C Button and Z Button, Need All Locations
 					new PadSchema.ButtonScema
 					{
 						Name = "P" + controller + " Up",
@@ -106,7 +105,6 @@ namespace BizHawk.Client.EmuHawk
 						Location = new Point(158, 20),
 						Type = PadSchema.PadInputType.Boolean
 					},
-
 					new PadSchema.ButtonScema
 					{
 						Name = "P" + controller + " L",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs
index 029f33515f..bc1fa855f8 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs
@@ -13,13 +13,15 @@ namespace BizHawk.Client.EmuHawk
 		{
 			yield return StandardController(1);
 			yield return StandardController(2);
+			yield return ConsoleButtons();
 		}
-		public static PadSchema StandardController(int controller)
+
+		private static PadSchema StandardController(int controller)
 		{
 			return new PadSchema
 			{
 				IsConsole = false,
-				DefaultSize = new Size(174, 74),
+				DefaultSize = new Size(200, 90),
 				Buttons = new[]
 				{
 					new PadSchema.ButtonScema
@@ -27,7 +29,7 @@ namespace BizHawk.Client.EmuHawk
 						Name = "P" + controller + " Up",
 						DisplayName = "",
 						Icon = Properties.Resources.BlueUp,
-						Location = new Point(14, 2),
+						Location = new Point(34, 17),
 						Type = PadSchema.PadInputType.Boolean
 					},
 					new PadSchema.ButtonScema
@@ -35,7 +37,7 @@ namespace BizHawk.Client.EmuHawk
 						Name = "P" + controller + " Down",
 						DisplayName = "",
 						Icon = Properties.Resources.BlueDown,
-						Location = new Point(14, 46),
+						Location = new Point(34, 61),
 						Type = PadSchema.PadInputType.Boolean
 					},
 					new PadSchema.ButtonScema
@@ -43,7 +45,7 @@ namespace BizHawk.Client.EmuHawk
 						Name = "P" + controller + " Left",
 						DisplayName = "",
 						Icon = Properties.Resources.Back,
-						Location = new Point(2, 24),
+						Location = new Point(22, 39),
 						Type = PadSchema.PadInputType.Boolean
 					},
 					new PadSchema.ButtonScema
@@ -51,63 +53,93 @@ namespace BizHawk.Client.EmuHawk
 						Name = "P" + controller + " Right",
 						DisplayName = "",
 						Icon = Properties.Resources.Forward,
-						Location = new Point(24, 24),
-						Type = PadSchema.PadInputType.Boolean
-					},
-					new PadSchema.ButtonScema
-					{
-						Name = "P" + controller + " B",
-						DisplayName = "B",
-						Location = new Point(134, 48),
-						Type = PadSchema.PadInputType.Boolean
-					},
-					new PadSchema.ButtonScema
-					{
-						Name = "P" + controller + " A",
-						DisplayName = "A",
-						Location = new Point(146, 22),
-						Type = PadSchema.PadInputType.Boolean
-					},
-					new PadSchema.ButtonScema
-					{
-						Name = "P" + controller + " Select",
-						DisplayName = "s",
-						Location = new Point(56, 42),
-						Type = PadSchema.PadInputType.Boolean
-					},
-					new PadSchema.ButtonScema
-					{
-						Name = "P" + controller + " Start",
-						DisplayName = "S",
-						Location = new Point(78, 42),
-						Type = PadSchema.PadInputType.Boolean
-					},
-					new PadSchema.ButtonScema
-					{
-						Name = "P" + controller + " X",
-						DisplayName = "X",
-						Location = new Point(122, 12),
-						Type = PadSchema.PadInputType.Boolean
-					},
-					new PadSchema.ButtonScema
-					{
-						Name = "P" + controller + " Y",
-						DisplayName = "Y",
-						Location = new Point(110, 34),
+						Location = new Point(44, 39),
 						Type = PadSchema.PadInputType.Boolean
 					},
 					new PadSchema.ButtonScema
 					{
 						Name = "P" + controller + " L",
 						DisplayName = "L",
-						Location = new Point(42, 0),
+						Location = new Point(2, 10),
 						Type = PadSchema.PadInputType.Boolean
 					},
 					new PadSchema.ButtonScema
 					{
 						Name = "P" + controller + " R",
 						DisplayName = "R",
-						Location = new Point(94, 0),
+						Location = new Point(174, 10),
+						Type = PadSchema.PadInputType.Boolean
+					},
+					
+					
+					new PadSchema.ButtonScema
+					{
+						Name = "P" + controller + " Select",
+						DisplayName = "s",
+						Location = new Point(70, 39),
+						Type = PadSchema.PadInputType.Boolean
+					},
+					new PadSchema.ButtonScema
+					{
+						Name = "P" + controller + " Start",
+						DisplayName = "S",
+						Location = new Point(92, 39),
+						Type = PadSchema.PadInputType.Boolean
+					},
+
+					new PadSchema.ButtonScema
+					{
+						Name = "P" + controller + " Y",
+						DisplayName = "Y",
+						Location = new Point(121, 39),
+						Type = PadSchema.PadInputType.Boolean
+					},
+					new PadSchema.ButtonScema
+					{
+						Name = "P" + controller + " B",
+						DisplayName = "B",
+						Location = new Point(145, 52),
+						Type = PadSchema.PadInputType.Boolean
+					},
+					new PadSchema.ButtonScema
+					{
+						Name = "P" + controller + " X",
+						DisplayName = "X",
+						Location = new Point(122, 15),
+						Type = PadSchema.PadInputType.Boolean
+					},
+					new PadSchema.ButtonScema
+					{
+						Name = "P" + controller + " A",
+						DisplayName = "A",
+						Location = new Point(146, 25),
+						Type = PadSchema.PadInputType.Boolean
+					},
+				}
+			};
+		}
+
+		private static PadSchema ConsoleButtons()
+		{
+			return new PadSchema
+			{
+				DisplayName = "Console",
+				IsConsole = true,
+				DefaultSize = new Size(150, 50),
+				Buttons = new[]
+				{
+					new PadSchema.ButtonScema
+					{
+						Name = "Reset",
+						DisplayName = "Reset",
+						Location = new Point(10, 15),
+						Type = PadSchema.PadInputType.Boolean
+					},
+					new PadSchema.ButtonScema
+					{
+						Name = "Power",
+						DisplayName = "Power",
+						Location = new Point(58, 15),
 						Type = PadSchema.PadInputType.Boolean
 					}
 				}