diff --git a/modules/features/commons_core/commons_core.views_default.inc b/modules/features/commons_core/commons_core.views_default.inc
index 077209c..8e6cfd5 100644
--- a/modules/features/commons_core/commons_core.views_default.inc
+++ b/modules/features/commons_core/commons_core.views_default.inc
@@ -11,10 +11,9 @@ function commons_core_views_default_views() {
   $view->name = 'group_block_latest_content';
   $view->description = 'The latest group posts block';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('relationships', array(
@@ -272,10 +271,10 @@ function commons_core_views_default_views() {
       'field' => 'group_nid',
       'validate_user_argument_type' => 'uid',
       'validate_user_roles' => array(
-        '2' => 0,
-        '3' => 0,
-        '4' => 0,
-        '5' => 0,
+        2 => 0,
+        3 => 0,
+        4 => 0,
+        5 => 0,
       ),
       'override' => array(
         'button' => 'Override',
@@ -299,8 +298,8 @@ function commons_core_views_default_views() {
       'validate_argument_node_access' => 0,
       'validate_argument_nid_type' => 'nid',
       'validate_argument_vocabulary' => array(
-        '2' => 0,
-        '3' => 0,
+        2 => 0,
+        3 => 0,
       ),
       'validate_argument_type' => 'tid',
       'validate_argument_transform' => 0,
@@ -392,10 +391,9 @@ function commons_core_views_default_views() {
   $view->name = 'group_block_members';
   $view->description = 'A helper view to provide the block of group members and admins';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'users';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
@@ -466,10 +464,10 @@ function commons_core_views_default_views() {
       'field' => 'nid',
       'validate_user_argument_type' => 'uid',
       'validate_user_roles' => array(
-        '2' => 0,
-        '3' => 0,
-        '4' => 0,
-        '5' => 0,
+        2 => 0,
+        3 => 0,
+        4 => 0,
+        5 => 0,
       ),
       'override' => array(
         'button' => 'Override',
@@ -493,8 +491,8 @@ function commons_core_views_default_views() {
       'validate_argument_node_access' => 0,
       'validate_argument_nid_type' => 'nid',
       'validate_argument_vocabulary' => array(
-        '2' => 0,
-        '3' => 0,
+        2 => 0,
+        3 => 0,
       ),
       'validate_argument_type' => 'tid',
       'validate_argument_transform' => 0,
@@ -516,7 +514,7 @@ function commons_core_views_default_views() {
     'is_admin' => array(
       'operator' => 'in',
       'value' => array(
-        '1' => '1',
+        1 => '1',
       ),
       'group' => '0',
       'exposed' => FALSE,
@@ -590,7 +588,7 @@ function commons_core_views_default_views() {
     'is_admin' => array(
       'operator' => 'not in',
       'value' => array(
-        '1' => '1',
+        1 => '1',
       ),
       'group' => '0',
       'exposed' => FALSE,
@@ -652,10 +650,9 @@ function commons_core_views_default_views() {
   $view->name = 'group_node';
   $view->description = 'Group profile';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
@@ -786,11 +783,11 @@ function commons_core_views_default_views() {
       'link_to_taxonomy' => 1,
       'limit' => 0,
       'vids' => array(
-        '5' => 0,
-        '2' => 0,
-        '3' => 0,
-        '6' => 0,
-        '4' => 0,
+        5 => 0,
+        2 => 0,
+        3 => 0,
+        6 => 0,
+        4 => 0,
       ),
       'exclude' => 0,
       'id' => 'tid',
@@ -895,10 +892,10 @@ function commons_core_views_default_views() {
       'field' => 'nid',
       'validate_user_argument_type' => 'uid',
       'validate_user_roles' => array(
-        '2' => 0,
-        '3' => 0,
-        '4' => 0,
-        '5' => 0,
+        2 => 0,
+        3 => 0,
+        4 => 0,
+        5 => 0,
       ),
       'relationship' => 'none',
       'default_options_div_prefix' => '',
@@ -919,8 +916,8 @@ function commons_core_views_default_views() {
       'validate_argument_node_access' => 0,
       'validate_argument_nid_type' => 'nid',
       'validate_argument_vocabulary' => array(
-        '2' => 0,
-        '3' => 0,
+        2 => 0,
+        3 => 0,
       ),
       'validate_argument_type' => 'tid',
       'validate_argument_transform' => 0,
@@ -1021,10 +1018,10 @@ function commons_core_views_default_views() {
       'field' => 'group_nid',
       'validate_user_argument_type' => 'uid',
       'validate_user_roles' => array(
-        '2' => 0,
-        '3' => 0,
-        '4' => 0,
-        '5' => 0,
+        2 => 0,
+        3 => 0,
+        4 => 0,
+        5 => 0,
       ),
       'override' => array(
         'button' => 'Use default',
@@ -1048,8 +1045,8 @@ function commons_core_views_default_views() {
       'validate_argument_node_access' => 1,
       'validate_argument_nid_type' => 'nid',
       'validate_argument_vocabulary' => array(
-        '2' => 0,
-        '3' => 0,
+        2 => 0,
+        3 => 0,
       ),
       'validate_argument_type' => 'tid',
       'validate_argument_transform' => 0,
@@ -1130,10 +1127,9 @@ function commons_core_views_default_views() {
   $view->name = 'groups_featured_groups';
   $view->description = 'A block displaying the featured groups';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
@@ -1304,11 +1300,11 @@ function commons_core_views_default_views() {
       'link_to_taxonomy' => 1,
       'limit' => 0,
       'vids' => array(
-        '2' => 0,
-        '3' => 0,
-        '5' => 0,
-        '6' => 0,
-        '4' => 0,
+        2 => 0,
+        3 => 0,
+        5 => 0,
+        6 => 0,
+        4 => 0,
       ),
       'exclude' => 1,
       'id' => 'tid',
@@ -1491,10 +1487,9 @@ function commons_core_views_default_views() {
   $view->name = 'groups_main_listing';
   $view->description = 'The main listing of all groups';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
@@ -1540,14 +1535,16 @@ function commons_core_views_default_views() {
       'relationship' => 'none',
     ),
     'title' => array(
-      'label' => '',
+      'label' => 'Group title',
       'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
         'path' => '',
+        'absolute' => 0,
         'link_class' => '',
         'alt' => '',
+        'rel' => '',
         'prefix' => '',
         'suffix' => '',
         'target' => '',
@@ -1562,8 +1559,9 @@ function commons_core_views_default_views() {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
+      'hide_alter_empty' => 1,
       'link_to_node' => 1,
-      'exclude' => 1,
+      'exclude' => 0,
       'id' => 'title',
       'table' => 'node',
       'field' => 'title',
@@ -1573,14 +1571,16 @@ function commons_core_views_default_views() {
       ),
     ),
     'tid' => array(
-      'label' => 'Tags',
+      'label' => '',
       'alter' => array(
-        'alter_text' => 0,
-        'text' => '',
+        'alter_text' => 1,
+        'text' => '<em>[tid]</em>',
         'make_link' => 0,
         'path' => '',
+        'absolute' => 0,
         'link_class' => '',
         'alt' => '',
+        'rel' => '',
         'prefix' => '',
         'suffix' => '',
         'target' => '',
@@ -1595,18 +1595,17 @@ function commons_core_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
+      'hide_alter_empty' => 1,
       'type' => 'separator',
       'separator' => ', ',
       'link_to_taxonomy' => 1,
       'limit' => 0,
       'vids' => array(
-        '5' => 0,
-        '2' => 0,
-        '3' => 0,
-        '6' => 0,
-        '4' => 0,
+        2 => 0,
+        1 => 0,
+        3 => 0,
       ),
-      'exclude' => 1,
+      'exclude' => 0,
       'id' => 'tid',
       'table' => 'term_node',
       'field' => 'tid',
@@ -1615,17 +1614,99 @@ function commons_core_views_default_views() {
       ),
       'relationship' => 'none',
     ),
+    'posts_count' => array(
+      'label' => 'Posts',
+      'alter' => array(
+        'alter_text' => 0,
+        'text' => '',
+        'make_link' => 0,
+        'path' => '',
+        'absolute' => 0,
+        'link_class' => '',
+        'alt' => '',
+        'rel' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'target' => '',
+        'help' => '',
+        'trim' => 0,
+        'max_length' => '',
+        'word_boundary' => 1,
+        'ellipsis' => 1,
+        'html' => 0,
+        'strip_tags' => 0,
+      ),
+      'empty' => '',
+      'hide_empty' => 0,
+      'empty_zero' => 0,
+      'hide_alter_empty' => 1,
+      'set_precision' => FALSE,
+      'precision' => 0,
+      'decimal' => '.',
+      'separator' => ',',
+      'format_plural' => 0,
+      'format_plural_singular' => '1',
+      'format_plural_plural' => '@count',
+      'prefix' => '',
+      'suffix' => '',
+      'exclude' => 0,
+      'id' => 'posts_count',
+      'table' => 'og_statistics',
+      'field' => 'posts_count',
+      'relationship' => 'none',
+    ),
+    'members_count' => array(
+      'label' => 'Members',
+      'alter' => array(
+        'alter_text' => 0,
+        'text' => '',
+        'make_link' => 0,
+        'path' => '',
+        'absolute' => 0,
+        'link_class' => '',
+        'alt' => '',
+        'rel' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'target' => '',
+        'help' => '',
+        'trim' => 0,
+        'max_length' => '',
+        'word_boundary' => 1,
+        'ellipsis' => 1,
+        'html' => 0,
+        'strip_tags' => 0,
+      ),
+      'empty' => '',
+      'hide_empty' => 0,
+      'empty_zero' => 0,
+      'hide_alter_empty' => 1,
+      'set_precision' => FALSE,
+      'precision' => 0,
+      'decimal' => '.',
+      'separator' => ',',
+      'format_plural' => 0,
+      'format_plural_singular' => '1',
+      'format_plural_plural' => '@count',
+      'prefix' => '',
+      'suffix' => '',
+      'exclude' => 0,
+      'id' => 'members_count',
+      'table' => 'og_statistics',
+      'field' => 'members_count',
+      'relationship' => 'none',
+    ),
     'description' => array(
-      'label' => '',
+      'label' => 'Description',
       'alter' => array(
-        'alter_text' => 1,
-        'text' => '<div class="title">[title]</div>
-<div class="tags">Tags: [tid] </div>
-<div class="description">[description] </div>',
+        'alter_text' => 0,
+        'text' => '',
         'make_link' => 0,
         'path' => '',
+        'absolute' => 0,
         'link_class' => '',
         'alt' => '',
+        'rel' => '',
         'prefix' => '',
         'suffix' => '',
         'target' => '',
@@ -1640,6 +1721,7 @@ function commons_core_views_default_views() {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
+      'hide_alter_empty' => 1,
       'exclude' => 0,
       'id' => 'description',
       'table' => 'og',
@@ -1649,15 +1731,17 @@ function commons_core_views_default_views() {
         'button' => 'Override',
       ),
     ),
-    'subscribe' => array(
-      'label' => '',
+    'created' => array(
+      'label' => 'Created',
       'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
         'path' => '',
+        'absolute' => 0,
         'link_class' => '',
         'alt' => '',
+        'rel' => '',
         'prefix' => '',
         'suffix' => '',
         'target' => '',
@@ -1670,18 +1754,18 @@ function commons_core_views_default_views() {
         'strip_tags' => 0,
       ),
       'empty' => '',
-      'hide_empty' => 1,
+      'hide_empty' => 0,
       'empty_zero' => 0,
+      'hide_alter_empty' => 1,
+      'date_format' => 'custom',
+      'custom_date_format' => 'Y-m-d',
       'exclude' => 0,
-      'id' => 'subscribe',
-      'table' => 'og',
-      'field' => 'subscribe',
+      'id' => 'created',
+      'table' => 'node',
+      'field' => 'created',
       'relationship' => 'none',
-      'override' => array(
-        'button' => 'Override',
-      ),
     ),
-    'leave_group' => array(
+    'subscribe' => array(
       'label' => '',
       'alter' => array(
         'alter_text' => 0,
@@ -1704,33 +1788,22 @@ function commons_core_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'text' => 'Leave',
       'exclude' => 0,
-      'id' => 'leave_group',
-      'table' => 'og_uid',
-      'field' => 'leave_group',
+      'id' => 'subscribe',
+      'table' => 'og',
+      'field' => 'subscribe',
+      'relationship' => 'none',
       'override' => array(
         'button' => 'Override',
       ),
-      'relationship' => 'none',
     ),
   ));
   $handler->override_option('sorts', array(
-    'score' => array(
-      'order' => 'DESC',
-      'id' => 'score',
-      'table' => 'search_index',
-      'field' => 'score',
-      'override' => array(
-        'button' => 'Override',
-      ),
-      'relationship' => 'none',
-    ),
     'created' => array(
+      'order' => 'DESC',
+      'granularity' => 'second',
       'exposed' => TRUE,
-      'order' => 'unsorted',
       'identifier' => 'unsorted',
-      'granularity' => 'second',
       'id' => 'created',
       'table' => 'node',
       'field' => 'created',
@@ -1744,57 +1817,6 @@ function commons_core_views_default_views() {
         'order' => 'unsorted',
       ),
     ),
-    'title' => array(
-      'exposed' => TRUE,
-      'order' => 'unsorted',
-      'identifier' => 'unsorted',
-      'id' => 'title',
-      'table' => 'node',
-      'field' => 'title',
-      'expose' => array(
-        'label' => 'Title',
-        'identifier' => 'title_sort',
-        'order' => 'unsorted',
-      ),
-      'override' => array(
-        'button' => 'Override',
-      ),
-      'relationship' => 'none',
-    ),
-    'members_count' => array(
-      'exposed' => TRUE,
-      'order' => 'unsorted',
-      'identifier' => 'unsorted',
-      'id' => 'members_count',
-      'table' => 'og_statistics',
-      'field' => 'members_count',
-      'expose' => array(
-        'label' => 'Members',
-        'identifier' => 'members_count_sort',
-        'order' => 'unsorted',
-      ),
-      'override' => array(
-        'button' => 'Override',
-      ),
-      'relationship' => 'none',
-    ),
-    'posts_count' => array(
-      'exposed' => TRUE,
-      'order' => 'DESC',
-      'identifier' => 'unsorted',
-      'id' => 'posts_count',
-      'table' => 'og_statistics',
-      'field' => 'posts_count',
-      'expose' => array(
-        'label' => 'Posts',
-        'identifier' => 'posts_count_sort',
-        'order' => 'unsorted',
-      ),
-      'override' => array(
-        'button' => 'Override',
-      ),
-      'relationship' => 'none',
-    ),
   ));
   $handler->override_option('filters', array(
     'status' => array(
@@ -1848,77 +1870,6 @@ function commons_core_views_default_views() {
         'button' => 'Expose',
       ),
     ),
-    'keys' => array(
-      'operator' => 'optional',
-      'value' => '',
-      'group' => '0',
-      'exposed' => TRUE,
-      'expose' => array(
-        'use_operator' => 0,
-        'operator' => 'keys_op',
-        'identifier' => 'keys',
-        'label' => 'Search',
-        'optional' => 1,
-        'remember' => 0,
-      ),
-      'id' => 'keys',
-      'table' => 'search_index',
-      'field' => 'keys',
-      'override' => array(
-        'button' => 'Override',
-      ),
-      'relationship' => 'none',
-    ),
-    'selective' => array(
-      'operator' => 'in',
-      'value' => array(),
-      'group' => '0',
-      'exposed' => TRUE,
-      'expose' => array(
-        'use_operator' => 0,
-        'operator' => 'selective_op',
-        'identifier' => 'selective',
-        'label' => 'Access',
-        'optional' => 1,
-        'single' => 1,
-        'remember' => 0,
-        'reduce' => 0,
-      ),
-      'id' => 'selective',
-      'table' => 'og',
-      'field' => 'selective',
-      'override' => array(
-        'button' => 'Override',
-      ),
-      'relationship' => 'none',
-    ),
-    'tid' => array(
-      'operator' => 'or',
-      'value' => '',
-      'group' => '0',
-      'exposed' => TRUE,
-      'expose' => array(
-        'use_operator' => 0,
-        'operator' => 'tid_op',
-        'identifier' => 'tid',
-        'label' => 'Tags',
-        'optional' => 1,
-        'single' => 0,
-        'remember' => 0,
-      ),
-      'type' => 'textfield',
-      'limit' => TRUE,
-      'vid' => '1',
-      'id' => 'tid',
-      'table' => 'term_node',
-      'field' => 'tid',
-      'hierarchy' => 0,
-      'override' => array(
-        'button' => 'Override',
-      ),
-      'relationship' => 'none',
-      'reduce_duplicates' => 0,
-    ),
   ));
   $handler->override_option('access', array(
     'type' => 'none',
@@ -1934,9 +1885,55 @@ function commons_core_views_default_views() {
   $handler->override_option('empty', 'There are currently no groups');
   $handler->override_option('empty_format', '1');
   $handler->override_option('use_pager', '1');
-  $handler->override_option('distinct', 1);
+  $handler->override_option('distinct', 0);
+  $handler->override_option('style_plugin', 'table');
   $handler->override_option('style_options', array(
     'grouping' => '',
+    'override' => 1,
+    'sticky' => 0,
+    'order' => 'desc',
+    'summary' => '',
+    'columns' => array(
+      'field_group_image_fid' => 'field_group_image_fid',
+      'title' => 'title',
+      'tid' => 'title',
+      'posts_count' => 'posts_count',
+      'members_count' => 'members_count',
+      'description' => 'description',
+      'created' => 'created',
+      'subscribe' => 'subscribe',
+    ),
+    'info' => array(
+      'field_group_image_fid' => array(
+        'separator' => '',
+      ),
+      'title' => array(
+        'sortable' => 1,
+        'separator' => '<br />',
+      ),
+      'tid' => array(
+        'separator' => '',
+      ),
+      'posts_count' => array(
+        'sortable' => 1,
+        'separator' => '',
+      ),
+      'members_count' => array(
+        'sortable' => 1,
+        'separator' => '',
+      ),
+      'description' => array(
+        'separator' => '',
+      ),
+      'created' => array(
+        'sortable' => 1,
+        'separator' => '',
+      ),
+      'subscribe' => array(
+        'separator' => '',
+      ),
+    ),
+    'default' => 'created',
   ));
   $handler = $view->new_display('feed', 'Feed', 'feed');
   $handler->override_option('sorts', array(
@@ -2083,6 +2080,7 @@ function commons_core_views_default_views() {
   ));
   $handler->override_option('sitename_title', FALSE);
   $handler = $view->new_display('page', 'Page', 'page_1');
+  $handler->override_option('sorts', array());
   $handler->override_option('path', 'groups');
   $handler->override_option('menu', array(
     'type' => 'none',
@@ -2106,10 +2104,9 @@ function commons_core_views_default_views() {
   $view->name = 'groups_most_active';
   $view->description = 'A block displaying the most active groups';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
@@ -2364,10 +2361,9 @@ function commons_core_views_default_views() {
   $view->name = 'groups_my_groups';
   $view->description = 'A block displaying the current user\'s groups';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('relationships', array(
@@ -2565,7 +2561,7 @@ function commons_core_views_default_views() {
   $handler->override_option('access', array(
     'type' => 'role',
     'role' => array(
-      '2' => 2,
+      2 => 2,
     ),
   ));
   $handler->override_option('cache', array(
@@ -2591,10 +2587,9 @@ function commons_core_views_default_views() {
   $view->name = 'groups_my_groups_listing';
   $view->description = 'The page listing of my groups';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
@@ -2700,11 +2695,11 @@ function commons_core_views_default_views() {
       'link_to_taxonomy' => 1,
       'limit' => 0,
       'vids' => array(
-        '5' => 0,
-        '2' => 0,
-        '3' => 0,
-        '6' => 0,
-        '4' => 0,
+        5 => 0,
+        2 => 0,
+        3 => 0,
+        6 => 0,
+        4 => 0,
       ),
       'exclude' => 1,
       'id' => 'tid',
@@ -2909,7 +2904,7 @@ function commons_core_views_default_views() {
   $handler->override_option('access', array(
     'type' => 'role',
     'role' => array(
-      '2' => 2,
+      2 => 2,
     ),
   ));
   $handler->override_option('cache', array(
@@ -2951,10 +2946,9 @@ function commons_core_views_default_views() {
   $view->name = 'groups_newest_groups';
   $view->description = 'A block displaying the newest groups';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
@@ -3168,10 +3162,9 @@ function commons_core_views_default_views() {
   $view->name = 'most_bookmarked';
   $view->description = 'The most bookmarked nodes';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('relationships', array(
@@ -3401,10 +3394,9 @@ function commons_core_views_default_views() {
   $view->name = 'my_recent_items';
   $view->description = 'Items I\'ve recently created';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('relationships', array(
@@ -3692,10 +3684,9 @@ function commons_core_views_default_views() {
   $view->name = 'my_unread_items';
   $view->description = 'Recently updated item\'s I\'ve comment on';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('relationships', array(
@@ -3990,10 +3981,9 @@ function commons_core_views_default_views() {
   $view->name = 'newest_users';
   $view->description = 'Show the newest users on the site';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'users';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
@@ -4113,10 +4103,9 @@ function commons_core_views_default_views() {
   $view->name = 'notice_latest_comments';
   $view->description = 'The latest comments on all notices';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'comments';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('relationships', array(
@@ -4381,10 +4370,9 @@ function commons_core_views_default_views() {
   $view->name = 'og_my_content';
   $view->description = 'Shows your content across your groups';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('relationships', array(
@@ -4646,9 +4634,9 @@ function commons_core_views_default_views() {
       'field' => 'uid_touch',
       'validate_user_argument_type' => 'uid',
       'validate_user_roles' => array(
-        '2' => 0,
-        '3' => 0,
-        '4' => 0,
+        2 => 0,
+        3 => 0,
+        4 => 0,
       ),
       'override' => array(
         'button' => 'Override',
@@ -4672,8 +4660,8 @@ function commons_core_views_default_views() {
       'validate_argument_node_access' => 0,
       'validate_argument_nid_type' => 'nid',
       'validate_argument_vocabulary' => array(
-        '2' => 0,
-        '1' => 0,
+        2 => 0,
+        1 => 0,
       ),
       'validate_argument_type' => 'tid',
       'validate_argument_transform' => 0,
@@ -4771,7 +4759,7 @@ function commons_core_views_default_views() {
   $handler->override_option('access', array(
     'type' => 'role',
     'role' => array(
-      '2' => 2,
+      2 => 2,
     ),
   ));
   $handler->override_option('cache', array(
@@ -5668,10 +5656,9 @@ function commons_core_views_default_views() {
   $view->name = 'recent_notices';
   $view->description = 'Show the latest notice node types';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
@@ -6327,10 +6314,9 @@ function commons_core_views_default_views() {
   $view->name = 'tag_cloud';
   $view->description = 'Popular tag cloud';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('sorts', array(
@@ -6366,7 +6352,7 @@ function commons_core_views_default_views() {
     'vid' => array(
       'operator' => 'in',
       'value' => array(
-        '1' => '1',
+        1 => '1',
       ),
       'group' => '0',
       'exposed' => FALSE,
@@ -6413,10 +6399,9 @@ function commons_core_views_default_views() {
   $view->name = 'user_meta';
   $view->description = 'User meta info block';
   $view->tag = '';
-  $view->view_php = '';
   $view->base_table = 'users';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
diff --git a/modules/features/commons_subgroups/commons_subgroups.views_default.inc b/modules/features/commons_subgroups/commons_subgroups.views_default.inc
index fb0f572..8099dd0 100644
--- a/modules/features/commons_subgroups/commons_subgroups.views_default.inc
+++ b/modules/features/commons_subgroups/commons_subgroups.views_default.inc
@@ -12,7 +12,7 @@ function commons_subgroups_views_default_views() {
   $view->description = 'The main listing of all groups (optimized for subgroups)';
   $view->tag = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
+  $view->core = 0;
   $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
@@ -128,7 +128,7 @@ function commons_subgroups_views_default_views() {
       'label' => '',
       'alter' => array(
         'alter_text' => 1,
-        'text' => '<em>[tid]</em>', 
+        'text' => '<em>[tid]</em>',
         'make_link' => 0,
         'path' => '',
         'link_class' => '',
@@ -164,7 +164,6 @@ function commons_subgroups_views_default_views() {
       'override' => array(
         'button' => 'Override',
       ),
-      'relationship' => 'none', 
     ),
     'posts_count' => array(
       'label' => 'Posts',
@@ -342,46 +341,13 @@ function commons_subgroups_views_default_views() {
         'button' => 'Override',
       ),
     ),
-    'leave_group' => array(
-      'label' => '',
-      'alter' => array(
-        'alter_text' => 0,
-        'text' => '',
-        'make_link' => 0,
-        'path' => '',
-        'link_class' => '',
-        'alt' => '',
-        'prefix' => '',
-        'suffix' => '',
-        'target' => '',
-        'help' => '',
-        'trim' => 0,
-        'max_length' => '',
-        'word_boundary' => 1,
-        'ellipsis' => 1,
-        'html' => 0,
-        'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'text' => 'Leave',
-      'exclude' => 0,
-      'id' => 'leave_group',
-      'table' => 'og_uid',
-      'field' => 'leave_group',
-      'override' => array(
-        'button' => 'Override',
-      ),
-      'relationship' => 'none',
-    ),
   ));
   $handler->override_option('sorts', array(
     'created' => array(
+      'order' => 'DESC',
+      'granularity' => 'second',
       'exposed' => TRUE,
-      'order' => 'unsorted',
       'identifier' => 'unsorted',
-      'granularity' => 'second',
       'id' => 'created',
       'table' => 'node',
       'field' => 'created',
@@ -396,8 +362,8 @@ function commons_subgroups_views_default_views() {
       ),
     ),
     'title' => array(
+      'order' => 'ASC',
       'exposed' => TRUE,
-      'order' => 'unsorted',
       'identifier' => 'unsorted',
       'id' => 'title',
       'table' => 'node',
@@ -573,13 +539,14 @@ function commons_subgroups_views_default_views() {
   $handler->override_option('empty', 'There are currently no groups');
   $handler->override_option('empty_format', '1');
   $handler->override_option('use_pager', '1');
-  $handler->override_option('distinct', 1);
+  $handler->override_option('distinct', 0);
   $handler->override_option('style_plugin', 'table');
   $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 0,
     'order' => 'desc',
+    'summary' => '',
     'columns' => array(
       'nid' => 'nid',
       'field_group_image_fid' => 'field_group_image_fid',
@@ -590,7 +557,6 @@ function commons_subgroups_views_default_views() {
       'description' => 'description',
       'created' => 'created',
       'subscribe' => 'subscribe',
-      'leave_group' => 'subscribe',
     ),
     'info' => array(
       'nid' => array(
@@ -625,9 +591,6 @@ function commons_subgroups_views_default_views() {
       'subscribe' => array(
         'separator' => '',
       ),
-      'leave_group' => array(
-        'separator' => '',
-      ),
     ),
     'default' => 'created',
   ));
@@ -751,6 +714,7 @@ function commons_subgroups_views_default_views() {
   ));
   $handler->override_option('sitename_title', FALSE);
   $handler = $view->new_display('page', 'Page', 'page_1');
+  $handler->override_option('sorts', array());
   $handler->override_option('filters', array(
     'status' => array(
       'id' => 'status',
@@ -837,6 +801,7 @@ function commons_subgroups_views_default_views() {
     'name' => 'navigation',
   ));
   $handler = $view->new_display('page', 'Subgroups', 'page_2');
+  $handler->override_option('sorts', array());
   $handler->override_option('arguments', array(
     'parent' => array(
       'default_action' => 'not found',
@@ -858,10 +823,10 @@ function commons_subgroups_views_default_views() {
       'field' => 'parent',
       'validate_user_argument_type' => 'uid',
       'validate_user_roles' => array(
-        '2' => 0,
-        '3' => 0,
-        '4' => 0,
-        '5' => 0,
+        2 => 0,
+        3 => 0,
+        4 => 0,
+        5 => 0,
       ),
       'override' => array(
         'button' => 'Use default',
@@ -886,9 +851,9 @@ function commons_subgroups_views_default_views() {
       'validate_argument_node_access' => 0,
       'validate_argument_nid_type' => 'nid',
       'validate_argument_vocabulary' => array(
-        '3' => 0,
-        '2' => 0,
-        '4' => 0,
+        3 => 0,
+        2 => 0,
+        4 => 0,
       ),
       'validate_argument_type' => 'tid',
       'validate_argument_transform' => 0,