From fc0775b03cbf96d42336cd3b0f492eca1c3a0b04 Mon Sep 17 00:00:00 2001
From: mindfaucet <tyler@mindfaucet.com>
Date: Tue, 24 Nov 2009 15:14:59 -0700
Subject: [PATCH] ComicPress Options Styling... still in progress. ;)

---
 comicpress-options.php     |  77 +++++-----
 js/tabbed/tabbed_pages.css |  81 ++++++----
 options/generaloptions.php | 292 +++++++++++++++++++------------------
 options/indexoptions.php   | 119 +++++++--------
 options/themestyle.php     |  69 ++++-----
 5 files changed, 341 insertions(+), 297 deletions(-)

diff --git a/comicpress-options.php b/comicpress-options.php
index bae5a7d..1c1ebd3 100644
--- a/comicpress-options.php
+++ b/comicpress-options.php
@@ -171,45 +171,48 @@ function comicpress_admin() {
 			<div class="<?php if ($tab == 'buyprint') { ?>on<?php } else { ?>off<?php } ?>" title="buyprintoptions"><span><?php _e('Buy Print','comicpress'); ?></span></div>
 			<div class="<?php if ($tab == 'members') { ?>on<?php } else { ?>off<?php } ?>" title="membersoptions"><span><?php _e('Members','comicpress'); ?></span></div>
 		</div>
-		<div id="comicpress-options">
-			<?php include(get_template_directory() . '/options/themestyle.php'); ?>
-			<?php include(get_template_directory() . '/options/generaloptions.php'); ?>
-			<?php include(get_template_directory() . '/options/indexoptions.php'); ?>
-			<?php include(get_template_directory() . '/options/postoptions.php'); ?>
-			<?php include(get_template_directory() . '/options/archivesearchoptions.php'); ?>
-			<?php include(get_template_directory() . '/options/menubaroptions.php'); ?>
-			<?php include(get_template_directory() . '/options/customheaderoptions.php'); ?>
-			<?php include(get_template_directory() . '/options/buyprintoptions.php'); ?>
-			<?php include(get_template_directory() . '/options/membersoptions.php'); ?>
-		</div>
+		<?php include(get_template_directory() . '/options/themestyle.php'); ?>
+		<?php include(get_template_directory() . '/options/generaloptions.php'); ?>
+		<?php include(get_template_directory() . '/options/indexoptions.php'); ?>
+		<?php include(get_template_directory() . '/options/postoptions.php'); ?>
+		<?php include(get_template_directory() . '/options/archivesearchoptions.php'); ?>
+		<?php include(get_template_directory() . '/options/menubaroptions.php'); ?>
+		<?php include(get_template_directory() . '/options/customheaderoptions.php'); ?>
+		<?php include(get_template_directory() . '/options/buyprintoptions.php'); ?>
+		<?php include(get_template_directory() . '/options/membersoptions.php'); ?>
 	</div>
 	
-
-
-	
-			<div class="cpadmin-footer">
-
-			<form action="https://www.paypal.com/cgi-bin/webscr" method="post" class="cpadmin-donate">
-				<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!">
-				<img alt="" border="0"
-				src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1"
-				height="1">
-			</form>
-			<a href="http://comicpress.org/"><strong>ComicPress 2.9</strong> <small>[ <?php echo $comicpress_options['comicpress_version']; ?> ]</small></a>. <?php _e('Created by','comicpress'); ?> <a href="http://mindfaucet.com/">Tyler Martin</a> <?php _e('with','comicpress'); ?> <a href="http://www.coswellproductions.com/">John Bintz</a><?php _e(',','comicpress'); ?> <a href="http://frumph.net/">Philip M. Hofer</a> <small>(<a href="http://frumph.net/">Frumph</a>)</small> <?php _e('and','comicpress'); ?> <a href="http://www.oycomics.com/">Danny Burleson</a>.<br />
-			<?php _e('If you like the ComicPress theme, please donate.  It will help in creating new versions.','comicpress'); ?>
-			<br />
-			<br />
-			<form method="post" id="myForm" name="template" enctype="multipart/form-data">
-				<?php wp_nonce_field('update-options') ?>		
-				<input name="comicpress_reset" type="submit" class="button" value="Reset All Settings" />
-				<input type="hidden" name="action" value="comicpress_reset" />	
-			</form>
-</div>
+	<div class="cpadmin-footer">
+		<a href="http://comicpress.org/"><strong>ComicPress 2.9</strong> <small>[ <?php echo $comicpress_options['comicpress_version']; ?> ]</small></a>. <?php _e('Created by','comicpress'); ?> <a href="http://mindfaucet.com/">Tyler Martin</a> <?php _e('with','comicpress'); ?> <a href="http://www.coswellproductions.com/">John Bintz</a><?php _e(',','comicpress'); ?> <a href="http://frumph.net/">Philip M. Hofer</a> <small>(<a href="http://frumph.net/">Frumph</a>)</small> <?php _e('and','comicpress'); ?> <a href="http://www.oycomics.com/">Danny Burleson</a>.<br />
+		<?php _e('If you like the ComicPress theme, please donate.  It will help in creating new versions.','comicpress'); ?>
+		<table style="margin:0 auto;">
+			<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="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!">
+						<img alt="" border="0"
+						src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1"
+						height="1">
+					</form>
+				</td>
+				<td style="width:200px;">
+					<a href="http://comicpress.org/"><img src="<?php echo get_template_directory_uri(); ?>/images/cal/default.png" /></a>
+				</td>
+				<td style="width:200px;">
+					<form method="post" id="myForm" name="template" enctype="multipart/form-data">
+						<?php wp_nonce_field('update-options') ?>		
+						<input name="comicpress_reset" type="submit" class="button" value="Reset All Settings" />
+						<input type="hidden" name="action" value="comicpress_reset" />	
+					</form>
+				</td>
+			</td>
+		</table>
+	</div>
 	
 	
 </div>
diff --git a/js/tabbed/tabbed_pages.css b/js/tabbed/tabbed_pages.css
index 6f88cee..ccd36d3 100644
--- a/js/tabbed/tabbed_pages.css
+++ b/js/tabbed/tabbed_pages.css
@@ -65,24 +65,8 @@ div.hide {
 div.show {
 	clear: left;
 	display: run-in;
-	background: #fff;
-	border-width: 1px 1px 0 1px;
-	border-style: solid;
-	border-color: #dfdfdf;
-	padding: 10px;
-	z-index: 50;
-	margin-top: -2px;
 	position: relative;
-	font: 11px verdana, arial, sans-serif;
-	line-height: 18px;
-	border-top-left-radius: 6px;
-	-moz-border-radius-topleft: 6px;
-	-webkit-border-top-left-radius: 6px;
-	-khtml-border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-	-moz-border-radius-topright: 6px;
-	-webkit-border-top-right-radius: 6px;
-	-khtml-border-top-right-radius: 6px;
+	z-index: 50;
 }
 div.show img {
 	float: left;
@@ -94,12 +78,47 @@ div.show img {
 
 .cpadmin-footer {
 	padding: 10px;
+	margin: 10px 0 0 0;
 	color: #777;
+	text-align: center;
 	background: #fff;
+	border: 1px solid #dfdfdf;
+	font-family: 'Arial', sans-serif;
+	border-radius: 6px;
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	-khtml-border-radius: 6px;
+}
+.cpadmin-donate {
+	float: right;
+}
+.cpadmin-footer a {
+	text-decoration: none;
+}
+
+#comicpress-options {
+	padding: 10px 10px 1px 10px;
+	background: #fff;
+	border-width: 1px 1px 1px 1px;
+	border-style: solid;
+	border-color: #dfdfdf;
+	margin-top: -2px;
+	font: 11px verdana, arial, sans-serif;
+	line-height: 18px;
+	border-top-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	-webkit-border-top-left-radius: 6px;
+	-khtml-border-top-left-radius: 6px;
+	border-top-right-radius: 6px;
+	-moz-border-radius-topright: 6px;
+	-webkit-border-top-right-radius: 6px;
+	-khtml-border-top-right-radius: 6px;
+}
+
+#comicpress-options-save {
 	border-width: 0 1px 1px 1px;
 	border-style: solid;
 	border-color: #dfdfdf;
-	font-family: 'Arial', sans-serif;
 	border-bottom-left-radius: 6px;
 	-moz-border-radius-bottomleft: 6px;
 	-webkit-border-bottom-left-radius: 6px;
@@ -109,26 +128,32 @@ div.show img {
 	-webkit-border-bottom-right-radius: 6px;
 	-khtml-border-bottom-right-radius: 6px;
 }
-.cpadmin-donate {
-	float: right;
-}
-.cpadmin-footer a {
-	text-decoration: none;
-}
 
 #comicpress-options  table.widefat thead tr th {
 font-size: 14px;
-padding-top: 10px;
 }
 
 #comicpress-options  table.widefat label {
 display: block;
 text-align: right;
 }
-#comicpress-options  table.widefat label select {
+#comicpress-options  table.widefat select {
 width: 100%;
 }
 
-#comicpress-options  table.widefat .button-primary {
-padding: 1px 5px;
+#comicpress-options table.widefat {
+margin-bottom: 10px;
+border-bottom: none;
 }
+
+#comicpress-options table.widefat th.scope {
+width: 200px;
+}
+
+#comicpress-options table.widefat th.scope label {
+color: #21759b;
+}
+
+#comicpress-options table.widefat th.scope label:hover {
+color: #d54e21;
+}
\ No newline at end of file
diff --git a/options/generaloptions.php b/options/generaloptions.php
index 7bab999..d7d6f23 100644
--- a/options/generaloptions.php
+++ b/options/generaloptions.php
@@ -2,160 +2,168 @@
 
 	<form method="post" id="myForm" name="template" enctype="multipart/form-data">
 	<?php wp_nonce_field('update-options') ?>
+	
+		<div id="comicpress-options">
 
-		<table class="widefat">
-
-			<thead>
-				<tr>
-					<th colspan="3">Main</th>
+			<table class="widefat">
+				<thead>
+					<tr>
+						<th colspan="3">Main</th>
+					</tr>
+				</thead>
+				<tr class="alternate">
+					<th class="scope"><label for="disable_page_restraints"><?php _e('Disable page restraints?','comicpress'); ?></label></th>
+					<td>
+						<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 <b>Dynamic</b> (fills browser window) or <b>Fixed</b> (width is specified, e.g., 980px, 780px, etc.)  If <b>Dynamic</b> 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>
+					</td>
 				</tr>
-			</thead>
-			<tr class="alternate">
-				<td style="width:200px"><?php _e('Disable page restraints?','comicpress'); ?></td>
-				<td>
-					<input 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 <b>Dynamic</b> (fills browser window) or <b>Fixed</b> (width is specified, e.g., 980px, 780px, etc.)  If <b>Dynamic</b> 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>
-				</td>
-			</tr>
-			<tr>
-				<td><?php _e('Enable Rascal the ComicPress Mascot?','comicpress'); ?></td>
-				<td>
-					<input name="rascal_says" type="checkbox" value="1" <?php checked(true, $comicpress_options['rascal_says']); ?> />
-				</td>
-				<td>
-					<?php _e('Enable this option to make a comic bubble appear over the comic and write out what you put in the hovertext, along with a friendly face. You can add the hovertext when uploading your comic with ComicPress Manager. To change the graphics for this will need to be well-versed in CSS.','comicpress'); ?>
-				</td>
-			</tr>
-			<tr class="alternate">
-				<td><?php _e('Disable the comment notes?','comicpress'); ?></td>
-				<td>
-					<input name="disable_comment_note" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_comment_note']); ?> />
-				</td>
-				<td>
-					<?php _e('Disabling this will remove the note text that displays with more options for adding to comments (html).','comicpress'); ?>
-				</td>
-			</tr>
-			<tr>
-				<td><?php _e('Disable blog header?','comicpress'); ?></td>
-				<td>
-					<input name="disable_blogheader" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_blogheader']); ?> />		
-				</td>
-				<td>
-					<?php _e('Checkmark this and your site will not display the contents of #blogheader.','comicpress'); ?>
-				</td>
-			</tr>			
-		
-			<thead>
 				<tr>
-					<th colspan="3">Navigation</th>
+					<th class="scope"><label for="rascal_says"><?php _e('Enable Rascal the ComicPress Mascot?','comicpress'); ?></label></th>
+					<td>
+						<input id="rascal_says" name="rascal_says" type="checkbox" value="1" <?php checked(true, $comicpress_options['rascal_says']); ?> />
+					</td>
+					<td>
+						<?php _e('Enable this option to make a comic bubble appear over the comic and write out what you put in the hovertext, along with a friendly face. You can add the hovertext when uploading your comic with ComicPress Manager. To change the graphics for this will need to be well-versed in CSS.','comicpress'); ?>
+					</td>
 				</tr>
-			</thead>
-			<tr class="alternate">
-				<td><?php _e('Enable numbered pagination?','comicpress'); ?></td>
-				<td>
-					<input name="enable_numbered_pagination" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_numbered_pagination']); ?> />
-				</td>
-				<td>
-					<?php _e('Previous Entries and Next Entries buttons are replaced by a bar of numbered pages. Numbered pagination appears on the Home page, the author(s) page, the blog template, and comments/single when there are more then the set number of comments per page. Uses the same styling as the Menubar.','comicpress'); ?>
-				</td>
-			</tr>
-			<tr>
-				<td><?php _e('Click comic to go next?','comicpress'); ?></td>
-				<td>
-					<input name="comic_clicks_next" type="checkbox" value="1" <?php checked(true, $comicpress_options['comic_clicks_next']); ?> />
-				</td>
-				<td>
-					<?php _e('Allows users to click the comic itself to go to the next comic (unless on the latest comic). This allows you to offer a more convenient option for your archive readers to proceed to the next comic, and the next, etc. Any enabled hover options will continue to function even with this enabled.','comicpress'); ?>
-				</td>
-			</tr>
-			<tr class="alternate">
-				<td><?php _e('Disable the default comic post navigation?','comicpress'); ?></td>
-				<td>
-					<input name="disable_default_comic_nav" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_default_comic_nav']); ?> />
-				</td>
-				<td>
-					<?php _e('Previous Entries and Next Entries buttons are replaced by a bar of numbered pages. The default comic post navigation is above each comic blog post.','comicpress'); ?>
-				</td>
-			</tr>
-			<?php 
-				$current_gnav_directory = $comicpress_options['graphicnav_directory'];
-				if (empty($current_gnav_directory)) $current_gnav_directory = 'default';
-				$dirs_to_search = array_unique(array(get_template_directory(),get_stylesheet_directory()));
-				$gnav_directories = array();
-				foreach ($dirs_to_search as $dir) { $gnav_directories = array_merge($gnav_directories,glob("${dir}/images/nav/*")); }
-			?>	
-			<tr>
-				<td colspan="2"><?php _e('Graphic Navigation Directory','comicpress'); ?>		
-					<label>
-						<select name="graphicnav_directory" id="graphicnav_directory">
-							<?php
-								foreach ($gnav_directories as $gnav_dirs) {
-									if (is_dir($gnav_dirs)) { 
-										$gnav_dir_name = basename($gnav_dirs); ?>
-										<option class="level-0" value="<?php echo $gnav_dir_name; ?>" <?php if ($current_gnav_directory == $gnav_dir_name) { ?>selected="selected"<?php } ?>><?php echo $gnav_dir_name; ?></option>
-								<?php }
-								}
-							?>
-						</select>
-					</label>
-				</td>
-				<td>
-					<?php _e('Choose a directory to get the graphic navigation styling from. To create your own custom graphic navigation menu buttons just create a directory under <i>images/nav/</i> and place your image files inside of it and create a navstyle.css file to determine the style of your navigation display.','comicpress'); ?>
-				</td>
-			</tr>
+				<tr class="alternate">
+					<th class="scope"><label for="disable_comment_note"><?php _e('Disable the comment notes?','comicpress'); ?></label></th>
+					<td>
+						<input id="disable_comment_note" name="disable_comment_note" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_comment_note']); ?> />
+					</td>
+					<td>
+						<?php _e('Disabling this will remove the note text that displays with more options for adding to comments (html).','comicpress'); ?>
+					</td>
+				</tr>
+				<tr>
+					<th class="scope"><label for="disable_blogheader"><?php _e('Disable blog header?','comicpress'); ?></label></th>
+					<td>
+						<input id="disable_blogheader" name="disable_blogheader" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_blogheader']); ?> />		
+					</td>
+					<td>
+						<?php _e('Checkmark this and your site will not display the contents of #blogheader.','comicpress'); ?>
+					</td>
+				</tr>			
+			</table>
 			
-			<thead>
-				<tr>
-					<th colspan="3">Sidebars</th>
+			<table class="widefat">
+				<thead>
+					<tr>
+						<th colspan="3">Navigation</th>
+					</tr>
+				</thead>
+				<tr class="alternate">
+					<th class="scope"><label for="enable_numbered_pagination"><?php _e('Enable numbered pagination?','comicpress'); ?></label></th>
+					<td>
+						<input id="enable_numbered_pagination" name="enable_numbered_pagination" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_numbered_pagination']); ?> />
+					</td>
+					<td>
+						<?php _e('Previous Entries and Next Entries buttons are replaced by a bar of numbered pages. Numbered pagination appears on the Home page, the author(s) page, the blog template, and comments/single when there are more then the set number of comments per page. Uses the same styling as the Menubar.','comicpress'); ?>
+					</td>
 				</tr>
-			</thead>
-			<tr class="alternate">
-				<td><?php _e('Enable main Sidebar CSS for all sidebars?','comicpress'); ?></td>
-				<td>
-					<input name="enable_widgetarea_use_sidebar_css" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_widgetarea_use_sidebar_css']); ?> />
-				</td>
-				<td>
-					<?php _e('Uses default CSS styling of the sidebars for all sidebar areas. If disabled it will use the .customwidgetarea user-made styling and only Sidebar-left and Sidebar-right will use sidebar styling.','comicpress'); ?><br />
-				</td>
-			</tr>
-
-			<tr>
-				<td><?php _e('Disable home page sidebars?','comicpress'); ?></td>
-				<td>
-					<input name="disable_lrsidebars_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_lrsidebars_frontpage']); ?> />
-				</td>
-				<td>
-					<?php _e('Your home page will not display the default left/right sidebars. Minimalists dream. WARNING: Not recommended for use with Graphic Novel layouts.','comicpress'); ?>
-				</td>
-			</tr>		
-			
-			<thead>
 				<tr>
-					<th colspan="3">Footer</th>
+					<th class="scope"><label for="comic_clicks_next"><?php _e('Click comic to go next?','comicpress'); ?></label></th>
+					<td>
+						<input id="comic_clicks_next" name="comic_clicks_next" type="checkbox" value="1" <?php checked(true, $comicpress_options['comic_clicks_next']); ?> />
+					</td>
+					<td>
+						<?php _e('Allows users to click the comic itself to go to the next comic (unless on the latest comic). This allows you to offer a more convenient option for your archive readers to proceed to the next comic, and the next, etc. Any enabled hover options will continue to function even with this enabled.','comicpress'); ?>
+					</td>
 				</tr>
-			</thead>
-			<tr class="alternate">
-				<td><?php _e('Disable the default text in the footer?','comicpress'); ?></td>
-				<td>
-					<input name="disable_footer_text" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_footer_text']); ?> />
-				</td>
-				<td>
-					<?php _e('Default text in the footer will not display. Enable this if you do not want any text in the footer. If you wish to add you own custom content, you may do so via Appearance -> Widgets-> Footer.', 'comicpress'); ?>
-				</td>
-			</tr>
-
-			<tfoot>
+				<tr class="alternate">
+					<th class="scope"><label for="disable_default_comic_nav"><?php _e('Disable the default comic post navigation?','comicpress'); ?></label></th>
+					<td>
+						<input id="disable_default_comic_nav" name="disable_default_comic_nav" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_default_comic_nav']); ?> />
+					</td>
+					<td>
+						<?php _e('Previous Entries and Next Entries buttons are replaced by a bar of numbered pages. The default comic post navigation is above each comic blog post.','comicpress'); ?>
+					</td>
+				</tr>
+				<?php 
+					$current_gnav_directory = $comicpress_options['graphicnav_directory'];
+					if (empty($current_gnav_directory)) $current_gnav_directory = 'default';
+					$dirs_to_search = array_unique(array(get_template_directory(),get_stylesheet_directory()));
+					$gnav_directories = array();
+					foreach ($dirs_to_search as $dir) { $gnav_directories = array_merge($gnav_directories,glob("${dir}/images/nav/*")); }
+				?>	
 				<tr>
-					<th colspan="3">
-						<input name="comicpress_save_general" type="submit" class="button-primary" value="Save Settings" />
-						<input type="hidden" name="action" value="comicpress_save_general" />
+					<th class="scope" colspan="2"><label for="graphicnav_directory" style="text-align:left"><?php _e('Graphic Navigation Directory','comicpress'); ?></label>	
+						
+							<select name="graphicnav_directory" id="graphicnav_directory">
+								<?php
+									foreach ($gnav_directories as $gnav_dirs) {
+										if (is_dir($gnav_dirs)) { 
+											$gnav_dir_name = basename($gnav_dirs); ?>
+											<option class="level-0" value="<?php echo $gnav_dir_name; ?>" <?php if ($current_gnav_directory == $gnav_dir_name) { ?>selected="selected"<?php } ?>><?php echo $gnav_dir_name; ?></option>
+									<?php }
+									}
+								?>
+							</select>
+						
 					</th>
+					<td>
+						<?php _e('Choose a directory to get the graphic navigation styling from. To create your own custom graphic navigation menu buttons just create a directory under <i>images/nav/</i> and place your image files inside of it and create a navstyle.css file to determine the style of your navigation display.','comicpress'); ?>
+					</td>
 				</tr>
-			</tfoot>
+			</table>
 			
-		</table>
+			<table class="widefat">
+				<thead>
+					<tr>
+						<th colspan="3">Sidebars</th>
+					</tr>
+				</thead>
+				<tr class="alternate">
+					<th class="scope"><label for="enable_widgetarea_use_sidebar_css"><?php _e('Enable main Sidebar CSS for all sidebars?','comicpress'); ?></label></th>
+					<td>
+						<input id="enable_widgetarea_use_sidebar_css" name="enable_widgetarea_use_sidebar_css" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_widgetarea_use_sidebar_css']); ?> />
+					</td>
+					<td>
+						<?php _e('Uses default CSS styling of the sidebars for all sidebar areas. If disabled it will use the .customwidgetarea user-made styling and only Sidebar-left and Sidebar-right will use sidebar styling.','comicpress'); ?><br />
+					</td>
+				</tr>
+				<tr>
+					<th class="scope"><label for="disable_lrsidebars_frontpage"><?php _e('Disable home page sidebars?','comicpress'); ?></label></th>
+					<td>
+						<input id="disable_lrsidebars_frontpage" name="disable_lrsidebars_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_lrsidebars_frontpage']); ?> />
+					</td>
+					<td>
+						<?php _e('Your home page will not display the default left/right sidebars. Minimalists dream. WARNING: Not recommended for use with Graphic Novel layouts.','comicpress'); ?>
+					</td>
+				</tr>		
+			</table>
+			
+			<table class="widefat">
+				<thead>
+					<tr>
+						<th colspan="3">Footer</th>
+					</tr>
+				</thead>
+				<tr class="alternate">
+					<th class="scope"><label for="disable_footer_text"><?php _e('Disable the default text in the footer?','comicpress'); ?></label></th>
+					<td>
+						<input id="disable_footer_text" name="disable_footer_text" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_footer_text']); ?> />
+					</td>
+					<td>
+						<?php _e('Default text in the footer will not display. Enable this if you do not want any text in the footer. If you wish to add you own custom content, you may do so via Appearance -> Widgets-> Footer.', 'comicpress'); ?>
+					</td>
+				</tr>
+			</table>
+		
+		</div>
+
+		<div id="comicpress-options-save">
+			<div id="major-publishing-actions">
+				<div id="publishing-action">
+					<input name="comicpress_save_general" type="submit" class="button-primary" value="Save Settings" />
+					<input type="hidden" name="action" value="comicpress_save_general" />
+				</div>
+				<div class="clear"></div>
+			</div>
+		</div>
 		
 	</form>
 	
diff --git a/options/indexoptions.php b/options/indexoptions.php
index c2820ac..4fabcf9 100644
--- a/options/indexoptions.php
+++ b/options/indexoptions.php
@@ -3,66 +3,71 @@
 	<form method="post" id="myForm" name="template" enctype="multipart/form-data">
 	<?php wp_nonce_field('update-options') ?>
 
-		<table class="widefat">
-
-			<thead>
-				<tr>
-					<th colspan="3">Post</th>
-				</tr>
-			</thead>
-			<tr class="alternate">
-				<td style="width:200px"><?php _e('Disable the blog on the Home page?','comicpress'); ?></td>
-				<td>
-					<input name="disable_blog_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_blog_frontpage']); ?> />					
-				</td>
-				<td>
-					<?php _e('Checkmark this and the blog will not display on the Home page of your site. The features allows to either not have a blog at all, or, if you place a menu link to your blog page, you can maintain your blog within the same site without readers having to see it when they are just trying to read your comic.','comicpress'); ?>
-				</td>
-			</tr>	
-
-			<thead>
-				<tr>
-					<th colspan="3">Comic</th>
-				</tr>
-			</thead>
-			<tr class="alternate">
-				<td><?php _e('Disable comic on Home page?','comicpress'); ?></td>
-				<td>
-					<input name="disable_comic_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_comic_frontpage']); ?> />					
-				</td>
-				<td>
-					<?php _e('Checkmark this and the comic will not display on the home page of your site. You can use the Latest Thumbnail widget to display your comic in a sidebar. Make sure you set the archive-thumbnail size to under 200px. Note: Turning this off and using the Graphic Novel style turns ComicPress into a blog only.','comicpress'); ?>
-				</td>
-			</tr>
-			<tr>
-				<td><?php _e('Disable the comic blog on Home page?','comicpress'); ?></td>
-				<td>
-					<input name="disable_comic_blog_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_comic_blog_frontpage']); ?> />					
-				</td>
-				<td>
-					<?php _e('Checkmark this and the comic blog will not display on the Home Page. Enabling this allows you to either not have a comic blog at all, or you can place it where you want using the comic blog post widget. If there is no content in the post it will not display regardless.','comicpress'); ?>
-				</td>
-			</tr>
-			<tr class="alternate">
-				<td><?php _e('Disable the comic blog on the single pages?','comicpress'); ?></td>
-				<td>
-					<input name="disable_comic_blog_single" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_comic_blog_single']); ?> />					
-				</td>
-				<td>
-					<?php _e('Checkmark this and the blog portion of the comic will not display on the single/archive pages of your site.','comicpress'); ?>
-				</td>
-			</tr>
-			
-			<tfoot>
-				<tr>
-					<th colspan="3">
-						<input name="comicpress_save_index" type="submit" class="button-primary" value="Save Settings" />
-						<input type="hidden" name="action" value="comicpress_save_index" />
+		<div id="comicpress-options">
+		
+			<table class="widefat">
+				<thead>
+					<tr>
+						<th colspan="3">Post</th>
+					</tr>
+				</thead>
+				<tr class="alternate">
+					<th class="scope"><label for="disable_blog_frontpage"><?php _e('Disable the blog on the Home page?','comicpress'); ?></label></th>
+					<td>
+						<input id="disable_blog_frontpage" name="disable_blog_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_blog_frontpage']); ?> />					
+					</td>
+					<td>
+						<?php _e('Checkmark this and the blog will not display on the Home page of your site. The features allows to either not have a blog at all, or, if you place a menu link to your blog page, you can maintain your blog within the same site without readers having to see it when they are just trying to read your comic.','comicpress'); ?>
 					</td>
 				</tr>
-			</tfoot>
+			</table>
+
+			<table class="widefat">
+				<thead>
+					<tr>
+						<th colspan="3">Comic</th>
+					</tr>
+				</thead>
+				<tr class="alternate">
+					<th class="scope"><label for="disable_comic_frontpage"><?php _e('Disable comic on Home page?','comicpress'); ?></label></th>
+					<td>
+						<input id="disable_comic_frontpage" name="disable_comic_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_comic_frontpage']); ?> />					
+					</td>
+					<td>
+						<?php _e('Checkmark this and the comic will not display on the home page of your site. You can use the Latest Thumbnail widget to display your comic in a sidebar. Make sure you set the archive-thumbnail size to under 200px. Note: Turning this off and using the Graphic Novel style turns ComicPress into a blog only.','comicpress'); ?>
+					</td>
+				</tr>
+				<tr>
+					<th class="scope"><label for="disable_comic_blog_frontpage"><?php _e('Disable the comic blog on Home page?','comicpress'); ?></label></th>
+					<td>
+						<input id="disable_comic_blog_frontpage" name="disable_comic_blog_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['disable_comic_blog_frontpage']); ?> />					
+					</td>
+					<td>
+						<?php _e('Checkmark this and the comic blog will not display on the Home Page. Enabling this allows you to either not have a comic blog at all, or you can place it where you want using the comic blog post widget. If there is no content in the post it will not display regardless.','comicpress'); ?>
+					</td>
+				</tr>
+				<tr class="alternate">
+					<th class="scope"><label for="disable_comic_blog_single"><?php _e('Disable the comic blog on the single pages?','comicpress'); ?></lable></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>
+					<td>
+						<?php _e('Checkmark this and the blog portion of the comic will not display on the single/archive pages of your site.','comicpress'); ?>
+					</td>
+				</tr>
+			</table>
+			
+		</div>
 		
-		</table>
+		<div id="comicpress-options-save">
+			<div id="major-publishing-actions">
+				<div id="publishing-action">
+					<input name="comicpress_save_index" type="submit" class="button-primary" value="Save Settings" />
+					<input type="hidden" name="action" value="comicpress_save_index" />
+				</div>
+				<div class="clear"></div>
+			</div>
+		</div>
 	
 	</form>
 	
diff --git a/options/themestyle.php b/options/themestyle.php
index cd52cb7..4971cca 100644
--- a/options/themestyle.php
+++ b/options/themestyle.php
@@ -11,17 +11,17 @@
 		<?php wp_nonce_field('update-options') ?>
 		
 
-			
-			<table class="widefat" cellspacing="0">
-				<thead>
-					<tr>
-						<th colspan="4">Layout</th>
-					</tr>
-				</thead>
-				<tr class="alternate">
-					<td><br /><?php _e('Choose Your Desired Website Layout','comicpress'); ?><br />
-						<label>
-							<select name="cp_theme_layout" id="cp_theme_layout" class="code" onchange="showimage(this,'cpthemestyle')">
+			<div id="comicpress-options">
+				
+				<table class="widefat" cellspacing="0">
+					<thead>
+						<tr>
+							<th colspan="4">Layout</th>
+						</tr>
+					</thead>
+					<tr class="alternate">
+						<th class="scope" style="width:250px"><br /><label for="cp_theme_layout" style="text-align:left"><?php _e('Choose Your Website Layout','comicpress'); ?></label>
+							<select name="cp_theme_layout" id="cp_theme_layout" onchange="showimage(this,'cpthemestyle')">
 								<option class="level-0" value="standard" <?php if ($comicpress_options['cp_theme_layout'] == 'standard') { ?>selected="selected" <?php } ?>><?php _e('2 Column (Standard)','comicpress'); ?></option>
 								<option class="level-0" value="3c" <?php if ($comicpress_options['cp_theme_layout'] =='3c') { ?>selected="selected" <?php } ?>><?php _e('3 Column ','comicpress'); ?></option>
 								<option class="level-0" value="3c2r" <?php if ($comicpress_options['cp_theme_layout'] =='3c2r') { ?>selected="selected" <?php } ?>><?php _e('3 Column: Sidebars Right','comicpress'); ?></option>
@@ -30,31 +30,34 @@
 								<option class="level-0" value="gn" <?php if ($comicpress_options['cp_theme_layout'] =='gn') { ?>selected="selected" <?php } ?>><?php _e('Graphic Novel: Sidebar Left','comicpress'); ?></option>
 								<option class="level-0" value="rgn" <?php if ($comicpress_options['cp_theme_layout'] =='rgn') { ?>selected="selected" <?php } ?>><?php _e('Graphic Novel: Sidebar Right','comicpress'); ?></option>
 							</select>
-						</label>
-					</td>
-					<td>
-						<img id="cpthemestyle" src="<?php echo get_template_directory_uri(); ?>/images/options/<?php echo $comicpress_options['cp_theme_layout']; ?>.png" alt="ComicPress Theme Style" />
-					</td>
-					<td style="vertical-align:middle">
-						<i>Comic Strip - 2 Column</i> and <i>Single Panel - 2 Column</i> themes default width: <b>780px</b>.
-						<br/><br/>
-						<i>Comic Strip - 3 Column</i>, <i>Single Panel - 3 Column</i>, and <i>Graphic Novel</i> themes default width: <b>980px</b>.
-					</td>
-				</tr>
-				<tfoot>
-					<tr>
-						<th colspan="3">
-							<input name="comicpress_save_layout" type="submit" class="button-primary" value="Save Layout" />
-							<input type="hidden" name="action" value="comicpress_save_layout" />
 						</th>
+						<td>
+							<img id="cpthemestyle" src="<?php echo get_template_directory_uri(); ?>/images/options/<?php echo $comicpress_options['cp_theme_layout']; ?>.png" alt="ComicPress Theme Style" />
+						</td>
+						<td style="vertical-align:middle">
+							<i>Comic Strip - 2 Column</i> and <i>Single Panel - 2 Column</i> themes default width: <b>780px</b>.
+							<br/><br/>
+							<i>Comic Strip - 3 Column</i>, <i>Single Panel - 3 Column</i>, and <i>Graphic Novel</i> themes default width: <b>980px</b>.
+						</td>
 					</tr>
-				</tfoot>
-			</table>
-
-		
+				</table>
+				
+				<div class="clear"></div>
+				
+			</div>
+			
+			<div id="comicpress-options-save">
+				<div id="major-publishing-actions">
+					<div id="publishing-action">
+						<input name="comicpress_save_layout" type="submit" class="button-primary" value="Save Layout" />
+						<input type="hidden" name="action" value="comicpress_save_layout" />
+					</div>
+					<div class="clear"></div>
+				</div>
+			</div>
 
 		</form>
 
-
-
+		<div class="clear"></div>
+		
 </div>