diff --git a/options/addonoptions.php b/options/addonoptions.php
index 1ca4939..3ad6bf1 100644
--- a/options/addonoptions.php
+++ b/options/addonoptions.php
@@ -3,7 +3,7 @@
 	<form method="post" id="myForm" name="template" enctype="multipart/form-data" action="">
 	<?php wp_nonce_field('update-options') ?>
 
-		<div id="comicpress-options">
+		<div class="comicpress-options">
 
 		<table class="widefat">
 			<thead>
diff --git a/options/archivesearchoptions.php b/options/archivesearchoptions.php
index 4e2e9c3..da2db8a 100644
--- a/options/archivesearchoptions.php
+++ b/options/archivesearchoptions.php
@@ -1,9 +1,9 @@
 <div id="comicpress-archivesearch">
 
-	<form method="post" id="myForm" name="template" enctype="multipart/form-data" action="">
+	<form method="post" id="myForm-archive" name="template" enctype="multipart/form-data" action="">
 	<?php wp_nonce_field('update-options') ?>
 
-		<div id="comicpress-options">
+		<div class="comicpress-options">
 
 			<table class="widefat">
 				<thead>
diff --git a/options/configoptions.php b/options/configoptions.php
index 26cca16..3f66e3a 100644
--- a/options/configoptions.php
+++ b/options/configoptions.php
@@ -3,7 +3,7 @@
 	<form method="post" id="myForm" name="template" enctype="multipart/form-data" action="">
 	<?php wp_nonce_field('update-options') ?>
 
-		<div id="comicpress-options">
+		<div class="comicpress-options">
 
 			<table class="widefat">
 
diff --git a/options/generaloptions.php b/options/generaloptions.php
index 162381e..e761488 100644
--- a/options/generaloptions.php
+++ b/options/generaloptions.php
@@ -3,7 +3,7 @@
 	<form method="post" id="myForm" name="template" enctype="multipart/form-data" action="">
 	<?php wp_nonce_field('update-options') ?>
 
-		<div id="comicpress-options">
+		<div class="comicpress-options">
 
 			<table class="widefat">
 				<thead>
diff --git a/options/indexoptions.php b/options/indexoptions.php
index 3b1bbc5..f4be8ca 100644
--- a/options/indexoptions.php
+++ b/options/indexoptions.php
@@ -3,7 +3,7 @@
 	<form method="post" id="myForm" name="template" enctype="multipart/form-data" action="">
 	<?php wp_nonce_field('update-options') ?>
 
-		<div id="comicpress-options">
+		<div class="comicpress-options">
 
 			<table class="widefat">
 				<thead>
diff --git a/options/menubaroptions.php b/options/menubaroptions.php
index 0a74c30..57654d6 100644
--- a/options/menubaroptions.php
+++ b/options/menubaroptions.php
@@ -3,7 +3,7 @@
 	<form method="post" id="myForm" name="template" enctype="multipart/form-data" action="">
 	<?php wp_nonce_field('update-options') ?>
 
-		<div id="comicpress-options">
+		<div class="comicpress-options">
 
 			<table class="widefat">
 				<thead>
diff --git a/options/options.css b/options/options.css
index aa0bdfd..d1d15d7 100644
--- a/options/options.css
+++ b/options/options.css
@@ -97,7 +97,7 @@ div.show img {
 	text-decoration: none;
 }
 
-#comicpress-options {
+.comicpress-options {
 	padding: 10px 10px 1px 10px;
 	background: #fff;
 	border-width: 1px 1px 1px 1px;
@@ -131,54 +131,54 @@ div.show img {
 	-khtml-border-bottom-right-radius: 6px;
 }
 
-#comicpress-options  table.widefat thead tr th {
+.comicpress-options  table.widefat thead tr th {
 	font-size: 14px;
 }
 
-#comicpress-options  table.widefat label {
+.comicpress-options  table.widefat label {
 	display: block;
 	text-align: right;
 }
 
-#comicpress-options  table.widefat label.inline-label {
+.comicpress-options  table.widefat label.inline-label {
 	display: inline;
 }
 
-#comicpress-options  table.widefat select {
+.comicpress-options  table.widefat select {
 	width: 100%;
 }
 
-#comicpress-options table.widefat {
+.comicpress-options table.widefat {
 	margin-bottom: 10px;
 	border-bottom: none;
 }
 
-#comicpress-options table.widefat th {
+.comicpress-options table.widefat th {
 	width: 200px;
 }
 
-#comicpress-options table.widefat th input{
+.comicpress-options table.widefat th input{
 margin: 1px;
 padding: 3px;
 width: 100%;
 }
 
-#comicpress-options table.widefat th .radio input{
+.comicpress-options table.widefat th .radio input{
 margin: 0;
 padding: 0;
 width: auto;
 }
 
-#comicpress-options table.widefat th label {
+.comicpress-options table.widefat th label {
 	color: #21759b;
 	text-align: left;
 }
 
-#comicpress-options table.widefat th label:hover {
+.comicpress-options table.widefat th label:hover {
 	color: #d54e21;
 }
 
-#comicpress-options table.widefat th, #comicpress-options table.widefat td {
+.comicpress-options table.widefat th, .comicpress-options table.widefat td {
 	vertical-align: middle;
 }
 #comicpress-version-title {
@@ -200,7 +200,7 @@ width: auto;
 	letter-spacing: 8px;
 }
 
-#comicpress-options .radio {
+.comicpress-options .radio {
 	padding-top: 5px;
 	text-align: right;
 }
diff --git a/options/postoptions.php b/options/postoptions.php
index 20ea1c7..468883b 100644
--- a/options/postoptions.php
+++ b/options/postoptions.php
@@ -3,7 +3,7 @@
 	<form method="post" id="myForm" name="template" enctype="multipart/form-data" action="">
 	<?php wp_nonce_field('update-options') ?>
 
-		<div id="comicpress-options">
+		<div class="comicpress-options">
 
 			<table class="widefat">
 				<thead>
diff --git a/options/themestyle.php b/options/themestyle.php
index 51f609d..f2a7026 100644
--- a/options/themestyle.php
+++ b/options/themestyle.php
@@ -12,7 +12,7 @@
 
 	<?php wp_nonce_field('update-options') ?>
 
-		<div id="comicpress-options">
+		<div class="comicpress-options">
 
 			<table class="widefat" cellspacing="0">
 				<thead>