diff --git a/classes/ComicPressAdmin.inc b/classes/ComicPressAdmin.inc
index 4245dee..7b5017a 100644
--- a/classes/ComicPressAdmin.inc
+++ b/classes/ComicPressAdmin.inc
@@ -70,18 +70,18 @@ class ComicPressAdmin {
 
     if (strpos($pagenow, "post") === 0) {
       add_meta_box("comic-image-ordering", __("Comic Image Ordering", 'comicpress'), array(&$this, 'render_comic_image_ordering'), "post", "normal", "low");
-      wp_enqueue_script('cp-ordering', get_stylesheet_directory_uri() . '/js/ComicImageOrdering.js', array('scriptaculous', 'scriptaculous-slider'));
-      wp_enqueue_style('cp-admin', get_stylesheet_directory_uri() . '/css/cp-admin.css');
+      wp_enqueue_script('cp-ordering', get_template_directory_uri() . '/js/ComicImageOrdering.js', array('scriptaculous', 'scriptaculous-slider'));
+      wp_enqueue_style('cp-admin', get_template_directory_uri() . '/css/cp-admin.css');
       add_action('admin_footer', array(&$this, 'admin_footer'));
     }
 
 		if ($plugin_page == 'comicpress/render_admin') {
-			wp_enqueue_style('cp-admin', get_stylesheet_directory_uri() . '/css/cp-admin.css');
-			wp_enqueue_script('cp-admin', get_stylesheet_directory_uri() . '/js/Storyline.js', array('prototype', 'scriptaculous'));
+			wp_enqueue_style('cp-admin', get_template_directory_uri() . '/css/cp-admin.css');
+			wp_enqueue_script('cp-admin', get_template_directory_uri() . '/js/Storyline.js', array('prototype', 'scriptaculous'));
 		}
 
 		if (strpos($pagenow, "media-upload") === 0) {
-			wp_enqueue_script('cp-media', get_stylesheet_directory_uri() . '/js/MediaUpload.js', array('prototype'));
+			wp_enqueue_script('cp-media', get_template_directory_uri() . '/js/MediaUpload.js', array('prototype'));
 		}
 	}
 
diff --git a/classes/partials/options-admin.inc b/classes/partials/options-admin.inc
index 04f6271..9912fc6 100644
--- a/classes/partials/options-admin.inc
+++ b/classes/partials/options-admin.inc
@@ -5,11 +5,16 @@
     <h3><?php _e('Global Options', 'comicpress') ?></h3>
     <table class="widefat fixed">
       <tr>
-        <th scope="row" valign="top"><?php _e('Layout', 'comicpress') ?></th>
+        <th scope="row" valign="top"><?php _e("Arrange storyline category order", 'comicpress') ?></th>
         <td>
-          <select name="cp[layout]">
-            <?php echo $this->create_layout_options($this->comicpress->get_layout_choices(), $this->comicpress->comicpress_options['layout']) ?>
-          </select>
+					<input type="hidden" name="cp[storyline_order]" />
+					<div id="storyline-sorter" class="cp-children">
+	          <?php 
+							$this->_render_admin_storyline_tree(reset($storyline->get_simple_storyline()))
+						?>
+					</div>
+					<script type="text/javascript">Storyline.setup()</script>
+          <p><em><?php _e('(drag and drop desired order. categories can be modified on the Posts -> Categories page)', 'comicpress') ?></em></p>
         </td>
       </tr>
       <?php foreach (array(
@@ -31,41 +36,6 @@
           <input type="text" name="cp[blogpost_count]" value="<?php echo $this->comicpress->comicpress_options['blogpost_count'] ?>" size="3" />
         </td>
       </tr>
-      <tr>
-        <th scope="row" valign="top"><?php _e("Arrange storyline category order", 'comicpress') ?></th>
-        <td>
-					<input type="hidden" name="cp[storyline_order]" />
-					<div id="storyline-sorter" class="cp-children">
-	          <?php 
-							$this->_render_admin_storyline_tree(reset($storyline->get_simple_storyline()))
-						?>
-					</div>
-					<script type="text/javascript">Storyline.setup()</script>
-          <p><em><?php _e('(drag and drop desired order. categories can be modified on the Posts -> Categories page)', 'comicpress') ?></em></p>
-        </td>
-      </tr>
-      <tr>
-        <th scope="row"><?php _e('Insert into comic space:', 'comicpress') ?></th>
-        <td>
-          <?php foreach (array(
-            "comic_only" => __("The comic only, with post content below", 'comicpress'),
-            "post_content" => __("The post content", 'comicpress')
-          ) as $value => $label) { ?>
-            <label><input type="radio" name="cp[comic_space]" value="<?php echo $value ?>" <?php echo ($this->comicpress->comicpress_options['comic_space'] == $value) ? 'checked="checked"' : "" ?> /> <?php echo $label ?></label><br />
-          <?php } ?>
-        </td>
-      </tr>
-      <tr>
-        <th scope="row"><?php _e('Use subcategories of the Master Comic Category as:', 'comicpress') ?></th>
-        <td>
-          <?php foreach (array(
-            "storyline" => __("Storyline indicators for a single comic", 'comicpress'),
-            "multicomic" => __("Multicomic indicators, with direct descendents being separate comics", 'comicpress')
-          ) as $value => $label) { ?>
-            <label><input type="radio" name="cp[category_usage]" value="<?php echo $value ?>" <?php echo ($this->comicpress->comicpress_options['category_usage'] == $value) ? 'checked="checked"' : "" ?> /> <?php echo $label ?></label><br />
-          <?php } ?>
-        </td>
-      </tr>
     </table>
     <h3><?php _e('Admin Options', 'comicpress') ?></h3>
     <table class="widefat fixed">
diff --git a/css/cp-admin.css b/css/cp-admin.css
index e03ce6f..c2c731b 100644
--- a/css/cp-admin.css
+++ b/css/cp-admin.css
@@ -2,6 +2,10 @@
   padding-left: 20px
 }
 
+#children-0 {
+	padding-left: 0
+}
+
 .cp-category-info span {
 	cursor: move;
 	color: #004