diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.cshtml
index aef1759c..d38fa9a0 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.cshtml
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.cshtml
@@ -35,7 +35,7 @@
                     Template PDF
                 </th>
                 <td>
-                    <input type="file" name="Template" /><br />@Html.ValidationMessage("Template")
+                    <input type="file" name="Template" accept=".pdf" /><br />@Html.ValidationMessage("Template")
                 </td>
             </tr>
             <tr id="trJobTypes">
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.generated.cs
index 8435a0a8..053c7b29 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
     using System.Web.UI;
     using System.Web.WebPages;
     using Disco;
-    using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services;
     using Disco.Services.Authorization;
@@ -129,11 +128,13 @@ WriteLiteral(" type=\"file\"");
 
 WriteLiteral(" name=\"Template\"");
 
+WriteLiteral(" accept=\".pdf\"");
+
 WriteLiteral(" /><br />");
 
             
             #line 38 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
-                                                          Write(Html.ValidationMessage("Template"));
+                                                                        Write(Html.ValidationMessage("Template"));
 
             
             #line default
@@ -179,15 +180,15 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n");
             #line hidden
 WriteLiteral("                <tr");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 2032), Tuple.Create("\"", 2057)
-, Tuple.Create(Tuple.Create("", 2037), Tuple.Create("trJobSubType", 2037), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 2046), Tuple.Create("\"", 2071)
+, Tuple.Create(Tuple.Create("", 2051), Tuple.Create("trJobSubType", 2051), true)
             
             #line 51 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
-, Tuple.Create(Tuple.Create("", 2049), Tuple.Create<System.Object, System.Int32>(jt.Id
+, Tuple.Create(Tuple.Create("", 2063), Tuple.Create<System.Object, System.Int32>(jt.Id
             
             #line default
             #line hidden
-, 2049), false)
+, 2063), false)
 );
 
 WriteLiteral(" class=\"jobSubTypes\"");
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml
index 2db3175c..60c428c1 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml
@@ -376,7 +376,7 @@
             <tbody>
                 <tr>
                     <td>
-                        <div style="margin: -8px -5px; max-height: 350px; overflow-y: scroll; text-align: center;">
+                        <div style="margin: -8px -5px; height: 350px; overflow-y: scroll; text-align: center;">
                             <img style="margin: 8px 5px;" src="@Url.Action(MVC.API.DocumentTemplate.TemplatePreview(Model.DocumentTemplate.Id))" />
                         </div>
                     </td>
@@ -386,7 +386,7 @@
                     <tr>
                         <td>
                             @if (Model.TemplatePagesHaveAttachmentId.Any(i => !i))
-                {
+                            {
                                 <div class="info-box">
                                     @for (int i = 0; i < Model.TemplatePagesHaveAttachmentId.Count; i++)
                                     {
@@ -412,7 +412,7 @@
                                         <div>
                                             @using (Html.BeginForm(MVC.API.DocumentTemplate.Template(Model.DocumentTemplate.Id, true, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
                                             {
-                                                <input type="file" name="Template" id="Config_DocumentTemplates_TemplatePdf_Template" style="width: 250px;" />
+                                                <input type="file" name="Template" id="Config_DocumentTemplates_TemplatePdf_Template" accept=".pdf" style="width: 250px;" />
                                             }
                                         </div>
                                     </div>
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs
index 534588e4..0cdb2a18 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs
@@ -1234,21 +1234,21 @@ WriteLiteral(" style=\"width: 650px; margin: 0 auto 20px;\"");
 WriteLiteral(">\r\n        <h2>PDF Template</h2>\r\n        <table>\r\n            <tbody>\r\n         " +
 "       <tr>\r\n                    <td>\r\n                        <div");
 
-WriteLiteral(" style=\"margin: -8px -5px; max-height: 350px; overflow-y: scroll; text-align: cen" +
-"ter;\"");
+WriteLiteral(" style=\"margin: -8px -5px; height: 350px; overflow-y: scroll; text-align: center;" +
+"\"");
 
 WriteLiteral(">\r\n                            <img");
 
 WriteLiteral(" style=\"margin: 8px 5px;\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 22173), Tuple.Create("\"", 22259)
+WriteAttribute("src", Tuple.Create(" src=\"", 22169), Tuple.Create("\"", 22255)
             
             #line 380 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 22179), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DocumentTemplate.TemplatePreview(Model.DocumentTemplate.Id))
+, Tuple.Create(Tuple.Create("", 22175), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DocumentTemplate.TemplatePreview(Model.DocumentTemplate.Id))
             
             #line default
             #line hidden
-, 22179), false)
+, 22175), false)
 );
 
 WriteLiteral(" />\r\n                        </div>\r\n                    </td>\r\n                <" +
@@ -1279,7 +1279,7 @@ WriteLiteral("                    <tr>\r\n                        <td>\r\n");
             
             #line 388 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                              if (Model.TemplatePagesHaveAttachmentId.Any(i => !i))
-                {
+                            {
 
             
             #line default
@@ -1423,6 +1423,8 @@ WriteLiteral(" name=\"Template\"");
 
 WriteLiteral(" id=\"Config_DocumentTemplates_TemplatePdf_Template\"");
 
+WriteLiteral(" accept=\".pdf\"");
+
 WriteLiteral(" style=\"width: 250px;\"");
 
 WriteLiteral(" />\r\n");
@@ -2278,11 +2280,30 @@ WriteLiteral("    ");
             #line 775 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
      if (canBulkGenerate)
     {
+        if (Model.DocumentTemplate.Scope == DocumentTemplate.DocumentTemplateScopes.User)
+        {
+            
+            
+            #line default
+            #line hidden
+            
+            #line 779 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+       Write(Html.ActionLinkButton("Bulk Generate", MVC.Config.DocumentTemplate.BulkGenerate(Model.DocumentTemplate.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral("        <a");
+            
+            #line 779 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                                                                                                        
+        }
+        else
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <a");
 
 WriteLiteral(" id=\"buttonBulkGenerate\"");
 
@@ -2292,197 +2313,137 @@ WriteLiteral(" class=\"button\"");
 
 WriteLiteral(">Bulk Generate</a>\r\n");
 
-WriteLiteral("        <div");
+WriteLiteral("            <div");
 
 WriteLiteral(" id=\"dialogBulkGenerate\"");
 
-WriteLiteral(" class=\"hiddenDialog\"");
+WriteLiteral(" class=\"hiddenDialog dialog-bulk-generate\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 44007), Tuple.Create("\"", 44058)
-, Tuple.Create(Tuple.Create("", 44015), Tuple.Create("Bulk", 44015), true)
-, Tuple.Create(Tuple.Create(" ", 44019), Tuple.Create("Generate:", 44020), true)
+WriteAttribute("title", Tuple.Create(" title=\"", 44318), Tuple.Create("\"", 44369)
+, Tuple.Create(Tuple.Create("", 44326), Tuple.Create("Bulk", 44326), true)
+, Tuple.Create(Tuple.Create(" ", 44330), Tuple.Create("Generate:", 44331), true)
             
-            #line 778 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-, Tuple.Create(Tuple.Create(" ", 44029), Tuple.Create<System.Object, System.Int32>(Model.DocumentTemplate.Id
+            #line 784 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                        , Tuple.Create(Tuple.Create(" ", 44340), Tuple.Create<System.Object, System.Int32>(Model.DocumentTemplate.Id
             
             #line default
             #line hidden
-, 44030), false)
+, 44341), false)
 );
 
-WriteLiteral(">\r\n            <div");
+WriteLiteral(">\r\n                <div");
 
 WriteLiteral(" class=\"brief\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 780 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 786 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 786 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                     switch (Model.DocumentTemplate.Scope)
+                    {
+                        case "Device":
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            <div>\r\n                                Enter multiple" +
+" <span");
+
+WriteLiteral(" class=\"scopeDescBulkGenerate\"");
+
+WriteLiteral(">Device Serial Numbers</span> separated by <code>&lt;new line&gt;</code>, commas " +
+"(<code>,</code>) or semicolons (<code>;</code>).\r\n                            </" +
+"div>\r\n");
+
+WriteLiteral("                            <div");
+
+WriteLiteral(" class=\"examples clearfix\"");
+
+WriteLiteral(">\r\n                                <h4>Examples:</h4>\r\n                          " +
+"      <div");
+
+WriteLiteral(" class=\"example1 code\"");
+
+WriteLiteral(">\r\n                                    01234567<br />\r\n                          " +
+"          ABCD9876<br />\r\n                                    8VQ6G2R\r\n         " +
+"                       </div>\r\n                                <div");
+
+WriteLiteral(" class=\"example2 code\"");
+
+WriteLiteral(">01234567,ABCD9876,8VQ6G2R</div>\r\n                                <div");
+
+WriteLiteral(" class=\"example3 code\"");
+
+WriteLiteral(">01234567;ABCD9876;8VQ6G2R</div>\r\n                            </div>\r\n");
+
+            
+            #line 802 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                            break;
+                        case "Job":
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            <div>\r\n                                Enter multiple" +
+" <span");
+
+WriteLiteral(" class=\"scopeDescBulkGenerate\"");
+
+WriteLiteral(">Job Ids</span> separated by <code>&lt;new line&gt;</code>, commas (<code>,</code" +
+">) or semicolons (<code>;</code>).\r\n                            </div>\r\n");
+
+WriteLiteral("                            <div");
+
+WriteLiteral(" class=\"examples clearfix\"");
+
+WriteLiteral(">\r\n                                <h4>Examples:</h4>\r\n                          " +
+"      <div");
+
+WriteLiteral(" class=\"example1 code\"");
+
+WriteLiteral(">\r\n                                    86<br />\r\n                                " +
+"    99<br />\r\n                                    44\r\n                          " +
+"      </div>\r\n                                <div");
+
+WriteLiteral(" class=\"example2 code\"");
+
+WriteLiteral(">86,99,44</div>\r\n                                <div");
+
+WriteLiteral(" class=\"example3 code\"");
+
+WriteLiteral(">86;99;44</div>\r\n                            </div>\r\n");
+
+            
+            #line 817 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                            break;
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n");
+
+            
+            #line 820 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 780 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                 switch (Model.DocumentTemplate.Scope)
-                {
-                    case "Device":
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        <div>\r\n                            Enter multiple <span");
-
-WriteLiteral(" class=\"scopeDescBulkGenerate\"");
-
-WriteLiteral(">Device Serial Numbers</span> separated by <code>&lt;new line&gt;</code>, commas " +
-"(<code>,</code>) or semicolons (<code>;</code>).\r\n                        </div>" +
-"\r\n");
-
-WriteLiteral("                        <div");
-
-WriteLiteral(" class=\"examples clearfix\"");
-
-WriteLiteral(">\r\n                            <h4>Examples:</h4>\r\n                            <d" +
-"iv");
-
-WriteLiteral(" class=\"example1 code\"");
-
-WriteLiteral(">\r\n                                01234567<br />\r\n                              " +
-"  ABCD9876<br />\r\n                                8VQ6G2R\r\n                     " +
-"       </div>\r\n                            <div");
-
-WriteLiteral(" class=\"example2 code\"");
-
-WriteLiteral(">01234567,ABCD9876,8VQ6G2R</div>\r\n                            <div");
-
-WriteLiteral(" class=\"example3 code\"");
-
-WriteLiteral(">01234567;ABCD9876;8VQ6G2R</div>\r\n                        </div>\r\n");
-
-            
-            #line 796 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                        break;
-                    case "Job":
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        <div>\r\n                            Enter multiple <span");
-
-WriteLiteral(" class=\"scopeDescBulkGenerate\"");
-
-WriteLiteral(">Job Ids</span> separated by <code>&lt;new line&gt;</code>, commas (<code>,</code" +
-">) or semicolons (<code>;</code>).\r\n                        </div>\r\n");
-
-WriteLiteral("                        <div");
-
-WriteLiteral(" class=\"examples clearfix\"");
-
-WriteLiteral(">\r\n                            <h4>Examples:</h4>\r\n                            <d" +
-"iv");
-
-WriteLiteral(" class=\"example1 code\"");
-
-WriteLiteral(">\r\n                                86<br />\r\n                                99<b" +
-"r />\r\n                                44\r\n                            </div>\r\n  " +
-"                          <div");
-
-WriteLiteral(" class=\"example2 code\"");
-
-WriteLiteral(">86,99,44</div>\r\n                            <div");
-
-WriteLiteral(" class=\"example3 code\"");
-
-WriteLiteral(">86;99;44</div>\r\n                        </div>\r\n");
-
-            
-            #line 811 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                        break;
-                    case "User":
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        <div>\r\n                            Enter multiple <span");
-
-WriteLiteral(" class=\"scopeDescBulkGenerate\"");
-
-WriteLiteral(">User Ids</span> separated by <code>&lt;new line&gt;</code>, commas (<code>,</cod" +
-"e>) or semicolons (<code>;</code>).\r\n                        </div>\r\n");
-
-WriteLiteral("                        <div");
-
-WriteLiteral(" class=\"examples clearfix\"");
-
-WriteLiteral(">\r\n                            <h4>Examples:</h4>\r\n                            <d" +
-"iv");
-
-WriteLiteral(" class=\"example1 code\"");
-
-WriteLiteral(">\r\n                                user6<br />\r\n                                s" +
-"mi0099<br />");
-
-            
             #line 820 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                         Write(ActiveDirectory.Context.PrimaryDomain.NetBiosName);
+                 using (Html.BeginForm(MVC.API.DocumentTemplate.BulkGenerate(Model.DocumentTemplate.Id), FormMethod.Post))
+                {
 
             
             #line default
             #line hidden
-WriteLiteral("\\rsmith\r\n                            </div>\r\n                            <div");
-
-WriteLiteral(" class=\"example2 code\"");
-
-WriteLiteral(">user6,smi0099,");
-
-            
-            #line 822 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                                                 Write(ActiveDirectory.Context.PrimaryDomain.NetBiosName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\\rsmith</div>\r\n                            <div");
-
-WriteLiteral(" class=\"example3 code\"");
-
-WriteLiteral(">user6;smi0099;");
-
-            
-            #line 823 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                                                 Write(ActiveDirectory.Context.PrimaryDomain.NetBiosName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\\rsmith</div>\r\n                        </div>\r\n");
-
-            
-            #line 825 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                        break;
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            </div>\r\n");
-
-            
-            #line 828 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 828 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-             using (Html.BeginForm(MVC.API.DocumentTemplate.BulkGenerate(Model.DocumentTemplate.Id), FormMethod.Post))
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <div");
+WriteLiteral("                    <div");
 
 WriteLiteral(" class=\"field-validation-valid\"");
 
@@ -2492,7 +2453,7 @@ WriteLiteral(" data-valmsg-for=\"DataIds\"");
 
 WriteLiteral("></div>\r\n");
 
-WriteLiteral("                <textarea");
+WriteLiteral("                    <textarea");
 
 WriteLiteral(" id=\"inputBulkGenerateDataIds\"");
 
@@ -2505,18 +2466,18 @@ WriteLiteral(" data-val-required=\"Identifiers are required\"");
 WriteLiteral("></textarea>\r\n");
 
             
-            #line 832 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                if (Model.TemplatePageCount > 1 && Model.TemplatePageCount % 2 != 0)
-                {
+            #line 824 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                    if (Model.TemplatePageCount > 1 && Model.TemplatePageCount % 2 != 0)
+                    {
 
             
             #line default
             #line hidden
-WriteLiteral("                    <div");
+WriteLiteral("                        <div");
 
 WriteLiteral(" style=\"margin-top: 6px;\"");
 
-WriteLiteral(">\r\n                        <input");
+WriteLiteral(">\r\n                            <input");
 
 WriteLiteral(" id=\"inputBulkGenerateInsertBlankPage\"");
 
@@ -2530,60 +2491,61 @@ WriteLiteral(" /><label");
 
 WriteLiteral(" for=\"inputBulkGenerateInsertBlankPage\"");
 
-WriteLiteral(">Insert Blank Pages for Double-Sided Printing</label>\r\n                    </div>" +
-"\r\n");
+WriteLiteral(">Insert Blank Pages for Double-Sided Printing</label>\r\n                        </" +
+"div>\r\n");
 
             
-            #line 837 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                }
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </div>\r\n");
-
-            
-            #line 840 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-
-
-            
-            #line default
-            #line hidden
-WriteLiteral(@"        <script>
-            $(function () {
-                var dialog;
-
-                $('#buttonBulkGenerate').click(function () {
-                    if (!dialog) {
-                        dialog = $('#dialogBulkGenerate').dialog({
-                            resizable: false,
-                            modal: true,
-                            autoOpen: false,
-                            width: 460,
-                            buttons: {
-                                ""Bulk Generate"": function () {
-                                    dialog.find('form').submit();
-                                    dialog.dialog(""disable"");
-                                },
-                                Close: function () {
-                                    $(this).dialog(""close"");
-                                }
-                            }
-                        });
-
-                        $.validator.unobtrusive.reparse('#inputBulkGenerateDataIds');
+            #line 829 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                     }
+                }
 
-                    dialog.dialog('open');
-                    return false;
+            
+            #line default
+            #line hidden
+WriteLiteral("            </div>\r\n");
+
+            
+            #line 832 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"            <script>
+                $(function () {
+                    var dialog;
+
+                    $('#buttonBulkGenerate').click(function () {
+                        if (!dialog) {
+                            dialog = $('#dialogBulkGenerate').dialog({
+                                resizable: false,
+                                modal: true,
+                                autoOpen: false,
+                                width: 460,
+                                buttons: {
+                                    ""Bulk Generate"": function () {
+                                        dialog.find('form').submit();
+                                        dialog.dialog(""disable"");
+                                    },
+                                    Close: function () {
+                                        $(this).dialog(""close"");
+                                    }
+                                }
+                            });
+
+                            $.validator.unobtrusive.reparse('#inputBulkGenerateDataIds');
+                        }
+
+                        dialog.dialog('open');
+                        return false;
+                    });
                 });
-            });
-        </script>
+            </script>
 ");
 
             
-            #line 871 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 863 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+        }
     }
 
             
@@ -2592,7 +2554,7 @@ WriteLiteral(@"        <script>
 WriteLiteral("    ");
 
             
-            #line 872 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 865 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
      if (Authorization.Has(Claims.Config.DocumentTemplate.Delete))
     {
         
@@ -2600,14 +2562,14 @@ WriteLiteral("    ");
             #line default
             #line hidden
             
-            #line 874 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 867 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
    Write(Html.ActionLinkButton("Delete", MVC.API.DocumentTemplate.Delete(Model.DocumentTemplate.Id, true), "buttonDelete"));
 
             
             #line default
             #line hidden
             
-            #line 874 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 867 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                                                                                                                           
     }
 
@@ -2616,6 +2578,62 @@ WriteLiteral("    ");
             #line hidden
 WriteLiteral("</div>\r\n");
 
+            
+            #line 870 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+ if (!string.IsNullOrWhiteSpace(Model.BulkGenerateDownloadId))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
+
+WriteLiteral(" id=\"Config_DocumentTemplates_Show_DownloadBulk_Dialog\"");
+
+WriteLiteral(" class=\"dialog\"");
+
+WriteLiteral(" title=\"Download Bulk Documents\"");
+
+WriteLiteral(">\r\n        <a");
+
+WriteAttribute("href", Tuple.Create(" href=\"", 48940), Tuple.Create("\"", 49071)
+            
+            #line 873 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+, Tuple.Create(Tuple.Create("", 48947), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DocumentTemplate.BulkGenerateDownload(Model.BulkGenerateDownloadId, Model.BulkGenerateDownloadFilename))
+            
+            #line default
+            #line hidden
+, 48947), false)
+);
+
+WriteLiteral(" class=\"button\"");
+
+WriteLiteral("><i");
+
+WriteLiteral(" class=\"fa fa-download fa-lg\"");
+
+WriteLiteral("></i>Download Bulk Documents</a>\r\n    </div>\r\n");
+
+WriteLiteral(@"    <script>
+        $(function () {
+            $('#Config_DocumentTemplates_Show_DownloadBulk_Dialog')
+                .dialog({
+                    width: 400,
+                    height: 100,
+                    resizable: false,
+                    modal: true,
+                    autoOpen: true
+                });
+        });
+    </script>
+");
+
+            
+            #line 887 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+}
+            
+            #line default
+            #line hidden
         }
     }
 }
diff --git a/Disco.Web/Areas/Config/Views/Plugins/Install.cshtml b/Disco.Web/Areas/Config/Views/Plugins/Install.cshtml
index b72c5e43..a7a3d2f5 100644
--- a/Disco.Web/Areas/Config/Views/Plugins/Install.cshtml
+++ b/Disco.Web/Areas/Config/Views/Plugins/Install.cshtml
@@ -10,15 +10,15 @@
 <div id="pluginLibrary">
     <h4 id="pluginLibraryHeading">The plugin library [<a href="https://discoict.com.au/">https://discoict.com.au</a>] was last updated @CommonHelpers.FriendlyDate((Model.Library.ManifestDate > DateTime.Now ? DateTime.Now : Model.Library.ManifestDate))</h4>
     @if (Model.Library.Plugins.Count == 0)
-    { 
+    {
         <div class="form" style="width: 450px; padding: 100px 0;">
             <h2>No Plugins are Available</h2>
-        </div>  
+        </div>
     }
     else
     {
         var pluginGroups = Model.AvailablePlugins;
-        
+
         <div id="pluginLibraryGroups">
             @foreach (var pluginGroup in pluginGroups)
             {
@@ -31,7 +31,8 @@
                             <tr>
                                 <td>
                                     <div class="pluginItem@(installedPlugin != null ? " pluginInstalled" : string.Empty)">
-                                        <h2 class="pluginName"><i class="fa fa-cogs"></i>@plugin.Item1.Name
+                                        <h2 class="pluginName">
+                                            <i class="fa fa-cogs"></i>@plugin.Item1.Name
                                             @if (installedPlugin == null)
                                             {
                                                 <a class="pluginInstallLink button" href="@(Url.Action(MVC.API.Plugin.Install(plugin.Item1.Id)))">Install</a>
@@ -40,11 +41,11 @@
                                             {
                                                 if (Version.Parse(plugin.Item2.Version) > installedPlugin.Version)
                                                 {
-                                                <a class="pluginUpdateLink button" href="@(Url.Action(MVC.API.Plugin.Update(plugin.Item1.Id)))">Update</a>    
+                                                    <a class="pluginUpdateLink button" href="@(Url.Action(MVC.API.Plugin.Update(plugin.Item1.Id)))">Update</a>
                                                 }
                                                 else
                                                 {
-                                                <a class="pluginInstalledLink button disabled" href="#">Installed</a>    
+                                                    <a class="pluginInstalledLink button disabled" href="#">Installed</a>
                                                 }
                                             }
                                         </h2>
@@ -54,13 +55,14 @@
                                         </div>
                                     </div>
                                 </td>
-                            </tr>   
+                            </tr>
+
                         }
                     </table>
                 </div>
             }
         </div>
-        
+
     }
 </div>
 <div id="dialogInstallPlugin" title="Install this Plugin?">
@@ -81,7 +83,7 @@
             @using (Html.BeginForm(MVC.API.Plugin.InstallLocal(), FormMethod.Post, new { enctype = "multipart/form-data" }))
             {
                 <label for="pluginFile">Plugin Package: </label>
-                <input id="pluginFile" name="Plugin" type="file" />
+                <input id="pluginFile" name="Plugin" type="file" accept=".discoPlugin" />
             }
         </div>
         <div class="info-box error">
diff --git a/Disco.Web/Areas/Config/Views/Plugins/Install.generated.cs b/Disco.Web/Areas/Config/Views/Plugins/Install.generated.cs
index 0c17860f..1eb22a24 100644
--- a/Disco.Web/Areas/Config/Views/Plugins/Install.generated.cs
+++ b/Disco.Web/Areas/Config/Views/Plugins/Install.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Areas.Config.Views.Plugins
     using System.Web.UI;
     using System.Web.WebPages;
     using Disco;
-    using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services;
     using Disco.Services.Authorization;
@@ -94,7 +93,7 @@ WriteLiteral("</h4>\r\n");
             
             #line 12 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
      if (Model.Library.Plugins.Count == 0)
-    { 
+    {
 
             
             #line default
@@ -105,7 +104,7 @@ WriteLiteral(" class=\"form\"");
 
 WriteLiteral(" style=\"width: 450px; padding: 100px 0;\"");
 
-WriteLiteral(">\r\n            <h2>No Plugins are Available</h2>\r\n        </div>  \r\n");
+WriteLiteral(">\r\n            <h2>No Plugins are Available</h2>\r\n        </div>\r\n");
 
             
             #line 17 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
@@ -113,7 +112,7 @@ WriteLiteral(">\r\n            <h2>No Plugins are Available</h2>\r\n        </di
     else
     {
         var pluginGroups = Model.AvailablePlugins;
-        
+
 
             
             #line default
@@ -171,30 +170,30 @@ WriteLiteral("</h2>\r\n                    <table>\r\n");
 WriteLiteral("                            <tr>\r\n                                <td>\r\n         " +
 "                           <div");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 1506), Tuple.Create("\"", 1586)
-, Tuple.Create(Tuple.Create("", 1514), Tuple.Create("pluginItem", 1514), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 1495), Tuple.Create("\"", 1575)
+, Tuple.Create(Tuple.Create("", 1503), Tuple.Create("pluginItem", 1503), true)
             
             #line 33 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-, Tuple.Create(Tuple.Create("", 1524), Tuple.Create<System.Object, System.Int32>(installedPlugin != null ? " pluginInstalled" : string.Empty
+, Tuple.Create(Tuple.Create("", 1513), Tuple.Create<System.Object, System.Int32>(installedPlugin != null ? " pluginInstalled" : string.Empty
             
             #line default
             #line hidden
-, 1524), false)
+, 1513), false)
 );
 
 WriteLiteral(">\r\n                                        <h2");
 
 WriteLiteral(" class=\"pluginName\"");
 
-WriteLiteral("><i");
+WriteLiteral(">\r\n                                            <i");
 
 WriteLiteral(" class=\"fa fa-cogs\"");
 
 WriteLiteral("></i>");
 
             
-            #line 34 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-                                                                                    Write(plugin.Item1.Name);
+            #line 35 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+                                                                 Write(plugin.Item1.Name);
 
             
             #line default
@@ -202,13 +201,13 @@ WriteLiteral("></i>");
 WriteLiteral("\r\n");
 
             
-            #line 35 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 36 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                             
             
             #line default
             #line hidden
             
-            #line 35 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 36 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                              if (installedPlugin == null)
                                             {
 
@@ -219,20 +218,20 @@ WriteLiteral("                                                <a");
 
 WriteLiteral(" class=\"pluginInstallLink button\"");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 1904), Tuple.Create("\"", 1965)
+WriteAttribute("href", Tuple.Create(" href=\"", 1939), Tuple.Create("\"", 2000)
             
-            #line 37 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-           , Tuple.Create(Tuple.Create("", 1911), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Plugin.Install(plugin.Item1.Id))
+            #line 38 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+           , Tuple.Create(Tuple.Create("", 1946), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Plugin.Install(plugin.Item1.Id))
             
             #line default
             #line hidden
-, 1911), false)
+, 1946), false)
 );
 
 WriteLiteral(">Install</a>\r\n");
 
             
-            #line 38 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 39 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                             }
                                             else
                                             {
@@ -242,24 +241,24 @@ WriteLiteral(">Install</a>\r\n");
             
             #line default
             #line hidden
-WriteLiteral("                                                <a");
+WriteLiteral("                                                    <a");
 
 WriteLiteral(" class=\"pluginUpdateLink button\"");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 2373), Tuple.Create("\"", 2433)
+WriteAttribute("href", Tuple.Create(" href=\"", 2412), Tuple.Create("\"", 2472)
             
-            #line 43 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-          , Tuple.Create(Tuple.Create("", 2380), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Plugin.Update(plugin.Item1.Id))
+            #line 44 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+              , Tuple.Create(Tuple.Create("", 2419), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Plugin.Update(plugin.Item1.Id))
             
             #line default
             #line hidden
-, 2380), false)
+, 2419), false)
 );
 
-WriteLiteral(">Update</a>    \r\n");
+WriteLiteral(">Update</a>\r\n");
 
             
-            #line 44 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 45 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                                 }
                                                 else
                                                 {
@@ -267,16 +266,16 @@ WriteLiteral(">Update</a>    \r\n");
             
             #line default
             #line hidden
-WriteLiteral("                                                <a");
+WriteLiteral("                                                    <a");
 
 WriteLiteral(" class=\"pluginInstalledLink button disabled\"");
 
 WriteLiteral(" href=\"#\"");
 
-WriteLiteral(">Installed</a>    \r\n");
+WriteLiteral(">Installed</a>\r\n");
 
             
-            #line 48 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 49 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                                 }
                                             }
 
@@ -291,7 +290,7 @@ WriteLiteral(" class=\"pluginItemBlurb\"");
 WriteLiteral(">");
 
             
-            #line 51 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 52 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                                                  Write(new HtmlString(plugin.Item1.Description));
 
             
@@ -308,7 +307,7 @@ WriteLiteral(" class=\"pluginId\"");
 WriteLiteral(">");
 
             
-            #line 53 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 54 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                                               Write(plugin.Item1.Id);
 
             
@@ -321,7 +320,7 @@ WriteLiteral(" class=\"pluginVersion\"");
 WriteLiteral(">v");
 
             
-            #line 53 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 54 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                                                                                                       Write(plugin.Item2.Version);
 
             
@@ -330,7 +329,7 @@ WriteLiteral(">v");
 WriteLiteral("</span> | ");
 
             
-            #line 53 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 54 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                                                                                                                                       Write(plugin.Item1.Author);
 
             
@@ -338,14 +337,14 @@ WriteLiteral("</span> | ");
             #line hidden
 WriteLiteral(" | <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 3244), Tuple.Create("\"", 3279)
+WriteAttribute("href", Tuple.Create(" href=\"", 3279), Tuple.Create("\"", 3314)
             
-            #line 53 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-                                                                                                           , Tuple.Create(Tuple.Create("", 3251), Tuple.Create<System.Object, System.Int32>(plugin.Item1.InformationUrl
+            #line 54 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+                                                                                                           , Tuple.Create(Tuple.Create("", 3286), Tuple.Create<System.Object, System.Int32>(plugin.Item1.InformationUrl
             
             #line default
             #line hidden
-, 3251), false)
+, 3286), false)
 );
 
 WriteLiteral(" title=\"More Information\"");
@@ -358,10 +357,11 @@ WriteLiteral(" class=\"fa fa-external-link\"");
 
 WriteLiteral("></i></a>\r\n                                        </div>\r\n                      " +
 "              </div>\r\n                                </td>\r\n                   " +
-"         </tr>   \r\n");
+"         </tr>\r\n");
 
             
-            #line 58 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 59 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+
                         }
 
             
@@ -370,7 +370,7 @@ WriteLiteral("></i></a>\r\n                                        </div>\r\n
 WriteLiteral("                    </table>\r\n                </div>\r\n");
 
             
-            #line 61 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 63 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
             }
 
             
@@ -379,8 +379,8 @@ WriteLiteral("                    </table>\r\n                </div>\r\n");
 WriteLiteral("        </div>\r\n");
 
             
-            #line 63 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-        
+            #line 65 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+
     }
 
             
@@ -417,7 +417,7 @@ WriteLiteral("></i><strong>Warning:</strong> All plugins run with the same level
 "om a trusted source.</strong>\r\n        </p>\r\n    </div>\r\n</div>\r\n");
 
             
-            #line 77 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 79 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
  if (canInstallLocal)
 {
 
@@ -437,13 +437,13 @@ WriteLiteral(" style=\"padding-bottom: 10px;\"");
 WriteLiteral(">\r\n");
 
             
-            #line 81 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 83 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
             
             
             #line default
             #line hidden
             
-            #line 81 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 83 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
              using (Html.BeginForm(MVC.API.Plugin.InstallLocal(), FormMethod.Post, new { enctype = "multipart/form-data" }))
             {
 
@@ -464,10 +464,12 @@ WriteLiteral(" name=\"Plugin\"");
 
 WriteLiteral(" type=\"file\"");
 
+WriteLiteral(" accept=\".discoPlugin\"");
+
 WriteLiteral(" />\r\n");
 
             
-            #line 85 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 87 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
             }
 
             
@@ -491,7 +493,7 @@ WriteLiteral("></i><strong>Warning:</strong> All plugins run with the same level
 "\n");
 
             
-            #line 94 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 96 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
 }
 
             
@@ -527,13 +529,13 @@ WriteLiteral("<script>\r\n    $(function () {\r\n        var $selectedPlugin;\r\
 "\n\r\n            return false;\r\n        });\r\n\r\n");
 
             
-            #line 153 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 155 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
         
             
             #line default
             #line hidden
             
-            #line 153 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 155 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
          if (canInstallLocal)
         {
             
@@ -568,7 +570,7 @@ WriteLiteral(@"
         ");
 
             
-            #line 180 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 182 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                }
 
             
@@ -583,7 +585,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("    ");
 
             
-            #line 184 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 186 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
 Write(Html.ActionLinkButton("Update Plugin Library", MVC.API.Plugin.UpdateLibraryManifest()));
 
             
@@ -592,13 +594,13 @@ Write(Html.ActionLinkButton("Update Plugin Library", MVC.API.Plugin.UpdateLibrar
 WriteLiteral("\r\n");
 
             
-            #line 185 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 187 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 185 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 187 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
      if (canInstallLocal)
     {
         
@@ -606,14 +608,14 @@ WriteLiteral("\r\n");
             #line default
             #line hidden
             
-            #line 187 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 189 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
    Write(Html.ActionLinkButton("Install Plugin Package", MVC.API.Plugin.InstallLocal(), "buttonUpload"));
 
             
             #line default
             #line hidden
             
-            #line 187 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 189 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                                                                                        
     }
 
diff --git a/Disco.Web/Views/Device/Import.cshtml b/Disco.Web/Views/Device/Import.cshtml
index 2079fceb..df537af6 100644
--- a/Disco.Web/Views/Device/Import.cshtml
+++ b/Disco.Web/Views/Device/Import.cshtml
@@ -16,7 +16,7 @@
                         @Html.LabelFor(m => m.ImportFile)
                     </th>
                     <td>
-                        <input id="ImportFile" name="ImportFile" type="file" data-val="true" data-val-required="An Import File is required." /><br />
+                        <input id="ImportFile" name="ImportFile" type="file" data-val="true" data-val-required="An Import File is required." accept=".xlsx,.csv" /><br />
                         @Html.ValidationMessageFor(m => m.ImportFile)
                         <div>
                             @Html.CheckBoxFor(m => m.HasHeader)
diff --git a/Disco.Web/Views/Device/Import.generated.cs b/Disco.Web/Views/Device/Import.generated.cs
index a3584c9a..ac7c12a8 100644
--- a/Disco.Web/Views/Device/Import.generated.cs
+++ b/Disco.Web/Views/Device/Import.generated.cs
@@ -112,6 +112,8 @@ WriteLiteral(" data-val=\"true\"");
 
 WriteLiteral(" data-val-required=\"An Import File is required.\"");
 
+WriteLiteral(" accept=\".xlsx,.csv\"");
+
 WriteLiteral(" /><br />\r\n");
 
 WriteLiteral("                        ");