diff --git a/addons/api/addon/models/auth-method.js b/addons/api/addon/models/auth-method.js
index 8e6c4f198..f0832cc91 100644
--- a/addons/api/addon/models/auth-method.js
+++ b/addons/api/addon/models/auth-method.js
@@ -61,6 +61,8 @@ export default class AuthMethodModel extends GeneratedAuthMethodModel {
    */
   @equal('is_primary', true) isPrimary;
 
+  options = options;
+
   /**
    * @type {boolean}
    */
diff --git a/addons/api/mirage/config.js b/addons/api/mirage/config.js
index b866dcae2..759eb63c3 100644
--- a/addons/api/mirage/config.js
+++ b/addons/api/mirage/config.js
@@ -536,9 +536,10 @@ export default function () {
       return managedGroups.where({ authMethodId });
     }
   );
-  this.get('/managed-groups/:id');
-  this.del('/managed-groups/:id');
   this.post('/managed-groups');
+  this.get('/managed-groups/:id');
+  this.patch('/managed-groups/:id');
+  this.del('/managed-groups/:id');
 
   /* Uncomment the following line and the Response import above
    * Then change the response code to simulate error responses.
diff --git a/addons/rose/addon/components/rose/form/radio/radio-card/tile/index.js b/addons/rose/addon/components/rose/form/radio/card/tile/index.js
similarity index 56%
rename from addons/rose/addon/components/rose/form/radio/radio-card/tile/index.js
rename to addons/rose/addon/components/rose/form/radio/card/tile/index.js
index c670c00be..10546dd73 100644
--- a/addons/rose/addon/components/rose/form/radio/radio-card/tile/index.js
+++ b/addons/rose/addon/components/rose/form/radio/card/tile/index.js
@@ -1,6 +1,6 @@
 import RoseFormRadioRadioComponent from '../../radio';
 
-export default class RoseFormRadioRadioCardComponent extends RoseFormRadioRadioComponent {
+export default class RoseFormRadioCardComponent extends RoseFormRadioRadioComponent {
   // =attributes
 
   className = 'rose-form-radio-card-tile';
diff --git a/addons/rose/addon/components/rose/form/radio/radio-card/tile/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/card/tile/index.stories.mdx
similarity index 88%
rename from addons/rose/addon/components/rose/form/radio/radio-card/tile/index.stories.mdx
rename to addons/rose/addon/components/rose/form/radio/card/tile/index.stories.mdx
index cd22b4f24..b45073e6e 100644
--- a/addons/rose/addon/components/rose/form/radio/radio-card/tile/index.stories.mdx
+++ b/addons/rose/addon/components/rose/form/radio/card/tile/index.stories.mdx
@@ -2,14 +2,14 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks';
 import { hbs } from 'ember-cli-htmlbars';
 import { text, boolean, select } from '@storybook/addon-knobs';
 
-<Meta title="Rose|Form/Radio/Radio/RadioCard/Tile" component="Form/Radio/Radio/RadioCard/Tile" />
+<Meta title="Rose|Form/Radio/Radio/Card/Tile" component="Form/Radio/Radio/Card/Tile" />
 
 # Form RadioCard field in tile format
 
 Renders a form radioCard field in a tile format.
 
 ```htmlbars
-<Rose::Form::Radio::RadioCard::Tile
+<Rose::Form::Radio::Card::Tile
   @label="Yes"
   @error={{false}}
   @value="yes-agree"
@@ -22,7 +22,7 @@ Renders a form radioCard field in a tile format.
 <Preview>
   <Story name="Tile" height="10rem">{{
     template: hbs`
-      <Rose::Form::Radio::RadioCard::Tile
+      <Rose::Form::Radio::Card::Tile
         @label={{label}}
         @error={{error}}
         @value={{value}}
diff --git a/addons/rose/addon/components/rose/form/radio/radio-card/wide/index.js b/addons/rose/addon/components/rose/form/radio/card/wide/index.js
similarity index 100%
rename from addons/rose/addon/components/rose/form/radio/radio-card/wide/index.js
rename to addons/rose/addon/components/rose/form/radio/card/wide/index.js
diff --git a/addons/rose/addon/components/rose/form/radio/radio-card/wide/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/card/wide/index.stories.mdx
similarity index 87%
rename from addons/rose/addon/components/rose/form/radio/radio-card/wide/index.stories.mdx
rename to addons/rose/addon/components/rose/form/radio/card/wide/index.stories.mdx
index b188d3793..f9470d1bb 100644
--- a/addons/rose/addon/components/rose/form/radio/radio-card/wide/index.stories.mdx
+++ b/addons/rose/addon/components/rose/form/radio/card/wide/index.stories.mdx
@@ -2,14 +2,14 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks';
 import { hbs } from 'ember-cli-htmlbars';
 import { text, boolean, select } from '@storybook/addon-knobs';
 
-<Meta title="Rose|Form/Radio/Radio/RadioCard/Wide" component="Form/Radio/Radio/RadioCard/Wide" />
+<Meta title="Rose|Form/Radio/Radio/Card/Wide" component="Form/Radio/Radio/Card/Wide" />
 
 # Form Radiofield in a wide format
 
 Renders a form radiofield in a Wide format.
 
 ```htmlbars
-<Rose::Form::Radio::RadioCard::Wide
+<Rose::Form::Radio::Card::Wide
   @label="Yes"
   @error={{false}}
   @value="yes-agree"
@@ -22,7 +22,7 @@ Renders a form radiofield in a Wide format.
 <Preview>
   <Story name="Wide" height="10rem">{{
     template: hbs`
-      <Rose::Form::Radio::RadioCard::Wide
+      <Rose::Form::Radio::Card::Wide
         @label={{label}}
         @error={{error}}
         @value={{value}}
diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.hbs b/addons/rose/addon/components/rose/form/radio/radio/index.hbs
index ddc2a6b34..b2e204478 100644
--- a/addons/rose/addon/components/rose/form/radio/radio/index.hbs
+++ b/addons/rose/addon/components/rose/form/radio/radio/index.hbs
@@ -23,6 +23,11 @@
 
     {{@label}}
   <span class="radio-card-overlay"></span>
+     {{#if @helperText}}
+      <Rose::Form::HelperText @id="helper-text-{{this.id}}" @error={{@error}} @link={{@link}} @linkText={{@linkText}}>
+        {{@helperText}}
+      </Rose::Form::HelperText>
+    {{/if}}
   </label>
 
   {{yield}}
diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx
index 63e873862..613952aff 100644
--- a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx
+++ b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx
@@ -29,12 +29,14 @@ Renders a form radiofield.
         @selectedValue={{selectedValue}}
         @disabled={{disabled}}
         @icon={{icon}}
+        @helperText={{helperText}}
         />
     `,
     context: {
       label: text('text', 'Radiofield'),
       error: boolean('error', false),
       value: text('value', 'value and selectedValue must match to select radiofield'),
+      helperText: text('helperText', 'Helper text'),
       selectedValue: text(
         'selectedValue',
         'value and selectedValue must match to select radiofield'
@@ -63,6 +65,7 @@ Renders a form radiofield.
   @disabled={{false}}
   @changed={{fn}}
   @inline={{true}}
+  @helperText={{helperText}}
   />
 ```
 
@@ -77,6 +80,7 @@ Renders a form radiofield.
         @disabled={{disabled}}
         @icon={{icon}}
         @inline={{inline}}
+        @helperText={{helperText}}
         />
       <Rose::Form::Radio::Radio
         @label='Radiofield2'
@@ -86,6 +90,7 @@ Renders a form radiofield.
         @disabled={{disabled}}
         @icon={{icon}}
         @inline={{inline}}
+        @helperText={{helperText}}
         />
       <Rose::Form::Radio::Radio
         @label='Radiofield3'
@@ -95,6 +100,7 @@ Renders a form radiofield.
         @disabled={{disabled}}
         @icon={{icon}}
         @inline={{inline}}
+        @helperText={{helperText}}
         />
     `,
     context: {
@@ -104,6 +110,7 @@ Renders a form radiofield.
         'selectedValue',
         'value and selectedValue must match to select radiofield'
       ),
+      helperText: text('helperText', 'Helper text'),
       disabled: boolean('disabled', false),
       icon: select(
         'icon',
diff --git a/addons/rose/addon/styles/rose/components/form/_radio.scss b/addons/rose/addon/styles/rose/components/form/_radio.scss
index 3c94ac816..32be9a8c5 100644
--- a/addons/rose/addon/styles/rose/components/form/_radio.scss
+++ b/addons/rose/addon/styles/rose/components/form/_radio.scss
@@ -1,5 +1,6 @@
 @use '../../variables/sizing';
 @use '../../utilities/type';
+@use '../../variables/typography';
 
 $radio-svg: (
   'default':
@@ -34,9 +35,18 @@ $data-svg-prefix: 'data:image/svg+xml;utf-8,';
   color: var(--ui-gray);
 
   .rose-form-radio-label {
+    display: flex;
+    align-items: center;
+    .rose-form-helper-text {
+      font-weight: normal;
+      margin-left: sizing.rems(xxs);
+      margin-bottom: 0;
+    }
+
     @include type.type(s, semibold);
     color: currentColor;
     padding-left: sizing.rems(l);
+    padding-top: sizing.rems(xxxs);
 
     .rose-icon {
       margin-right: sizing.rems(xxs);
diff --git a/addons/rose/addon/styles/rose/components/form/_radioCard.scss b/addons/rose/addon/styles/rose/components/form/_radioCard.scss
index 4be2c5908..048390e9e 100644
--- a/addons/rose/addon/styles/rose/components/form/_radioCard.scss
+++ b/addons/rose/addon/styles/rose/components/form/_radioCard.scss
@@ -21,13 +21,13 @@ $size-xxxxs: sizing.rems(xxxxs); // 1
     height: $l + $size-xxs;
     background-color: var(--ui-gray-subtler-5);
     width: 100%;
-    bottom: 1px;
+    bottom: 0;
     right: 0;
   }
   .rose-form-radio-label {
     font-style: normal;
     font-weight: bold;
-    font-size: 14px;
+    font-size: typography.font-size(s);
     color: var(--black);
     width: ($m) * 23;
     height: ($m) * 7.5;
@@ -35,13 +35,20 @@ $size-xxxxs: sizing.rems(xxxxs); // 1
     position: relative;
     text-align: left;
     word-break: break-all;
-    border: 1px solid #bac1cc;
+    border: $size-xxxxs solid #bac1cc;
     box-shadow: 0 $size-xxs $size-xxs
       rgba(var(--stark-components), var(--opacity-2));
-    border-radius: 2px;
-    padding: 19px;
+    border-radius: $size-xxxs;
+    padding: $s $l;
     box-sizing: border-box;
     background-color: var(--white);
+    .rose-form-helper-text {
+      font-weight: normal;
+    }
+    .rose-icon {
+      padding-right: $size-xxs;
+      padding-left: $size-xxs;
+    }
   }
   .rose-form-radio-field {
     position: absolute;
@@ -50,7 +57,7 @@ $size-xxxxs: sizing.rems(xxxxs); // 1
     &:not(:disabled) {
       &:hover {
         ~ .rose-form-radio-label {
-          border: 1px solid var(--ui-gray);
+          border: $size-xxxxs solid var(--ui-gray);
         }
       }
       &:checked {
@@ -58,14 +65,14 @@ $size-xxxxs: sizing.rems(xxxxs); // 1
           .radio-card-overlay {
             background-color: var(--action-subtler-1h);
           }
-          border: 1px solid #1563ff;
+          border: $size-xxxxs solid #1563ff;
         }
       }
     }
 
     &:disabled {
       ~ .rose-form-radio-label {
-        border: 1px solid var(--ui-border-subtler-1);
+        border: $size-xxxxs solid var(--ui-border-subtler-1);
         background-color: var(--ui-gray-subtler-6);
         color: var(--ui-gray-starker-1);
       }
@@ -73,22 +80,21 @@ $size-xxxxs: sizing.rems(xxxxs); // 1
   }
 
   &.error {
-    color: var(--failure);
     .rose-form-radio-field {
       &:not(:disabled):not(:focus) {
         ~ .rose-form-radio-label {
           .radio-card-overlay {
-            background-color: var(--failure--subtler-1);
+            background-color: var(--failure-subtler-1);
           }
-          border: $xxxxs solid #c73445;
+          border-color: var(--failure);
         }
         &:checked {
           opacity: 0;
           ~ .rose-form-radio-label {
             &::after {
               position: absolute;
-              bottom: 5px;
-              right: 174px;
+              bottom: $size-xxs + $size-xxxs;
+              right: sizing.rems(m) * 10.9;
               display: block;
               width: $m;
               height: $m;
@@ -121,28 +127,32 @@ $size-xxxxs: sizing.rems(xxxxs); // 1
     height: $l + $size-xxs;
     background-color: var(--ui-gray-subtler-5);
     width: 100%;
-    bottom: 1px;
+    bottom: 0;
     right: 0;
   }
   .rose-form-radio-label {
     font-style: normal;
     font-weight: bold;
-    font-size: 14px;
+    font-size: typography.font-size(s);
     color: var(--black);
     width: ($m) * 15;
     height: ($m) * 9;
-
-    display: block;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
     position: relative;
     text-align: left;
     word-break: break-all;
     border: $xxxxs solid var(--ui-border);
     box-shadow: 0 $size-xxs $size-xxs
       rgba(var(--stark-components), var(--opacity-2));
-    border-radius: 2px;
-    padding: 19px;
+    border-radius: $size-xxxs;
+    padding: $m $size-xxs;
     box-sizing: border-box;
     background-color: var(--white);
+    .rose-form-helper-text {
+      font-weight: normal;
+    }
   }
   .rose-form-radio-field {
     position: absolute;
@@ -173,14 +183,13 @@ $size-xxxxs: sizing.rems(xxxxs); // 1
   }
 
   &.error {
-    color: var(--failure);
     .rose-form-radio-field {
       &:not(:disabled):not(:focus) {
         ~ .rose-form-radio-label {
           .radio-card-overlay {
-            background-color: var(--failure--subtler-1);
+            background-color: var(--failure-subtler-1);
           }
-          border: $xxxxs solid #c73445;
+          border-color: var(--failure);
         }
         &:checked {
           opacity: 0;
@@ -188,7 +197,7 @@ $size-xxxxs: sizing.rems(xxxxs); // 1
             &::after {
               position: absolute;
               bottom: $size-xxs;
-              right: 109px;
+              right: sizing.rems(m) * 6.8;
               display: block;
               width: $m;
               height: $m;
diff --git a/addons/rose/addon/styles/rose/variables/color/_css.scss b/addons/rose/addon/styles/rose/variables/color/_css.scss
index be294f8ea..3e554cc07 100644
--- a/addons/rose/addon/styles/rose/variables/color/_css.scss
+++ b/addons/rose/addon/styles/rose/variables/color/_css.scss
@@ -49,7 +49,6 @@
   --failure-subtler-1: #{color(red, 100)};
   --failure: #{color(red)};
   --failure-starker-1: #{color(red, 800)};
-  --failure--subtler-1: #{color(red, 050)};
 
   --success-subtler-2: #{color(green, 010)};
   --success-subtler-1: #{color(green, 100)};
@@ -109,7 +108,6 @@
   --failure-subtler-1: #{color(red, 800)};
   --failure: #{color(red, 300)};
   --failure-starker-1: #{color(red, 200)};
-  --failure--subtler-1: #{color(red, 050)};
 
   --success-subtler-2: #{color(green, 900)};
   --success-subtler-1: #{color(green, 800)};
diff --git a/addons/rose/app/components/rose/form/radio/card/tile/index.js b/addons/rose/app/components/rose/form/radio/card/tile/index.js
new file mode 100644
index 000000000..a050dcff9
--- /dev/null
+++ b/addons/rose/app/components/rose/form/radio/card/tile/index.js
@@ -0,0 +1 @@
+export { default } from 'rose/components/rose/form/radio/card/tile';
diff --git a/addons/rose/app/components/rose/form/radio/card/wide/index.js b/addons/rose/app/components/rose/form/radio/card/wide/index.js
new file mode 100644
index 000000000..b239d9820
--- /dev/null
+++ b/addons/rose/app/components/rose/form/radio/card/wide/index.js
@@ -0,0 +1 @@
+export { default } from 'rose/components/rose/form/radio/card/wide';
diff --git a/addons/rose/app/components/rose/form/radio/radio-card/tile/index.js b/addons/rose/app/components/rose/form/radio/radio-card/tile/index.js
deleted file mode 100644
index d3d617b77..000000000
--- a/addons/rose/app/components/rose/form/radio/radio-card/tile/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'rose/components/rose/form/radio/radio-card/tile';
diff --git a/addons/rose/app/components/rose/form/radio/radio-card/wide/index.js b/addons/rose/app/components/rose/form/radio/radio-card/wide/index.js
deleted file mode 100644
index 5c17ecb7e..000000000
--- a/addons/rose/app/components/rose/form/radio/radio-card/wide/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'rose/components/rose/form/radio/radio-card/wide';
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-actions.hbs b/ui/admin/app/components/auth-methods/auth-method/accounts/account/actions/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-actions.hbs
rename to ui/admin/app/components/auth-methods/auth-method/accounts/account/actions/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs b/ui/admin/app/components/auth-methods/auth-method/accounts/account/header/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
rename to ui/admin/app/components/auth-methods/auth-method/accounts/account/header/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs b/ui/admin/app/components/auth-methods/auth-method/accounts/account/nav/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs
rename to ui/admin/app/components/auth-methods/auth-method/accounts/account/nav/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs b/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs
similarity index 97%
rename from ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs
rename to ui/admin/app/components/auth-methods/auth-method/actions/index.hbs
index 5626026a6..39c4a1d96 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs
+++ b/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs
@@ -21,7 +21,7 @@
           @changed={{route-action 'changeState'}}
           as |radioGroup|
         >
-          {{#each this.oidcStates as |state|}}
+          {{#each @model.options.oidc.state as |state|}}
             <dropdown.item>
               <radioGroup.radio
                 @label={{t (concat 'states.' state)}}
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs b/ui/admin/app/components/auth-methods/auth-method/header/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
rename to ui/admin/app/components/auth-methods/auth-method/header/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-actions.hbs b/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/actions/index.hbs
similarity index 83%
rename from ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-actions.hbs
rename to ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/actions/index.hbs
index 3340d97f2..98a51d476 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-actions.hbs
+++ b/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/actions/index.hbs
@@ -7,7 +7,7 @@
     <dropdown.button
       @style='danger'
       @disabled={{@model.canSave}}
-      {{on 'click' (route-action 'delete' @model)}}
+      {{on 'click' (route-action 'deleteManagedGroup' @model)}}
     >
       {{t 'resources.managed-group.actions.delete'}}
     </dropdown.button>
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-header.hbs b/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/header/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-header.hbs
rename to ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/header/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-navigation.hbs b/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/nav/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-navigation.hbs
rename to ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/nav/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs b/ui/admin/app/components/auth-methods/auth-method/nav/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs
rename to ui/admin/app/components/auth-methods/auth-method/nav/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs b/ui/admin/app/components/users/user/actions/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/users/user/-actions.hbs
rename to ui/admin/app/components/users/user/actions/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/users/user/-header.hbs b/ui/admin/app/components/users/user/header/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/users/user/-header.hbs
rename to ui/admin/app/components/users/user/header/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/users/user/-navigation.hbs b/ui/admin/app/components/users/user/nav/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/users/user/-navigation.hbs
rename to ui/admin/app/components/users/user/nav/index.hbs
diff --git a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method.js b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method.js
index 1aa269744..1005f0216 100644
--- a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method.js
+++ b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method.js
@@ -1,5 +1,4 @@
 import Controller from '@ember/controller';
-import { options } from 'api/models/auth-method';
 
 export default class ScopesScopeAuthMethodsAuthMethodController extends Controller {
   // =attributes
@@ -11,12 +10,4 @@ export default class ScopesScopeAuthMethodsAuthMethodController extends Controll
   get breadCrumb() {
     return this.model.displayName;
   }
-
-  /**
-   * OIDC auth-method states
-   * @type {[string]}
-   */
-  get oidcStates() {
-    return options.oidc.state;
-  }
 }
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method.js
index c0678ed0a..bd2f8457e 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method.js
@@ -15,30 +15,6 @@ export default class ScopesScopeAuthMethodsAuthMethodRoute extends Route {
     return this.store.findRecord('auth-method', auth_method_id);
   }
 
-  /**
-   * Renders the auth-method specific templates for header, navigation,
-   * and actions page sections.
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/auth-methods/auth-method/-header', {
-      into: 'scopes/scope/auth-methods/auth-method',
-      outlet: 'header',
-    });
-
-    this.render('scopes/scope/auth-methods/auth-method/-navigation', {
-      into: 'scopes/scope/auth-methods/auth-method',
-      outlet: 'navigation',
-    });
-
-    this.render('scopes/scope/auth-methods/auth-method/-actions', {
-      into: 'scopes/scope/auth-methods/auth-method',
-      outlet: 'actions',
-    });
-  }
-
   // =actions
 
   /**
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts.js
index 9fcb9b990..5072d99b7 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts.js
@@ -19,16 +19,23 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsRoute extends Route
    * Returns accounts for the current auth method.
    * @return {Promise{[AccountModel]}}
    */
-  model() {
+  async model() {
     const authMethod = this.modelFor('scopes.scope.auth-methods.auth-method');
     const { id: auth_method_id } = authMethod;
+    let accounts;
+
     if (
       this.can.can('list collection', authMethod, {
         collection: 'accounts',
       })
     ) {
-      return this.store.query('account', { auth_method_id });
+      accounts = await this.store.query('account', { auth_method_id });
     }
+
+    return {
+      authMethod,
+      accounts,
+    };
   }
 
   // =actions
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account.js
index 8f90f239e..6ee0f3426 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account.js
@@ -12,36 +12,4 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsAccountRoute extend
   model({ account_id }) {
     return this.store.findRecord('account', account_id, { reload: true });
   }
-
-  /**
-   * Renders the route-set specific page sections
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render(
-      'scopes/scope/auth-methods/auth-method/accounts/account/-header',
-      {
-        into: 'scopes/scope/auth-methods/auth-method',
-        outlet: 'header',
-      }
-    );
-
-    this.render(
-      'scopes/scope/auth-methods/auth-method/accounts/account/-actions',
-      {
-        into: 'scopes/scope/auth-methods/auth-method',
-        outlet: 'actions',
-      }
-    );
-
-    this.render(
-      'scopes/scope/auth-methods/auth-method/accounts/account/-navigation',
-      {
-        into: 'scopes/scope/auth-methods/auth-method',
-        outlet: 'navigation',
-      }
-    );
-  }
 }
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/index.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/index.js
index 20a6940d7..44cc36e3c 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/index.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/index.js
@@ -1,10 +1,2 @@
 import Route from '@ember/routing/route';
-export default class ScopesScopeAuthMethodsAuthMethodAccountsAccountIndexRoute extends Route {
-  // setupController(controller) {
-  //   const authMethod = this.modelFor(
-  //     'scopes.scope.auth-methods.auth-method'
-  //   );
-  //   super.setupController(...arguments);
-  //   controller.setProperties({ authMethod });
-  // }
-}
+export default class ScopesScopeAuthMethodsAuthMethodAccountsAccountIndexRoute extends Route {}
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js
index 019933eaf..c1a1ba32f 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js
@@ -11,23 +11,6 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsAccountSettingsRout
   @service notify;
   @service router;
 
-  // =methods
-
-  /**
-   * Renders the route-set specific page sections
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-    this.render(
-      'scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header',
-      {
-        into: 'scopes/scope/auth-methods/auth-method',
-        outlet: 'header',
-      }
-    );
-  }
-
   // =actions
 
   /**
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/new.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/new.js
index 2d31bd683..4f5d11f57 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/new.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/new.js
@@ -16,27 +16,4 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsNewRoute extends Ro
       auth_method_id,
     });
   }
-
-  /**
-   * Renders new account templates for header, navigation, and action page sections.
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/auth-methods/auth-method/accounts/new/-header', {
-      into: 'scopes/scope/auth-methods/auth-method',
-      outlet: 'header',
-    });
-
-    this.render('_empty', {
-      into: 'scopes/scope/auth-methods/auth-method',
-      outlet: 'actions',
-    });
-
-    this.render('_empty', {
-      into: 'scopes/scope/auth-methods/auth-method',
-      outlet: 'navigation',
-    });
-  }
 }
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js
index 51b55adb9..6a558f0ad 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js
@@ -19,16 +19,24 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends
    *
    * @returns {Promise{[ManagedGroupsModel]}}
    */
-  model() {
+  async model() {
     const authMethod = this.modelFor('scopes.scope.auth-methods.auth-method');
     const { id: auth_method_id } = authMethod;
     const canListManagedGroups = this.can.can('list collection', authMethod, {
       collection: 'managed-groups',
     });
+    let managedGroups;
 
     if (canListManagedGroups) {
-      return this.store.query('managed-group', { auth_method_id });
+      managedGroups = await this.store.query('managed-group', {
+        auth_method_id,
+      });
     }
+
+    return {
+      authMethod,
+      managedGroups,
+    };
   }
 
   // =actions
@@ -81,7 +89,7 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends
   @confirm('questions.delete-confirm')
   @notifyError(({ message }) => message, { catch: true })
   @notifySuccess('notifications.delete-success')
-  async delete(managedGroup) {
+  async deleteManagedGroup(managedGroup) {
     await managedGroup.destroyRecord();
     await this.router.replaceWith(
       'scopes.scope.auth-methods.auth-method.managed-groups'
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.js
index 816b537da..414bfd6b8 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.js
@@ -14,36 +14,4 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsManagedGroupRo
       reload: true,
     });
   }
-
-  /**
-   * Render the route-set specific page sections
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render(
-      'scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-header',
-      {
-        into: 'scopes/scope/auth-methods/auth-method',
-        outlet: 'header',
-      }
-    );
-
-    this.render(
-      'scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-actions',
-      {
-        into: 'scopes/scope/auth-methods/auth-method',
-        outlet: 'actions',
-      }
-    );
-
-    this.render(
-      'scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-navigation',
-      {
-        into: 'scopes/scope/auth-methods/auth-method',
-        outlet: 'navigation',
-      }
-    );
-  }
 }
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js
index 1c3dd319c..30e1a98e8 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js
@@ -12,15 +12,19 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsManagedGroupMe
    * Returns the previously loaded managed group instances memebrs.
    * @return {Promise{[AccountModel]}}
    */
-  model() {
-    const { auth_method_id, member_ids } = this.modelFor(
+  async model() {
+    const managedGroup = this.modelFor(
       'scopes.scope.auth-methods.auth-method.managed-groups.managed-group'
     );
+    const { auth_method_id, member_ids } = managedGroup;
 
-    return this.resourceFilterStore.queryBy(
-      'account',
-      { id: member_ids },
-      { auth_method_id }
-    );
+    return {
+      managedGroup,
+      members: await this.resourceFilterStore.queryBy(
+        'account',
+        { id: member_ids },
+        { auth_method_id }
+      ),
+    };
   }
 }
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/new.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/new.js
index ca2b1473c..702d4bb6e 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/new.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/new.js
@@ -11,26 +11,4 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsNewRoute exten
       auth_method_id,
     });
   }
-
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render(
-      'scopes/scope/auth-methods/auth-method/managed-groups/new/-header',
-      {
-        into: 'scopes/scope/auth-methods/auth-method',
-        outlet: 'header',
-      }
-    );
-
-    this.render('_empty', {
-      into: 'scopes/scope/auth-methods/auth-method',
-      outlet: 'actions',
-    });
-
-    this.render('_empty', {
-      into: 'scopes/scope/auth-methods/auth-method',
-      outlet: 'navigation',
-    });
-  }
 }
diff --git a/ui/admin/app/routes/scopes/scope/users/user.js b/ui/admin/app/routes/scopes/scope/users/user.js
index 2d7ed072e..d26912707 100644
--- a/ui/admin/app/routes/scopes/scope/users/user.js
+++ b/ui/admin/app/routes/scopes/scope/users/user.js
@@ -12,27 +12,4 @@ export default class ScopesScopeUsersUserRoute extends Route {
   async model({ user_id }) {
     return this.store.findRecord('user', user_id);
   }
-
-  /**
-   * Renders the route-set specific page sections
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/users/user/-header', {
-      into: 'scopes/scope/users/user',
-      outlet: 'header',
-    });
-
-    this.render('scopes/scope/users/user/-actions', {
-      into: 'scopes/scope/users/user',
-      outlet: 'actions',
-    });
-
-    this.render('scopes/scope/users/user/-navigation', {
-      into: 'scopes/scope/users/user',
-      outlet: 'navigation',
-    });
-  }
 }
diff --git a/ui/admin/app/routes/scopes/scope/users/user/add-accounts.js b/ui/admin/app/routes/scopes/scope/users/user/add-accounts.js
index ab62093a4..992f90a0e 100644
--- a/ui/admin/app/routes/scopes/scope/users/user/add-accounts.js
+++ b/ui/admin/app/routes/scopes/scope/users/user/add-accounts.js
@@ -38,29 +38,6 @@ export default class ScopesScopeUsersUserAddAccountsRoute extends Route {
     return { user, authMethods, accounts };
   }
 
-  /**
-   * Renders the route-set specific page sections
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/users/user/add-accounts/-header', {
-      into: 'scopes/scope/users/user',
-      outlet: 'header',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/users/user',
-      outlet: 'actions',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/users/user',
-      outlet: 'navigation',
-    });
-  }
-
   // =actions
 
   /**
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method.hbs
index 837d1f984..7d32ecb0d 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method.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/auth-methods/auth-method/accounts/account/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/index.hbs
index e20c46a14..128f07833 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/index.hbs
@@ -1,5 +1,28 @@
-<Form::Account
-  @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>
+    <AuthMethods::AuthMethod::Accounts::Account::Header @model={{@model}} />
+  </page.header>
+
+  <page.navigation>
+    <AuthMethods::AuthMethod::Accounts::Account::Nav @model={{@model}} />
+  </page.navigation>
+
+  <page.actions>
+    <AuthMethods::AuthMethod::Accounts::Account::Actions @model={{@model}} />
+  </page.actions>
+
+  <page.body>
+    <Form::Account
+      @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/auth-methods/auth-method/accounts/account/set-password.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
index 58be5da25..07eacdb14 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
@@ -1,7 +1,37 @@
 {{page-title (t 'actions.set-password')}}
 
-<Form::Account::Password::SetPassword
-  @model={{@model}}
-  @submit={{route-action 'setPassword' @model}}
-  @cancel={{route-action 'cancel' @model}}
-/>
\ No newline at end of file
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <h2>{{t 'resources.account.title'}}</h2>
+    <p>{{t 'resources.account.messages.set-password.description'}}</p>
+    <Copyable
+      @text={{@model.id}}
+      @buttonText={{t 'actions.copy-to-clipboard'}}
+      @acknowledgeText={{t 'states.copied'}}
+    >
+      <code>{{@model.id}}</code>
+    </Copyable>
+  </page.header>
+
+  <page.navigation>
+    <AuthMethods::AuthMethod::Accounts::Account::Nav @model={{@model}} />
+  </page.navigation>
+
+  <page.actions>
+    <AuthMethods::AuthMethod::Accounts::Account::Actions @model={{@model}} />
+  </page.actions>
+
+  <page.body>
+    <Form::Account::Password::SetPassword
+      @model={{@model}}
+      @submit={{route-action 'setPassword' @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/auth-methods/auth-method/accounts/account/set-password/-header.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs
deleted file mode 100644
index da4406391..000000000
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-<h2>{{t 'resources.account.title'}}</h2>
-<p>{{t 'resources.account.messages.set-password.description'}}</p>
-<Copyable
-  @text={{@model.id}}
-  @buttonText={{t 'actions.copy-to-clipboard'}}
-  @acknowledgeText={{t 'states.copied'}}
->
-  <code>{{@model.id}}</code>
-</Copyable>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
index 67ba884ae..23568129e 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
@@ -1,149 +1,175 @@
-{{#if @model}}
-  {{! OIDC accounts display more fields }}
-  {{#if @model.firstObject.isOIDC}}
-    <Rose::Table as |table|>
-      <table.header as |header|>
-        <header.row as |row|>
-          <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
-          <row.headerCell>{{t 'form.issuer.label'}}</row.headerCell>
-          <row.headerCell>{{t 'form.subject.label'}}</row.headerCell>
-          <row.headerCell>{{t 'form.email.label'}}</row.headerCell>
-          <row.headerCell>{{t 'form.full_name.label'}}</row.headerCell>
-          <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
-          <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-        </header.row>
-      </table.header>
-      <table.body as |body|>
-        {{#each @model as |account|}}
-          <body.row as |row|>
-            <row.headerCell scope='row'>
-              {{#if (can 'read model' account)}}
-                <LinkTo
-                  @route='scopes.scope.auth-methods.auth-method.accounts.account'
-                  @model={{account.id}}
-                >
-                  {{account.accountName}}
-                </LinkTo>
-              {{else}}
-                {{account.accountName}}
-              {{/if}}
-              <p>{{account.description}}</p>
-            </row.headerCell>
-            <row.cell>
-              <code>{{account.attributes.issuer}}</code>
-            </row.cell>
-            <row.cell>
-              <code>{{account.attributes.subject}}</code>
-            </row.cell>
-            <row.cell>
-              <code>{{account.attributes.email}}</code>
-            </row.cell>
-            <row.cell>
-              {{account.attributes.full_name}}
-            </row.cell>
-            <row.cell>
-              <Rose::Badge>{{account.type}}</Rose::Badge>
-            </row.cell>
-            <row.cell>
-              <Copyable
-                @text={{account.id}}
-                @buttonText={{t 'actions.copy-to-clipboard'}}
-                @acknowledgeText={{t 'states.copied'}}
-              >
-                <code>{{account.id}}</code>
-              </Copyable>
-            </row.cell>
-          </body.row>
-        {{/each}}
-      </table.body>
-    </Rose::Table>
-  {{else}}
-    <Rose::Table as |table|>
-      <table.header as |header|>
-        <header.row as |row|>
-          <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
-          <row.headerCell>{{t 'form.login_name.label'}}</row.headerCell>
-          <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
-          <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-        </header.row>
-      </table.header>
-      <table.body as |body|>
-        {{#each @model as |account|}}
-          <body.row as |row|>
-            <row.headerCell>
-              {{#if (can 'read model' account)}}
-                <LinkTo
-                  @route='scopes.scope.auth-methods.auth-method.accounts.account'
-                  @model={{account.id}}
-                >
-                  {{account.accountName}}
-                </LinkTo>
-              {{else}}
-                {{account.accountName}}
-              {{/if}}
-              <p>{{account.description}}</p>
-            </row.headerCell>
-            <row.cell>
-              {{account.attributes.login_name}}
-            </row.cell>
-            <row.cell>
-              <Rose::Badge>{{account.type}}</Rose::Badge>
-            </row.cell>
-            <row.cell>
-              <Copyable
-                @text={{account.id}}
-                @buttonText={{t 'actions.copy-to-clipboard'}}
-                @acknowledgeText={{t 'states.copied'}}
-              >
-                <code>{{account.id}}</code>
-              </Copyable>
-            </row.cell>
-          </body.row>
-        {{/each}}
-      </table.body>
-    </Rose::Table>
-  {{/if}}
-{{else}}
+<Rose::Layout::Page as |page|>
 
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.account.messages.welcome.title'}}
-      as |message|
-    >
-      <message.description>
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
 
-        {{#if (can 'list collection' this.authMethod collection='accounts')}}
-          {{! can list (at least):  show default welcome message}}
-          {{t 'resources.account.description'}}
+  <page.header>
+    <AuthMethods::AuthMethod::Header @model={{@model.authMethod}} />
+  </page.header>
 
-        {{else if (can
-          'create collection' this.authMethod collection='accounts'
-        )}}
-          {{! can create (only):  show create-but-not-list welcome message}}
-          {{t
-            'descriptions.create-but-not-list'
-            resource=(t 'resources.account.title_plural')
-          }}
-        {{else}}
-          {{! can neither list nor create }}
-          {{t
-            'descriptions.neither-list-nor-create'
-            resource=(t 'resources.account.title_plural')
-          }}
-        {{/if}}
+  <page.navigation>
+    <AuthMethods::AuthMethod::Nav @model={{@model.authMethod}} />
+  </page.navigation>
 
-      </message.description>
+  <page.actions>
+    <AuthMethods::AuthMethod::Actions @model={{@model.authMethod}} />
+  </page.actions>
 
-      {{#if (can 'create collection' this.authMethod collection='accounts')}}
-
-        <message.link
-          @route='scopes.scope.auth-methods.auth-method.accounts.new'
-        >
-          <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
-          {{t 'resources.account.actions.create'}}
-        </message.link>
+  <page.body>
+    {{#if @model.accounts}}
+      {{! OIDC accounts display more fields }}
+      {{#if @model.accounts.firstObject.isOIDC}}
+        <Rose::Table as |table|>
+          <table.header as |header|>
+            <header.row as |row|>
+              <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+              <row.headerCell>{{t 'form.issuer.label'}}</row.headerCell>
+              <row.headerCell>{{t 'form.subject.label'}}</row.headerCell>
+              <row.headerCell>{{t 'form.email.label'}}</row.headerCell>
+              <row.headerCell>{{t 'form.full_name.label'}}</row.headerCell>
+              <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+              <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+            </header.row>
+          </table.header>
+          <table.body as |body|>
+            {{#each @model.accounts as |account|}}
+              <body.row as |row|>
+                <row.headerCell scope='row'>
+                  {{#if (can 'read model' account)}}
+                    <LinkTo
+                      @route='scopes.scope.auth-methods.auth-method.accounts.account'
+                      @model={{account.id}}
+                    >
+                      {{account.accountName}}
+                    </LinkTo>
+                  {{else}}
+                    {{account.accountName}}
+                  {{/if}}
+                  <p>{{account.description}}</p>
+                </row.headerCell>
+                <row.cell>
+                  <code>{{account.attributes.issuer}}</code>
+                </row.cell>
+                <row.cell>
+                  <code>{{account.attributes.subject}}</code>
+                </row.cell>
+                <row.cell>
+                  <code>{{account.attributes.email}}</code>
+                </row.cell>
+                <row.cell>
+                  {{account.attributes.full_name}}
+                </row.cell>
+                <row.cell>
+                  <Rose::Badge>{{account.type}}</Rose::Badge>
+                </row.cell>
+                <row.cell>
+                  <Copyable
+                    @text={{account.id}}
+                    @buttonText={{t 'actions.copy-to-clipboard'}}
+                    @acknowledgeText={{t 'states.copied'}}
+                  >
+                    <code>{{account.id}}</code>
+                  </Copyable>
+                </row.cell>
+              </body.row>
+            {{/each}}
+          </table.body>
+        </Rose::Table>
+      {{else}}
+        <Rose::Table as |table|>
+          <table.header as |header|>
+            <header.row as |row|>
+              <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+              <row.headerCell>{{t 'form.login_name.label'}}</row.headerCell>
+              <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+              <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+            </header.row>
+          </table.header>
+          <table.body as |body|>
+            {{#each @model.accounts as |account|}}
+              <body.row as |row|>
+                <row.headerCell>
+                  {{#if (can 'read model' account)}}
+                    <LinkTo
+                      @route='scopes.scope.auth-methods.auth-method.accounts.account'
+                      @model={{account.id}}
+                    >
+                      {{account.accountName}}
+                    </LinkTo>
+                  {{else}}
+                    {{account.accountName}}
+                  {{/if}}
+                  <p>{{account.description}}</p>
+                </row.headerCell>
+                <row.cell>
+                  {{account.attributes.login_name}}
+                </row.cell>
+                <row.cell>
+                  <Rose::Badge>{{account.type}}</Rose::Badge>
+                </row.cell>
+                <row.cell>
+                  <Copyable
+                    @text={{account.id}}
+                    @buttonText={{t 'actions.copy-to-clipboard'}}
+                    @acknowledgeText={{t 'states.copied'}}
+                  >
+                    <code>{{account.id}}</code>
+                  </Copyable>
+                </row.cell>
+              </body.row>
+            {{/each}}
+          </table.body>
+        </Rose::Table>
       {{/if}}
-    </Rose::Message>
-  </Rose::Layout::Centered>
+    {{else}}
 
-{{/if}}
\ No newline at end of file
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.account.messages.welcome.title'}}
+          as |message|
+        >
+          <message.description>
+
+            {{#if
+              (can 'list collection' this.authMethod collection='accounts')
+            }}
+              {{! can list (at least):  show default welcome message}}
+              {{t 'resources.account.description'}}
+
+            {{else if (can
+              'create collection' this.authMethod collection='accounts'
+            )}}
+              {{! can create (only):  show create-but-not-list welcome message}}
+              {{t
+                'descriptions.create-but-not-list'
+                resource=(t 'resources.account.title_plural')
+              }}
+            {{else}}
+              {{! can neither list nor create }}
+              {{t
+                'descriptions.neither-list-nor-create'
+                resource=(t 'resources.account.title_plural')
+              }}
+            {{/if}}
+
+          </message.description>
+
+          {{#if
+            (can 'create collection' this.authMethod collection='accounts')
+          }}
+
+            <message.link
+              @route='scopes.scope.auth-methods.auth-method.accounts.new'
+            >
+              <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
+              {{t 'resources.account.actions.create'}}
+            </message.link>
+          {{/if}}
+        </Rose::Message>
+      </Rose::Layout::Centered>
+
+    {{/if}}
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs
index e20c46a14..fac7d93fb 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs
@@ -1,5 +1,23 @@
-<Form::Account
-  @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>
+    <h2>
+      {{t 'titles.new'}}
+      <DocLink @doc='account.new' @iconSize='large' />
+    </h2>
+  </page.header>
+
+  <page.body>
+    <Form::Account
+      @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/auth-methods/auth-method/accounts/new/-header.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs
deleted file mode 100644
index 0144711e6..000000000
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<h2>
-  {{t 'titles.new'}}
-  <DocLink @doc='account.new' @iconSize='large' />
-</h2>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
index e3302df0b..2360f98a6 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
@@ -1,8 +1,30 @@
-<Form::AuthMethod
-  @model={{@model}}
-  @submit={{route-action 'save' @model}}
-  @cancel={{route-action 'cancel' @model}}
-  @removeItemByIndex={{route-action 'removeItemByIndex' @model}}
-  @addStringItem={{route-action 'addStringItem' @model}}
-  @addAccountClaimMapItem={{route-action 'addAccountClaimMapItem' @model}}
-/>
\ No newline at end of file
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <AuthMethods::AuthMethod::Header @model={{@model}} />
+  </page.header>
+
+  <page.navigation>
+    <AuthMethods::AuthMethod::Nav @model={{@model}} />
+  </page.navigation>
+
+  <page.actions>
+    <AuthMethods::AuthMethod::Actions @model={{@model}} />
+  </page.actions>
+
+  <page.body>
+    <Form::AuthMethod
+      @model={{@model}}
+      @submit={{route-action 'save' @model}}
+      @cancel={{route-action 'cancel' @model}}
+      @removeItemByIndex={{route-action 'removeItemByIndex' @model}}
+      @addStringItem={{route-action 'addStringItem' @model}}
+      @addAccountClaimMapItem={{route-action 'addAccountClaimMapItem' @model}}
+    />
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/index.hbs
index c482fd414..cce1b218b 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/index.hbs
@@ -1,86 +1,112 @@
-{{#if @model}}
-  <Rose::Table as |table|>
-    <table.header as |header|>
-      <header.row as |row|>
-        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.description.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-      </header.row>
-    </table.header>
+<Rose::Layout::Page as |page|>
 
-    <table.body as |body|>
-      {{#each @model as |managed-group|}}
-        <body.row as |row|>
-          <row.headerCell>
-            {{#if (can 'read model' managed-group)}}
-              <LinkTo
-                @route='scopes.scope.auth-methods.auth-method.managed-groups.managed-group'
-                @model={{managed-group.id}}
-              >
-                {{managed-group.displayName}}
-              </LinkTo>
-            {{else}}
-              {{managed-group.displayName}}
-            {{/if}}
-          </row.headerCell>
-          <row.cell>{{managed-group.description}}</row.cell>
-          <row.cell>
-            <Rose::Badge>{{managed-group.type}}</Rose::Badge>
-          </row.cell>
-          <row.cell>
-            <Copyable
-              @text={{managed-group.id}}
-              @buttonText={{t 'actions.copy-to-clipboard'}}
-              @acknowledgeText={{t 'states.copied'}}
-            >
-              <code>{{managed-group.id}}</code>
-            </Copyable>
-          </row.cell>
-        </body.row>
-      {{/each}}
-    </table.body>
-  </Rose::Table>
-{{else}}
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.managed-group.messages.welcome.title'}}
-      as |message|
-    >
-      <message.description>
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
 
-        {{#if
-          (can 'list collection' this.authMethod collection='managed-groups')
-        }}
-          {{! Can list (at least): show default welcome message }}
-          {{t 'resources.managed-group.description'}}
-        {{else if (can
-          'create collection' this.authMethod collection='managed-groups'
-        )}}
-          {{! Can create only: show create but not list welcome message }}
-          {{t
-            'descriptions.create-but-not-list'
-            resource=(t 'resources.managed-group.title_plural')
-          }}
-        {{else}}
-          {{! Can neither list nor create }}
-          {{t
-            'descriptions.neither-list-nor-create'
-            resource=(t 'resources.managed-group.title_plural')
-          }}
-        {{/if}}
-      </message.description>
+  <page.header>
+    <AuthMethods::AuthMethod::Header @model={{@model.authMethod}} />
+  </page.header>
 
-      {{#if
-        (can 'create collection' this.authMethod collection='managed-groups')
-      }}
-        <message.link
-          @route='scopes.scope.auth-methods.auth-method.managed-groups.new'
+  <page.navigation>
+    <AuthMethods::AuthMethod::Nav @model={{@model.authMethod}} />
+  </page.navigation>
+
+  <page.actions>
+    <AuthMethods::AuthMethod::Actions @model={{@model.authMethod}} />
+  </page.actions>
+
+  <page.body>
+    {{#if @model.managedGroups}}
+      <Rose::Table as |table|>
+        <table.header as |header|>
+          <header.row as |row|>
+            <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.description.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+          </header.row>
+        </table.header>
+
+        <table.body as |body|>
+          {{#each @model.managedGroups as |managed-group|}}
+            <body.row as |row|>
+              <row.headerCell>
+                {{#if (can 'read model' managed-group)}}
+                  <LinkTo
+                    @route='scopes.scope.auth-methods.auth-method.managed-groups.managed-group'
+                    @model={{managed-group.id}}
+                  >
+                    {{managed-group.displayName}}
+                  </LinkTo>
+                {{else}}
+                  {{managed-group.displayName}}
+                {{/if}}
+              </row.headerCell>
+              <row.cell>{{managed-group.description}}</row.cell>
+              <row.cell>
+                <Rose::Badge>{{managed-group.type}}</Rose::Badge>
+              </row.cell>
+              <row.cell>
+                <Copyable
+                  @text={{managed-group.id}}
+                  @buttonText={{t 'actions.copy-to-clipboard'}}
+                  @acknowledgeText={{t 'states.copied'}}
+                >
+                  <code>{{managed-group.id}}</code>
+                </Copyable>
+              </row.cell>
+            </body.row>
+          {{/each}}
+        </table.body>
+      </Rose::Table>
+    {{else}}
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.managed-group.messages.welcome.title'}}
+          as |message|
         >
-          <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
-          {{t 'resources.managed-group.actions.create'}}
-        </message.link>
-      {{/if}}
-    </Rose::Message>
-  </Rose::Layout::Centered>
-{{/if}}
\ No newline at end of file
+          <message.description>
+
+            {{#if
+              (can
+                'list collection' this.authMethod collection='managed-groups'
+              )
+            }}
+              {{! Can list (at least): show default welcome message }}
+              {{t 'resources.managed-group.description'}}
+            {{else if (can
+              'create collection' this.authMethod collection='managed-groups'
+            )}}
+              {{! Can create only: show create but not list welcome message }}
+              {{t
+                'descriptions.create-but-not-list'
+                resource=(t 'resources.managed-group.title_plural')
+              }}
+            {{else}}
+              {{! Can neither list nor create }}
+              {{t
+                'descriptions.neither-list-nor-create'
+                resource=(t 'resources.managed-group.title_plural')
+              }}
+            {{/if}}
+          </message.description>
+
+          {{#if
+            (can
+              'create collection' this.authMethod collection='managed-groups'
+            )
+          }}
+            <message.link
+              @route='scopes.scope.auth-methods.auth-method.managed-groups.new'
+            >
+              <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
+              {{t 'resources.managed-group.actions.create'}}
+            </message.link>
+          {{/if}}
+        </Rose::Message>
+      </Rose::Layout::Centered>
+    {{/if}}
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.hbs
index bcaa893ac..8abc571c3 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.hbs
@@ -1,5 +1,33 @@
-<Form::ManagedGroup
-  @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>
+    <AuthMethods::AuthMethod::ManagedGroups::ManagedGroup::Header
+      @model={{@model}}
+    />
+  </page.header>
+
+  <page.navigation>
+    <AuthMethods::AuthMethod::ManagedGroups::ManagedGroup::Nav
+      @model={{@model}}
+    />
+  </page.navigation>
+
+  <page.actions>
+    <AuthMethods::AuthMethod::ManagedGroups::ManagedGroup::Actions
+      @model={{@model}}
+    />
+  </page.actions>
+
+  <page.body>
+    <Form::ManagedGroup
+      @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/auth-methods/auth-method/managed-groups/managed-group/members.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.hbs
index 8f942d312..5111f1838 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.hbs
@@ -1,62 +1,90 @@
 {{page-title (t 'resources.managed-group.member.title_plural')}}
 
-{{#if @model}}
-  <Rose::Table as |table|>
-    <table.header as |header|>
-      <header.row as |row|>
-        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.issuer.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.subject.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.email.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.full_name.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-      </header.row>
-    </table.header>
-    <table.body as |body|>
-      {{#each @model as |member|}}
-        <body.row as |row|>
-          <row.headerCell scope='row'>
-            {{member.accountName}}
-            <p>{{member.description}}</p>
-          </row.headerCell>
-          <row.cell>
-            <code>{{member.attributes.issuer}}</code>
-          </row.cell>
-          <row.cell>
-            <code>{{member.attributes.subject}}</code>
-          </row.cell>
-          <row.cell>
-            <code>{{member.attributes.email}}</code>
-          </row.cell>
-          <row.cell>
-            {{member.attributes.full_name}}
-          </row.cell>
-          <row.cell>
-            <Rose::Badge>{{member.type}}</Rose::Badge>
-          </row.cell>
-          <row.cell>
-            <Copyable
-              @text={{member.id}}
-              @buttonText={{t 'actions.copy-to-clipboard'}}
-              @acknowledgeText={{t 'states.copied'}}
-            >
-              <code>{{member.id}}</code>
-            </Copyable>
-          </row.cell>
-        </body.row>
-      {{/each}}
-    </table.body>
-  </Rose::Table>
-{{else}}
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.managed-group.member.messages.title'}}
-      as |message|
-    >
-      <message.description>
-        {{t 'resources.managed-group.member.messages.description'}}
-      </message.description>
-    </Rose::Message>
-  </Rose::Layout::Centered>
-{{/if}}
\ No newline at end of file
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <AuthMethods::AuthMethod::ManagedGroups::ManagedGroup::Header
+      @model={{@model.managedGroup}}
+    />
+  </page.header>
+
+  <page.navigation>
+    <AuthMethods::AuthMethod::ManagedGroups::ManagedGroup::Nav
+      @model={{@model.managedGroup}}
+    />
+  </page.navigation>
+
+  <page.actions>
+    <AuthMethods::AuthMethod::ManagedGroups::ManagedGroup::Actions
+      @model={{@model.managedGroup}}
+    />
+  </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.issuer.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.subject.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.email.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.full_name.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+          </header.row>
+        </table.header>
+        <table.body as |body|>
+          {{#each @model.members as |member|}}
+            <body.row as |row|>
+              <row.headerCell scope='row'>
+                {{member.accountName}}
+                <p>{{member.description}}</p>
+              </row.headerCell>
+              <row.cell>
+                <code>{{member.attributes.issuer}}</code>
+              </row.cell>
+              <row.cell>
+                <code>{{member.attributes.subject}}</code>
+              </row.cell>
+              <row.cell>
+                <code>{{member.attributes.email}}</code>
+              </row.cell>
+              <row.cell>
+                {{member.attributes.full_name}}
+              </row.cell>
+              <row.cell>
+                <Rose::Badge>{{member.type}}</Rose::Badge>
+              </row.cell>
+              <row.cell>
+                <Copyable
+                  @text={{member.id}}
+                  @buttonText={{t 'actions.copy-to-clipboard'}}
+                  @acknowledgeText={{t 'states.copied'}}
+                >
+                  <code>{{member.id}}</code>
+                </Copyable>
+              </row.cell>
+            </body.row>
+          {{/each}}
+        </table.body>
+      </Rose::Table>
+    {{else}}
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.managed-group.member.messages.title'}}
+          as |message|
+        >
+          <message.description>
+            {{t 'resources.managed-group.member.messages.description'}}
+          </message.description>
+        </Rose::Message>
+      </Rose::Layout::Centered>
+    {{/if}}
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs
index bcaa893ac..24a69bfbb 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs
@@ -1,5 +1,23 @@
-<Form::ManagedGroup
-  @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>
+    <h2>
+      {{t 'titles.new'}}
+      {{! TODO: change the icon link }}
+      <DocLink @doc='account.new' @iconSize='large' />
+    </h2>
+  </page.header>
+
+  <page.body>
+    <Form::ManagedGroup
+      @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/auth-methods/auth-method/managed-groups/new/-header.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new/-header.hbs
deleted file mode 100644
index b6e89205e..000000000
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new/-header.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<h2>
-  {{t 'titles.new'}}
-  {{! TODO: change the icon link }}
-  <DocLink @doc='account.new' @iconSize='large' />
-</h2>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
index ea12808c3..b2380e0fb 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
@@ -35,7 +35,6 @@
   </page.actions>
 
   <page.body>
-
     {{#if
       (or
         @model
diff --git a/ui/admin/app/templates/scopes/scope/users/user.hbs b/ui/admin/app/templates/scopes/scope/users/user.hbs
index 837d1f984..7d32ecb0d 100644
--- a/ui/admin/app/templates/scopes/scope/users/user.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/user.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/users/user/accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs
index a61d813a0..e7373ac9e 100644
--- a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs
@@ -1,79 +1,101 @@
 {{page-title (t 'resources.user.messages.accounts.title')}}
 
-{{#if @model.accounts}}
+<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.type.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.accounts as |account|}}
-        <body.row as |row|>
-          <row.headerCell>
-            {{account.accountName}}
-            <p>{{account.description}}</p>
-          </row.headerCell>
-          <row.cell>
-            <Rose::Badge>
-              {{t (concat 'resources.auth-method.types.' account.type)}}
-            </Rose::Badge>
-          </row.cell>
-          <row.cell>
-            <Copyable
-              @text={{account.id}}
-              @buttonText={{t 'actions.copy-to-clipboard'}}
-              @acknowledgeText={{t 'states.copied'}}
-            >
-              <code>{{account.id}}</code>
-            </Copyable>
-          </row.cell>
-          <row.cell>
-            {{#if (can 'removeAccounts user' @model.user)}}
-              <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 'removeAccount' @model.user account)
-                  }}
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <Users::User::Header @model={{@model.user}} />
+  </page.header>
+
+  <page.navigation>
+    <Users::User::Nav @model={{@model.user}} />
+  </page.navigation>
+
+  <page.actions>
+    <Users::User::Actions @model={{@model.user}} />
+  </page.actions>
+
+  <page.body>
+    {{#if @model.accounts}}
+
+      <Rose::Table as |table|>
+        <table.header as |header|>
+          <header.row as |row|>
+            <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.type.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.accounts as |account|}}
+            <body.row as |row|>
+              <row.headerCell>
+                {{account.accountName}}
+                <p>{{account.description}}</p>
+              </row.headerCell>
+              <row.cell>
+                <Rose::Badge>
+                  {{t (concat 'resources.auth-method.types.' account.type)}}
+                </Rose::Badge>
+              </row.cell>
+              <row.cell>
+                <Copyable
+                  @text={{account.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>{{account.id}}</code>
+                </Copyable>
+              </row.cell>
+              <row.cell>
+                {{#if (can 'removeAccounts user' @model.user)}}
+                  <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 'removeAccount' @model.user account)
+                      }}
+                    >
+                      {{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.user.messages.accounts.title'}}
-      as |message|
-    >
-      <message.description>
-        {{t 'resources.user.messages.accounts.description'}}
-      </message.description>
-      <message.link @route='scopes.scope.users.user.add-accounts'>
-        <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
-        {{t 'resources.user.actions.add-accounts'}}
-      </message.link>
-    </Rose::Message>
-  </Rose::Layout::Centered>
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.user.messages.accounts.title'}}
+          as |message|
+        >
+          <message.description>
+            {{t 'resources.user.messages.accounts.description'}}
+          </message.description>
+          <message.link @route='scopes.scope.users.user.add-accounts'>
+            <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
+            {{t 'resources.user.actions.add-accounts'}}
+          </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
diff --git a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs
index 4f514a506..df557eb09 100644
--- a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs
@@ -1,28 +1,43 @@
 {{page-title (t 'resources.user.actions.add-accounts')}}
 
-{{#if @model.accounts}}
-  <Form::User::AddAccounts
-    @model={{@model.user}}
-    @authMethods={{@model.authMethods}}
-    @accounts={{@model.accounts}}
-    @submit={{route-action 'addAccounts' @model.user}}
-    @cancel={{route-action 'cancel'}}
-  />
-{{/if}}
+<Rose::Layout::Page as |page|>
 
-{{#unless @model.accounts}}
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.user.messages.no-accounts.title'}}
-      as |message|
-    >
-      <message.description>
-        {{t 'resources.user.messages.no-accounts.description'}}
-      </message.description>
-      <message.link @route='scopes.scope.users.user.accounts'>
-        <Rose::Icon @name='flight-icons/svg/chevron-left-16' />
-        {{t 'actions.back'}}
-      </message.link>
-    </Rose::Message>
-  </Rose::Layout::Centered>
-{{/unless}}
\ No newline at end of file
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <h2>{{t 'resources.user.messages.add-accounts.title'}}</h2>
+    <p>{{t 'resources.user.messages.add-accounts.description'}}</p>
+  </page.header>
+
+  <page.body>
+    {{#if @model.accounts}}
+      <Form::User::AddAccounts
+        @model={{@model.user}}
+        @authMethods={{@model.authMethods}}
+        @accounts={{@model.accounts}}
+        @submit={{route-action 'addAccounts' @model.user}}
+        @cancel={{route-action 'cancel'}}
+      />
+    {{/if}}
+
+    {{#unless @model.accounts}}
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.user.messages.no-accounts.title'}}
+          as |message|
+        >
+          <message.description>
+            {{t 'resources.user.messages.no-accounts.description'}}
+          </message.description>
+          <message.link @route='scopes.scope.users.user.accounts'>
+            <Rose::Icon @name='flight-icons/svg/chevron-left-16' />
+            {{t 'actions.back'}}
+          </message.link>
+        </Rose::Message>
+      </Rose::Layout::Centered>
+    {{/unless}}
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/users/user/add-accounts/-header.hbs b/ui/admin/app/templates/scopes/scope/users/user/add-accounts/-header.hbs
deleted file mode 100644
index 91acf84fd..000000000
--- a/ui/admin/app/templates/scopes/scope/users/user/add-accounts/-header.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-<h2>{{t 'resources.user.messages.add-accounts.title'}}</h2>
-<p>{{t 'resources.user.messages.add-accounts.description'}}</p>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/users/user/index.hbs b/ui/admin/app/templates/scopes/scope/users/user/index.hbs
index e90a1ff9a..c5530509a 100644
--- a/ui/admin/app/templates/scopes/scope/users/user/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/user/index.hbs
@@ -1,5 +1,27 @@
-<Form::User
-  @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>
+    <Users::User::Header @model={{@model}} />
+  </page.header>
+
+  <page.navigation>
+    <Users::User::Nav @model={{@model}} />
+  </page.navigation>
+
+  <page.actions>
+    <Users::User::Actions @model={{@model}} />
+  </page.actions>
+
+  <page.body>
+    <Form::User
+      @model={{@model}}
+      @submit={{route-action 'save' @model}}
+      @cancel={{route-action 'cancel' @model}}
+    />
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file