diff --git a/InvenTree/report/templatetags/report.py b/InvenTree/report/templatetags/report.py
index 6917271a40..aea2105abb 100644
--- a/InvenTree/report/templatetags/report.py
+++ b/InvenTree/report/templatetags/report.py
@@ -410,7 +410,10 @@ def format_number(number, **kwargs):
         except ValueError:
             pass
 
-    value = str(number)
+    # Re-encode, and normalize again
+    value = Decimal(number).normalize()
+    value = format(value, 'f')
+    value = str(value)
 
     leading = kwargs.get('leading', None)
 
diff --git a/docs/docs/report/report.md b/docs/docs/report/report.md
index e82ac5ead6..1bd05c3c6d 100644
--- a/docs/docs/report/report.md
+++ b/docs/docs/report/report.md
@@ -117,6 +117,7 @@ So, if you are writing a template which has custom formatting, (or any other sec
 
 ```html
 {% raw %}
+{% load l10n %}
 <head>
     <style>
         @page {
@@ -133,6 +134,9 @@ So, if you are writing a template which has custom formatting, (or any other sec
 !!! tip "Close it out"
     Don't forget to end with a `{% raw %}{% endlocalize %}{% endraw %}` tag!
 
+!!! tip "l10n"
+    You will need to add `{% raw %}{% load l10n %}{% endraw %}` to the top of your template file to use the `{% raw %}{% localize %}{% endraw %}` tag.
+
 ### Extending with Plugins
 
 The [ReportMixin plugin class](../extend/plugins/report.md) allows reporting functionality to be extended with custom features.
diff --git a/src/frontend/src/components/nav/DetailDrawer.tsx b/src/frontend/src/components/nav/DetailDrawer.tsx
index 0d442dbfe1..91f7b3e734 100644
--- a/src/frontend/src/components/nav/DetailDrawer.tsx
+++ b/src/frontend/src/components/nav/DetailDrawer.tsx
@@ -27,6 +27,7 @@ export interface DrawerProps {
   renderContent: (id?: string) => React.ReactNode;
   urlPrefix?: string;
   size?: MantineNumberSize;
+  closeOnEscape?: boolean;
 }
 
 const useStyles = createStyles(() => ({
@@ -40,6 +41,7 @@ function DetailDrawerComponent({
   title,
   position = 'right',
   size,
+  closeOnEscape = true,
   renderContent
 }: DrawerProps) {
   const navigate = useNavigate();
@@ -62,6 +64,7 @@ function DetailDrawerComponent({
         addDetailDrawer(false);
       }}
       position={position}
+      closeOnEscape={closeOnEscape}
       size={size}
       classNames={{ root: classes.flex, body: classes.flex }}
       scrollAreaComponent={Stack}
diff --git a/src/frontend/src/components/render/Build.tsx b/src/frontend/src/components/render/Build.tsx
index d5ee532c78..fb7f3e76a3 100644
--- a/src/frontend/src/components/render/Build.tsx
+++ b/src/frontend/src/components/render/Build.tsx
@@ -20,3 +20,20 @@ export function RenderBuildOrder({ instance }: { instance: any }): ReactNode {
     />
   );
 }
+
+/*
+ * Inline rendering of a single BuildLine instance
+ */
+export function RenderBuildLine({ instance }: { instance: any }): ReactNode {
+  return (
+    <RenderInlineModel
+      primary={instance.part_detail.full_name}
+      secondary={instance.quantity}
+      suffix={StatusRenderer({
+        status: instance.status,
+        type: ModelType.build
+      })}
+      image={instance.part_detail.thumbnail || instance.part_detail.image}
+    />
+  );
+}
diff --git a/src/frontend/src/components/render/Instance.tsx b/src/frontend/src/components/render/Instance.tsx
index 2b11565463..15b348137f 100644
--- a/src/frontend/src/components/render/Instance.tsx
+++ b/src/frontend/src/components/render/Instance.tsx
@@ -5,7 +5,7 @@ import { ReactNode } from 'react';
 
 import { ModelType } from '../../enums/ModelType';
 import { Thumbnail } from '../images/Thumbnail';
-import { RenderBuildOrder } from './Build';
+import { RenderBuildLine, RenderBuildOrder } from './Build';
 import {
   RenderAddress,
   RenderCompany,
@@ -42,6 +42,7 @@ const RendererLookup: EnumDictionary<
 > = {
   [ModelType.address]: RenderAddress,
   [ModelType.build]: RenderBuildOrder,
+  [ModelType.buildline]: RenderBuildLine,
   [ModelType.company]: RenderCompany,
   [ModelType.contact]: RenderContact,
   [ModelType.manufacturerpart]: RenderManufacturerPart,
diff --git a/src/frontend/src/components/render/ModelType.tsx b/src/frontend/src/components/render/ModelType.tsx
index d17ad37f3b..cc9c66fd73 100644
--- a/src/frontend/src/components/render/ModelType.tsx
+++ b/src/frontend/src/components/render/ModelType.tsx
@@ -92,6 +92,14 @@ export const ModelInformationDict: ModelDict = {
     cui_detail: '/build/:pk/',
     api_endpoint: ApiEndpoints.build_order_list
   },
+  buildline: {
+    label: t`Build Line`,
+    label_multiple: t`Build Lines`,
+    url_overview: '/build/line',
+    url_detail: '/build/line/:pk/',
+    cui_detail: '/build/line/:pk/',
+    api_endpoint: ApiEndpoints.build_line_list
+  },
   company: {
     label: t`Company`,
     label_multiple: t`Companies`,
diff --git a/src/frontend/src/enums/ModelType.tsx b/src/frontend/src/enums/ModelType.tsx
index da0f3413db..e5d5155883 100644
--- a/src/frontend/src/enums/ModelType.tsx
+++ b/src/frontend/src/enums/ModelType.tsx
@@ -13,6 +13,7 @@ export enum ModelType {
   stocklocation = 'stocklocation',
   stockhistory = 'stockhistory',
   build = 'build',
+  buildline = 'buildline',
   company = 'company',
   purchaseorder = 'purchaseorder',
   purchaseorderline = 'purchaseorderline',
diff --git a/src/frontend/src/pages/Index/Settings/AdminCenter/TemplateManagementPanel.tsx b/src/frontend/src/pages/Index/Settings/AdminCenter/TemplateManagementPanel.tsx
index e4ce84857d..833caba5b5 100644
--- a/src/frontend/src/pages/Index/Settings/AdminCenter/TemplateManagementPanel.tsx
+++ b/src/frontend/src/pages/Index/Settings/AdminCenter/TemplateManagementPanel.tsx
@@ -64,7 +64,7 @@ export default function TemplateManagementPanel() {
             }
           },
           {
-            name: t`Stock item`,
+            name: t`Stock Item`,
             key: 'stock',
             icon: 'stock',
             preview: {
@@ -73,12 +73,12 @@ export default function TemplateManagementPanel() {
             }
           },
           {
-            name: t`Build line`,
+            name: t`Build Line`,
             key: 'buildline',
             icon: 'builds',
             preview: {
               itemKey: 'line',
-              model: ModelType.build
+              model: ModelType.buildline
             }
           }
         ]
@@ -96,7 +96,7 @@ export default function TemplateManagementPanel() {
         defaultTemplate: defaultReportTemplate,
         variants: [
           {
-            name: t`Purchase order`,
+            name: t`Purchase Order`,
             key: 'po',
             icon: 'purchase_orders',
             preview: {
@@ -105,7 +105,7 @@ export default function TemplateManagementPanel() {
             }
           },
           {
-            name: t`Sales order`,
+            name: t`Sales Order`,
             key: 'so',
             icon: 'sales_orders',
             preview: {
@@ -114,7 +114,7 @@ export default function TemplateManagementPanel() {
             }
           },
           {
-            name: t`Return order`,
+            name: t`Return Order`,
             key: 'ro',
             icon: 'return_orders',
             preview: {
@@ -151,7 +151,7 @@ export default function TemplateManagementPanel() {
             }
           },
           {
-            name: t`Stock location`,
+            name: t`Stock Location`,
             key: 'slr',
             icon: 'default_location',
             preview: {
diff --git a/src/frontend/src/tables/settings/TemplateTable.tsx b/src/frontend/src/tables/settings/TemplateTable.tsx
index 55deef787c..c834ded101 100644
--- a/src/frontend/src/tables/settings/TemplateTable.tsx
+++ b/src/frontend/src/tables/settings/TemplateTable.tsx
@@ -286,6 +286,7 @@ export function TemplateTable({
       <DetailDrawer
         title={t`Edit` + ' ' + templateTypeTranslation}
         size={'90%'}
+        closeOnEscape={false}
         renderContent={(id) => {
           return (
             <TemplateDrawer
