diff --git a/cpv.module b/cpv.module
index 42597fc..55e5efc 100644
--- a/cpv.module
+++ b/cpv.module
@@ -25,6 +25,8 @@ function cpv_menu() {
     'page arguments' => array('cpv_settings'),
     'access arguments' => array('administer views'),
     'file' => 'cpv.admin.inc',
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 10,
   );
 
   // CPV settings are only needed if code can be served from the file system.
diff --git a/cpv_plugin_display_extender_code.inc b/cpv_plugin_display_extender_code.inc
index 9e4cfe3..1bacd2b 100644
--- a/cpv_plugin_display_extender_code.inc
+++ b/cpv_plugin_display_extender_code.inc
@@ -13,7 +13,7 @@ class cpv_plugin_display_extender_code extends views_plugin_display_extender {
   /**
    * Provide a form to edit options for this plugin.
    */
-  function option_definition(&$options) {
+  function options_definition_alter(&$options) {
     $options['cpv_css'] = array('default' => '');
     $options['cpv_js'] = array('default' => '');
   }
@@ -26,9 +26,9 @@ class cpv_plugin_display_extender_code extends views_plugin_display_extender {
     $display = $this->display;
     $save = variable_get('cpv_save', 'inline');
     
-    $css  = trim($display->options['cpv_css']);
-    $js   = trim($display->options['cpv_js']);
-    switch($save) {
+    $css  = array_key_exists('cpv_css', $display->options) ? trim($display->options['cpv_css']) : '';
+    $js  = array_key_exists('cpv_js', $display->options) ? trim($display->options['cpv_js']) : '';
+    switch ($save) {
       // Serve code inline.
       case 'inline':
         if (!empty($css)) {