diff --git a/web/app/components/document/sidebar.hbs b/web/app/components/document/sidebar.hbs
index cead9508d..27ccb1902 100644
--- a/web/app/components/document/sidebar.hbs
+++ b/web/app/components/document/sidebar.hbs
@@ -36,7 +36,7 @@
           <Hds::Badge
             data-test-sidebar-title-badge
             @text={{if this.isDraft "Draft" @document.docNumber}}
-            class="uppercase !rounded-[3px]
+            class="!rounded-[3px] uppercase
               {{if
                 @document.isDraft
                 '!bg-color-palette-neutral-500 !text-white'
@@ -62,7 +62,7 @@
                     "up"
                     "down"
                   }}
-                  class="flex items-center text-color-foreground-faint sidebar-header-button draft-visibility-button"
+                  class="sidebar-header-button draft-visibility-button flex items-center text-color-foreground-faint"
                   {{tooltip
                     this.toggleDraftVisibilityTooltipText
                     placement="bottom"
@@ -82,14 +82,14 @@
                   class="flex items-start gap-3 py-2.5 pl-4 pr-6"
                   {{on "click" (perform this.setDraftVisibility dd.value)}}
                 >
-                  <FlightIcon @name={{dd.attrs.icon}} class="shrink-0 mt-0.5" />
+                  <FlightIcon @name={{dd.attrs.icon}} class="mt-0.5 shrink-0" />
                   <div class="w-full">
                     <h4>{{dd.attrs.title}}</h4>
                     <p>{{dd.attrs.description}}</p>
                   </div>
                   <FlightIcon
                     @name="check"
-                    class="check shrink-0 mt-0.5
+                    class="check mt-0.5 shrink-0
                       {{if dd.isSelected 'visible' 'invisible'}}"
                   />
                 </dd.Action>
@@ -140,7 +140,7 @@
         {{/if}}
       </div>
 
-      <hr class="border-0 border-b hds-border-faint" />
+      <hr class="hds-border-faint border-0 border-b" />
 
       {{! Summary }}
       <div class="mb-5">
@@ -198,7 +198,7 @@
       <div class="flex flex-col items-start space-y-2">
         <Document::Sidebar::SectionHeader @title="Product/Area" />
         {{#if (and this.isDraft this.isOwner)}}
-          <div class="w-full relative">
+          <div class="relative w-full">
             <Inputs::ProductSelect
               data-test-document-product-area-editable
               @selected={{this.product}}
@@ -384,16 +384,16 @@
   {{#if this.footerIsShown}}
     <div class="sidebar-footer {{if this.editingIsDisabled 'locked'}}">
       {{#if this.footerControlsAreDisabled}}
-        <div class="px-3 -mb-1">
-          <div class="w-full pt-3.5 border-t border-color-border-primary">
+        <div class="-mb-1 px-3">
+          <div class="w-full border-t border-color-border-primary pt-3.5">
             <div class="text-body-200 text-color-foreground-faint">
               <h5
-                class="text-body-200 font-semibold text-color-foreground-primary flex items-center mb-1"
+                class="mb-1 flex items-center text-body-200 font-semibold text-color-foreground-primary"
               >
                 {{if this.docIsLocked "Document is locked" "Read-only headers"}}
                 <FlightIcon
                   @name="lock"
-                  class="shrink-0 text-color-foreground-faint -mt-px ml-1.5"
+                  class="-mt-px ml-1.5 shrink-0 text-color-foreground-faint"
                 />
               </h5>
               <p class="mb-1.5">
@@ -422,7 +422,7 @@
       {{else}}
         {{#if this.isDraft}}
           {{#if this.isOwner}}
-            <div class="flex items-start px-3 gap-2">
+            <div class="flex items-start gap-2 px-3">
               <Hds::Button
                 @text="Publish for review..."
                 @size="medium"
@@ -443,7 +443,7 @@
           {{/if}}
         {{else}}
           {{#if this.isOwner}}
-            <div class="flex items-start px-3 gap-2">
+            <div class="flex items-start gap-2 px-3">
 
               <Hds::Button
                 @text={{this.moveToStatusButtonText}}
@@ -474,7 +474,7 @@
 
           {{else}}
             {{#if this.isApprover}}
-              <div class="flex flex-col items-start px-3 gap-2">
+              <div class="flex flex-col items-start gap-2 px-3">
                 <Hds::Button
                   @text={{this.approveButtonText}}
                   @size="medium"
@@ -534,8 +534,8 @@
     <Document::Modal
       @color="critical"
       @headerText="Delete draft?"
-      @bodyText="Are you sure you want to archive this document?"
-      @errorTitle="Error archiving document"
+      @bodyText="Are you sure you want to delete this draft?"
+      @errorTitle="Error deleting draft"
       @close={{this.closeDeleteModal}}
       @task={{perform this.deleteDraft}}
       @taskButtonText="Yes, delete"
@@ -564,11 +564,11 @@
             <div class="text-center">
               <FlightIcon @name="loading" @size="24" class="mb-5" />
               <h2>Submitting for review...</h2>
-              <p class="text-body-300 mb-2">This usually takes about a minute.</p>
+              <p class="mb-2 text-body-300">This usually takes about a minute.</p>
               <span
-                class="block text-[12px] text-color-foreground-faint mb-8"
+                class="mb-8 block text-[12px] text-color-foreground-faint"
               >We appreciate your patience.</span>
-              <div class="flex justify-center space-x-2 items-center">
+              <div class="flex items-center justify-center space-x-2">
                 <div class="h-px w-4 bg-color-border-primary"></div>
                 <FlightIcon
                   @name="hashicorp"
@@ -586,9 +586,8 @@
               >
                 <FlightIcon @size="16" @name="at-sign" />
               </div>
-              Approvers and people subscribed to
-              “{{@document.product}}”
-              will be notified.
+              Approvers and people subscribed to “{{@document.product}}” will be
+              notified.
             </li>
             <li class="flex items-center">
               <div
@@ -644,7 +643,7 @@
                 </Hds::Form::Checkbox::Field>
               </div>
               {{#if check.links.length}}
-                <ul class="list-none pl-6 mt-1.5">
+                <ul class="mt-1.5 list-none pl-6">
                   {{#each check.links as |link|}}
                     <li>
                       <Hds::Link::Inline
@@ -652,7 +651,7 @@
                         @iconPosition="trailing"
                         @isHrefExternal={{true}}
                         @href={{link.url}}
-                        class="no-underline text-body-100"
+                        class="text-body-100 no-underline"
                       >
                         {{link.text}}
                       </Hds::Link::Inline>