diff --git a/ui/admin/app/templates/scopes/scope/groups/group/-actions.hbs b/ui/admin/app/components/groups/group/actions/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/groups/group/-actions.hbs
rename to ui/admin/app/components/groups/group/actions/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/-header.hbs b/ui/admin/app/components/groups/group/header/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/groups/group/-header.hbs
rename to ui/admin/app/components/groups/group/header/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/-navigation.hbs b/ui/admin/app/components/groups/group/nav/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/groups/group/-navigation.hbs
rename to ui/admin/app/components/groups/group/nav/index.hbs
diff --git a/ui/admin/app/routes/scopes/scope/groups/group.js b/ui/admin/app/routes/scopes/scope/groups/group.js
index 0d9ad56bf..75a1c70d2 100644
--- a/ui/admin/app/routes/scopes/scope/groups/group.js
+++ b/ui/admin/app/routes/scopes/scope/groups/group.js
@@ -12,27 +12,4 @@ export default class ScopesScopeGroupsGroupRoute extends Route {
   model({ group_id }) {
     return this.store.findRecord('group', group_id, { reload: true });
   }
-
-  /**
-   * Renders the route-set specific page sections
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/groups/group/-header', {
-      into: 'scopes/scope/groups/group',
-      outlet: 'header',
-    });
-
-    this.render('scopes/scope/groups/group/-actions', {
-      into: 'scopes/scope/groups/group',
-      outlet: 'actions',
-    });
-
-    this.render('scopes/scope/groups/group/-navigation', {
-      into: 'scopes/scope/groups/group',
-      outlet: 'navigation',
-    });
-  }
 }
diff --git a/ui/admin/app/routes/scopes/scope/groups/group/add-members.js b/ui/admin/app/routes/scopes/scope/groups/group/add-members.js
index fda2aaaed..7629c17d9 100644
--- a/ui/admin/app/routes/scopes/scope/groups/group/add-members.js
+++ b/ui/admin/app/routes/scopes/scope/groups/group/add-members.js
@@ -34,29 +34,6 @@ export default class ScopesScopeGroupsGroupAddMembersRoute extends Route {
     });
   }
 
-  /**
-   * Renders the route-set specific page sections
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/groups/group/add-members/-header', {
-      into: 'scopes/scope/groups/group',
-      outlet: 'header',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/groups/group',
-      outlet: 'actions',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/groups/group',
-      outlet: 'navigation',
-    });
-  }
-
   // =actions
 
   /**
diff --git a/ui/admin/app/templates/scopes/scope/groups/group.hbs b/ui/admin/app/templates/scopes/scope/groups/group.hbs
index 837d1f984..7d32ecb0d 100644
--- a/ui/admin/app/templates/scopes/scope/groups/group.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/group.hbs
@@ -1,25 +1,3 @@
 {{page-title @model.displayName}}
 
-<Rose::Layout::Page as |page|>
-
-  <page.breadcrumbs>
-    <BreadCrumbs />
-  </page.breadcrumbs>
-
-  <page.header>
-    {{outlet 'header'}}
-  </page.header>
-
-  <page.navigation>
-    {{outlet 'navigation'}}
-  </page.navigation>
-
-  <page.actions>
-    {{outlet 'actions'}}
-  </page.actions>
-
-  <page.body>
-    {{outlet}}
-  </page.body>
-
-</Rose::Layout::Page>
\ No newline at end of file
+{{outlet}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs b/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs
index a85c01185..3013ba2f7 100644
--- a/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs
@@ -1,8 +1,26 @@
 {{page-title (t 'resources.group.messages.add-members.title')}}
 
-<Form::Group::AddMembers
-  @model={{@model.group}}
-  @users={{@model.users}}
-  @submit={{route-action 'addMembers' @model.group}}
-  @cancel={{route-action 'cancel'}}
-/>
\ No newline at end of file
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <h2>
+      {{t 'resources.group.messages.add-members.title'}}
+      <DocLink @doc='group.add-members' @iconSize='large' />
+    </h2>
+    <p>{{t 'resources.group.messages.add-members.description'}}</p>
+  </page.header>
+
+  <page.body>
+    <Form::Group::AddMembers
+      @model={{@model.group}}
+      @users={{@model.users}}
+      @submit={{route-action 'addMembers' @model.group}}
+      @cancel={{route-action 'cancel'}}
+    />
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/add-members/-header.hbs b/ui/admin/app/templates/scopes/scope/groups/group/add-members/-header.hbs
deleted file mode 100644
index 71181a8df..000000000
--- a/ui/admin/app/templates/scopes/scope/groups/group/add-members/-header.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<h2>
-  {{t 'resources.group.messages.add-members.title'}}
-  <DocLink @doc='group.add-members' @iconSize='large' />
-</h2>
-<p>{{t 'resources.group.messages.add-members.description'}}</p>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/index.hbs b/ui/admin/app/templates/scopes/scope/groups/group/index.hbs
index 6a89a496d..d5da2abf3 100644
--- a/ui/admin/app/templates/scopes/scope/groups/group/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/group/index.hbs
@@ -1,5 +1,27 @@
-<Form::Group
-  @model={{@model}}
-  @submit={{route-action 'save' @model}}
-  @cancel={{route-action 'cancel' @model}}
-/>
\ No newline at end of file
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <Groups::Group::Header @model={{@model}} />
+  </page.header>
+
+  <page.navigation>
+    <Groups::Group::Nav @model={{@model}} />
+  </page.navigation>
+
+  <page.actions>
+    <Groups::Group::Actions @model={{@model}} />
+  </page.actions>
+
+  <page.body>
+    <Form::Group
+      @model={{@model}}
+      @submit={{route-action 'save' @model}}
+      @cancel={{route-action 'cancel' @model}}
+    />
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
index 9df657c32..b4c479eda 100644
--- a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
@@ -1,75 +1,97 @@
 {{page-title (t 'resources.group.messages.members.title')}}
 
-{{#if @model.members}}
+<Rose::Layout::Page as |page|>
 
-  <Rose::Table as |table|>
-    <table.header as |header|>
-      <header.row as |row|>
-        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-        <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
-      </header.row>
-    </table.header>
-    <table.body as |body|>
-      {{#each @model.members as |member|}}
-        <body.row as |row|>
-          <row.headerCell>
-            {{member.displayName}}
-            {{#if member.accountName}}
-              <br /><Rose::Badge>{{member.accountName}}</Rose::Badge>
-            {{/if}}
-          </row.headerCell>
-          <row.cell>
-            <Copyable
-              @text={{member.id}}
-              @buttonText={{t 'actions.copy-to-clipboard'}}
-              @acknowledgeText={{t 'states.copied'}}
-            >
-              <code>{{member.id}}</code>
-            </Copyable>
-          </row.cell>
-          <row.cell>
-            {{#if (can 'removeMembers group' @model.group)}}
-              <Rose::Dropdown
-                @icon='flight-icons/svg/more-horizontal-16'
-                @iconOnly={{true}}
-                @showCaret={{false}}
-                @dropdownRight={{true}}
-                @text='{{t 'actions.manage'}}'
-                as |dropdown|
-              >
-                <dropdown.button
-                  @style='danger'
-                  {{on
-                    'click'
-                    (route-action 'removeMember' @model.group member)
-                  }}
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <Groups::Group::Header @model={{@model.group}} />
+  </page.header>
+
+  <page.navigation>
+    <Groups::Group::Nav @model={{@model.group}} />
+  </page.navigation>
+
+  <page.actions>
+    <Groups::Group::Actions @model={{@model.group}} />
+  </page.actions>
+
+  <page.body>
+    {{#if @model.members}}
+
+      <Rose::Table as |table|>
+        <table.header as |header|>
+          <header.row as |row|>
+            <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+            <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
+          </header.row>
+        </table.header>
+        <table.body as |body|>
+          {{#each @model.members as |member|}}
+            <body.row as |row|>
+              <row.headerCell>
+                {{member.displayName}}
+                {{#if member.accountName}}
+                  <br /><Rose::Badge>{{member.accountName}}</Rose::Badge>
+                {{/if}}
+              </row.headerCell>
+              <row.cell>
+                <Copyable
+                  @text={{member.id}}
+                  @buttonText={{t 'actions.copy-to-clipboard'}}
+                  @acknowledgeText={{t 'states.copied'}}
                 >
-                  {{t 'actions.remove'}}
-                </dropdown.button>
-              </Rose::Dropdown>
-            {{/if}}
-          </row.cell>
-        </body.row>
-      {{/each}}
-    </table.body>
-  </Rose::Table>
+                  <code>{{member.id}}</code>
+                </Copyable>
+              </row.cell>
+              <row.cell>
+                {{#if (can 'removeMembers group' @model.group)}}
+                  <Rose::Dropdown
+                    @icon='flight-icons/svg/more-horizontal-16'
+                    @iconOnly={{true}}
+                    @showCaret={{false}}
+                    @dropdownRight={{true}}
+                    @text='{{t 'actions.manage'}}'
+                    as |dropdown|
+                  >
+                    <dropdown.button
+                      @style='danger'
+                      {{on
+                        'click'
+                        (route-action 'removeMember' @model.group member)
+                      }}
+                    >
+                      {{t 'actions.remove'}}
+                    </dropdown.button>
+                  </Rose::Dropdown>
+                {{/if}}
+              </row.cell>
+            </body.row>
+          {{/each}}
+        </table.body>
+      </Rose::Table>
 
-{{else}}
+    {{else}}
 
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.group.messages.members.title'}}
-      as |message|
-    >
-      <message.description>
-        {{t 'resources.group.messages.members.description'}}
-      </message.description>
-      <message.link @route='scopes.scope.groups.group.add-members'>
-        <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
-        {{t 'resources.group.actions.add-members'}}
-      </message.link>
-    </Rose::Message>
-  </Rose::Layout::Centered>
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.group.messages.members.title'}}
+          as |message|
+        >
+          <message.description>
+            {{t 'resources.group.messages.members.description'}}
+          </message.description>
+          <message.link @route='scopes.scope.groups.group.add-members'>
+            <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
+            {{t 'resources.group.actions.add-members'}}
+          </message.link>
+        </Rose::Message>
+      </Rose::Layout::Centered>
 
-{{/if}}
\ No newline at end of file
+    {{/if}}
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file