diff --git a/config/optional/views.view.group_members.yml b/config/optional/views.view.group_members.yml
index be48c75..37e8994 100644
--- a/config/optional/views.view.group_members.yml
+++ b/config/optional/views.view.group_members.yml
@@ -39,7 +39,7 @@ display:
       exposed_form:
         type: basic
         options:
-          submit_button: Apply
+          submit_button: Filter
           reset_button: false
           reset_button_label: Reset
           exposed_sorts_label: 'Sort by'
@@ -80,9 +80,13 @@ display:
           description: ''
           columns:
             name: name
+            mail: mail
+            status: status
             group_roles: group_roles
-            changed: changed
             created: created
+            access: access
+            edit_user: edit_user
+            view_user: view_user
             view_group_content: view_group_content
             edit_group_content: edit_group_content
             delete_group_content: delete_group_content
@@ -95,18 +99,25 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
-            group_roles:
+            mail:
+              sortable: false
+              default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            changed:
+            status:
               sortable: true
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
+            group_roles:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
             created:
               sortable: true
               default_sort_order: asc
@@ -114,6 +125,27 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
+            access:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            edit_user:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            view_user:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
             view_group_content:
               sortable: false
               default_sort_order: asc
@@ -217,6 +249,137 @@ display:
           entity_type: user
           entity_field: name
           plugin_id: field
+        mail:
+          id: mail
+          table: users_field_data
+          field: mail
+          relationship: gc__user
+          group_type: group
+          admin_label: ''
+          label: Email
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: basic_string
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: user
+          entity_field: mail
+          plugin_id: field
+        status:
+          id: status
+          table: users_field_data
+          field: status
+          relationship: gc__user
+          group_type: group
+          admin_label: ''
+          label: Status
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: boolean
+          settings:
+            format: custom
+            format_custom_true: Active
+            format_custom_false: Blocked
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: user
+          entity_field: status
+          plugin_id: field
         group_roles:
           id: group_roles
           table: group_content__group_roles
@@ -280,14 +443,14 @@ display:
           separator: ', '
           field_api_classes: false
           plugin_id: field
-        changed:
-          id: changed
+        created:
+          id: created
           table: group_content_field_data
-          field: changed
+          field: created
           relationship: none
           group_type: group
           admin_label: ''
-          label: Updated
+          label: Joined
           exclude: false
           alter:
             alter_text: false
@@ -345,16 +508,16 @@ display:
           separator: ', '
           field_api_classes: false
           entity_type: group_content
-          entity_field: changed
+          entity_field: created
           plugin_id: field
-        created:
-          id: created
-          table: group_content_field_data
-          field: created
-          relationship: none
+        access:
+          id: access
+          table: users_field_data
+          field: access
+          relationship: gc__user
           group_type: group
           admin_label: ''
-          label: Joined
+          label: 'Last access'
           exclude: false
           alter:
             alter_text: false
@@ -396,11 +559,9 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
-          type: timestamp
+          type: timestamp_ago
           settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
+            granularity: 2
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -411,16 +572,118 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: group_content
-          entity_field: created
+          entity_type: user
+          entity_field: access
           plugin_id: field
+        view_user:
+          id: view_user
+          table: users
+          field: view_user
+          relationship: gc__user
+          group_type: group
+          admin_label: 'View user link'
+          label: 'Link to User'
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          text: 'View user'
+          entity_type: user
+          plugin_id: entity_link
+        edit_user:
+          id: edit_user
+          table: users
+          field: edit_user
+          relationship: gc__user
+          group_type: group
+          admin_label: 'Edit user link'
+          label: 'Link to edit User'
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          text: 'Edit user'
+          entity_type: user
+          plugin_id: entity_link_edit
         view_group_content:
           id: view_group_content
           table: group_content
           field: view_group_content
           relationship: none
           group_type: group
-          admin_label: 'View member link'
+          admin_label: 'View membership link'
           label: ''
           exclude: true
           alter:
@@ -462,7 +725,7 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'View member'
+          text: 'View membership'
           entity_type: group_content
           plugin_id: entity_link
         edit_group_content:
@@ -471,7 +734,7 @@ display:
           field: edit_group_content
           relationship: none
           group_type: group
-          admin_label: 'Edit member link'
+          admin_label: 'Edit membership link'
           label: ''
           exclude: true
           alter:
@@ -513,7 +776,7 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'Edit member'
+          text: 'Edit membership'
           entity_type: group_content
           plugin_id: entity_link_edit
         delete_group_content:
@@ -522,7 +785,7 @@ display:
           field: delete_group_content
           relationship: none
           group_type: group
-          admin_label: 'Remove member link'
+          admin_label: 'Delete membership link'
           label: ''
           exclude: true
           alter:
@@ -564,7 +827,7 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'Remove member'
+          text: 'Delete membership'
           entity_type: group_content
           plugin_id: entity_link_delete
         dropbutton:
@@ -616,16 +879,111 @@ display:
           empty_zero: false
           hide_alter_empty: true
           fields:
+            view_user: view_user
+            edit_user: edit_user
             view_group_content: view_group_content
             edit_group_content: edit_group_content
             delete_group_content: delete_group_content
             name: '0'
+            mail: '0'
+            status: '0'
             group_roles: '0'
-            changed: '0'
             created: '0'
+            access: '0'
           destination: true
           plugin_id: dropbutton
-      filters: {  }
+      filters:
+        combine:
+          id: combine
+          table: views
+          field: combine
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: combine_op
+            label: 'Name or email contains'
+            description: ''
+            use_operator: false
+            operator: combine_op
+            identifier: user
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          fields:
+            name: name
+            mail: mail
+          plugin_id: combine
+        status:
+          id: status
+          table: users_field_data
+          field: status
+          relationship: gc__user
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: ''
+            label: Active
+            description: null
+            use_operator: false
+            operator: status_op
+            identifier: status
+            required: true
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: true
+          group_info:
+            label: Status
+            description: ''
+            identifier: status
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items:
+              1:
+                title: Active
+                operator: '='
+                value: '1'
+              2:
+                title: Blocked
+                operator: '='
+                value: '0'
+              3:
+                title: ''
+                operator: '='
+                value: ''
+          entity_type: user
+          entity_field: status
+          plugin_id: boolean
       sorts: {  }
       header: {  }
       footer: {  }
@@ -694,6 +1052,10 @@ display:
           plugin_id: numeric
       display_extenders: {  }
       title: Members
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
     cache_metadata:
       max-age: 0
       contexts:
diff --git a/modules/gnode/config/optional/views.view.group_nodes.yml b/modules/gnode/config/optional/views.view.group_nodes.yml
index c146c10..68f3964 100644
--- a/modules/gnode/config/optional/views.view.group_nodes.yml
+++ b/modules/gnode/config/optional/views.view.group_nodes.yml
@@ -38,7 +38,7 @@ display:
       exposed_form:
         type: basic
         options:
-          submit_button: Apply
+          submit_button: Filter
           reset_button: false
           reset_button_label: Reset
           exposed_sorts_label: 'Sort by'
@@ -433,14 +433,14 @@ display:
           entity_type: node
           entity_field: changed
           plugin_id: field
-        view_group_content:
-          id: view_group_content
-          table: group_content
-          field: view_group_content
-          relationship: group_content
+        view_node:
+          id: view_node
+          table: node
+          field: view_node
+          relationship: none
           group_type: group
-          admin_label: 'View relation link'
-          label: 'Link to Group content'
+          admin_label: 'View node link'
+          label: 'Link to Content'
           exclude: true
           alter:
             alter_text: false
@@ -481,17 +481,17 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'View relation'
-          entity_type: group_content
+          text: 'View content'
+          entity_type: node
           plugin_id: entity_link
-        edit_group_content:
-          id: edit_group_content
-          table: group_content
-          field: edit_group_content
-          relationship: group_content
+        edit_node:
+          id: edit_node
+          table: node
+          field: edit_node
+          relationship: none
           group_type: group
-          admin_label: 'Edit relation link'
-          label: 'Link to edit Group content'
+          admin_label: 'Edit node link'
+          label: 'Link to edit Content'
           exclude: true
           alter:
             alter_text: false
@@ -532,17 +532,68 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'Edit relation'
-          entity_type: group_content
+          text: 'Edit content'
+          entity_type: node
           plugin_id: entity_link_edit
-        delete_group_content:
-          id: delete_group_content
+        delete_node:
+          id: delete_node
+          table: node
+          field: delete_node
+          relationship: none
+          group_type: group
+          admin_label: 'Delete node link'
+          label: 'Link to delete Content'
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          text: 'Delete content'
+          entity_type: node
+          plugin_id: entity_link_delete
+        view_group_content:
+          id: view_group_content
           table: group_content
-          field: delete_group_content
+          field: view_group_content
           relationship: group_content
           group_type: group
-          admin_label: 'Delete relation link'
-          label: 'Link to delete Group content'
+          admin_label: 'View relation link'
+          label: 'Link to Group content'
           exclude: true
           alter:
             alter_text: false
@@ -583,17 +634,17 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'Delete relation'
+          text: 'View relation'
           entity_type: group_content
-          plugin_id: entity_link_delete
-        edit_node:
-          id: edit_node
-          table: node
-          field: edit_node
-          relationship: none
+          plugin_id: entity_link
+        edit_group_content:
+          id: edit_group_content
+          table: group_content
+          field: edit_group_content
+          relationship: group_content
           group_type: group
-          admin_label: 'Edit node link'
-          label: 'Link to edit Content'
+          admin_label: 'Edit relation link'
+          label: 'Link to edit Group content'
           exclude: true
           alter:
             alter_text: false
@@ -634,17 +685,17 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'Edit node'
-          entity_type: node
+          text: 'Edit relation'
+          entity_type: group_content
           plugin_id: entity_link_edit
-        delete_node:
-          id: delete_node
-          table: node
-          field: delete_node
-          relationship: none
+        delete_group_content:
+          id: delete_group_content
+          table: group_content
+          field: delete_group_content
+          relationship: group_content
           group_type: group
-          admin_label: 'Delete node link'
-          label: 'Link to delete Content'
+          admin_label: 'Delete relation link'
+          label: 'Link to delete Group content'
           exclude: true
           alter:
             alter_text: false
@@ -685,8 +736,8 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'Delete node'
-          entity_type: node
+          text: 'Delete relation'
+          entity_type: group_content
           plugin_id: entity_link_delete
         dropbutton:
           id: dropbutton
@@ -737,11 +788,12 @@ display:
           empty_zero: false
           hide_alter_empty: true
           fields:
+            view_node: view_node
+            edit_node: edit_node
+            delete_node: delete_node
             view_group_content: view_group_content
             edit_group_content: edit_group_content
             delete_group_content: delete_group_content
-            edit_node: edit_node
-            delete_node: delete_node
             title: '0'
             type: '0'
             status: '0'
@@ -749,6 +801,46 @@ display:
           destination: true
           plugin_id: dropbutton
       filters:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: title_op
+            label: Title
+            description: ''
+            use_operator: false
+            operator: title_op
+            identifier: title
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          entity_field: title
+          plugin_id: string
         status:
           id: status
           table: node_field_data
@@ -757,7 +849,7 @@ display:
           group_type: group
           admin_label: ''
           operator: '='
-          value: false
+          value: ''
           group: 1
           exposed: true
           expose:
@@ -881,7 +973,7 @@ display:
             title_enable: false
             title: All
           title_enable: true
-          title: '{{ arguments.gid|placeholder }} nodes'
+          title: '{{ arguments.gid|placeholder }} content'
           default_argument_type: fixed
           default_argument_options:
             argument: ''
@@ -906,7 +998,11 @@ display:
           entity_field: gid
           plugin_id: numeric
       display_extenders: {  }
-      title: Nodes
+      title: Content
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
     cache_metadata:
       max-age: 0
       contexts:
@@ -927,14 +1023,13 @@ display:
       path: group/%group/nodes
       menu:
         type: tab
-        title: Nodes
+        title: Content
         description: ''
         expanded: false
         parent: ''
         weight: 25
         context: '0'
         menu_name: main
-        enabled: true
     cache_metadata:
       max-age: 0
       contexts: