diff --git a/addon/components/badge.hbs b/addon/components/badge.hbs
index ace586d..e6359c3 100644
--- a/addon/components/badge.hbs
+++ b/addon/components/badge.hbs
@@ -1,4 +1,4 @@
-<div class="status-badge {{safe-dasherize @status}}-status-badge" ...attributes>
+<div class="status-badge {{safe-dasherize (or @status @type)}}-status-badge" ...attributes>
     <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium leading-4 whitespace-no-wrap {{@spanClass}}">
         <svg class="mr-1.5 h-2 w-2 {{if @hideStatusDot "hidden"}}" fill="currentColor" viewBox="0 0 8 8">
             <circle cx="4" cy="4" r="3"></circle>
diff --git a/addon/components/modal/layouts/confirm.hbs b/addon/components/modal/layouts/confirm.hbs
index 0971487..236b163 100644
--- a/addon/components/modal/layouts/confirm.hbs
+++ b/addon/components/modal/layouts/confirm.hbs
@@ -1,5 +1,5 @@
 <Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
-    <div class="modal-body-container flex {{if @options.body 'items-start' 'items-center'}}">
+    <div class="px-6 py-4 flex {{if @options.body 'items-start' 'items-center'}}">
         <div class="flex items-center justify-center flex-shrink-0 w-12 h-12 mx-auto bg-red-100 rounded-full sm:mx-0 sm:h-10 sm:w-10">
             {{#if @options.icon}}
                 <FaIcon @icon={{@options.icon}} @size={{@options.iconSize}} @spin={{@options.iconSpin}} @flip={{@options.iconFlip}} class={{@options.iconClass}} />
diff --git a/addon/components/overlay.js b/addon/components/overlay.js
index a2d475b..2a9e846 100644
--- a/addon/components/overlay.js
+++ b/addon/components/overlay.js
@@ -1,6 +1,7 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { later } from '@ember/runloop';
 
 export default class OverlayComponent extends Component {
     @tracked overlayNode;
@@ -34,13 +35,17 @@ export default class OverlayComponent extends Component {
 
         const { isOpen } = this.args;
 
-        setTimeout(() => {
-            this.isOpen = isOpen ?? true;
-
-            if (typeof this.args?.onLoad === 'function') {
-                this.args.onLoad(this.context);
-            }
-        }, 600);
+        later(
+            this,
+            () => {
+                this.isOpen = isOpen ?? true;
+
+                if (typeof this.args?.onLoad === 'function') {
+                    this.args.onLoad(this.context);
+                }
+            },
+            600
+        );
     }
 
     @action setupNode(property, node) {