diff --git a/options/addonoptions.php b/options/addonoptions.php
index 1862f06..cce9d63 100644
--- a/options/addonoptions.php
+++ b/options/addonoptions.php
@@ -1,6 +1,6 @@
 <div id="comicpress-addons">
 
-	<form method="post" id="myForm" name="template" enctype="multipart/form-data">
+	<form method="post" id="myForm" name="template" enctype="multipart/form-data" action="">
 	<?php wp_nonce_field('update-options') ?>
 
 		<div id="comicpress-options">
@@ -93,11 +93,9 @@
 			</tr>
 			<tr>
 				<th scope="row"><label for="buy_print_us_ship"><?php _e('Shipping Cost (US/Canada)','comicpress'); ?></label></th>
-				<td>
+				<td colspan="2">
 					<input type="text" size="7" name="buy_print_us_ship" id="buy_print_us_ship" value="<?php echo $comicpress_options['buy_print_us_ship']; ?>" />
 				</td>
-				<td>
-				</td>
 			</tr>
 			<tr class="alternate">
 				<th scope="row"><label for="buy_print_int_amount"><?php _e('Print Cost (International)','comicpress'); ?></label></th>
@@ -110,11 +108,9 @@
 			</tr>
 			<tr>
 				<th scope="row"><label for="buy_print_int_ship"><?php _e('Shipping Cost (International)','comicpress'); ?></label></th>
-				<td>
+				<td colspan="2">
 					<input type="text" size="7" name="buy_print_int_ship" id="buy_print_int_ship" value="<?php echo $comicpress_options['buy_print_int_ship']; ?>" />
 				</td>
-				<td/>
-				</td>
 			</tr>
 		</table>
 
diff --git a/options/archivesearchoptions.php b/options/archivesearchoptions.php
index bbcef40..b099c4a 100644
--- a/options/archivesearchoptions.php
+++ b/options/archivesearchoptions.php
@@ -8,7 +8,7 @@
 			<table class="widefat">
 				<thead>
 					<tr>
-						<th colspan="3"><?php _e('Archive & Search Results','comicpress'); ?></th>
+						<th colspan="3"><?php _e('Archive &amp; Search Results','comicpress'); ?></th>
 					</tr>
 				</thead>
 				<tr class="alternate">
diff --git a/options/configoptions.php b/options/configoptions.php
index 2b3f671..9654587 100644
--- a/options/configoptions.php
+++ b/options/configoptions.php
@@ -141,29 +141,23 @@
 
 				<tr class="alternate">
 					<th scope="row"><label for="rss_comic_width"><?php _e('RSS Thumbnail Width','comicpress'); ?></label></th>
-					<td>
+					<td colspan="2">
 						<input type="text" size="7" name="rss_comic_width" id="rss_comic_width" value="<?php echo $comicpress_options['comicpress_config']['rss_comic_width']; ?>" />
 					</td>
-					<td/>
-					</td>
 				</tr>
 
 				<tr>
 					<th scope="row"><label for="archive_comic_width"><?php _e('ARCHIVE Thumbnail Width','comicpress'); ?></label></th>
-					<td>
+					<td colspan="2">
 						<input type="text" size="7" name="archive_comic_width" id="archive_comic_width" value="<?php echo $comicpress_options['comicpress_config']['archive_comic_width']; ?>" />
 					</td>
-					<td/>
-					</td>
 				</tr>
 
 				<tr class="alternate">
 					<th scope="row"><label for="mini_comic_width"><?php _e('MINI Thumbnail Width','comicpress'); ?></label></th>
-					<td>
+					<td colspan="2">
 						<input type="text" size="7" name="mini_comic_width" id="mini_comic_width" value="<?php echo $comicpress_options['comicpress_config']['mini_comic_width']; ?>" />
 					</td>
-					<td/>
-					</td>
 				</tr>
 
 			</table>
diff --git a/options/generaloptions.php b/options/generaloptions.php
index 48babbd..33b9413 100644
--- a/options/generaloptions.php
+++ b/options/generaloptions.php
@@ -17,7 +17,7 @@
 						<input id="disable_page_restraints" name="disable_page_restraints" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_page_restraints']); ?> />
 					</td>
 					<td>
-						<?php _e('Allows the width of your site to either be Dynamic (fills browser window) or Fixed (width is specified, e.g., 980px, 780px, etc.)  If Dynamic is enabled #page and #page-wide will not load. This allow you to use the entire browser for your canvas instead of the 780px/980px that the two elements limit you to by default.','comicpress'); ?></th>
+						<?php _e('Allows the width of your site to either be Dynamic (fills browser window) or Fixed (width is specified, e.g., 980px, 780px, etc.)  If Dynamic is enabled #page and #page-wide will not load. This allow you to use the entire browser for your canvas instead of the 780px/980px that the two elements limit you to by default.','comicpress'); ?>
 					</td>
 				</tr>
 				<tr>
@@ -209,7 +209,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<p><?php _e('USAGE: Edit the user with <em>Dashboard -> Users -> Authors & Users</em> and flag the user you want to be a member with the option at the bottom.','comicpress'); ?></p>
+						<p><?php _e('USAGE: Edit the user with <em>Dashboard -> Users -> Authors &amp; Users</em> and flag the user you want to be a member with the option at the bottom.','comicpress'); ?></p>
 						<p><?php _e('Inside posts, add [members] content you only want members to see [/members]','comicpress'); ?></p>
 						<p><?php _e('When setting a \'members\' category, you *cannot* use an existing comic category, uncategorized, or blog category!','comicpress'); ?></p>
 						<p><?php _e('You MUST create a whole new category and called it "members", then you select that category here and create a page called "Members" or something equivelant and associate the Member\'s Only template to it.','comicpress'); ?></p>
diff --git a/options/indexoptions.php b/options/indexoptions.php
index 3d039c6..c7454b0 100644
--- a/options/indexoptions.php
+++ b/options/indexoptions.php
@@ -56,7 +56,7 @@
 					</td>
 				</tr>
 				<tr class="alternate">
-					<th scope="row"><label for="disable_comic_blog_single"><?php _e('Disable the comic blog on the single pages','comicpress'); ?></lable></th>
+					<th scope="row"><label for="disable_comic_blog_single"><?php _e('Disable the comic blog on the single pages','comicpress'); ?></label></th>
 					<td>
 						<input id="disable_comic_blog_single" name="disable_comic_blog_single" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_comic_blog_single']); ?> />
 					</td>
diff --git a/options/themestyle.php b/options/themestyle.php
index bb7a272..b5f2375 100644
--- a/options/themestyle.php
+++ b/options/themestyle.php
@@ -88,15 +88,15 @@
 			<tr>
 				<td style="width:200px;">
 					<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-						<input type="hidden" name="cmd" value="_s-xclick">
-						<input type="hidden" name="hosted_button_id" value="7827910">
+						<input type="hidden" name="cmd" value="_s-xclick" />
+						<input type="hidden" name="hosted_button_id" value="7827910" />
 						<input type="image"
 						src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif"
 						border="0" name="submit" alt="PayPal - The safer, easier way to pay
-						online!">
+						online!" />
 						<img alt="" border="0"
 						src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1"
-						height="1">
+						height="1" />
 					</form>
 				</td>
 				<td style="width:200px;">