diff --git a/config/board.3drag.h b/config/board.3drag.h
index be62095..ccc03a2 100644
--- a/config/board.3drag.h
+++ b/config/board.3drag.h
@@ -193,8 +193,8 @@ DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO14, THERMISTOR_BED)
   with slow switches, like solid state relays. PWM frequency can be
   influenced globally with FAST_PWM, see below.
 */
-//            name      port   pwm
 //DEFINE_HEATERS_START
+//            name      port   pwm
 DEFINE_HEATER(extruder, DIO10, 1)
 DEFINE_HEATER(bed,      DIO9,  1)
 DEFINE_HEATER(fan,      DIO8,  1)
diff --git a/config/board.gen3.h b/config/board.gen3.h
index 5a48b13..f4cd5d6 100644
--- a/config/board.gen3.h
+++ b/config/board.gen3.h
@@ -188,8 +188,8 @@ DEFINE_TEMP_SENSOR(noheater, TT_INTERCOM,   AIO0,  0)
   with slow switches, like solid state relays. PWM frequency can be
   influenced globally with FAST_PWM, see below.
 */
-//            name      port   pwm
 //DEFINE_HEATERS_START
+//            name      port   pwm
 
 //DEFINE_HEATERS_END
 
diff --git a/config/board.gen6.h b/config/board.gen6.h
index 169671f..3532edc 100644
--- a/config/board.gen6.h
+++ b/config/board.gen6.h
@@ -189,8 +189,8 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO5,  THERMISTOR_EXTRUDER)
   with slow switches, like solid state relays. PWM frequency can be
   influenced globally with FAST_PWM, see below.
 */
-//            name      port   pwm
 //DEFINE_HEATERS_START
+//            name      port   pwm
 DEFINE_HEATER(extruder, DIO6,  1)
 
 #define HEATER_EXTRUDER HEATER_extruder
diff --git a/config/board.gen7-v1.1-v1.3.h b/config/board.gen7-v1.1-v1.3.h
index d0da944..85f781c 100644
--- a/config/board.gen7-v1.1-v1.3.h
+++ b/config/board.gen7-v1.1-v1.3.h
@@ -197,8 +197,8 @@ DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO2,  THERMISTOR_BED)
   with slow switches, like solid state relays. PWM frequency can be
   influenced globally with FAST_PWM, see below.
 */
-//            name      port   pwm
 //DEFINE_HEATERS_START
+//            name      port   pwm
 DEFINE_HEATER(extruder, DIO4,  1)
 DEFINE_HEATER(bed,      DIO3,  1)
 
diff --git a/config/board.gen7-v1.4.h b/config/board.gen7-v1.4.h
index 8881bd8..472c1c3 100644
--- a/config/board.gen7-v1.4.h
+++ b/config/board.gen7-v1.4.h
@@ -198,8 +198,8 @@ DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO0,  THERMISTOR_BED)
   with slow switches, like solid state relays. PWM frequency can be
   influenced globally with FAST_PWM, see below.
 */
-//            name      port   pwm
 //DEFINE_HEATERS_START
+//            name      port   pwm
 DEFINE_HEATER(extruder, DIO4,  1)
 DEFINE_HEATER(bed,      DIO3,  1)
 
diff --git a/config/board.ramps-v1.2.h b/config/board.ramps-v1.2.h
index f579d55..3f7f643 100644
--- a/config/board.ramps-v1.2.h
+++ b/config/board.ramps-v1.2.h
@@ -194,8 +194,8 @@ DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO1,  THERMISTOR_BED)
   with slow switches, like solid state relays. PWM frequency can be
   influenced globally with FAST_PWM, see below.
 */
-//            name      port   pwm
 //DEFINE_HEATERS_START
+//            name      port   pwm
 DEFINE_HEATER(extruder, DIO10, 1)
 DEFINE_HEATER(bed,      DIO8,  1)
 DEFINE_HEATER(fan,      DIO9,  1)
diff --git a/config/board.ramps-v1.3.h b/config/board.ramps-v1.3.h
index 4d6b32b..a00d73d 100644
--- a/config/board.ramps-v1.3.h
+++ b/config/board.ramps-v1.3.h
@@ -197,8 +197,8 @@ DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO14, THERMISTOR_BED)
   with slow switches, like solid state relays. PWM frequency can be
   influenced globally with FAST_PWM, see below.
 */
-//            name      port   pwm
 //DEFINE_HEATERS_START
+//            name      port   pwm
 DEFINE_HEATER(extruder, DIO10, 1)
 DEFINE_HEATER(bed,      DIO8,  1)
 DEFINE_HEATER(fan,      DIO9,  1)
diff --git a/config/board.rumba.h b/config/board.rumba.h
index 3a73d24..8f9df82 100644
--- a/config/board.rumba.h
+++ b/config/board.rumba.h
@@ -197,8 +197,8 @@ DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO11, THERMISTOR_BED)
   with slow switches, like solid state relays. PWM frequency can be
   influenced globally with FAST_PWM, see below.
 */
-//            name      port   pwm
 //DEFINE_HEATERS_START
+//            name      port   pwm
 DEFINE_HEATER(extruder, DIO2,  1)
 DEFINE_HEATER(bed,      DIO9,  1)
 DEFINE_HEATER(fan,      DIO8,  1)
diff --git a/config/board.sanguinololu-v1.1.h b/config/board.sanguinololu-v1.1.h
index ac16435..4685e51 100644
--- a/config/board.sanguinololu-v1.1.h
+++ b/config/board.sanguinololu-v1.1.h
@@ -195,8 +195,8 @@ DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO6,  THERMISTOR_BED)
   with slow switches, like solid state relays. PWM frequency can be
   influenced globally with FAST_PWM, see below.
 */
-//            name      port   pwm
 //DEFINE_HEATERS_START
+//            name      port   pwm
 DEFINE_HEATER(extruder, DIO13, 1)
 DEFINE_HEATER(bed,      DIO14, 1)
 
diff --git a/config/board.sanguinololu-v1.2.h b/config/board.sanguinololu-v1.2.h
index 0b6dfbd..2009f85 100644
--- a/config/board.sanguinololu-v1.2.h
+++ b/config/board.sanguinololu-v1.2.h
@@ -195,8 +195,8 @@ DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO6,  THERMISTOR_BED)
   with slow switches, like solid state relays. PWM frequency can be
   influenced globally with FAST_PWM, see below.
 */
-//            name      port   pwm
 //DEFINE_HEATERS_START
+//            name      port   pwm
 DEFINE_HEATER(extruder, DIO12, 1)
 DEFINE_HEATER(bed,      DIO13, 1)
 
diff --git a/config/board.sanguish.h b/config/board.sanguish.h
index 12a54a2..b3fe21e 100644
--- a/config/board.sanguish.h
+++ b/config/board.sanguish.h
@@ -195,8 +195,8 @@ DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO0,  THERMISTOR_BED)
   with slow switches, like solid state relays. PWM frequency can be
   influenced globally with FAST_PWM, see below.
 */
-//            name      port   pwm
 //DEFINE_HEATERS_START
+//            name      port   pwm
 DEFINE_HEATER(extruder, DIO3,  1)
 DEFINE_HEATER(bed,      DIO4,  1)
 
diff --git a/config/board.teensy++-v2.0.h b/config/board.teensy++-v2.0.h
index 57556f3..63ead8f 100644
--- a/config/board.teensy++-v2.0.h
+++ b/config/board.teensy++-v2.0.h
@@ -193,8 +193,8 @@ DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO6,  THERMISTOR_BED)
   with slow switches, like solid state relays. PWM frequency can be
   influenced globally with FAST_PWM, see below.
 */
-//            name      port   pwm
 //DEFINE_HEATERS_START
+//            name      port   pwm
 DEFINE_HEATER(extruder, DIO15, 1)
 DEFINE_HEATER(bed,      DIO14, 1)
 DEFINE_HEATER(fan,      DIO16, 0)
diff --git a/config/board.teensy-v2.0.h b/config/board.teensy-v2.0.h
index 395ab05..3a9eea2 100644
--- a/config/board.teensy-v2.0.h
+++ b/config/board.teensy-v2.0.h
@@ -193,8 +193,8 @@ DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO0,  THERMISTOR_BED)
   with slow switches, like solid state relays. PWM frequency can be
   influenced globally with FAST_PWM, see below.
 */
-//            name      port   pwm
 //DEFINE_HEATERS_START
+//            name      port   pwm
 DEFINE_HEATER(extruder, DIO10, 1)
 DEFINE_HEATER(bed,      DIO9,  1)
 DEFINE_HEATER(fan,      DIO8,  0)
diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py
index 41adb23..d8dece5 100644
--- a/configtool/boardpanel.py
+++ b/configtool/boardpanel.py
@@ -483,10 +483,10 @@ class BoardPanel(wx.Panel):
       m = reStartHeaters.match(ln)
       if m:
         fp.write(ln)
+        fp.write("//            name      port   pwm\n")
         for s in self.heaters:
-          sstr = ", ".join(s)
+          sstr = "%-10s%-7s%s" % ((s[0] + ","), (s[1] + ","), s[2])
           fp.write("DEFINE_HEATER(%s)\n" % sstr)
-
         fp.write("\n")
         for s in self.heaters:
           fp.write(defineHeaterFormat % (s[0].upper(), s[0]))