diff --git a/options.php b/options.php
index 554ade3..91b210a 100644
--- a/options.php
+++ b/options.php
@@ -4,12 +4,7 @@ class ComicPressOptionsAdmin {
   function render_admin() {
     $nonce = wp_create_nonce('comicpress');
 
-    echo '<div class="wrap">';
-      echo '<h2>ComicPress Config</h2>';
-      echo '<form method="post">';
-        echo '<input type="hidden" name="cp[_nonce]" value="' . $nonce . '" />';
-      echo '</form>';
-    echo '</div>';
+    include(dirname(__FILE__) . '/partials/options-admin.inc');	
   }
 
   function get_root_categories() {
diff --git a/partials/options-admin.inc b/partials/options-admin.inc
new file mode 100644
index 0000000..5e17003
--- /dev/null
+++ b/partials/options-admin.inc
@@ -0,0 +1,15 @@
+<div class="wrap">
+  <h2>ComicPress Config</h2>
+  <form method="post">
+    <input type="hidden" name="cp[_nonce]" value="<?php echo $nonce ?>" />
+    <table>
+      <tr>
+        <th scope="row">Master Comic Category</th>
+        <td>
+          <select name="cp[comiccat]">
+          </select>
+        </td>
+      </tr>
+    </table>
+  </form>
+</div>
diff --git a/test/OptionsPageTest.php b/test/OptionsPageTest.php
index a2c88a9..e6fafef 100644
--- a/test/OptionsPageTest.php
+++ b/test/OptionsPageTest.php
@@ -16,7 +16,7 @@ class OptionsPageTest extends PHPUnit_Framework_TestCase {
     ob_start();
     $this->admin->render_admin();
     $source = ob_get_clean();
-    
+
     $this->assertTrue(($xml = _to_xml($source)) !== false);
     foreach (array(
       '//input[@name="cp[_nonce]" and @value="' . $nonce . '"]' => true