diff --git a/commons_wikis.features.og_features_permission.inc b/commons_wikis.features.og_features_permission.inc
index 4b9f377..eaf12aa 100644
--- a/commons_wikis.features.og_features_permission.inc
+++ b/commons_wikis.features.og_features_permission.inc
@@ -44,8 +44,8 @@ function commons_wikis_og_features_default_permissions() {
   // Exported og permission: 'node:group:update own wiki content'
   $permissions['node:group:update own wiki content'] = array(
     'roles' => array(
-      'administrator member' => 'administrator member',
       'member' => 'member',
+      'administrator member' => 'administrator member',
     ),
   );
 
diff --git a/commons_wikis.info b/commons_wikis.info
index f1f9bca..b486ef0 100644
--- a/commons_wikis.info
+++ b/commons_wikis.info
@@ -9,6 +9,7 @@ dependencies[] = commons_body
 dependencies[] = commons_groups
 dependencies[] = commons_topics
 dependencies[] = ctools
+dependencies[] = entity
 dependencies[] = entityreference
 dependencies[] = features
 dependencies[] = og_ui
@@ -32,7 +33,6 @@ features[og_features_permission][] = node:group:delete own wiki content
 features[og_features_permission][] = node:group:update any wiki content
 features[og_features_permission][] = node:group:update own wiki content
 features[panelizer_defaults][] = node:wiki:default
-features[panelizer_defaults][] = node:wiki:default:default
 features[user_permission][] = create wiki content
 features[user_permission][] = delete own wiki content
 features[user_permission][] = edit any wiki content
diff --git a/commons_wikis.module b/commons_wikis.module
index a16bb74..626f9a5 100644
--- a/commons_wikis.module
+++ b/commons_wikis.module
@@ -53,7 +53,7 @@ function commons_wikis_commons_bw_group_widget() {
 * Implements hook_views_pre_render().
 */
 function commons_wikis_views_pre_render(&$view) {
-  if ($view->name == 'commons_bw_wikis' && user_access('Wiki: Create new content')) {
+  if ($view->name == 'commons_bw_wikis' && node_access('create', 'wiki')) {
     $group_id = $view->args[0];
     $view->attachment_before = l('Create a wiki', 'node/add/wiki', array('query' => array('og_group_ref' => $group_id)));
   }  
diff --git a/commons_wikis.panelizer.inc b/commons_wikis.panelizer.inc
index 0df429d..b194016 100644
--- a/commons_wikis.panelizer.inc
+++ b/commons_wikis.panelizer.inc
@@ -46,23 +46,22 @@ function commons_wikis_panelizer_defaults() {
   $display->content = array();
   $display->panels = array();
     $pane = new stdClass();
-    $pane->pid = 'wiki-content';
+    $pane->pid = 'new-1';
     $pane->panel = 'two_66_33_first';
     $pane->type = 'node_content';
     $pane->subtype = 'node_content';
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'links' => 0,
-      'page' => 1,
+      'links' => 1,
       'no_extras' => 0,
-      'override_title' => 1,
+      'override_title' => 0,
       'override_title_text' => '',
       'identifier' => '',
       'link' => 0,
       'leave_node_title' => 0,
-      'context' => 'panelizer',
       'build_mode' => 'full',
+      'context' => 'panelizer',
     );
     $pane->cache = array();
     $pane->style = array(
@@ -71,11 +70,35 @@ function commons_wikis_panelizer_defaults() {
     $pane->css = array();
     $pane->extras = array();
     $pane->position = 0;
-    $pane->locks = '';
-    $display->content['wiki_content'] = $pane;
-    $display->panels['two_66_33_first'][0] = 'wiki-content';
+    $pane->locks = array();
+    $display->content['new-1'] = $pane;
+    $display->panels['two_66_33_first'][0] = 'new-1';
+    $pane = new stdClass();
+    $pane->pid = 'new-2';
+    $pane->panel = 'two_66_33_first';
+    $pane->type = 'node_comments';
+    $pane->subtype = 'node_comments';
+    $pane->shown = TRUE;
+    $pane->access = array();
+    $pane->configuration = array(
+      'mode' => '1',
+      'comments_per_page' => '30',
+      'context' => 'panelizer',
+      'override_title' => 1,
+      'override_title_text' => '',
+    );
+    $pane->cache = array();
+    $pane->style = array(
+      'settings' => NULL,
+    );
+    $pane->css = array();
+    $pane->extras = array();
+    $pane->position = 1;
+    $pane->locks = array();
+    $display->content['new-2'] = $pane;
+    $display->panels['two_66_33_first'][1] = 'new-2';
     $pane = new stdClass();
-    $pane->pid = 'wiki-contributor';
+    $pane->pid = 'new-3';
     $pane->panel = 'two_66_33_second';
     $pane->type = 'views_panes';
     $pane->subtype = 'commons_wikis_contributor_list-commons_wikis_contributor_pane';
@@ -94,10 +117,10 @@ function commons_wikis_panelizer_defaults() {
     $pane->extras = array();
     $pane->position = 0;
     $pane->locks = '';
-    $display->content['wiki-contributor'] = $pane;
-    $display->panels['two_66_33_first'][0] = 'wiki-contributor';
+    $display->content['new-3'] = $pane;
+    $display->panels['two_66_33_second'][0] = 'new-3';
   $display->hide_title = PANELS_TITLE_FIXED;
-  $display->title_pane = 'new-1';
+  $display->title_pane = '0';
   $panelizer->display = $display;
   $export['node:wiki:default'] = $panelizer;
 
diff --git a/commons_wikis.views_default.inc b/commons_wikis.views_default.inc
index 918484b..0fa68c5 100644
--- a/commons_wikis.views_default.inc
+++ b/commons_wikis.views_default.inc
@@ -102,7 +102,6 @@ function commons_wikis_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'wiki' => 'wiki',
   );
-
   $export['commons_bw_wikis'] = $view;
 
   $view = new view();
@@ -206,7 +205,6 @@ function commons_wikis_views_default_views() {
       'label' => 'Content: Nid',
     ),
   );
-  
   $export['commons_wikis_contributor_list'] = $view;
 
   return $export;