diff --git a/Source/MantisSourcePlugin.class.php b/Source/MantisSourcePlugin.class.php
index 918430f..df70189 100644
--- a/Source/MantisSourcePlugin.class.php
+++ b/Source/MantisSourcePlugin.class.php
@@ -6,7 +6,7 @@
 /**
  * Abstract class for simplifying creation of source control plugins.
  * @author John Reese
- */ 
+ */
 abstract class MantisSourcePlugin extends MantisPlugin {
 	public function hooks() {
 		return array(
@@ -97,6 +97,7 @@
 
 	/**
 	 * Output form elements for configuration options.
+	 * The first div should have class 'spacer'
 	 */
 	public function update_config_form() {}
 
diff --git a/Source/Source.ViewAPI.php b/Source/Source.ViewAPI.php
index ed73887..c9c7760 100644
--- a/Source/Source.ViewAPI.php
+++ b/Source/Source.ViewAPI.php
@@ -84,7 +84,7 @@
 </span></td>
 </tr>
 		<?php } ?>
-<tr><td class="spacer"></td></tr>
+<tr class="spacer"></tr>
 		<?php
 	}
 }
diff --git a/Source/pages/manage_config_page.php b/Source/pages/manage_config_page.php
index 40d2d9f..ff16b3e 100755
--- a/Source/pages/manage_config_page.php
+++ b/Source/pages/manage_config_page.php
@@ -121,9 +121,7 @@
 		<span class="label-style"></span>
 	</div>
 
-	<div class="spacer"></div>
-
-	<div class="field-container">
+	<div class="field-container spacer">
 		<label for="buglink_regex_1"><span><?php echo plugin_lang_get( 'buglink_regex_1' ) ?></span></label>
 		<span class="input">
 			<input name="buglink_regex_1" size="50" maxlength="500" value="<?php echo string_attribute( plugin_config_get( 'buglink_regex_1' ) ) ?>"/>
@@ -145,9 +143,7 @@
 		<span class="label-style"></span>
 	</div>
 
-	<div class="spacer"></div>
-
-	<div class="field-container">
+	<div class="field-container spacer">
 		<label for="bugfix_regex_1"><span><?php echo plugin_lang_get( 'bugfix_regex_1' ) ?></span></label>
 		<span class="input">
 			<input name="bugfix_regex_1" size="50" maxlength="500" value="<?php echo string_attribute( plugin_config_get( 'bugfix_regex_1' ) ) ?>"/>
@@ -252,9 +248,7 @@
 		<span class="label-style"></span>
 	</div>
 
-	<div class="spacer"></div>
-
-	<div class="field-container">
+	<div class="field-container spacer">
 		<label for="bugfix_handler"><span><?php echo plugin_lang_get( 'api_key' ) ?></span></label>
 		<span class="input">
 			<input name="api_key" size="50" value="<?php echo string_attribute( plugin_config_get( 'api_key' ) ) ?>"/>
@@ -264,9 +258,7 @@
 		<span class="label-style"></span>
 	</div>
 
-	<div class="spacer"></div>
-
-	<div class="field-container">
+	<div class="field-container spacer">
 		<label for="remote_checkin"><span><?php echo plugin_lang_get( 'allow_remote_checkin' ) ?></span></label>
 		<span class="checkbox">
 			<input name="remote_checkin" type="checkbox" <?php check_checked( ON == $t_remote_checkin ) ?>/>
@@ -286,9 +278,7 @@
 		<span class="label-style"></span>
 	</div>
 
-	<div class="spacer"></div>
-
-	<div class="field-container">
+	<div class="field-container spacer">
 		<label for="remote_imports"><span><?php echo plugin_lang_get( 'allow_remote_import' ) ?></span></label>
 		<span class="checkbox">
 			<input name="remote_imports" type="checkbox" <?php check_checked( ON == $t_remote_imports ) ?>/>
@@ -311,7 +301,6 @@
 <?php
 	foreach( SourceVCS::all() as $t_type => $t_vcs ) {
 		if ( $t_vcs->configuration ) {
-			echo '<div class="spacer"></div>';
 			$t_vcs->update_config_form();
 		}
 	}
diff --git a/SourceGithub/SourceGithub.php b/SourceGithub/SourceGithub.php
index 72acdfc..e0f81cd 100755
--- a/SourceGithub/SourceGithub.php
+++ b/SourceGithub/SourceGithub.php
@@ -124,7 +124,7 @@
 <td class="category"><?php echo plugin_lang_get( 'hub_reponame' ) ?></td>
 <td><input name="hub_reponame" maxlength="250" size="40" value="<?php echo string_attribute( $t_hub_reponame ) ?>"/></td>
 </tr>
-<tr><td class="spacer"></td></tr>
+<tr class="spacer"></tr>
 <tr>
 <td class="category"><?php echo plugin_lang_get( 'hub_app_client_id' ) ?></td>
 <td><input name="hub_app_client_id" maxlength="250" size="40" value="<?php echo string_attribute( $t_hub_app_client_id ) ?>"/></td>
@@ -143,7 +143,7 @@
 echo plugin_lang_get( 'hub_app_authorized' );
 endif; ?></td>
 </tr>
-<tr><td class="spacer"></td></tr>
+<tr class="spacer"></tr>
 <tr>
 <td class="category"><?php echo plugin_lang_get( 'master_branch' ) ?></td>
 <td><input name="master_branch" maxlength="250" size="40" value="<?php echo string_attribute( $t_master_branch ) ?>"/></td>