diff --git a/Disco.Web/Areas/Config/ConfigAreaRegistration.cs b/Disco.Web/Areas/Config/ConfigAreaRegistration.cs
index 41660a3c..43f626a6 100644
--- a/Disco.Web/Areas/Config/ConfigAreaRegistration.cs
+++ b/Disco.Web/Areas/Config/ConfigAreaRegistration.cs
@@ -54,21 +54,6 @@ namespace Disco.Web.Areas.Config
                 "Config/DeviceProfile/{id}",
                 new { controller = "DeviceProfile", action = "Index", id = UrlParameter.Optional }
             );
-            context.MapRoute(
-                "Config_AttachmentType_Create",
-                "Config/AttachmentType/Create",
-                new { controller = "AttachmentType", action = "Create" }
-            );
-            context.MapRoute(
-                "Config_AttachmentType_ExpressionBrowser_Type",
-                "Config/AttachmentType/ExpressionBrowser/{type}",
-                new { controller = "AttachmentType", action = "ExpressionBrowser", type = UrlParameter.Optional }
-            );
-            context.MapRoute(
-                "Config_AttachmentType",
-                "Config/AttachmentType/{id}",
-                new { controller = "AttachmentType", action = "Index", id = UrlParameter.Optional }
-            );
             context.MapRoute(
                 "Config_DocumentTemplate_Create",
                 "Config/DocumentTemplate/Create",
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml b/Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml
index 5d710404..7db792e1 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml
@@ -368,7 +368,7 @@
                                                 $dialog.dialog("close");
                                             },
                                             "Expression Browser": () => {
-                                                window.open('@(Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser()))', '_blank');
+                                                window.open('@(Url.Action(MVC.Config.Expressions.Browser()))', '_blank');
                                             },
                                             "Save": () => {
                                                 const $form = $textarea.closest('form');
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs b/Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs
index a651cce6..e2da42e5 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs
@@ -1409,7 +1409,7 @@ WriteLiteral(@">
 
             
             #line 371 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-                                                         Write(Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser()));
+                                                         Write(Url.Action(MVC.Config.Expressions.Browser()));
 
             
             #line default
@@ -2541,14 +2541,14 @@ WriteLiteral(" class=\"fa fa-info-circle\"");
 
 WriteLiteral("></i>View the <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 48839), Tuple.Create("\"", 48889)
+WriteAttribute("href", Tuple.Create(" href=\"", 48824), Tuple.Create("\"", 48874)
             
             #line 853 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 48846), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.Plugins.Install())
+, Tuple.Create(Tuple.Create("", 48831), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.Plugins.Install())
             
             #line default
             #line hidden
-, 48846), false)
+, 48831), false)
 );
 
 WriteLiteral(">Plugin Catalogue</a> to discover and install certificate provider plugins.\r\n    " +
@@ -2763,14 +2763,14 @@ WriteLiteral(" class=\"fa fa-info-circle\"");
 
 WriteLiteral("></i>View the <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 52093), Tuple.Create("\"", 52143)
+WriteAttribute("href", Tuple.Create(" href=\"", 52078), Tuple.Create("\"", 52128)
             
             #line 916 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 52100), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.Plugins.Install())
+, Tuple.Create(Tuple.Create("", 52085), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.Plugins.Install())
             
             #line default
             #line hidden
-, 52100), false)
+, 52085), false)
 );
 
 WriteLiteral(">Plugin Catalogue</a> to discover and install wireless profile provider plugins.\r" +
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.cshtml
index 9bb50f8a..5fac049e 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.cshtml
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.cshtml
@@ -118,7 +118,7 @@ else
     }
     @if (Authorization.Has(Claims.Config.Show))
     {
-        @Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser())
+        @Html.ActionLinkButton("Expression Browser", MVC.Config.Expressions.Browser())
     }
     @if (Model.DocumentTemplates.Count > 2 && Authorization.HasAll(Claims.Config.DocumentTemplate.Create, Claims.Config.DocumentTemplate.Configure))
     {
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.generated.cs
index 3cf35de2..e79f784b 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.generated.cs
@@ -612,14 +612,14 @@ WriteLiteral("    ");
             #line hidden
             
             #line 121 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
-   Write(Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser()));
+   Write(Html.ActionLinkButton("Expression Browser", MVC.Config.Expressions.Browser()));
 
             
             #line default
             #line hidden
             
             #line 121 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
-                                                                                                     
+                                                                                      
     }
 
             
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml
index 3b76f721..6699557a 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml
@@ -141,7 +141,7 @@
                         <h4>@Model.DocumentTemplate.Scope Scope</h4>
                         <div class="info-box">
                             <p class="fa-p">
-                                <i class="fa fa-info-circle"></i>This template is generated from @(Model.DocumentTemplate.Scope)s. Any expressions within the Template&nbsp;PDF will be evaluated within the <a href="@(Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser()))#@(Model.DocumentTemplate.Scope)Scope">@(Model.DocumentTemplate.Scope) Scope</a>.
+                                <i class="fa fa-info-circle"></i>This template is generated from @(Model.DocumentTemplate.Scope)s. Any expressions within the Template&nbsp;PDF will be evaluated within the <a href="@(Url.Action(MVC.Config.Expressions.Browser()))#@(Model.DocumentTemplate.Scope)Scope">@(Model.DocumentTemplate.Scope) Scope</a>.
                             </p>
                         </div>
                         <div>
@@ -996,7 +996,7 @@
                 @Html.Partial(MVC.Config.DocumentTemplate.Views._ExpressionsTable, Model.TemplateExpressions)
             </div>
         </div>
-        <div id="dialogConfirmDelete" title="Delete this Document Template?">
+        <div id="dialogConfirmDelete" title="Delete this Document Template?" class="dialog">
             <p>
                 <i class="fa fa-exclamation-triangle fa-lg warning"></i>This item will be permanently deleted and cannot be recovered.<br />
                 <em>
@@ -1050,7 +1050,7 @@
             }
             @if (Authorization.Has(Claims.Config.Show))
             {
-                @Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser())
+                @Html.ActionLinkButton("Expression Browser", MVC.Config.Expressions.Browser())
             }
             @if (canBulkGenerate)
             {
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs
index 62202e43..c5f1c6b9 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs
@@ -459,30 +459,30 @@ WriteLiteral("></i>This template is generated from ");
             #line hidden
 WriteLiteral("s. Any expressions within the Template&nbsp;PDF will be evaluated within the <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 6951), Tuple.Create("\"", 7057)
+WriteAttribute("href", Tuple.Create(" href=\"", 6951), Tuple.Create("\"", 7042)
             
             #line 144 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                                                                                                                       , Tuple.Create(Tuple.Create("", 6958), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser())
+                                                                                                                                       , Tuple.Create(Tuple.Create("", 6958), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.Expressions.Browser())
             
             #line default
             #line hidden
 , 6958), false)
-, Tuple.Create(Tuple.Create("", 7020), Tuple.Create("#", 7020), true)
+, Tuple.Create(Tuple.Create("", 7005), Tuple.Create("#", 7005), true)
             
             #line 144 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                                                                                                                                                                                      , Tuple.Create(Tuple.Create("", 7021), Tuple.Create<System.Object, System.Int32>(Model.DocumentTemplate.Scope
+                                                                                                                                                                                       , Tuple.Create(Tuple.Create("", 7006), Tuple.Create<System.Object, System.Int32>(Model.DocumentTemplate.Scope
             
             #line default
             #line hidden
-, 7021), false)
-, Tuple.Create(Tuple.Create("", 7052), Tuple.Create("Scope", 7052), true)
+, 7006), false)
+, Tuple.Create(Tuple.Create("", 7037), Tuple.Create("Scope", 7037), true)
 );
 
 WriteLiteral(">");
 
             
             #line 144 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                                                                                                                                                                                                                                                                                                       Write(Model.DocumentTemplate.Scope);
+                                                                                                                                                                                                                                                                                                        Write(Model.DocumentTemplate.Scope);
 
             
             #line default
@@ -566,24 +566,24 @@ WriteLiteral(">\r\n");
             #line hidden
 WriteLiteral("                                                <option");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 8181), Tuple.Create("\"", 8195)
+WriteAttribute("value", Tuple.Create(" value=\"", 8166), Tuple.Create("\"", 8180)
             
             #line 160 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 8189), Tuple.Create<System.Object, System.Int32>(scope
+, Tuple.Create(Tuple.Create("", 8174), Tuple.Create<System.Object, System.Int32>(scope
             
             #line default
             #line hidden
-, 8189), false)
+, 8174), false)
 );
 
-WriteAttribute("selected", Tuple.Create(" selected=\"", 8196), Tuple.Create("\"", 8268)
+WriteAttribute("selected", Tuple.Create(" selected=\"", 8181), Tuple.Create("\"", 8253)
             
             #line 160 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-  , Tuple.Create(Tuple.Create("", 8207), Tuple.Create<System.Object, System.Int32>(scope == Model.DocumentTemplate.Scope ? " selected" : null
+  , Tuple.Create(Tuple.Create("", 8192), Tuple.Create<System.Object, System.Int32>(scope == Model.DocumentTemplate.Scope ? " selected" : null
             
             #line default
             #line hidden
-, 8207), false)
+, 8192), false)
 );
 
 WriteLiteral(">");
@@ -912,29 +912,29 @@ WriteLiteral(" class=\"jobTypes\"");
 WriteLiteral(">\r\n                                                    <h4>\r\n                    " +
 "                                    <input");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 14809), Tuple.Create("\"", 14828)
-, Tuple.Create(Tuple.Create("", 14814), Tuple.Create("Types_", 14814), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 14794), Tuple.Create("\"", 14813)
+, Tuple.Create(Tuple.Create("", 14799), Tuple.Create("Types_", 14799), true)
             
             #line 258 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 14820), Tuple.Create<System.Object, System.Int32>(jt.Id
+, Tuple.Create(Tuple.Create("", 14805), Tuple.Create<System.Object, System.Int32>(jt.Id
             
             #line default
             #line hidden
-, 14820), false)
+, 14805), false)
 );
 
 WriteLiteral(" class=\"jobType\"");
 
 WriteLiteral(" type=\"checkbox\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 14861), Tuple.Create("\"", 14877)
+WriteAttribute("value", Tuple.Create(" value=\"", 14846), Tuple.Create("\"", 14862)
             
             #line 258 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                          , Tuple.Create(Tuple.Create("", 14869), Tuple.Create<System.Object, System.Int32>(jt.Id
+                                          , Tuple.Create(Tuple.Create("", 14854), Tuple.Create<System.Object, System.Int32>(jt.Id
             
             #line default
             #line hidden
-, 14869), false)
+, 14854), false)
 );
 
 WriteLiteral(" ");
@@ -948,15 +948,15 @@ WriteLiteral(" ");
             #line hidden
 WriteLiteral(" /><label");
 
-WriteAttribute("for", Tuple.Create(" for=\"", 14949), Tuple.Create("\"", 14969)
-, Tuple.Create(Tuple.Create("", 14955), Tuple.Create("Types_", 14955), true)
+WriteAttribute("for", Tuple.Create(" for=\"", 14934), Tuple.Create("\"", 14954)
+, Tuple.Create(Tuple.Create("", 14940), Tuple.Create("Types_", 14940), true)
             
             #line 258 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                                                                                                                      , Tuple.Create(Tuple.Create("", 14961), Tuple.Create<System.Object, System.Int32>(jt.Id
+                                                                                                                                      , Tuple.Create(Tuple.Create("", 14946), Tuple.Create<System.Object, System.Int32>(jt.Id
             
             #line default
             #line hidden
-, 14961), false)
+, 14946), false)
 );
 
 WriteLiteral(">");
@@ -971,15 +971,15 @@ WriteLiteral(">");
 WriteLiteral("</label>\r\n                                                    </h4>\r\n            " +
 "                                        <div");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 15111), Tuple.Create("\"", 15133)
-, Tuple.Create(Tuple.Create("", 15116), Tuple.Create("SubTypes_", 15116), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 15096), Tuple.Create("\"", 15118)
+, Tuple.Create(Tuple.Create("", 15101), Tuple.Create("SubTypes_", 15101), true)
             
             #line 260 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 15125), Tuple.Create<System.Object, System.Int32>(jt.Id
+, Tuple.Create(Tuple.Create("", 15110), Tuple.Create<System.Object, System.Int32>(jt.Id
             
             #line default
             #line hidden
-, 15125), false)
+, 15110), false)
 );
 
 WriteLiteral(" class=\"jobSubTypes\"");
@@ -1242,14 +1242,14 @@ WriteLiteral(">\r\n                            <img");
 
 WriteLiteral(" style=\"margin: 8px 5px;\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 22216), Tuple.Create("\"", 22302)
+WriteAttribute("src", Tuple.Create(" src=\"", 22201), Tuple.Create("\"", 22287)
             
             #line 381 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 22222), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DocumentTemplate.TemplatePreview(Model.DocumentTemplate.Id))
+, Tuple.Create(Tuple.Create("", 22207), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DocumentTemplate.TemplatePreview(Model.DocumentTemplate.Id))
             
             #line default
             #line hidden
-, 22222), false)
+, 22207), false)
 );
 
 WriteLiteral(" />\r\n                        </div>\r\n                    </td>\r\n                <" +
@@ -2102,14 +2102,14 @@ WriteLiteral(@">
                                 <tbody>
                                     <tr");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 40577), Tuple.Create("\"", 40639)
+WriteAttribute("class", Tuple.Create(" class=\"", 40562), Tuple.Create("\"", 40624)
             
             #line 698 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 40585), Tuple.Create<System.Object, System.Int32>(Model.OnImportUserFlagRules.Any() ? "hidden" : null
+, Tuple.Create(Tuple.Create("", 40570), Tuple.Create<System.Object, System.Int32>(Model.OnImportUserFlagRules.Any() ? "hidden" : null
             
             #line default
             #line hidden
-, 40585), false)
+, 40570), false)
 );
 
 WriteLiteral(">\r\n                                        <td");
@@ -2161,25 +2161,25 @@ WriteLiteral(">\r\n                                            <td>");
 WriteLiteral("</td>\r\n                                            <td>\r\n                        " +
 "                        <i");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 41189), Tuple.Create("\"", 41260)
-, Tuple.Create(Tuple.Create("", 41197), Tuple.Create("fa", 41197), true)
-, Tuple.Create(Tuple.Create(" ", 41199), Tuple.Create("fa-", 41200), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 41174), Tuple.Create("\"", 41245)
+, Tuple.Create(Tuple.Create("", 41182), Tuple.Create("fa", 41182), true)
+, Tuple.Create(Tuple.Create(" ", 41184), Tuple.Create("fa-", 41185), true)
             
             #line 706 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 41203), Tuple.Create<System.Object, System.Int32>(rule.UserFlag.Icon
+, Tuple.Create(Tuple.Create("", 41188), Tuple.Create<System.Object, System.Int32>(rule.UserFlag.Icon
             
             #line default
             #line hidden
-, 41203), false)
-, Tuple.Create(Tuple.Create(" ", 41224), Tuple.Create("fa-lg", 41225), true)
-, Tuple.Create(Tuple.Create(" ", 41230), Tuple.Create("d-", 41231), true)
+, 41188), false)
+, Tuple.Create(Tuple.Create(" ", 41209), Tuple.Create("fa-lg", 41210), true)
+, Tuple.Create(Tuple.Create(" ", 41215), Tuple.Create("d-", 41216), true)
             
             #line 706 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-              , Tuple.Create(Tuple.Create("", 41233), Tuple.Create<System.Object, System.Int32>(rule.UserFlag.IconColour
+              , Tuple.Create(Tuple.Create("", 41218), Tuple.Create<System.Object, System.Int32>(rule.UserFlag.IconColour
             
             #line default
             #line hidden
-, 41233), false)
+, 41218), false)
 );
 
 WriteLiteral("></i>\r\n");
@@ -2364,19 +2364,19 @@ WriteLiteral(" id=\"DocumentTemplate_OnImportUserFlagRules_AddDialog\"");
 
 WriteLiteral(" class=\"hiddenDialog\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 43671), Tuple.Create("\"", 43733)
-, Tuple.Create(Tuple.Create("", 43679), Tuple.Create("On", 43679), true)
-, Tuple.Create(Tuple.Create(" ", 43681), Tuple.Create("Import", 43682), true)
-, Tuple.Create(Tuple.Create(" ", 43688), Tuple.Create("User", 43689), true)
-, Tuple.Create(Tuple.Create(" ", 43693), Tuple.Create("Flag", 43694), true)
-, Tuple.Create(Tuple.Create(" ", 43698), Tuple.Create("Rule:", 43699), true)
+WriteAttribute("title", Tuple.Create(" title=\"", 43656), Tuple.Create("\"", 43718)
+, Tuple.Create(Tuple.Create("", 43664), Tuple.Create("On", 43664), true)
+, Tuple.Create(Tuple.Create(" ", 43666), Tuple.Create("Import", 43667), true)
+, Tuple.Create(Tuple.Create(" ", 43673), Tuple.Create("User", 43674), true)
+, Tuple.Create(Tuple.Create(" ", 43678), Tuple.Create("Flag", 43679), true)
+, Tuple.Create(Tuple.Create(" ", 43683), Tuple.Create("Rule:", 43684), true)
             
             #line 740 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                                            , Tuple.Create(Tuple.Create(" ", 43704), Tuple.Create<System.Object, System.Int32>(Model.DocumentTemplate.Id
+                                                            , Tuple.Create(Tuple.Create(" ", 43689), Tuple.Create<System.Object, System.Int32>(Model.DocumentTemplate.Id
             
             #line default
             #line hidden
-, 43705), false)
+, 43690), false)
 );
 
 WriteLiteral(">\r\n                                <div");
@@ -2530,66 +2530,66 @@ WriteLiteral(" class=\"item\"");
 
 WriteLiteral(">\r\n                                                <input");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 46311), Tuple.Create("\"", 46372)
-, Tuple.Create(Tuple.Create("", 46316), Tuple.Create("DocumentTemplate_OnImportUserFlagRules_Add_Flag_", 46316), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 46296), Tuple.Create("\"", 46357)
+, Tuple.Create(Tuple.Create("", 46301), Tuple.Create("DocumentTemplate_OnImportUserFlagRules_Add_Flag_", 46301), true)
             
             #line 776 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                          , Tuple.Create(Tuple.Create("", 46364), Tuple.Create<System.Object, System.Int32>(flag.Id
+                          , Tuple.Create(Tuple.Create("", 46349), Tuple.Create<System.Object, System.Int32>(flag.Id
             
             #line default
             #line hidden
-, 46364), false)
+, 46349), false)
 );
 
 WriteLiteral(" type=\"radio\"");
 
 WriteLiteral(" name=\"userFlagId\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 46404), Tuple.Create("\"", 46420)
+WriteAttribute("value", Tuple.Create(" value=\"", 46389), Tuple.Create("\"", 46405)
             
             #line 776 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                                                          , Tuple.Create(Tuple.Create("", 46412), Tuple.Create<System.Object, System.Int32>(flag.Id
+                                                                          , Tuple.Create(Tuple.Create("", 46397), Tuple.Create<System.Object, System.Int32>(flag.Id
             
             #line default
             #line hidden
-, 46412), false)
+, 46397), false)
 );
 
 WriteLiteral(" required />\r\n                                                <label");
 
-WriteAttribute("for", Tuple.Create(" for=\"", 46489), Tuple.Create("\"", 46551)
-, Tuple.Create(Tuple.Create("", 46495), Tuple.Create("DocumentTemplate_OnImportUserFlagRules_Add_Flag_", 46495), true)
+WriteAttribute("for", Tuple.Create(" for=\"", 46474), Tuple.Create("\"", 46536)
+, Tuple.Create(Tuple.Create("", 46480), Tuple.Create("DocumentTemplate_OnImportUserFlagRules_Add_Flag_", 46480), true)
             
             #line 777 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                           , Tuple.Create(Tuple.Create("", 46543), Tuple.Create<System.Object, System.Int32>(flag.Id
+                           , Tuple.Create(Tuple.Create("", 46528), Tuple.Create<System.Object, System.Int32>(flag.Id
             
             #line default
             #line hidden
-, 46543), false)
+, 46528), false)
 );
 
 WriteLiteral("><i");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 46555), Tuple.Create("\"", 46614)
-, Tuple.Create(Tuple.Create("", 46563), Tuple.Create("fa", 46563), true)
-, Tuple.Create(Tuple.Create(" ", 46565), Tuple.Create("fa-", 46566), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 46540), Tuple.Create("\"", 46599)
+, Tuple.Create(Tuple.Create("", 46548), Tuple.Create("fa", 46548), true)
+, Tuple.Create(Tuple.Create(" ", 46550), Tuple.Create("fa-", 46551), true)
             
             #line 777 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                                      , Tuple.Create(Tuple.Create("", 46569), Tuple.Create<System.Object, System.Int32>(flag.Icon
+                                                      , Tuple.Create(Tuple.Create("", 46554), Tuple.Create<System.Object, System.Int32>(flag.Icon
             
             #line default
             #line hidden
-, 46569), false)
-, Tuple.Create(Tuple.Create(" ", 46581), Tuple.Create("fa-fw", 46582), true)
-, Tuple.Create(Tuple.Create(" ", 46587), Tuple.Create("fa-lg", 46588), true)
-, Tuple.Create(Tuple.Create(" ", 46593), Tuple.Create("d-", 46594), true)
+, 46554), false)
+, Tuple.Create(Tuple.Create(" ", 46566), Tuple.Create("fa-fw", 46567), true)
+, Tuple.Create(Tuple.Create(" ", 46572), Tuple.Create("fa-lg", 46573), true)
+, Tuple.Create(Tuple.Create(" ", 46578), Tuple.Create("d-", 46579), true)
             
             #line 777 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                                                                 , Tuple.Create(Tuple.Create("", 46596), Tuple.Create<System.Object, System.Int32>(flag.IconColour
+                                                                                 , Tuple.Create(Tuple.Create("", 46581), Tuple.Create<System.Object, System.Int32>(flag.IconColour
             
             #line default
             #line hidden
-, 46596), false)
+, 46581), false)
 );
 
 WriteLiteral("></i>");
@@ -2814,25 +2814,25 @@ WriteLiteral("                                    <tr>\r\n
 WriteLiteral("</td>\r\n                                        <td>\r\n                            " +
 "                <i");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 54877), Tuple.Create("\"", 54948)
-, Tuple.Create(Tuple.Create("", 54885), Tuple.Create("fa", 54885), true)
-, Tuple.Create(Tuple.Create(" ", 54887), Tuple.Create("fa-", 54888), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 54862), Tuple.Create("\"", 54933)
+, Tuple.Create(Tuple.Create("", 54870), Tuple.Create("fa", 54870), true)
+, Tuple.Create(Tuple.Create(" ", 54872), Tuple.Create("fa-", 54873), true)
             
             #line 924 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 54891), Tuple.Create<System.Object, System.Int32>(rule.UserFlag.Icon
+, Tuple.Create(Tuple.Create("", 54876), Tuple.Create<System.Object, System.Int32>(rule.UserFlag.Icon
             
             #line default
             #line hidden
-, 54891), false)
-, Tuple.Create(Tuple.Create(" ", 54912), Tuple.Create("fa-lg", 54913), true)
-, Tuple.Create(Tuple.Create(" ", 54918), Tuple.Create("d-", 54919), true)
+, 54876), false)
+, Tuple.Create(Tuple.Create(" ", 54897), Tuple.Create("fa-lg", 54898), true)
+, Tuple.Create(Tuple.Create(" ", 54903), Tuple.Create("d-", 54904), true)
             
             #line 924 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-          , Tuple.Create(Tuple.Create("", 54921), Tuple.Create<System.Object, System.Int32>(rule.UserFlag.IconColour
+          , Tuple.Create(Tuple.Create("", 54906), Tuple.Create<System.Object, System.Int32>(rule.UserFlag.IconColour
             
             #line default
             #line hidden
-, 54921), false)
+, 54906), false)
 );
 
 WriteLiteral("></i>\r\n");
@@ -3077,6 +3077,8 @@ WriteLiteral(" id=\"dialogConfirmDelete\"");
 
 WriteLiteral(" title=\"Delete this Document Template?\"");
 
+WriteLiteral(" class=\"dialog\"");
+
 WriteLiteral(">\r\n            <p>\r\n                <i");
 
 WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg warning\"");
@@ -3179,14 +3181,14 @@ WriteLiteral("            ");
             #line hidden
             
             #line 1053 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-           Write(Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser()));
+           Write(Html.ActionLinkButton("Expression Browser", MVC.Config.Expressions.Browser()));
 
             
             #line default
             #line hidden
             
             #line 1053 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                                                                                             
+                                                                                              
             }
 
             
@@ -3237,16 +3239,16 @@ WriteLiteral(" id=\"dialogBulkGenerate\"");
 
 WriteLiteral(" class=\"hiddenDialog dialog-bulk-generate\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 62567), Tuple.Create("\"", 62618)
-, Tuple.Create(Tuple.Create("", 62575), Tuple.Create("Bulk", 62575), true)
-, Tuple.Create(Tuple.Create(" ", 62579), Tuple.Create("Generate:", 62580), true)
+WriteAttribute("title", Tuple.Create(" title=\"", 62552), Tuple.Create("\"", 62603)
+, Tuple.Create(Tuple.Create("", 62560), Tuple.Create("Bulk", 62560), true)
+, Tuple.Create(Tuple.Create(" ", 62564), Tuple.Create("Generate:", 62565), true)
             
             #line 1064 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                , Tuple.Create(Tuple.Create(" ", 62589), Tuple.Create<System.Object, System.Int32>(Model.DocumentTemplate.Id
+                                , Tuple.Create(Tuple.Create(" ", 62574), Tuple.Create<System.Object, System.Int32>(Model.DocumentTemplate.Id
             
             #line default
             #line hidden
-, 62590), false)
+, 62575), false)
 );
 
 WriteLiteral(">\r\n                        <div");
@@ -3525,14 +3527,14 @@ WriteLiteral(" title=\"Download Bulk Documents\"");
 
 WriteLiteral(">\r\n                <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 67869), Tuple.Create("\"", 68000)
+WriteAttribute("href", Tuple.Create(" href=\"", 67854), Tuple.Create("\"", 67985)
             
             #line 1153 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 67876), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DocumentTemplate.BulkGenerateDownload(Model.BulkGenerateDownloadId, Model.BulkGenerateDownloadFilename))
+, Tuple.Create(Tuple.Create("", 67861), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DocumentTemplate.BulkGenerateDownload(Model.BulkGenerateDownloadId, Model.BulkGenerateDownloadFilename))
             
             #line default
             #line hidden
-, 67876), false)
+, 67861), false)
 );
 
 WriteLiteral(" class=\"button\"");
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/ShowPackage.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/ShowPackage.cshtml
index b0fa28be..f9a43aae 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/ShowPackage.cshtml
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/ShowPackage.cshtml
@@ -161,7 +161,7 @@
                         <h4>@Model.Package.Scope Scope</h4>
                         <div class="info-box">
                             <p class="fa-p">
-                                <i class="fa fa-info-circle"></i>This package is generated from @(Model.Package.Scope)s. Any expressions within the Document&nbsp;Template&nbsp;PDF will be evaluated within the <a href="@(Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser()))#@(Model.Package.Scope)Scope">@(Model.Package.Scope) Scope</a>.
+                                <i class="fa fa-info-circle"></i>This package is generated from @(Model.Package.Scope)s. Any expressions within the Document&nbsp;Template&nbsp;PDF will be evaluated within the <a href="@(Url.Action(MVC.Config.Expressions.Browser()))#@(Model.Package.Scope)Scope">@(Model.Package.Scope) Scope</a>.
                             </p>
                         </div>
                         <div>
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/ShowPackage1.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/ShowPackage1.generated.cs
index aeb3455b..257961bb 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/ShowPackage1.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/ShowPackage1.generated.cs
@@ -566,30 +566,30 @@ WriteLiteral("></i>This package is generated from ");
 WriteLiteral("s. Any expressions within the Document&nbsp;Template&nbsp;PDF will be evaluated w" +
 "ithin the <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 8106), Tuple.Create("\"", 8203)
+WriteAttribute("href", Tuple.Create(" href=\"", 8106), Tuple.Create("\"", 8188)
             
             #line 164 "..\..\Areas\Config\Views\DocumentTemplate\ShowPackage.cshtml"
-                                                                                                                                           , Tuple.Create(Tuple.Create("", 8113), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser())
+                                                                                                                                           , Tuple.Create(Tuple.Create("", 8113), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.Expressions.Browser())
             
             #line default
             #line hidden
 , 8113), false)
-, Tuple.Create(Tuple.Create("", 8175), Tuple.Create("#", 8175), true)
+, Tuple.Create(Tuple.Create("", 8160), Tuple.Create("#", 8160), true)
             
             #line 164 "..\..\Areas\Config\Views\DocumentTemplate\ShowPackage.cshtml"
-                                                                                                                                                                                                          , Tuple.Create(Tuple.Create("", 8176), Tuple.Create<System.Object, System.Int32>(Model.Package.Scope
+                                                                                                                                                                                           , Tuple.Create(Tuple.Create("", 8161), Tuple.Create<System.Object, System.Int32>(Model.Package.Scope
             
             #line default
             #line hidden
-, 8176), false)
-, Tuple.Create(Tuple.Create("", 8198), Tuple.Create("Scope", 8198), true)
+, 8161), false)
+, Tuple.Create(Tuple.Create("", 8183), Tuple.Create("Scope", 8183), true)
 );
 
 WriteLiteral(">");
 
             
             #line 164 "..\..\Areas\Config\Views\DocumentTemplate\ShowPackage.cshtml"
-                                                                                                                                                                                                                                                                                                                  Write(Model.Package.Scope);
+                                                                                                                                                                                                                                                                                                   Write(Model.Package.Scope);
 
             
             #line default
@@ -673,24 +673,24 @@ WriteLiteral(">\r\n");
             #line hidden
 WriteLiteral("                                            <option");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 9324), Tuple.Create("\"", 9338)
+WriteAttribute("value", Tuple.Create(" value=\"", 9309), Tuple.Create("\"", 9323)
             
             #line 180 "..\..\Areas\Config\Views\DocumentTemplate\ShowPackage.cshtml"
-, Tuple.Create(Tuple.Create("", 9332), Tuple.Create<System.Object, System.Int32>(scope
+, Tuple.Create(Tuple.Create("", 9317), Tuple.Create<System.Object, System.Int32>(scope
             
             #line default
             #line hidden
-, 9332), false)
+, 9317), false)
 );
 
-WriteAttribute("selected", Tuple.Create(" selected=\"", 9339), Tuple.Create("\"", 9413)
+WriteAttribute("selected", Tuple.Create(" selected=\"", 9324), Tuple.Create("\"", 9398)
             
             #line 180 "..\..\Areas\Config\Views\DocumentTemplate\ShowPackage.cshtml"
-, Tuple.Create(Tuple.Create("", 9350), Tuple.Create<System.Object, System.Int32>(scope == Model.Package.Scope.ToString() ? " selected" : null
+, Tuple.Create(Tuple.Create("", 9335), Tuple.Create<System.Object, System.Int32>(scope == Model.Package.Scope.ToString() ? " selected" : null
             
             #line default
             #line hidden
-, 9350), false)
+, 9335), false)
 );
 
 WriteLiteral(">");
@@ -998,29 +998,29 @@ WriteLiteral(" class=\"jobTypes\"");
 WriteLiteral(">\r\n                                            <h4>\r\n                            " +
 "                    <input");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 15271), Tuple.Create("\"", 15290)
-, Tuple.Create(Tuple.Create("", 15276), Tuple.Create("Types_", 15276), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 15256), Tuple.Create("\"", 15275)
+, Tuple.Create(Tuple.Create("", 15261), Tuple.Create("Types_", 15261), true)
             
             #line 273 "..\..\Areas\Config\Views\DocumentTemplate\ShowPackage.cshtml"
-, Tuple.Create(Tuple.Create("", 15282), Tuple.Create<System.Object, System.Int32>(jt.Id
+, Tuple.Create(Tuple.Create("", 15267), Tuple.Create<System.Object, System.Int32>(jt.Id
             
             #line default
             #line hidden
-, 15282), false)
+, 15267), false)
 );
 
 WriteLiteral(" class=\"jobType\"");
 
 WriteLiteral(" type=\"checkbox\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 15323), Tuple.Create("\"", 15339)
+WriteAttribute("value", Tuple.Create(" value=\"", 15308), Tuple.Create("\"", 15324)
             
             #line 273 "..\..\Areas\Config\Views\DocumentTemplate\ShowPackage.cshtml"
-                                  , Tuple.Create(Tuple.Create("", 15331), Tuple.Create<System.Object, System.Int32>(jt.Id
+                                  , Tuple.Create(Tuple.Create("", 15316), Tuple.Create<System.Object, System.Int32>(jt.Id
             
             #line default
             #line hidden
-, 15331), false)
+, 15316), false)
 );
 
 WriteLiteral(" ");
@@ -1034,15 +1034,15 @@ WriteLiteral(" ");
             #line hidden
 WriteLiteral(" /><label");
 
-WriteAttribute("for", Tuple.Create(" for=\"", 15411), Tuple.Create("\"", 15431)
-, Tuple.Create(Tuple.Create("", 15417), Tuple.Create("Types_", 15417), true)
+WriteAttribute("for", Tuple.Create(" for=\"", 15396), Tuple.Create("\"", 15416)
+, Tuple.Create(Tuple.Create("", 15402), Tuple.Create("Types_", 15402), true)
             
             #line 273 "..\..\Areas\Config\Views\DocumentTemplate\ShowPackage.cshtml"
-                                                                                                                              , Tuple.Create(Tuple.Create("", 15423), Tuple.Create<System.Object, System.Int32>(jt.Id
+                                                                                                                              , Tuple.Create(Tuple.Create("", 15408), Tuple.Create<System.Object, System.Int32>(jt.Id
             
             #line default
             #line hidden
-, 15423), false)
+, 15408), false)
 );
 
 WriteLiteral(">");
@@ -1057,15 +1057,15 @@ WriteLiteral(">");
 WriteLiteral("</label>\r\n                                            </h4>\r\n                    " +
 "                        <div");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 15557), Tuple.Create("\"", 15579)
-, Tuple.Create(Tuple.Create("", 15562), Tuple.Create("SubTypes_", 15562), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 15542), Tuple.Create("\"", 15564)
+, Tuple.Create(Tuple.Create("", 15547), Tuple.Create("SubTypes_", 15547), true)
             
             #line 275 "..\..\Areas\Config\Views\DocumentTemplate\ShowPackage.cshtml"
-, Tuple.Create(Tuple.Create("", 15571), Tuple.Create<System.Object, System.Int32>(jt.Id
+, Tuple.Create(Tuple.Create("", 15556), Tuple.Create<System.Object, System.Int32>(jt.Id
             
             #line default
             #line hidden
-, 15571), false)
+, 15556), false)
 );
 
 WriteLiteral(" class=\"jobSubTypes\"");
@@ -1371,14 +1371,14 @@ WriteLiteral(" type=\"hidden\"");
 
 WriteLiteral(" name=\"DocumentTemplates\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 22953), Tuple.Create("\"", 22973)
+WriteAttribute("value", Tuple.Create(" value=\"", 22938), Tuple.Create("\"", 22958)
             
             #line 395 "..\..\Areas\Config\Views\DocumentTemplate\ShowPackage.cshtml"
-                        , Tuple.Create(Tuple.Create("", 22961), Tuple.Create<System.Object, System.Int32>(template.Id
+                        , Tuple.Create(Tuple.Create("", 22946), Tuple.Create<System.Object, System.Int32>(template.Id
             
             #line default
             #line hidden
-, 22961), false)
+, 22946), false)
 );
 
 WriteLiteral(" />\r\n                                                    <span");
@@ -1472,14 +1472,14 @@ WriteLiteral(" type=\"hidden\"");
 
 WriteLiteral(" name=\"DocumentTemplates\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 24459), Tuple.Create("\"", 24479)
+WriteAttribute("value", Tuple.Create(" value=\"", 24444), Tuple.Create("\"", 24464)
             
             #line 416 "..\..\Areas\Config\Views\DocumentTemplate\ShowPackage.cshtml"
-                    , Tuple.Create(Tuple.Create("", 24467), Tuple.Create<System.Object, System.Int32>(template.Id
+                    , Tuple.Create(Tuple.Create("", 24452), Tuple.Create<System.Object, System.Int32>(template.Id
             
             #line default
             #line hidden
-, 24467), false)
+, 24452), false)
 );
 
 WriteLiteral(" />\r\n                                                <span");
@@ -2065,16 +2065,16 @@ WriteLiteral(" id=\"dialogBulkGenerate\"");
 
 WriteLiteral(" class=\"hiddenDialog\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 37321), Tuple.Create("\"", 37363)
-, Tuple.Create(Tuple.Create("", 37329), Tuple.Create("Bulk", 37329), true)
-, Tuple.Create(Tuple.Create(" ", 37333), Tuple.Create("Generate:", 37334), true)
+WriteAttribute("title", Tuple.Create(" title=\"", 37306), Tuple.Create("\"", 37348)
+, Tuple.Create(Tuple.Create("", 37314), Tuple.Create("Bulk", 37314), true)
+, Tuple.Create(Tuple.Create(" ", 37318), Tuple.Create("Generate:", 37319), true)
             
             #line 672 "..\..\Areas\Config\Views\DocumentTemplate\ShowPackage.cshtml"
-, Tuple.Create(Tuple.Create(" ", 37343), Tuple.Create<System.Object, System.Int32>(Model.Package.Id
+, Tuple.Create(Tuple.Create(" ", 37328), Tuple.Create<System.Object, System.Int32>(Model.Package.Id
             
             #line default
             #line hidden
-, 37344), false)
+, 37329), false)
 );
 
 WriteLiteral(">\r\n            <div");