--- og_user_roles.module.old	2008-08-22 10:30:37.000000000 -0600
+++ og_user_roles.module	2008-08-22 10:51:17.000000000 -0600
@@ -308,12 +308,31 @@ function og_user_roles_admin_settings() 
     '#default_value' => variable_get('og_user_roles_test_default', 0),
     '#description' => t('Every time user_access() is called, it will call og_user_all_roles() which adds group roles to $user->roles.  Do you wish to see the output from this function? (Note that this feature is for testing/debug purposes, and could create a very large output file.  This feature also requires that the table og_user_test already exist. Details here: ' . l("OG User Roles: Test", "http://drupal.org/node/164038")),
   );
+  
+  $form['og_user_roles_menu_options'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Group Menu Options.'),
+    '#description' => t('Give group admins control of the display of OGR and default OG create links in the groups menu.'),
+    '#collapsible' => TRUE,
+    );
+  $form['og_user_roles_menu_options']['og_user_roles_menu_options_enabled'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Enable menu control?'),
+    '#default_value' => variable_get('og_user_roles_menu_options_enabled', 1),
+    '#description' => t("This will add two form elements, inside a field set, to the OG node's edit page, enabling this feature."),
+    );
 
   $form['og_user_roles_logo'] = array(
     '#type' => 'fieldset',
     '#title' => t('Group Logo Attributes.'),
     '#description' => t('Group admins can upload a logo for their group. Here you enter the maximimum width and height attributes for Group Logos.'),
     '#collapsible' => TRUE,
+    );
+  $form['og_user_roles_logo']['og_user_roles_logo_enabled'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Enable group logo?'),
+    '#default_value' => variable_get('og_user_roles_logo_enabled', 1),
+    '#description' => t("This will add a text box onto the OG node's edit page, enabling this feature."),
     );
   $form['og_user_roles_logo']['og_user_roles_logo_width'] = array(
     '#type' => 'textfield',
@@ -2916,7 +2935,7 @@ function og_user_roles_form_alter($form_
       if ($type != '' && $form_id == $type . "_node_form")  {
 
         // Group Logo Location
-
+        if(variable_get('og_user_roles_logo_enabled', '1') ) {
           $form['og_user_roles_logo'] = array(
             '#type' => 'fieldset',
             '#title' => t('Group Logo location.'),
@@ -2931,9 +2950,9 @@ function og_user_roles_form_alter($form_
             );
           $form['#validate'] += array('og_user_roles_logo_form_validate' => array($form_id, &$form));          
           $form['#submit'] += array('og_user_roles_logo_form_submit' => array($form_id, &$form));          
-
+        }
         // Add the code to display 'Create content' link and/or remove 'create_' links.
-
+        if (variable_get('og_user_roles_menu_options_enabled', 1)) {
           $form['og_user_roles_links_gid'] = array(
             '#type' => 'fieldset',
             '#title' => t('Control group menu content links.'),
@@ -2952,7 +2971,7 @@ function og_user_roles_form_alter($form_
             '#description' => t('Do you wish to remove the default OG <strong>Create</strong> content links on this group\'s menu?'),
             );
           $form['#submit'] += array('og_user_roles_links_form_submit' => array($form_id, &$form));          
-
+        }
         // Add the code to disallow public posts to the
         // group edit form.