diff --git a/Disco.BI/BI/DataStore.cs b/Disco.BI/BI/DataStore.cs
index 3d907da5..e5dafcbc 100644
--- a/Disco.BI/BI/DataStore.cs
+++ b/Disco.BI/BI/DataStore.cs
@@ -10,9 +10,9 @@ namespace Disco.BI
     public static class DataStore
     {
 
-        public static string CreateLocation(DiscoDataContext dbContext, string SubLocation, DateTime? SubSubLocationTimestamp = null)
+        public static string CreateLocation(DiscoDataContext Database, string SubLocation, DateTime? SubSubLocationTimestamp = null)
         {
-            return CreateLocation(dbContext.DiscoConfiguration, SubLocation, SubSubLocationTimestamp);
+            return CreateLocation(Database.DiscoConfiguration, SubLocation, SubSubLocationTimestamp);
         }
         public static string CreateLocation(SystemConfiguration DiscoConfiguration, string SubLocation, DateTime? SubSubLocationTimestamp = null)
         {
diff --git a/Disco.BI/BI/DeviceBI/BatchUtilities.cs b/Disco.BI/BI/DeviceBI/BatchUtilities.cs
index 31ac7538..ca6a630a 100644
--- a/Disco.BI/BI/DeviceBI/BatchUtilities.cs
+++ b/Disco.BI/BI/DeviceBI/BatchUtilities.cs
@@ -9,7 +9,7 @@ namespace Disco.BI.DeviceBI
 {
     public static class BatchUtilities
     {
-        public static DeviceBatch DefaultNewDeviceBatch(DiscoDataContext dbContext)
+        public static DeviceBatch DefaultNewDeviceBatch(DiscoDataContext Database)
         {
             return new DeviceBatch()
             {
diff --git a/Disco.BI/BI/DeviceBI/DeviceModelBI.cs b/Disco.BI/BI/DeviceBI/DeviceModelBI.cs
index ad7d70cc..bffe8101 100644
--- a/Disco.BI/BI/DeviceBI/DeviceModelBI.cs
+++ b/Disco.BI/BI/DeviceBI/DeviceModelBI.cs
@@ -32,7 +32,7 @@ namespace Disco.BI
                     if (deviceModel == null)
                     {
                         // Create the Device Model in a different DataContext so we don't have to commit unrelated changes
-                        using (DiscoDataContext dbContext = new DiscoDataContext())
+                        using (DiscoDataContext database = new DiscoDataContext())
                         {
                             var addDeviceModel = new DeviceModel
                             {
@@ -41,8 +41,8 @@ namespace Disco.BI
                                 ModelType = ModelType,
                                 Description = string.Format("{0} {1}", Manufacturer, Model)
                             };
-                            dbContext.DeviceModels.Add(addDeviceModel);
-                            dbContext.SaveChanges();
+                            database.DeviceModels.Add(addDeviceModel);
+                            database.SaveChanges();
                         }
 
                         // Obtain the Device Model with the in-scope DataContext
diff --git a/Disco.BI/BI/DeviceBI/Enrol.cs b/Disco.BI/BI/DeviceBI/Enrol.cs
index f846e0a0..9ecc0906 100644
--- a/Disco.BI/BI/DeviceBI/Enrol.cs
+++ b/Disco.BI/BI/DeviceBI/Enrol.cs
@@ -11,6 +11,8 @@ using Disco.Models.Repository;
 using Tamir.SharpSsh;
 using Disco.Services.Plugins;
 using Disco.Services.Plugins.Features.CertificateProvider;
+using Disco.Services.Users;
+using Disco.Services.Authorization;
 
 namespace Disco.BI.DeviceBI
 {
@@ -24,7 +26,7 @@ namespace Disco.BI.DeviceBI
         }
 
         private static Regex SshPromptRegEx = new Regex("[\\$,\\#]", RegexOptions.Multiline);
-        public static MacSecureEnrolResponse MacSecureEnrol(DiscoDataContext dbContext, string Host)
+        public static MacSecureEnrolResponse MacSecureEnrol(DiscoDataContext Database, string Host)
         {
             MacEnrol trustedRequest = new MacEnrol();
             string sessionId = System.Guid.NewGuid().ToString("B");
@@ -32,8 +34,8 @@ namespace Disco.BI.DeviceBI
             try
             {
                 EnrolmentLog.LogSessionStarting(sessionId, Host, EnrolmentTypes.MacSecure);
-                EnrolmentLog.LogSessionProgress(sessionId, 0, string.Format("Connecting to '{0}' as '{1}'", Host, dbContext.DiscoConfiguration.Bootstrapper.MacSshUsername));
-                SshShell shell = new SshShell(Host, dbContext.DiscoConfiguration.Bootstrapper.MacSshUsername, dbContext.DiscoConfiguration.Bootstrapper.MacSshPassword);
+                EnrolmentLog.LogSessionProgress(sessionId, 0, string.Format("Connecting to '{0}' as '{1}'", Host, Database.DiscoConfiguration.Bootstrapper.MacSshUsername));
+                SshShell shell = new SshShell(Host, Database.DiscoConfiguration.Bootstrapper.MacSshUsername, Database.DiscoConfiguration.Bootstrapper.MacSshPassword);
                 try
                 {
                     shell.ExpectPattern = "#";
@@ -55,7 +57,7 @@ namespace Disco.BI.DeviceBI
                         output = shell.Expect(":");
                         EnrolmentLog.LogSessionProgress(sessionId, 27, "Connected, Elevating Credentials");
                         EnrolmentLog.LogSessionDiagnosticInformation(sessionId, output);
-                        shell.WriteLine(dbContext.DiscoConfiguration.Bootstrapper.MacSshPassword);
+                        shell.WriteLine(Database.DiscoConfiguration.Bootstrapper.MacSshPassword);
                         System.Threading.Thread.Sleep(250);
                         output = shell.Expect(SshPromptRegEx);
                         sessionElevated = true;
@@ -96,7 +98,7 @@ namespace Disco.BI.DeviceBI
                         shell.Close();
                     }
                     EnrolmentLog.LogSessionProgress(sessionId, 100, "Disconnected, Starting Disco Enrolment");
-                    MacSecureEnrolResponse response = MacSecureEnrolResponse.FromMacEnrolResponse(MacEnrol(dbContext, trustedRequest, true, sessionId));
+                    MacSecureEnrolResponse response = MacSecureEnrolResponse.FromMacEnrolResponse(MacEnrol(Database, trustedRequest, true, sessionId));
                     EnrolmentLog.LogSessionFinished(sessionId);
                     MacSecureEnrol = response;
                 }
@@ -211,7 +213,7 @@ namespace Disco.BI.DeviceBI
 
         #endregion
 
-        public static MacEnrolResponse MacEnrol(DiscoDataContext dbContext, MacEnrol Request, bool Trusted, string OpenSessionId = null)
+        public static MacEnrolResponse MacEnrol(DiscoDataContext Database, MacEnrol Request, bool Trusted, string OpenSessionId = null)
         {
             string sessionId;
             if (OpenSessionId == null)
@@ -228,7 +230,7 @@ namespace Disco.BI.DeviceBI
             try
             {
                 EnrolmentLog.LogSessionProgress(sessionId, 10, "Querying Database");
-                Device RepoDevice = dbContext.Devices.Include("AssignedUser").Include("DeviceProfile").Include("DeviceProfile").Where(d => d.SerialNumber == Request.DeviceSerialNumber).FirstOrDefault();
+                Device RepoDevice = Database.Devices.Include("AssignedUser").Include("DeviceProfile").Include("DeviceProfile").Where(d => d.SerialNumber == Request.DeviceSerialNumber).FirstOrDefault();
                 if (!Trusted)
                 {
                     if (RepoDevice == null)
@@ -240,9 +242,9 @@ namespace Disco.BI.DeviceBI
                 {
                     EnrolmentLog.LogSessionProgress(sessionId, 50, "New Device, Building Disco Instance");
                     EnrolmentLog.LogSessionTaskAddedDevice(sessionId, Request.DeviceSerialNumber);
-                    DeviceProfile deviceProfile = dbContext.DeviceProfiles.Find(dbContext.DiscoConfiguration.DeviceProfiles.DefaultDeviceProfileId);
+                    DeviceProfile deviceProfile = Database.DeviceProfiles.Find(Database.DiscoConfiguration.DeviceProfiles.DefaultDeviceProfileId);
 
-                    var deviceModelResult = dbContext.DeviceModels.GetOrCreateDeviceModel(Request.DeviceManufacturer.Trim(), Request.DeviceModel.Trim(), Request.DeviceModel.Trim());
+                    var deviceModelResult = Database.DeviceModels.GetOrCreateDeviceModel(Request.DeviceManufacturer.Trim(), Request.DeviceModel.Trim(), Request.DeviceModel.Trim());
                     DeviceModel deviceModel = deviceModelResult.Item1;
                     if (deviceModelResult.Item2)
                         EnrolmentLog.LogSessionTaskCreatedDeviceModel(sessionId, Request.DeviceSerialNumber, deviceModelResult.Item1.Manufacturer, deviceModelResult.Item1.Model);
@@ -259,7 +261,7 @@ namespace Disco.BI.DeviceBI
                         CreatedDate = DateTime.Now,
                         EnrolledDate = DateTime.Now
                     };
-                    dbContext.Devices.Add(RepoDevice);
+                    Database.Devices.Add(RepoDevice);
                 }
                 else
                 {
@@ -267,7 +269,7 @@ namespace Disco.BI.DeviceBI
                     EnrolmentLog.LogSessionTaskUpdatingDevice(sessionId, Request.DeviceSerialNumber);
                     if (!RepoDevice.DeviceModelId.HasValue || RepoDevice.DeviceModelId.Value == 1)
                     {
-                        var deviceModelResult = dbContext.DeviceModels.GetOrCreateDeviceModel(Request.DeviceManufacturer.Trim(), Request.DeviceModel.Trim(), Request.DeviceModel.Trim());
+                        var deviceModelResult = Database.DeviceModels.GetOrCreateDeviceModel(Request.DeviceManufacturer.Trim(), Request.DeviceModel.Trim(), Request.DeviceModel.Trim());
                         DeviceModel deviceModel = deviceModelResult.Item1;
                         if (deviceModelResult.Item2)
                             EnrolmentLog.LogSessionTaskCreatedDeviceModel(sessionId, Request.DeviceSerialNumber, deviceModelResult.Item1.Manufacturer, deviceModelResult.Item1.Model);
@@ -295,11 +297,11 @@ namespace Disco.BI.DeviceBI
                 if (RepoDevice.DeviceProfile.DistributionType == DeviceProfile.DistributionTypes.OneToOne && RepoDevice.AssignedUser != null)
                 {
                     ActiveDirectoryUserAccount AssignedUserInfo = ActiveDirectory.GetUserAccount(RepoDevice.AssignedUser.Id);
-                    EnrolmentLog.LogSessionTaskAssigningUser(sessionId, RepoDevice.SerialNumber, AssignedUserInfo.DisplayName, AssignedUserInfo.sAMAccountName, AssignedUserInfo.Domain, AssignedUserInfo.ObjectSid);
-                    response.DeviceAssignedUserUsername = AssignedUserInfo.sAMAccountName;
+                    EnrolmentLog.LogSessionTaskAssigningUser(sessionId, RepoDevice.SerialNumber, AssignedUserInfo.DisplayName, AssignedUserInfo.SamAccountName, AssignedUserInfo.Domain, AssignedUserInfo.SecurityIdentifier);
+                    response.DeviceAssignedUserUsername = AssignedUserInfo.SamAccountName;
                     response.DeviceAssignedUserDomain = AssignedUserInfo.Domain;
                     response.DeviceAssignedUserName = AssignedUserInfo.DisplayName;
-                    response.DeviceAssignedUserSID = AssignedUserInfo.ObjectSid;
+                    response.DeviceAssignedUserSID = AssignedUserInfo.SecurityIdentifier;
                 }
                 response.DeviceComputerName = RepoDevice.ComputerName;
                 EnrolmentLog.LogSessionProgress(sessionId, 100, "Completed Successfully");
@@ -321,11 +323,11 @@ namespace Disco.BI.DeviceBI
             }
             return response;
         }
-        public static EnrolResponse Enrol(DiscoDataContext dbContext, string Username, Models.ClientServices.Enrol Request)
+        public static EnrolResponse Enrol(DiscoDataContext Database, string Username, Models.ClientServices.Enrol Request)
         {
             ActiveDirectoryMachineAccount MachineInfo = null;
             EnrolResponse response = new EnrolResponse();
-            User authenticatedUser = null;
+            AuthorizationToken authenticatedToken = null;
             bool isAuthenticated = false;
             string sessionId = System.Guid.NewGuid().ToString("B");
             response.SessionId = sessionId;
@@ -336,21 +338,21 @@ namespace Disco.BI.DeviceBI
                 EnrolmentLog.LogSessionProgress(sessionId, 10, "Loading User Data");
                 if (!string.IsNullOrWhiteSpace(Username))
                 {
-                    authenticatedUser = UserBI.UserCache.GetUser(Username, dbContext);
-                    isAuthenticated = (authenticatedUser != null);
+                    authenticatedToken = UserService.GetAuthorization(Username, Database);
+                    isAuthenticated = (authenticatedToken != null);
                 }
                 EnrolmentLog.LogSessionProgress(sessionId, 13, "Loading Device Data");
 
-                Device RepoDevice = dbContext.Devices.Include("AssignedUser").Include("DeviceModel").Include("DeviceProfile").Where(d => d.SerialNumber == Request.DeviceSerialNumber).FirstOrDefault();
+                Device RepoDevice = Database.Devices.Include("AssignedUser").Include("DeviceModel").Include("DeviceProfile").Where(d => d.SerialNumber == Request.DeviceSerialNumber).FirstOrDefault();
                 EnrolmentLog.LogSessionProgress(sessionId, 15, "Discovering User/Device Disco Permissions");
                 if (isAuthenticated)
                 {
-                    if (authenticatedUser.Type != "Admin")
+                    if (!authenticatedToken.Has(Claims.Device.Actions.EnrolDevices))
                     {
-                        if (authenticatedUser.Type != "Computer")
-                            throw new EnrolSafeException(string.Format("Connection not correctly authenticated (SN: {0}; Auth User: {1}; User Type: {2})", Request.DeviceSerialNumber, authenticatedUser.Id, authenticatedUser.Type));
-                        if (!authenticatedUser.Id.Equals(string.Format("{0}$", Request.DeviceComputerName), System.StringComparison.InvariantCultureIgnoreCase))
-                            throw new EnrolSafeException(string.Format("Connection not correctly authenticated (SN: {0}; Auth User: {1}; User Type: {2})", Request.DeviceSerialNumber, authenticatedUser.Id, authenticatedUser.Type));
+                        if (authenticatedToken.Has(Claims.ComputerAccount))
+                            throw new EnrolSafeException(string.Format("Connection not correctly authenticated (SN: {0}; Auth User: {1})", Request.DeviceSerialNumber, authenticatedToken.User.Id));
+                        if (!authenticatedToken.User.Id.Equals(string.Format("{0}$", Request.DeviceComputerName), System.StringComparison.InvariantCultureIgnoreCase))
+                            throw new EnrolSafeException(string.Format("Connection not correctly authenticated (SN: {0}; Auth User: {1})", Request.DeviceSerialNumber, authenticatedToken.User.Id));
                     }
                 }
                 else
@@ -375,10 +377,10 @@ namespace Disco.BI.DeviceBI
                 {
                     EnrolmentLog.LogSessionProgress(sessionId, 30, "New Device, Creating Disco Instance");
                     EnrolmentLog.LogSessionTaskAddedDevice(sessionId, Request.DeviceSerialNumber);
-                    DeviceProfile deviceProfile = dbContext.DeviceProfiles.Find(dbContext.DiscoConfiguration.DeviceProfiles.DefaultDeviceProfileId);
+                    DeviceProfile deviceProfile = Database.DeviceProfiles.Find(Database.DiscoConfiguration.DeviceProfiles.DefaultDeviceProfileId);
 
 
-                    var deviceModelResult = dbContext.DeviceModels.GetOrCreateDeviceModel(Request.DeviceManufacturer.Trim(), Request.DeviceModel.Trim(), Request.DeviceModel.Trim());
+                    var deviceModelResult = Database.DeviceModels.GetOrCreateDeviceModel(Request.DeviceManufacturer.Trim(), Request.DeviceModel.Trim(), Request.DeviceModel.Trim());
                     DeviceModel deviceModel = deviceModelResult.Item1;
                     if (deviceModelResult.Item2)
                         EnrolmentLog.LogSessionTaskCreatedDeviceModel(sessionId, Request.DeviceSerialNumber, deviceModelResult.Item1.Manufacturer, deviceModelResult.Item1.Model);
@@ -396,14 +398,14 @@ namespace Disco.BI.DeviceBI
                         EnrolledDate = DateTime.Now,
                         LastEnrolDate = DateTime.Now
                     };
-                    dbContext.Devices.Add(RepoDevice);
+                    Database.Devices.Add(RepoDevice);
                 }
                 else
                 {
                     EnrolmentLog.LogSessionProgress(sessionId, 30, "Existing Device, Updating Disco Instance");
                     EnrolmentLog.LogSessionTaskUpdatingDevice(sessionId, Request.DeviceSerialNumber);
 
-                    var deviceModelResult = dbContext.DeviceModels.GetOrCreateDeviceModel(Request.DeviceManufacturer.Trim(), Request.DeviceModel.Trim(), Request.DeviceModel.Trim());
+                    var deviceModelResult = Database.DeviceModels.GetOrCreateDeviceModel(Request.DeviceManufacturer.Trim(), Request.DeviceModel.Trim(), Request.DeviceModel.Trim());
                     DeviceModel deviceModel = deviceModelResult.Item1;
                     if (deviceModelResult.Item2)
                         EnrolmentLog.LogSessionTaskCreatedDeviceModel(sessionId, Request.DeviceSerialNumber, deviceModelResult.Item1.Manufacturer, deviceModelResult.Item1.Model);
@@ -425,7 +427,7 @@ namespace Disco.BI.DeviceBI
                         {
                             EnrolmentLog.LogSessionProgress(sessionId, 50, "Provisioning an Active Directory Computer Account");
                             if (string.IsNullOrEmpty(RepoDevice.ComputerName) || RepoDevice.DeviceProfile.EnforceComputerNameConvention)
-                                RepoDevice.ComputerName = RepoDevice.ComputerNameRender(dbContext);
+                                RepoDevice.ComputerName = RepoDevice.ComputerNameRender(Database);
                             EnrolmentLog.LogSessionTaskProvisioningADAccount(sessionId, RepoDevice.SerialNumber, RepoDevice.ComputerName);
                             MachineInfo = ActiveDirectory.GetMachineAccount(RepoDevice.ComputerName);
                             response.OfflineDomainJoin = ActiveDirectory.OfflineDomainJoinProvision(ref MachineInfo, RepoDevice.ComputerName, RepoDevice.DeviceProfile.OrganisationalUnit, sessionId);
@@ -458,7 +460,7 @@ namespace Disco.BI.DeviceBI
                     // Enforce Computer Name Convention
                     if (RepoDevice.DeviceProfile.EnforceComputerNameConvention)
                     {
-                        var calculatedComputerName = RepoDevice.ComputerNameRender(dbContext);
+                        var calculatedComputerName = RepoDevice.ComputerNameRender(Database);
                         if (!Request.DeviceComputerName.Equals(calculatedComputerName, StringComparison.InvariantCultureIgnoreCase))
                         {
                             EnrolmentLog.LogSessionProgress(sessionId, 50, string.Format("Renaming Device: {0} -> {1}", Request.DeviceComputerName, calculatedComputerName));
@@ -476,15 +478,18 @@ namespace Disco.BI.DeviceBI
                     // Enforce Organisation Unit
                     if (response.OfflineDomainJoin == null && RepoDevice.DeviceProfile.EnforceOrganisationalUnit)
                     {
-                        if ((RepoDevice.DeviceProfile.OrganisationalUnit == null && MachineInfo.ParentDistinguishedName.Equals("CN=Computers", StringComparison.InvariantCultureIgnoreCase)) // Null (Default) OU
-                            || !MachineInfo.ParentDistinguishedName.Equals(RepoDevice.DeviceProfile.OrganisationalUnit, StringComparison.InvariantCultureIgnoreCase)) // Custom OU
+                        var parentDistinguishedName = MachineInfo.ParentDistinguishedName();
+
+                        if ((RepoDevice.DeviceProfile.OrganisationalUnit == null && parentDistinguishedName != null
+                            && parentDistinguishedName.Equals("CN=Computers", StringComparison.InvariantCultureIgnoreCase)) // Null (Default) OU
+                            || !parentDistinguishedName.Equals(RepoDevice.DeviceProfile.OrganisationalUnit, StringComparison.InvariantCultureIgnoreCase)) // Custom OU
                         {
                             string newOU = RepoDevice.DeviceProfile.OrganisationalUnit ?? "CN=Computers";
 
-                            EnrolmentLog.LogSessionProgress(sessionId, 65, string.Format("Moving Device Organisation Unit: {0} -> {1}", MachineInfo.ParentDistinguishedName, newOU));
-                            EnrolmentLog.LogSessionTaskMovingDeviceOrganisationUnit(sessionId, MachineInfo.ParentDistinguishedName, newOU);
+                            EnrolmentLog.LogSessionProgress(sessionId, 65, string.Format("Moving Device Organisation Unit: {0} -> {1}", parentDistinguishedName, newOU));
+                            EnrolmentLog.LogSessionTaskMovingDeviceOrganisationUnit(sessionId, parentDistinguishedName, newOU);
                             MachineInfo.MoveOrganisationUnit(RepoDevice.DeviceProfile.OrganisationalUnit);
-                            MachineInfo = ActiveDirectory.GetMachineAccount(MachineInfo.sAMAccountName);
+                            MachineInfo = ActiveDirectory.GetMachineAccount(MachineInfo.SamAccountName);
                             response.RequireReboot = true;
                         }
                     }
@@ -507,12 +512,12 @@ namespace Disco.BI.DeviceBI
                     {
                         EnrolmentLog.LogSessionProgress(sessionId, 80, "Retrieving Active Directory Assigned User Account");
                         ActiveDirectoryUserAccount AssignedUserInfo = ActiveDirectory.GetUserAccount(RepoDevice.AssignedUser.Id);
-                        EnrolmentLog.LogSessionTaskAssigningUser(sessionId, RepoDevice.SerialNumber, AssignedUserInfo.DisplayName, AssignedUserInfo.sAMAccountName, AssignedUserInfo.Domain, AssignedUserInfo.ObjectSid);
+                        EnrolmentLog.LogSessionTaskAssigningUser(sessionId, RepoDevice.SerialNumber, AssignedUserInfo.DisplayName, AssignedUserInfo.SamAccountName, AssignedUserInfo.Domain, AssignedUserInfo.SecurityIdentifier);
                         response.AllowBootstrapperUninstall = true;
-                        response.DeviceAssignedUserUsername = AssignedUserInfo.sAMAccountName;
+                        response.DeviceAssignedUserUsername = AssignedUserInfo.SamAccountName;
                         response.DeviceAssignedUserDomain = AssignedUserInfo.Domain;
                         response.DeviceAssignedUserName = AssignedUserInfo.DisplayName;
-                        response.DeviceAssignedUserSID = AssignedUserInfo.ObjectSid;
+                        response.DeviceAssignedUserSID = AssignedUserInfo.SecurityIdentifier;
                     }
                 }
                 else
@@ -523,7 +528,7 @@ namespace Disco.BI.DeviceBI
                 {
                     EnrolmentLog.LogSessionProgress(sessionId, 90, "Provisioning a Wireless Certificate");
 
-                    var allocationResult = RepoDevice.AllocateCertificate(dbContext);
+                    var allocationResult = RepoDevice.AllocateCertificate(Database);
                     var deviceCertificate = allocationResult.Item1;
                     if (deviceCertificate != null)
                     {
diff --git a/Disco.BI/BI/DeviceBI/Importing/Import.cs b/Disco.BI/BI/DeviceBI/Importing/Import.cs
index a1f4b77c..28bb1994 100644
--- a/Disco.BI/BI/DeviceBI/Importing/Import.cs
+++ b/Disco.BI/BI/DeviceBI/Importing/Import.cs
@@ -2,6 +2,7 @@
 using Disco.Data.Repository;
 using Disco.Models.BI.Device;
 using Disco.Models.Repository;
+using Disco.Services.Users;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -24,13 +25,13 @@ namespace Disco.BI.DeviceBI.Importing
             return (ImportDeviceSession)HttpRuntime.Cache.Get(parseKey);
         }
 
-        internal static bool ImportRecord(this ImportDevice device, DiscoDataContext dbContext, PopulateRecordReferences references)
+        internal static bool ImportRecord(this ImportDevice device, DiscoDataContext Database, PopulateRecordReferences references)
         {
             // Skips If Errors
             if (device.Errors == null || device.Errors.Count == 0)
             {
                 // Re-Populate & Skip If Errors
-                device.PopulateRecord(dbContext, references);
+                device.PopulateRecord(Database, references);
                 if (device.Errors == null || device.Errors.Count == 0)
                 {
                     Device discoDevice = device.Device;
@@ -44,7 +45,7 @@ namespace Disco.BI.DeviceBI.Importing
                             CreatedDate = DateTime.Now,
                             AllowUnauthenticatedEnrol = true,
                         };
-                        dbContext.Devices.Add(discoDevice);
+                        Database.Devices.Add(discoDevice);
                     }
 
                     if (discoDevice.DeviceModelId != device.DeviceModelId)
@@ -60,10 +61,10 @@ namespace Disco.BI.DeviceBI.Importing
 
                     if (discoDevice.AssignedUserId != device.AssignedUserId)
                     {
-                        discoDevice.AssignDevice(dbContext, device.AssignedUser);
+                        discoDevice.AssignDevice(Database, device.AssignedUser);
                     }
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
 
                     return true;
                 }
@@ -71,16 +72,16 @@ namespace Disco.BI.DeviceBI.Importing
             return false;
         }
 
-        internal static PopulateRecordReferences GetPopulateRecordReferences(DiscoDataContext dbContext)
+        internal static PopulateRecordReferences GetPopulateRecordReferences(DiscoDataContext Database)
         {
             return new PopulateRecordReferences(
-                dbContext.DeviceModels.ToDictionary(dm => dm.Id),
-                dbContext.DeviceProfiles.ToDictionary(dp => dp.Id),
-                dbContext.DeviceBatches.ToDictionary(db => db.Id)
+                Database.DeviceModels.ToDictionary(dm => dm.Id),
+                Database.DeviceProfiles.ToDictionary(dp => dp.Id),
+                Database.DeviceBatches.ToDictionary(db => db.Id)
                 );
         }
 
-        internal static void PopulateRecord(this ImportDevice device, DiscoDataContext dbContext, PopulateRecordReferences references)
+        internal static void PopulateRecord(this ImportDevice device, DiscoDataContext Database, PopulateRecordReferences references)
         {
 
             var deviceModels = references.Item1;
@@ -90,7 +91,7 @@ namespace Disco.BI.DeviceBI.Importing
             // SERIAL NUMBER - Existing Device
             if (!device.Errors.ContainsKey("SerialNumber"))
             {
-                device.Device = dbContext.Devices.Find(device.SerialNumber);
+                device.Device = Database.Devices.Find(device.SerialNumber);
                 if (device.Device != null && device.Device.DecommissionedDate.HasValue)
                     device.Errors.Add("SerialNumber", "The device is decommissioned");
             }
@@ -135,7 +136,7 @@ namespace Disco.BI.DeviceBI.Importing
             {
                 try
                 {
-                    device.AssignedUser = UserBI.UserCache.GetUser(device.AssignedUserId, dbContext, true);
+                    device.AssignedUser = UserService.GetUser(device.AssignedUserId, Database, true);
                 }
                 catch (ArgumentException)
                 {
diff --git a/Disco.BI/BI/DeviceBI/Importing/ImportParseTask.cs b/Disco.BI/BI/DeviceBI/Importing/ImportParseTask.cs
index 2d3de6aa..ff8a0af4 100644
--- a/Disco.BI/BI/DeviceBI/Importing/ImportParseTask.cs
+++ b/Disco.BI/BI/DeviceBI/Importing/ImportParseTask.cs
@@ -45,14 +45,14 @@ namespace Disco.BI.DeviceBI.Importing
 
             this.Status.UpdateStatus(20, "Parsing CSV File", string.Format("Linking {0} Records", records.Count));
 
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                var populateReferences = Import.GetPopulateRecordReferences(dbContext);
+                var populateReferences = Import.GetPopulateRecordReferences(database);
 
                 DateTime lastUpdate = DateTime.Now;
                 foreach (var record in records)
                 {
-                    record.PopulateRecord(dbContext, populateReferences);
+                    record.PopulateRecord(database, populateReferences);
 
                     if (DateTime.Now.Subtract(lastUpdate).TotalSeconds > 1)
                     {
diff --git a/Disco.BI/BI/DeviceBI/Importing/ImportProcessTask.cs b/Disco.BI/BI/DeviceBI/Importing/ImportProcessTask.cs
index 2dc3ca9e..c0d416e5 100644
--- a/Disco.BI/BI/DeviceBI/Importing/ImportProcessTask.cs
+++ b/Disco.BI/BI/DeviceBI/Importing/ImportProcessTask.cs
@@ -35,14 +35,14 @@ namespace Disco.BI.DeviceBI.Importing
 
             this.Status.UpdateStatus(0, "Processing Device Import", "Importing Devices");
 
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                var populateReferences = Import.GetPopulateRecordReferences(dbContext);
+                var populateReferences = Import.GetPopulateRecordReferences(database);
 
                 DateTime lastUpdate = DateTime.Now;
                 foreach (var record in records)
                 {
-                    if (record.ImportRecord(dbContext, populateReferences))
+                    if (record.ImportRecord(database, populateReferences))
                         recordsImported++;
 
                     if (DateTime.Now.Subtract(lastUpdate).TotalSeconds > 1)
diff --git a/Disco.BI/BI/DeviceBI/Migration/LogMacAddressImporting.cs b/Disco.BI/BI/DeviceBI/Migration/LogMacAddressImporting.cs
index 4d7779aa..3f63ef53 100644
--- a/Disco.BI/BI/DeviceBI/Migration/LogMacAddressImporting.cs
+++ b/Disco.BI/BI/DeviceBI/Migration/LogMacAddressImporting.cs
@@ -19,26 +19,26 @@ namespace Disco.BI.DeviceBI.Migration
         public override bool CancelInitiallySupported { get { return false; } }
 
         #region Required Helpers
-        private static string RequiredFilePath(DiscoDataContext dbContext)
+        private static string RequiredFilePath(DiscoDataContext Database)
         {
-            if (dbContext.DiscoConfiguration.DataStoreLocation != null)
-                return System.IO.Path.Combine(dbContext.DiscoConfiguration.DataStoreLocation, "_LogMacAddressImportingRequired.txt");
+            if (Database.DiscoConfiguration.DataStoreLocation != null)
+                return System.IO.Path.Combine(Database.DiscoConfiguration.DataStoreLocation, "_LogMacAddressImportingRequired.txt");
             else
                 return null;
         }
 
-        public static bool IsRequired(DiscoDataContext dbContext)
+        public static bool IsRequired(DiscoDataContext Database)
         {
-            var requiredFilePath = RequiredFilePath(dbContext);
+            var requiredFilePath = RequiredFilePath(Database);
 
             if (requiredFilePath == null)
                 return false;
             else
                 return System.IO.File.Exists(requiredFilePath);
         }
-        public static void SetRequired(DiscoDataContext dbContext)
+        public static void SetRequired(DiscoDataContext Database)
         {
-            var requiredFilePath = RequiredFilePath(dbContext);
+            var requiredFilePath = RequiredFilePath(Database);
 
             if (requiredFilePath != null)
             {
@@ -49,9 +49,9 @@ namespace Disco.BI.DeviceBI.Migration
         }
         #endregion
 
-        public override void InitalizeScheduledTask(DiscoDataContext dbContext)
+        public override void InitalizeScheduledTask(DiscoDataContext Database)
         {
-            if (IsRequired(dbContext))
+            if (IsRequired(Database))
             {
                 // Schedule in 15mins
                 var trigger = TriggerBuilder.Create()
@@ -73,7 +73,7 @@ namespace Disco.BI.DeviceBI.Migration
 
         protected override void ExecuteTask()
         {
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
                 Status.UpdateStatus(0, "Importing MAC Addresses", "Querying Logs for Details");
                 // Load Logs
@@ -82,7 +82,7 @@ namespace Disco.BI.DeviceBI.Migration
                     Module = DeviceBI.EnrolmentLog.Current.ModuleId,
                     EventTypes = new List<int>() { (int)DeviceBI.EnrolmentLog.EventTypeIds.SessionDeviceInfo }
                 };
-                var results = logRetriever.Query(dbContext);
+                var results = logRetriever.Query(database);
 
                 Status.UpdateStatus(50, string.Format("Passing {0} logs", results.Count));
 
@@ -93,7 +93,7 @@ namespace Disco.BI.DeviceBI.Migration
 
                 Status.UpdateStatus(75, string.Format("Importing {0} details", addresses.Count));
 
-                var devices = dbContext.Devices.Include("DeviceDetails").ToList();
+                var devices = database.Devices.Include("DeviceDetails").ToList();
 
                 Tuple<string, string> addressResult;
                 foreach (var device in devices)
@@ -109,10 +109,10 @@ namespace Disco.BI.DeviceBI.Migration
 
                 Status.UpdateStatus(90, "Saving to Database");
 
-                dbContext.SaveChanges();
+                database.SaveChanges();
 
                 // Finished - Remove Placeholder File
-                var requiredFilePath = RequiredFilePath(dbContext);
+                var requiredFilePath = RequiredFilePath(database);
                 if (System.IO.File.Exists(requiredFilePath))
                     System.IO.File.Delete(requiredFilePath);
             }
diff --git a/Disco.BI/BI/DeviceBI/Searching.cs b/Disco.BI/BI/DeviceBI/Searching.cs
index 2440152f..5b6ea0e5 100644
--- a/Disco.BI/BI/DeviceBI/Searching.cs
+++ b/Disco.BI/BI/DeviceBI/Searching.cs
@@ -29,7 +29,7 @@ namespace Disco.BI.DeviceBI
             }).ToList();
         }
 
-        public static List<DeviceSearchResultItem> Search(DiscoDataContext dbContext, string Term, int? LimitCount = null, bool SearchDetails = false)
+        public static List<DeviceSearchResultItem> Search(DiscoDataContext Database, string Term, int? LimitCount = null, bool SearchDetails = false)
         {
             IQueryable<Device> query;
 
@@ -37,7 +37,7 @@ namespace Disco.BI.DeviceBI
 
             if (SearchDetails)
             {
-                query = dbContext.Devices.Where(d =>
+                query = Database.Devices.Where(d =>
                     d.AssetNumber.Contains(Term) ||
                     d.ComputerName.Contains(Term) ||
                     d.SerialNumber.Contains(Term) ||
@@ -48,7 +48,7 @@ namespace Disco.BI.DeviceBI
             }
             else
             {
-                query = dbContext.Devices.Where(d =>
+                query = Database.Devices.Where(d =>
                     d.AssetNumber.Contains(Term) ||
                     d.ComputerName.Contains(Term) ||
                     d.SerialNumber.Contains(Term) ||
@@ -59,17 +59,17 @@ namespace Disco.BI.DeviceBI
             return Search_SelectDeviceSearchResultItem(query, LimitCount);
         }
 
-        public static List<DeviceSearchResultItem> SearchDeviceModel(DiscoDataContext dbContext, int DeviceModelId, int? LimitCount = null)
+        public static List<DeviceSearchResultItem> SearchDeviceModel(DiscoDataContext Database, int DeviceModelId, int? LimitCount = null)
         {
-            return Search_SelectDeviceSearchResultItem(dbContext.Devices.Where(d => d.DeviceModelId == DeviceModelId), LimitCount);
+            return Search_SelectDeviceSearchResultItem(Database.Devices.Where(d => d.DeviceModelId == DeviceModelId), LimitCount);
         }
-        public static List<DeviceSearchResultItem> SearchDeviceProfile(DiscoDataContext dbContext, int DeviceProfileId, int? LimitCount = null)
+        public static List<DeviceSearchResultItem> SearchDeviceProfile(DiscoDataContext Database, int DeviceProfileId, int? LimitCount = null)
         {
-            return Search_SelectDeviceSearchResultItem(dbContext.Devices.Where(d => d.DeviceProfileId == DeviceProfileId), LimitCount);
+            return Search_SelectDeviceSearchResultItem(Database.Devices.Where(d => d.DeviceProfileId == DeviceProfileId), LimitCount);
         }
-        public static List<DeviceSearchResultItem> SearchDeviceBatch(DiscoDataContext dbContext, int DeviceBatchId, int? LimitCount = null)
+        public static List<DeviceSearchResultItem> SearchDeviceBatch(DiscoDataContext Database, int DeviceBatchId, int? LimitCount = null)
         {
-            return Search_SelectDeviceSearchResultItem(dbContext.Devices.Where(d => d.DeviceBatchId == DeviceBatchId), LimitCount);
+            return Search_SelectDeviceSearchResultItem(Database.Devices.Where(d => d.DeviceBatchId == DeviceBatchId), LimitCount);
         }
 
     }
diff --git a/Disco.BI/BI/DocumentTemplateBI/DocumentTemplateQRCodeLocationCache.cs b/Disco.BI/BI/DocumentTemplateBI/DocumentTemplateQRCodeLocationCache.cs
index f128f700..2b66c007 100644
--- a/Disco.BI/BI/DocumentTemplateBI/DocumentTemplateQRCodeLocationCache.cs
+++ b/Disco.BI/BI/DocumentTemplateBI/DocumentTemplateQRCodeLocationCache.cs
@@ -16,7 +16,7 @@ namespace Disco.BI.DocumentTemplateBI
     {
         private static ConcurrentDictionary<string, List<RectangleF>> _Cache = new ConcurrentDictionary<string, List<RectangleF>>();
 
-        public static List<RectangleF> GetLocations(DocumentTemplate dt, DiscoDataContext dbContext)
+        public static List<RectangleF> GetLocations(DocumentTemplate dt, DiscoDataContext Database)
         {
             // Check Cache
             List<RectangleF> locations;
@@ -25,7 +25,7 @@ namespace Disco.BI.DocumentTemplateBI
                 return locations;
             }
             // Generate Cache
-            return GenerateLocations(dt, dbContext);
+            return GenerateLocations(dt, Database);
         }
 
         public static bool InvalidateLocations(DocumentTemplate dt)
@@ -47,9 +47,9 @@ namespace Disco.BI.DocumentTemplateBI
             return _Cache.TryAdd(DocumentTemplateId, Locations);
         }
 
-        internal static List<RectangleF> GenerateLocations(DocumentTemplate dt, DiscoDataContext dbContext)
+        internal static List<RectangleF> GenerateLocations(DocumentTemplate dt, DiscoDataContext Database)
         {
-            string templateFilename = dt.RepositoryFilename(dbContext);
+            string templateFilename = dt.RepositoryFilename(Database);
             PdfReader pdfReader = new PdfReader(templateFilename);
             List<RectangleF> locations = new List<RectangleF>();
 
diff --git a/Disco.BI/BI/DocumentTemplateBI/DocumentUniqueIdentifier.cs b/Disco.BI/BI/DocumentTemplateBI/DocumentUniqueIdentifier.cs
index 4b4efe17..6ade8f62 100644
--- a/Disco.BI/BI/DocumentTemplateBI/DocumentUniqueIdentifier.cs
+++ b/Disco.BI/BI/DocumentTemplateBI/DocumentUniqueIdentifier.cs
@@ -115,7 +115,7 @@ namespace Disco.BI.DocumentTemplateBI
             }
             throw new System.ArgumentException(string.Format("Invalid Document Unique Identifier Version ({0})", s[1]), "UniqueIdentifier");
         }
-        public bool LoadComponents(DiscoDataContext Context)
+        public bool LoadComponents(DiscoDataContext Database)
         {
             bool LoadComponents;
             if (!this._loadedComponentsOk.HasValue)
@@ -142,7 +142,7 @@ namespace Disco.BI.DocumentTemplateBI
                 }
                 else
                 {
-                    this._documentTemplate = Context.DocumentTemplates.Find(this.TemplateTypeId);
+                    this._documentTemplate = Database.DocumentTemplates.Find(this.TemplateTypeId);
                     if (this._documentTemplate != null)
                     {
                         scopeType = this._documentTemplate.Scope;
@@ -158,7 +158,7 @@ namespace Disco.BI.DocumentTemplateBI
                     switch (scopeType)
                     {
                         case DocumentTemplate.DocumentTemplateScopes.Device:
-                            Device d = Context.Devices.Find(this.DataId);
+                            Device d = Database.Devices.Find(this.DataId);
                             if (d != null)
                             {
                                 this._data = d;
@@ -169,7 +169,7 @@ namespace Disco.BI.DocumentTemplateBI
                             }
                             break;
                         case DocumentTemplate.DocumentTemplateScopes.Job:
-                            Job i = Context.Jobs.Find(int.Parse(this.DataId));
+                            Job i = Database.Jobs.Find(int.Parse(this.DataId));
                             if (i != null)
                             {
                                 this._data = i;
@@ -180,7 +180,7 @@ namespace Disco.BI.DocumentTemplateBI
                             }
                             break;
                         case DocumentTemplate.DocumentTemplateScopes.User:
-                            User u = Context.Users.Find(this.DataId);
+                            User u = Database.Users.Find(this.DataId);
                             if (u != null)
                             {
                                 this._data = u;
diff --git a/Disco.BI/BI/DocumentTemplateBI/Importer/DocumentDropBoxMonitor.cs b/Disco.BI/BI/DocumentTemplateBI/Importer/DocumentDropBoxMonitor.cs
index 5e02162a..1565643b 100644
--- a/Disco.BI/BI/DocumentTemplateBI/Importer/DocumentDropBoxMonitor.cs
+++ b/Disco.BI/BI/DocumentTemplateBI/Importer/DocumentDropBoxMonitor.cs
@@ -16,15 +16,15 @@ namespace Disco.BI.DocumentTemplateBI.Importer
 
         public const string WatcherFilter = "*.pdf";
         public string DropBoxLocation { get; private set; }
-     
-        public DocumentDropBoxMonitor(DiscoDataContext Context, ISchedulerFactory SchedulerFactory, Cache HttpCache)
+
+        public DocumentDropBoxMonitor(DiscoDataContext Database, ISchedulerFactory SchedulerFactory, Cache HttpCache)
         {
-            if (Context == null)
+            if (Database == null)
                 throw new System.ArgumentNullException("Context");
             
             this._httpCache = HttpCache;
 
-            var location = DataStore.CreateLocation(Context, "DocumentDropBox");
+            var location = DataStore.CreateLocation(Database, "DocumentDropBox");
             this.DropBoxLocation = location.EndsWith(@"\") ? location : string.Concat(location, @"\");
             
             this._scheduler = SchedulerFactory.GetScheduler();
diff --git a/Disco.BI/BI/DocumentTemplateBI/Importer/DocumentImporterCleanCacheJob.cs b/Disco.BI/BI/DocumentTemplateBI/Importer/DocumentImporterCleanCacheJob.cs
index 97795704..c9674fc0 100644
--- a/Disco.BI/BI/DocumentTemplateBI/Importer/DocumentImporterCleanCacheJob.cs
+++ b/Disco.BI/BI/DocumentTemplateBI/Importer/DocumentImporterCleanCacheJob.cs
@@ -13,7 +13,7 @@ namespace Disco.BI.DocumentTemplateBI.Importer
         public override bool SingleInstanceTask { get { return true; } }
         public override bool CancelInitiallySupported { get { return false; } }
 
-        public override void InitalizeScheduledTask(DiscoDataContext dbContext)
+        public override void InitalizeScheduledTask(DiscoDataContext Database)
         {
             // Trigger Daily @ 12:30am
             TriggerBuilder triggerBuilder = TriggerBuilder.Create().WithSchedule(CronScheduleBuilder.DailyAtHourAndMinute(0, 30));
@@ -24,9 +24,9 @@ namespace Disco.BI.DocumentTemplateBI.Importer
         protected override void ExecuteTask()
         {
             string dataStoreLocation;
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                dataStoreLocation = DataStore.CreateLocation(dbContext, "Cache\\DocumentDropBox_SessionPages");
+                dataStoreLocation = DataStore.CreateLocation(database, "Cache\\DocumentDropBox_SessionPages");
             }
 
             int deleteCount = 0;
diff --git a/Disco.BI/BI/DocumentTemplateBI/Importer/DocumentImporterJob.cs b/Disco.BI/BI/DocumentTemplateBI/Importer/DocumentImporterJob.cs
index 85e79fb7..6f7f91b4 100644
--- a/Disco.BI/BI/DocumentTemplateBI/Importer/DocumentImporterJob.cs
+++ b/Disco.BI/BI/DocumentTemplateBI/Importer/DocumentImporterJob.cs
@@ -40,12 +40,12 @@ namespace Disco.BI.DocumentTemplateBI.Importer
 
             try
             {
-                using (DiscoDataContext dbContext = new DiscoDataContext())
+                using (DiscoDataContext database = new DiscoDataContext())
                 {
                     if (retryCount < 18)
                     {
                         context.JobDetail.JobDataMap["RetryCount"] = (++retryCount);
-                        bool processResult = Interop.Pdf.PdfImporter.ProcessPdfAttachment(filename, dbContext, sessionId, httpCache);
+                        bool processResult = Interop.Pdf.PdfImporter.ProcessPdfAttachment(filename, database, sessionId, httpCache);
 
                         if (processResult)
                         {
@@ -60,7 +60,7 @@ namespace Disco.BI.DocumentTemplateBI.Importer
                             {
                                 try
                                 {
-                                    string folderError = DataStore.CreateLocation(dbContext, "DocumentDropBox_Errors");
+                                    string folderError = DataStore.CreateLocation(database, "DocumentDropBox_Errors");
                                     string filenameError = Path.Combine(folderError, Path.GetFileName(filename));
                                     int filenameErrorCount = 0;
                                     while (File.Exists(filenameError))
@@ -85,7 +85,7 @@ namespace Disco.BI.DocumentTemplateBI.Importer
                         {
                             try
                             {
-                                string folderError = DataStore.CreateLocation(dbContext, "DocumentDropBox_Errors");
+                                string folderError = DataStore.CreateLocation(database, "DocumentDropBox_Errors");
                                 string filenameError = Path.Combine(folderError, Path.GetFileName(filename));
                                 int filenameErrorCount = 0;
                                 while (File.Exists(filenameError))
diff --git a/Disco.BI/BI/Expressions/Expression.cs b/Disco.BI/BI/Expressions/Expression.cs
index 10b57c98..dbfb1916 100644
--- a/Disco.BI/BI/Expressions/Expression.cs
+++ b/Disco.BI/BI/Expressions/Expression.cs
@@ -167,14 +167,14 @@ namespace Disco.BI.Expressions
             return e;
         }
 
-        public static IDictionary StandardVariables(DocumentTemplate AttachmentType, DiscoDataContext DataContext, User User, System.DateTime TimeStamp, DocumentState DocumentState)
+        public static IDictionary StandardVariables(DocumentTemplate AttachmentType, DiscoDataContext Database, User User, System.DateTime TimeStamp, DocumentState DocumentState)
         {
             return new Hashtable
 			{
 
 				{
 					"DataContext", 
-					DataContext
+					Database
 				}, 
 
 				{
diff --git a/Disco.BI/BI/Expressions/ExpressionCachePreloadTask.cs b/Disco.BI/BI/Expressions/ExpressionCachePreloadTask.cs
index 9bb5ab55..783ad1c1 100644
--- a/Disco.BI/BI/Expressions/ExpressionCachePreloadTask.cs
+++ b/Disco.BI/BI/Expressions/ExpressionCachePreloadTask.cs
@@ -17,7 +17,7 @@ namespace Disco.BI.Expressions
         public override bool SingleInstanceTask { get { return true; } }
         public override bool CancelInitiallySupported { get { return false; } }
 
-        public override void InitalizeScheduledTask(DiscoDataContext dbContext)
+        public override void InitalizeScheduledTask(DiscoDataContext Database)
         {
             // Run in Background 1 Second after Scheduled (on App Startup)
             TriggerBuilder triggerBuilder = TriggerBuilder.Create().StartAt(new DateTimeOffset(DateTime.Now).AddSeconds(5));
@@ -28,9 +28,9 @@ namespace Disco.BI.Expressions
         protected override void ExecuteTask()
         {
             // Cache Document Template Filter Expressions
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                foreach (var documentTemplate in dbContext.DocumentTemplates.Where(dt => dt.FilterExpression != null && dt.FilterExpression != string.Empty))
+                foreach (var documentTemplate in database.DocumentTemplates.Where(dt => dt.FilterExpression != null && dt.FilterExpression != string.Empty))
                 {
                     if (!string.IsNullOrWhiteSpace(documentTemplate.FilterExpression))
                         documentTemplate.FilterExpressionFromCache();
diff --git a/Disco.BI/BI/Expressions/Extensions/ImageExt.cs b/Disco.BI/BI/Expressions/Extensions/ImageExt.cs
index 47c2ece9..45e75bab 100644
--- a/Disco.BI/BI/Expressions/Extensions/ImageExt.cs
+++ b/Disco.BI/BI/Expressions/Extensions/ImageExt.cs
@@ -26,39 +26,39 @@ namespace Disco.BI.Expressions.Extensions
             string AbsoluteFilePath = System.IO.Path.Combine(DataStoreLocation, RelativeFilePath);
             return new FileImageExpressionResult(AbsoluteFilePath);
         }
-        public static FileImageExpressionResult JobAttachmentFirstImage(Job Job, DiscoDataContext dbContext)
+        public static FileImageExpressionResult JobAttachmentFirstImage(Job Job, DiscoDataContext Database)
         {
             var attachment = Job.JobAttachments.FirstOrDefault(ja => ja.MimeType.StartsWith("image/", StringComparison.InvariantCultureIgnoreCase));
             if (attachment != null)
             {
-                var filename = attachment.RepositoryFilename(dbContext);
+                var filename = attachment.RepositoryFilename(Database);
                 return new FileImageExpressionResult(filename);
             }
             else
                 return null;
         }
-        public static FileImageExpressionResult JobAttachmentLastImage(Job Job, DiscoDataContext dbContext)
+        public static FileImageExpressionResult JobAttachmentLastImage(Job Job, DiscoDataContext Database)
         {
             var attachment = Job.JobAttachments.LastOrDefault(ja => ja.MimeType.StartsWith("image/", StringComparison.InvariantCultureIgnoreCase));
             if (attachment != null)
             {
-                var filename = attachment.RepositoryFilename(dbContext);
+                var filename = attachment.RepositoryFilename(Database);
                 return new FileImageExpressionResult(filename);
             }
             else
                 return null;
         }
-        public static FileImageExpressionResult JobAttachmentImage(JobAttachment JobAttachment, DiscoDataContext dbContext)
+        public static FileImageExpressionResult JobAttachmentImage(JobAttachment JobAttachment, DiscoDataContext Database)
         {
             if (JobAttachment == null)
                 throw new ArgumentNullException("JobAttachment");
             if (!JobAttachment.MimeType.StartsWith("image/", StringComparison.InvariantCultureIgnoreCase))
                 throw new ArgumentException("Invalid Image MimeType for Attachment");
 
-            var filename = JobAttachment.RepositoryFilename(dbContext);
+            var filename = JobAttachment.RepositoryFilename(Database);
             return new FileImageExpressionResult(filename);
         }
-        public static FileMontageImageExpressionResult JobAttachmentImageMontage(Job Job, DiscoDataContext dbContext)
+        public static FileMontageImageExpressionResult JobAttachmentImageMontage(Job Job, DiscoDataContext Database)
         {
             if (Job == null)
                 throw new ArgumentNullException("Job");
@@ -69,14 +69,14 @@ namespace Disco.BI.Expressions.Extensions
 
             if (attachments.Count > 0)
             {
-                var attachmentFilepaths = attachments.Select(a => a.RepositoryFilename(dbContext)).ToList();
+                var attachmentFilepaths = attachments.Select(a => a.RepositoryFilename(Database)).ToList();
 
                 return new FileMontageImageExpressionResult(attachmentFilepaths);
             }
             else
                 return null;
         }
-        public static FileMontageImageExpressionResult JobAttachmentsImageMontage(ArrayList JobAttachments, DiscoDataContext dbContext)
+        public static FileMontageImageExpressionResult JobAttachmentsImageMontage(ArrayList JobAttachments, DiscoDataContext Database)
         {
             if (JobAttachments == null)
                 throw new ArgumentNullException("JobAttachments");
@@ -85,7 +85,7 @@ namespace Disco.BI.Expressions.Extensions
 
             if (attachments.Count > 0)
             {
-                var attachmentFilepaths = attachments.Select(a => a.RepositoryFilename(dbContext)).ToList();
+                var attachmentFilepaths = attachments.Select(a => a.RepositoryFilename(Database)).ToList();
 
                 return new FileMontageImageExpressionResult(attachmentFilepaths);
             }
diff --git a/Disco.BI/BI/Extensions/AttachmentActionExtensions.cs b/Disco.BI/BI/Extensions/AttachmentActionExtensions.cs
index 7a24383f..2b129a7a 100644
--- a/Disco.BI/BI/Extensions/AttachmentActionExtensions.cs
+++ b/Disco.BI/BI/Extensions/AttachmentActionExtensions.cs
@@ -4,6 +4,8 @@ using System.Linq;
 using System.Text;
 using Disco.Models.Repository;
 using Disco.Data.Repository;
+using Disco.Services.Users;
+using Disco.Services.Authorization;
 
 namespace Disco.BI.Extensions
 {
@@ -13,39 +15,60 @@ namespace Disco.BI.Extensions
         #region Delete
         public static bool CanDelete(this DeviceAttachment da)
         {
-            return true; // Placeholder - Currently Can Always Delete;
+            if (UserService.CurrentAuthorization.Has(Claims.Device.Actions.RemoveAnyAttachments))
+                return true;
+
+            if (UserService.CurrentAuthorization.Has(Claims.Device.Actions.RemoveOwnAttachments)
+                && da.TechUserId == UserService.CurrentUserId)
+                return true;
+
+            return false;
         }
-        public static void OnDelete(this DeviceAttachment da, DiscoDataContext dbContext)
+        public static void OnDelete(this DeviceAttachment da, DiscoDataContext Database)
         {
             if (!da.CanDelete())
                 throw new InvalidOperationException("Deletion of Attachment is Denied");
 
-            da.RepositoryDelete(dbContext);
-            dbContext.DeviceAttachments.Remove(da);
+            da.RepositoryDelete(Database);
+            Database.DeviceAttachments.Remove(da);
         }
         public static bool CanDelete(this JobAttachment ja)
         {
-            return true; // Placeholder - Currently Can Always Delete;
+            if (UserService.CurrentAuthorization.Has(Claims.Job.Actions.RemoveAnyAttachments))
+                return true;
+
+            if (UserService.CurrentAuthorization.Has(Claims.Job.Actions.RemoveOwnAttachments)
+                && ja.TechUserId == UserService.CurrentUserId)
+                return true;
+
+            return false;
         }
-        public static void OnDelete(this JobAttachment ja, DiscoDataContext dbContext)
+        public static void OnDelete(this JobAttachment ja, DiscoDataContext Database)
         {
             if (!ja.CanDelete())
                 throw new InvalidOperationException("Deletion of Attachment is Denied");
 
-            ja.RepositoryDelete(dbContext);
-            dbContext.JobAttachments.Remove(ja);
+            ja.RepositoryDelete(Database);
+            Database.JobAttachments.Remove(ja);
         }
         public static bool CanDelete(this UserAttachment ua)
         {
-            return true; // Placeholder - Currently Can Always Delete;
+            if (UserService.CurrentAuthorization.Has(Claims.User.Actions.RemoveAnyAttachments))
+                return true;
+
+            if (UserService.CurrentAuthorization.Has(Claims.User.Actions.RemoveOwnAttachments)
+                && ua.TechUserId == UserService.CurrentUserId)
+                return true;
+
+            return false;
         }
-        public static void OnDelete(this UserAttachment ua, DiscoDataContext dbContext)
+        public static void OnDelete(this UserAttachment ua, DiscoDataContext Database)
         {
             if (!ua.CanDelete())
                 throw new InvalidOperationException("Deletion of Attachment is Denied");
 
-            ua.RepositoryDelete(dbContext);
-            dbContext.UserAttachments.Remove(ua);
+            ua.RepositoryDelete(Database);
+            Database.UserAttachments.Remove(ua);
         }
         #endregion
 
diff --git a/Disco.BI/BI/Extensions/AttachmentExtensions.cs b/Disco.BI/BI/Extensions/AttachmentExtensions.cs
index f7a5a7c8..3e336c2c 100644
--- a/Disco.BI/BI/Extensions/AttachmentExtensions.cs
+++ b/Disco.BI/BI/Extensions/AttachmentExtensions.cs
@@ -6,16 +6,17 @@ using Disco.Models.Repository;
 using Disco.Data.Repository;
 using System.IO;
 using Disco.BI.DocumentTemplateBI;
+using Disco.Services.Users;
 
 namespace Disco.BI.Extensions
 {
     public static class AttachmentExtensions
     {
 
-        public static bool ImportPdfAttachment(this DocumentUniqueIdentifier UniqueIdentifier, DiscoDataContext dbContext, System.IO.Stream PdfContent, byte[] PdfThumbnail)
+        public static bool ImportPdfAttachment(this DocumentUniqueIdentifier UniqueIdentifier, DiscoDataContext Database, System.IO.Stream PdfContent, byte[] PdfThumbnail)
         {
 
-            UniqueIdentifier.LoadComponents(dbContext);
+            UniqueIdentifier.LoadComponents(Database);
             DocumentTemplate documentTemplate = UniqueIdentifier.DocumentTemplate;
             string filename;
             string comments;
@@ -31,25 +32,25 @@ namespace Disco.BI.Extensions
                 comments = string.Format("Generated: {0:s}", UniqueIdentifier.TimeStamp);
             }
 
-            User creatorUser = UserBI.UserCache.GetUser(UniqueIdentifier.CreatorId, dbContext);
+            User creatorUser = UserService.GetUser(UniqueIdentifier.CreatorId, Database);
             if (creatorUser == null)
             {
                 // No Creator User (or Username invalid)
-                creatorUser = UserBI.UserCache.CurrentUser;
+                creatorUser = UserService.CurrentUser;
             }
             switch (UniqueIdentifier.DataScope)
             {
                 case DocumentTemplate.DocumentTemplateScopes.Device:
                     Device d = (Device)UniqueIdentifier.Data;
-                    d.CreateAttachment(dbContext, creatorUser, filename, DocumentTemplate.PdfMimeType, comments, PdfContent, documentTemplate, PdfThumbnail);
+                    d.CreateAttachment(Database, creatorUser, filename, DocumentTemplate.PdfMimeType, comments, PdfContent, documentTemplate, PdfThumbnail);
                     return true;
                 case DocumentTemplate.DocumentTemplateScopes.Job:
                     Job j = (Job)UniqueIdentifier.Data;
-                    j.CreateAttachment(dbContext, creatorUser, filename, DocumentTemplate.PdfMimeType, comments, PdfContent, documentTemplate, PdfThumbnail);
+                    j.CreateAttachment(Database, creatorUser, filename, DocumentTemplate.PdfMimeType, comments, PdfContent, documentTemplate, PdfThumbnail);
                     return true;
                 case DocumentTemplate.DocumentTemplateScopes.User:
                     User u = (User)UniqueIdentifier.Data;
-                    u.CreateAttachment(dbContext, creatorUser, filename, DocumentTemplate.PdfMimeType, comments, PdfContent, documentTemplate, PdfThumbnail);
+                    u.CreateAttachment(Database, creatorUser, filename, DocumentTemplate.PdfMimeType, comments, PdfContent, documentTemplate, PdfThumbnail);
                     return true;
                 default:
                     return false;
@@ -57,47 +58,47 @@ namespace Disco.BI.Extensions
 
         }
 
-        public static string RepositoryFilename(this DeviceAttachment da, DiscoDataContext dbContext)
+        public static string RepositoryFilename(this DeviceAttachment da, DiscoDataContext Database)
         {
-            return Path.Combine(DataStore.CreateLocation(dbContext, "DeviceAttachments", da.Timestamp), string.Format("{0}_{1}_file", da.DeviceSerialNumber, da.Id));
+            return Path.Combine(DataStore.CreateLocation(Database, "DeviceAttachments", da.Timestamp), string.Format("{0}_{1}_file", da.DeviceSerialNumber, da.Id));
         }
-        public static string RepositoryFilename(this JobAttachment ja, DiscoDataContext dbContext)
+        public static string RepositoryFilename(this JobAttachment ja, DiscoDataContext Database)
         {
-            return Path.Combine(DataStore.CreateLocation(dbContext, "JobAttachments", ja.Timestamp), string.Format("{0}_{1}_file", ja.JobId, ja.Id));
+            return Path.Combine(DataStore.CreateLocation(Database, "JobAttachments", ja.Timestamp), string.Format("{0}_{1}_file", ja.JobId, ja.Id));
         }
-        public static string RepositoryFilename(this UserAttachment ua, DiscoDataContext dbContext)
+        public static string RepositoryFilename(this UserAttachment ua, DiscoDataContext Database)
         {
-            return Path.Combine(DataStore.CreateLocation(dbContext, "UserAttachments", ua.Timestamp), string.Format("{0}_{1}_file", ua.UserId, ua.Id));
+            return Path.Combine(DataStore.CreateLocation(Database, "UserAttachments", ua.Timestamp), string.Format("{0}_{1}_file", ua.UserId, ua.Id));
         }
 
         private static string RepositoryThumbnailFilenameInternal(string DirectoryPath, string Filename)
         {
             return Path.Combine(DirectoryPath, Filename);
         }
-        public static string RepositoryThumbnailFilename(this DeviceAttachment da, DiscoDataContext dbContext)
+        public static string RepositoryThumbnailFilename(this DeviceAttachment da, DiscoDataContext Database)
         {
-            return RepositoryThumbnailFilenameInternal(DataStore.CreateLocation(dbContext, "DeviceAttachments", da.Timestamp), string.Format("{0}_{1}_thumb.jpg", da.DeviceSerialNumber, da.Id));
+            return RepositoryThumbnailFilenameInternal(DataStore.CreateLocation(Database, "DeviceAttachments", da.Timestamp), string.Format("{0}_{1}_thumb.jpg", da.DeviceSerialNumber, da.Id));
         }
-        public static string RepositoryThumbnailFilename(this JobAttachment ja, DiscoDataContext dbContext)
+        public static string RepositoryThumbnailFilename(this JobAttachment ja, DiscoDataContext Database)
         {
-            return RepositoryThumbnailFilenameInternal(DataStore.CreateLocation(dbContext, "JobAttachments", ja.Timestamp), string.Format("{0}_{1}_thumb.jpg", ja.JobId, ja.Id));
+            return RepositoryThumbnailFilenameInternal(DataStore.CreateLocation(Database, "JobAttachments", ja.Timestamp), string.Format("{0}_{1}_thumb.jpg", ja.JobId, ja.Id));
         }
-        public static string RepositoryThumbnailFilename(this UserAttachment ua, DiscoDataContext dbContext)
+        public static string RepositoryThumbnailFilename(this UserAttachment ua, DiscoDataContext Database)
         {
-            return RepositoryThumbnailFilenameInternal(DataStore.CreateLocation(dbContext, "UserAttachments", ua.Timestamp), string.Format("{0}_{1}_thumb.jpg", ua.UserId, ua.Id));
+            return RepositoryThumbnailFilenameInternal(DataStore.CreateLocation(Database, "UserAttachments", ua.Timestamp), string.Format("{0}_{1}_thumb.jpg", ua.UserId, ua.Id));
         }
 
-        public static void RepositoryDelete(this DeviceAttachment da, DiscoDataContext dbContext)
+        public static void RepositoryDelete(this DeviceAttachment da, DiscoDataContext Database)
         {
-            RepositoryDelete(da.RepositoryFilename(dbContext), da.RepositoryThumbnailFilename(dbContext));
+            RepositoryDelete(da.RepositoryFilename(Database), da.RepositoryThumbnailFilename(Database));
         }
-        public static void RepositoryDelete(this JobAttachment ja, DiscoDataContext dbContext)
+        public static void RepositoryDelete(this JobAttachment ja, DiscoDataContext Database)
         {
-            RepositoryDelete(ja.RepositoryFilename(dbContext), ja.RepositoryThumbnailFilename(dbContext));
+            RepositoryDelete(ja.RepositoryFilename(Database), ja.RepositoryThumbnailFilename(Database));
         }
-        public static void RepositoryDelete(this UserAttachment ua, DiscoDataContext dbContext)
+        public static void RepositoryDelete(this UserAttachment ua, DiscoDataContext Database)
         {
-            RepositoryDelete(ua.RepositoryFilename(dbContext), ua.RepositoryThumbnailFilename(dbContext));
+            RepositoryDelete(ua.RepositoryFilename(Database), ua.RepositoryThumbnailFilename(Database));
         }
         private static void RepositoryDelete(params string[] filePaths)
         {
@@ -108,39 +109,39 @@ namespace Disco.BI.Extensions
             }
         }
 
-        public static string SaveAttachment(this DeviceAttachment da, DiscoDataContext dbContext, Stream FileContent)
+        public static string SaveAttachment(this DeviceAttachment da, DiscoDataContext Database, Stream FileContent)
         {
-            string filePath = da.RepositoryFilename(dbContext);
+            string filePath = da.RepositoryFilename(Database);
             SaveAttachment(filePath, FileContent);
             return filePath;
         }
-        public static string SaveAttachment(this JobAttachment ja, DiscoDataContext dbContext, Stream FileContent)
+        public static string SaveAttachment(this JobAttachment ja, DiscoDataContext Database, Stream FileContent)
         {
-            string filePath = ja.RepositoryFilename(dbContext);
+            string filePath = ja.RepositoryFilename(Database);
             SaveAttachment(filePath, FileContent);
             return filePath;
         }
-        public static string SaveAttachment(this UserAttachment ua, DiscoDataContext dbContext, Stream FileContent)
+        public static string SaveAttachment(this UserAttachment ua, DiscoDataContext Database, Stream FileContent)
         {
-            string filePath = ua.RepositoryFilename(dbContext);
+            string filePath = ua.RepositoryFilename(Database);
             SaveAttachment(filePath, FileContent);
             return filePath;
         }
-        public static string SaveThumbnailAttachment(this DeviceAttachment da, DiscoDataContext dbContext, byte[] FileContent)
+        public static string SaveThumbnailAttachment(this DeviceAttachment da, DiscoDataContext Database, byte[] FileContent)
         {
-            string filePath = da.RepositoryThumbnailFilename(dbContext);
+            string filePath = da.RepositoryThumbnailFilename(Database);
             File.WriteAllBytes(filePath, FileContent);
             return filePath;
         }
-        public static string SaveThumbnailAttachment(this JobAttachment ja, DiscoDataContext dbContext, byte[] FileContent)
+        public static string SaveThumbnailAttachment(this JobAttachment ja, DiscoDataContext Database, byte[] FileContent)
         {
-            string filePath = ja.RepositoryThumbnailFilename(dbContext);
+            string filePath = ja.RepositoryThumbnailFilename(Database);
             File.WriteAllBytes(filePath, FileContent);
             return filePath;
         }
-        public static string SaveThumbnailAttachment(this UserAttachment ua, DiscoDataContext dbContext, byte[] FileContent)
+        public static string SaveThumbnailAttachment(this UserAttachment ua, DiscoDataContext Database, byte[] FileContent)
         {
-            string filePath = ua.RepositoryThumbnailFilename(dbContext);
+            string filePath = ua.RepositoryThumbnailFilename(Database);
             File.WriteAllBytes(filePath, FileContent);
             return filePath;
         }
@@ -154,39 +155,39 @@ namespace Disco.BI.Extensions
             }
         }
 
-        public static string GenerateThumbnail(this DeviceAttachment da, DiscoDataContext dbContext)
+        public static string GenerateThumbnail(this DeviceAttachment da, DiscoDataContext Database)
         {
-            string filePath = da.RepositoryThumbnailFilename(dbContext);
-            AttachmentBI.Utilities.GenerateThumbnail(da.RepositoryFilename(dbContext), da.MimeType, filePath);
+            string filePath = da.RepositoryThumbnailFilename(Database);
+            AttachmentBI.Utilities.GenerateThumbnail(da.RepositoryFilename(Database), da.MimeType, filePath);
             return filePath;
         }
-        public static string GenerateThumbnail(this JobAttachment ja, DiscoDataContext dbContext)
+        public static string GenerateThumbnail(this JobAttachment ja, DiscoDataContext Database)
         {
-            string filePath = ja.RepositoryThumbnailFilename(dbContext);
-            AttachmentBI.Utilities.GenerateThumbnail(ja.RepositoryFilename(dbContext), ja.MimeType, filePath);
+            string filePath = ja.RepositoryThumbnailFilename(Database);
+            AttachmentBI.Utilities.GenerateThumbnail(ja.RepositoryFilename(Database), ja.MimeType, filePath);
             return filePath;
         }
-        public static string GenerateThumbnail(this UserAttachment ua, DiscoDataContext dbContext)
+        public static string GenerateThumbnail(this UserAttachment ua, DiscoDataContext Database)
         {
-            string filePath = ua.RepositoryThumbnailFilename(dbContext);
-            AttachmentBI.Utilities.GenerateThumbnail(ua.RepositoryFilename(dbContext), ua.MimeType, filePath);
+            string filePath = ua.RepositoryThumbnailFilename(Database);
+            AttachmentBI.Utilities.GenerateThumbnail(ua.RepositoryFilename(Database), ua.MimeType, filePath);
             return filePath;
         }
-        public static string GenerateThumbnail(this DeviceAttachment da, DiscoDataContext dbContext, Stream SourceFile)
+        public static string GenerateThumbnail(this DeviceAttachment da, DiscoDataContext Database, Stream SourceFile)
         {
-            string filePath = da.RepositoryThumbnailFilename(dbContext);
+            string filePath = da.RepositoryThumbnailFilename(Database);
             AttachmentBI.Utilities.GenerateThumbnail(SourceFile, da.MimeType, filePath);
             return filePath;
         }
-        public static string GenerateThumbnail(this JobAttachment ja, DiscoDataContext dbContext, Stream SourceFile)
+        public static string GenerateThumbnail(this JobAttachment ja, DiscoDataContext Database, Stream SourceFile)
         {
-            string filePath = ja.RepositoryThumbnailFilename(dbContext);
+            string filePath = ja.RepositoryThumbnailFilename(Database);
             AttachmentBI.Utilities.GenerateThumbnail(SourceFile, ja.MimeType, filePath);
             return filePath;
         }
-        public static string GenerateThumbnail(this UserAttachment ua, DiscoDataContext dbContext, Stream SourceFile)
+        public static string GenerateThumbnail(this UserAttachment ua, DiscoDataContext Database, Stream SourceFile)
         {
-            string filePath = ua.RepositoryThumbnailFilename(dbContext);
+            string filePath = ua.RepositoryThumbnailFilename(Database);
             AttachmentBI.Utilities.GenerateThumbnail(SourceFile, ua.MimeType, filePath);
             return filePath;
         }
diff --git a/Disco.BI/BI/Extensions/AuthorizationRoleExtensions.cs b/Disco.BI/BI/Extensions/AuthorizationRoleExtensions.cs
new file mode 100644
index 00000000..2841ac34
--- /dev/null
+++ b/Disco.BI/BI/Extensions/AuthorizationRoleExtensions.cs
@@ -0,0 +1,28 @@
+using Disco.Data.Repository;
+using Disco.Models.Authorization;
+using Disco.Models.Repository;
+using Disco.Services.Users;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.BI.Extensions
+{
+    public static class AuthorizationRoleExtensions
+    {
+
+        public static void Delete(this IRoleToken roleToken, DiscoDataContext Database)
+        {
+            var role = Database.AuthorizationRoles.Find(roleToken.Role.Id);            
+            UserService.DeleteAuthorizationRole(Database, roleToken.Role);
+        }
+
+        public static void Delete(this AuthorizationRole role, DiscoDataContext Database)
+        {
+            UserService.DeleteAuthorizationRole(Database, role);
+        }
+
+    }
+}
diff --git a/Disco.BI/BI/Extensions/ClientServicesExtensions.cs b/Disco.BI/BI/Extensions/ClientServicesExtensions.cs
index d13012d7..d7b6321a 100644
--- a/Disco.BI/BI/Extensions/ClientServicesExtensions.cs
+++ b/Disco.BI/BI/Extensions/ClientServicesExtensions.cs
@@ -6,6 +6,7 @@ using Disco.Models.ClientServices;
 using System.Web;
 using Disco.Data.Repository;
 using Disco.Models.Repository;
+using Disco.Services.Users;
 
 namespace Disco.BI.Extensions
 {
@@ -20,10 +21,10 @@ namespace Disco.BI.Extensions
             if (HttpContext.Current.Request.IsAuthenticated)
                 username = HttpContext.Current.User.Identity.Name;
 
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                EnrolResponse response = DeviceBI.DeviceEnrol.Enrol(dbContext, username, request);
-                dbContext.SaveChanges();
+                EnrolResponse response = DeviceBI.DeviceEnrol.Enrol(database, username, request);
+                database.SaveChanges();
                 return response;
             }
         }
@@ -40,14 +41,14 @@ namespace Disco.BI.Extensions
             if (username == null)
                 throw new InvalidOperationException("Unauthenticated Http Context");
 
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                User user = UserBI.UserCache.GetUser(username, dbContext, true);
+                User user = UserService.GetUser(username, database, true);
                 WhoAmIResponse response = new WhoAmIResponse()
                 {
                     Username = user.Id,
                     DisplayName = user.DisplayName,
-                    Type = user.Type
+                    Type = "TODO!"
                 };
                 return response;
             }
@@ -58,10 +59,10 @@ namespace Disco.BI.Extensions
             if (HttpContext.Current == null)
                 throw new PlatformNotSupportedException("This function can only be accessed from within ASP.NET");
 
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                MacEnrolResponse response = DeviceBI.DeviceEnrol.MacEnrol(dbContext, request, false);
-                dbContext.SaveChanges();
+                MacEnrolResponse response = DeviceBI.DeviceEnrol.MacEnrol(database, request, false);
+                database.SaveChanges();
                 return response;
             }
         }
diff --git a/Disco.BI/BI/Extensions/DeviceActionExtensions.cs b/Disco.BI/BI/Extensions/DeviceActionExtensions.cs
index a20bc5cf..4884d751 100644
--- a/Disco.BI/BI/Extensions/DeviceActionExtensions.cs
+++ b/Disco.BI/BI/Extensions/DeviceActionExtensions.cs
@@ -5,6 +5,8 @@ using System.Text;
 using Disco.Models.Repository;
 using Disco.Data.Repository;
 using Disco.BI.Interop.ActiveDirectory;
+using Disco.Services.Users;
+using Disco.Services.Authorization;
 
 namespace Disco.BI.Extensions
 {
@@ -17,36 +19,57 @@ namespace Disco.BI.Extensions
 
         public static bool CanCreateJob(this Device d)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Actions.Create))
+                return false;
+
             return !d.IsDecommissioned();
         }
 
         public static bool CanUpdateAssignment(this Device d)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Device.Actions.AssignUser))
+                return false;
+
             return !d.IsDecommissioned();
         }
 
         public static bool CanUpdateDeviceProfile(this Device d)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Device.Properties.DeviceProfile))
+                return false;
+
             return !d.IsDecommissioned();
         }
 
         public static bool CanUpdateDeviceBatch(this Device d)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Device.Properties.DeviceBatch))
+                return false;
+
             return !d.IsDecommissioned();
         }
 
         public static bool CanUpdateTrustEnrol(this Device d)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Device.Actions.AllowUnauthenticatedEnrol))
+                return false;
+
             return !d.IsDecommissioned() && !d.AllowUnauthenticatedEnrol;
         }
         public static bool CanUpdateUntrustEnrol(this Device d)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Device.Actions.AllowUnauthenticatedEnrol))
+                return false;
+
             return !d.IsDecommissioned() && d.AllowUnauthenticatedEnrol;
         }
 
         #region Decommission
         public static bool CanDecommission(this Device d)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Device.Actions.Decommission))
+                return false;
+
             if (d.DecommissionedDate.HasValue)
                 return false; // Already Decommissioned
 
@@ -80,6 +103,9 @@ namespace Disco.BI.Extensions
         #region Recommission
         public static bool CanRecommission(this Device d)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Device.Actions.Recommission))
+                return false;
+
             return d.DecommissionedDate.HasValue;
         }
         public static void OnRecommission(this Device d)
@@ -105,17 +131,20 @@ namespace Disco.BI.Extensions
         #region Delete
         public static bool CanDelete(this Device d)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Device.Actions.Delete))
+                return false;
+
             return d.DecommissionedDate.HasValue;
         }
-        public static void OnDelete(this Device d, DiscoDataContext dbContext)
+        public static void OnDelete(this Device d, DiscoDataContext Database)
         {
             // Delete Jobs
-            foreach (Job j in dbContext.Jobs.Where(i => i.DeviceSerialNumber == d.SerialNumber))
+            foreach (Job j in Database.Jobs.Where(i => i.DeviceSerialNumber == d.SerialNumber))
             {
                 if (j.UserId == null)
                 { // No User associated, thus must Delete whole Job
                     if (j.CanDelete())
-                        j.OnDelete(dbContext);
+                        j.OnDelete(Database);
                     else
                         throw new InvalidOperationException(string.Format("Deletion of Device is Denied (See Job# {0})", j.Id));
                 }
@@ -128,35 +157,35 @@ namespace Disco.BI.Extensions
                     JobLog jobLog = new JobLog()
                     {
                         JobId = j.Id,
-                        TechUserId = UserBI.UserCache.CurrentUser.Id,
+                        TechUserId = UserService.CurrentUser.Id,
                         Timestamp = DateTime.Now,
                         Comments = string.Format("Device Deleted{0}{0}Serial Number: {1}{0}Computer Name: {2}{0}Model: {3}{0}Profile: {4}",
                                                     Environment.NewLine, d.SerialNumber, d.ComputerName, d.DeviceModel, d.DeviceProfile)
                     };
-                    dbContext.JobLogs.Add(jobLog);
+                    Database.JobLogs.Add(jobLog);
                 }
             }
 
             // Disable Wireless Certificates
-            foreach (var wc in dbContext.DeviceCertificates.Where(i => i.DeviceSerialNumber == d.SerialNumber))
+            foreach (var wc in Database.DeviceCertificates.Where(i => i.DeviceSerialNumber == d.SerialNumber))
             {
                 wc.DeviceSerialNumber = null;
                 wc.Enabled = false;
             }
             // Delete Device Details
-            foreach (var dd in dbContext.DeviceDetails.Where(i => i.DeviceSerialNumber == d.SerialNumber))
-                dbContext.DeviceDetails.Remove(dd);
+            foreach (var dd in Database.DeviceDetails.Where(i => i.DeviceSerialNumber == d.SerialNumber))
+                Database.DeviceDetails.Remove(dd);
             // Delete Device Attachments
-            foreach (var da in dbContext.DeviceAttachments.Where(i => i.DeviceSerialNumber == d.SerialNumber))
+            foreach (var da in Database.DeviceAttachments.Where(i => i.DeviceSerialNumber == d.SerialNumber))
             {
-                da.RepositoryDelete(dbContext);
-                dbContext.DeviceAttachments.Remove(da);
+                da.RepositoryDelete(Database);
+                Database.DeviceAttachments.Remove(da);
             }
             // Delete Device User Assignments
-            foreach (var dua in dbContext.DeviceUserAssignments.Where(i => i.DeviceSerialNumber == d.SerialNumber))
-                dbContext.DeviceUserAssignments.Remove(dua);
+            foreach (var dua in Database.DeviceUserAssignments.Where(i => i.DeviceSerialNumber == d.SerialNumber))
+                Database.DeviceUserAssignments.Remove(dua);
 
-            dbContext.Devices.Remove(d);
+            Database.Devices.Remove(d);
         }
         #endregion
     }
diff --git a/Disco.BI/BI/Extensions/DeviceBatchExtensions.cs b/Disco.BI/BI/Extensions/DeviceBatchExtensions.cs
index cfc04013..2fe39a4f 100644
--- a/Disco.BI/BI/Extensions/DeviceBatchExtensions.cs
+++ b/Disco.BI/BI/Extensions/DeviceBatchExtensions.cs
@@ -4,28 +4,33 @@ using System.Linq;
 using System.Text;
 using Disco.Models.Repository;
 using Disco.Data.Repository;
+using Disco.Services.Users;
+using Disco.Services.Authorization;
 
 namespace Disco.BI.Extensions
 {
     public static class DeviceBatchExtensions
     {
-        public static bool CanDelete(this DeviceBatch db, DiscoDataContext dbContext)
+        public static bool CanDelete(this DeviceBatch db, DiscoDataContext Database)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Config.DeviceBatch.Delete))
+                return false;
+
             // Can't Delete if Contains Devices
-            var deviceCount = dbContext.Devices.Count(d => d.DeviceBatchId == db.Id);
+            var deviceCount = Database.Devices.Count(d => d.DeviceBatchId == db.Id);
             if (deviceCount > 0)
                 return false;
 
             return true;
         }
 
-        public static void Delete(this DeviceBatch db, DiscoDataContext dbContext)
+        public static void Delete(this DeviceBatch db, DiscoDataContext Database)
         {
-            if (!db.CanDelete(dbContext))
+            if (!db.CanDelete(Database))
                 throw new InvalidOperationException("The state of this Device Batch doesn't allow it to be deleted");
 
             // Delete Batch
-            dbContext.DeviceBatches.Remove(db);
+            Database.DeviceBatches.Remove(db);
         }
     }
 }
diff --git a/Disco.BI/BI/Extensions/DeviceCertificateExtensions.cs b/Disco.BI/BI/Extensions/DeviceCertificateExtensions.cs
index c4889e2a..3e806cd9 100644
--- a/Disco.BI/BI/Extensions/DeviceCertificateExtensions.cs
+++ b/Disco.BI/BI/Extensions/DeviceCertificateExtensions.cs
@@ -11,16 +11,10 @@ namespace Disco.BI.Extensions
     public static class DeviceCertificateExtensions
     {
 
-        public static Tuple<DeviceCertificate, List<string>> AllocateCertificate(this Device device, DiscoDataContext dbContext)
+        public static Tuple<DeviceCertificate, List<string>> AllocateCertificate(this Device device, DiscoDataContext Database)
         {
             if (!string.IsNullOrEmpty(device.DeviceProfile.CertificateProviderId))
             {
-                // REMOVED 2012-07-18 G# - Plugin is responsible for checking
-                //var deviceCertificates = dbContext.DeviceCertificates.Where(c =>
-                //    c.DeviceSerialNumber == device.SerialNumber &&
-                //    c.ProviderId == device.DeviceProfile.CertificateProviderId &&
-                //    c.Enabled == true).ToList();
-
                 // Load Plugin
                 PluginFeatureManifest featureManifest = Plugins.GetPluginFeature(device.DeviceProfile.CertificateProviderId, typeof(CertificateProviderFeature));
 
@@ -32,7 +26,7 @@ namespace Disco.BI.Extensions
                     //    return new Tuple<DeviceCertificate, List<string>>(deviceCertificates[0], providerPlugin.RemoveExistingCertificateNames());
                     //else
 
-                    return providerFeature.AllocateCertificate(dbContext, device);    
+                    return providerFeature.AllocateCertificate(Database, device);    
                 }
             }
 
diff --git a/Disco.BI/BI/Extensions/DeviceExtensions.cs b/Disco.BI/BI/Extensions/DeviceExtensions.cs
index d4947778..ae611ca7 100644
--- a/Disco.BI/BI/Extensions/DeviceExtensions.cs
+++ b/Disco.BI/BI/Extensions/DeviceExtensions.cs
@@ -8,13 +8,15 @@ using System.Collections.Generic;
 using System;
 using System.IO;
 using Disco.Models.Interop.ActiveDirectory;
+using Disco.Services.Users;
+using Disco.Services.Authorization;
 
 namespace Disco.BI.Extensions
 {
     public static class DeviceExtensions
     {
 
-        public static string ComputerNameRender(this Device device, DiscoDataContext context)
+        public static string ComputerNameRender(this Device device, DiscoDataContext Database)
         {
             DeviceProfile deviceProfile = device.DeviceProfile;
             Expressions.Expression computerNameTemplateExpression = null;
@@ -24,7 +26,7 @@ namespace Disco.BI.Extensions
                 //return Expressions.Expression.TokenizeSingleDynamic(null, deviceProfile.Configuration(context).ComputerNameTemplate, 0);
                 return Expressions.Expression.TokenizeSingleDynamic(null, deviceProfile.ComputerNameTemplate, 0);
             });
-            System.Collections.IDictionary evaluatorVariables = Expressions.Expression.StandardVariables(null, context, UserBI.UserCache.CurrentUser, System.DateTime.Now, null);
+            System.Collections.IDictionary evaluatorVariables = Expressions.Expression.StandardVariables(null, Database, UserService.CurrentUser, System.DateTime.Now, null);
             string rendered;
             try
             {
@@ -40,12 +42,12 @@ namespace Disco.BI.Extensions
             }
             return rendered.ToString();
         }
-        public static System.Collections.Generic.List<DocumentTemplate> AvailableDocumentTemplates(this Device d, DiscoDataContext Context, User User, System.DateTime TimeStamp)
+        public static System.Collections.Generic.List<DocumentTemplate> AvailableDocumentTemplates(this Device d, DiscoDataContext Database, User User, System.DateTime TimeStamp)
         {
-            List<DocumentTemplate> ats = Context.DocumentTemplates
+            List<DocumentTemplate> ats = Database.DocumentTemplates
                 .Where(at => at.Scope == Disco.Models.Repository.DocumentTemplate.DocumentTemplateScopes.Device).ToList();
 
-            return ats.Where(at => at.FilterExpressionMatches(d, Context, User, TimeStamp, DocumentState.DefaultState())).ToList();
+            return ats.Where(at => at.FilterExpressionMatches(d, Database, User, TimeStamp, DocumentState.DefaultState())).ToList();
         }
 
         public static bool UpdateLastNetworkLogonDate(this Device Device)
@@ -53,7 +55,7 @@ namespace Disco.BI.Extensions
             return ActiveDirectoryUpdateLastNetworkLogonDateJob.UpdateLastNetworkLogonDate(Device);
         }
 
-        public static DeviceAttachment CreateAttachment(this Device Device, DiscoDataContext dbContext, User CreatorUser, string Filename, string MimeType, string Comments, Stream Content, DocumentTemplate DocumentTemplate = null, byte[] PdfThumbnail = null)
+        public static DeviceAttachment CreateAttachment(this Device Device, DiscoDataContext Database, User CreatorUser, string Filename, string MimeType, string Comments, Stream Content, DocumentTemplate DocumentTemplate = null, byte[] PdfThumbnail = null)
         {
             if (string.IsNullOrEmpty(MimeType) || MimeType.Equals("unknown/unknown", StringComparison.InvariantCultureIgnoreCase))
                 MimeType = Interop.MimeTypes.ResolveMimeType(Filename);
@@ -71,20 +73,20 @@ namespace Disco.BI.Extensions
             if (DocumentTemplate != null)
                 da.DocumentTemplateId = DocumentTemplate.Id;
 
-            dbContext.DeviceAttachments.Add(da);
-            dbContext.SaveChanges();
+            Database.DeviceAttachments.Add(da);
+            Database.SaveChanges();
 
-            da.SaveAttachment(dbContext, Content);
+            da.SaveAttachment(Database, Content);
             Content.Position = 0;
             if (PdfThumbnail == null)
-                da.GenerateThumbnail(dbContext, Content);
+                da.GenerateThumbnail(Database, Content);
             else
-                da.SaveThumbnailAttachment(dbContext, PdfThumbnail);
+                da.SaveThumbnailAttachment(Database, PdfThumbnail);
 
             return da;
         }
 
-        public static Device AddOffline(this Device d, DiscoDataContext dbContext)
+        public static Device AddOffline(this Device d, DiscoDataContext Database)
         {
             // Just Include:
             // - Serial Number
@@ -93,17 +95,31 @@ namespace Disco.BI.Extensions
             // - Assigned User Id
             // - Batch
 
+            // Enforce Authorization
+            var auth = UserService.CurrentAuthorization;
+            if (!auth.Has(Claims.Device.Properties.AssetNumber))
+                d.AssetNumber = null;
+            if (!auth.Has(Claims.Device.Properties.Location))
+                d.Location = null;
+            if (!auth.Has(Claims.Device.Properties.DeviceBatch))
+                d.DeviceBatchId = null;
+            if (!auth.Has(Claims.Device.Properties.DeviceProfile))
+                d.DeviceProfileId = Database.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId;
+            if (!auth.Has(Claims.Device.Actions.AssignUser))
+                d.AssignedUserId = null;
+
+
             // Batch
             DeviceBatch db = default(DeviceBatch);
             if (d.DeviceBatchId.HasValue)
-                db = dbContext.DeviceBatches.Find(d.DeviceBatchId.Value);
+                db = Database.DeviceBatches.Find(d.DeviceBatchId.Value);
 
             // Default Device Model
             DeviceModel dm = default(DeviceModel);
             if (db != null && db.DefaultDeviceModelId.HasValue)
-                dm = dbContext.DeviceModels.Find(db.DefaultDeviceModelId); // From Batch
+                dm = Database.DeviceModels.Find(db.DefaultDeviceModelId); // From Batch
             else
-                dm = dbContext.DeviceModels.Find(1); // Default
+                dm = Database.DeviceModels.Find(1); // Default
 
             Device d2 = new Device()
             {
@@ -112,7 +128,7 @@ namespace Disco.BI.Extensions
                 Location = d.Location,
                 CreatedDate = DateTime.Now,
                 DeviceProfileId = d.DeviceProfileId,
-                DeviceProfile = dbContext.DeviceProfiles.Find(d.DeviceProfileId),
+                DeviceProfile = Database.DeviceProfiles.Find(d.DeviceProfileId),
                 AllowUnauthenticatedEnrol = true,
                 DeviceModelId = dm.Id,
                 DeviceModel = dm,
@@ -120,22 +136,22 @@ namespace Disco.BI.Extensions
                 DeviceBatch = db
             };
 
-            dbContext.Devices.Add(d2);
+            Database.Devices.Add(d2);
             if (!string.IsNullOrEmpty(d.AssignedUserId))
             {
-                User u = UserBI.UserCache.GetUser(d.AssignedUserId, dbContext, true);
-                d2.AssignDevice(dbContext, u);
+                User u = UserService.GetUser(d.AssignedUserId, Database, true);
+                d2.AssignDevice(Database, u);
             }
 
             return d2;
         }
 
-        public static DeviceUserAssignment AssignDevice(this Device d, DiscoDataContext dbContext, User u)
+        public static DeviceUserAssignment AssignDevice(this Device d, DiscoDataContext Database, User u)
         {
             DeviceUserAssignment newDua = default(DeviceUserAssignment);
 
             // Mark existing assignments as Unassigned
-            foreach (var dua in dbContext.DeviceUserAssignments.Where(m => m.DeviceSerialNumber == d.SerialNumber && !m.UnassignedDate.HasValue))
+            foreach (var dua in Database.DeviceUserAssignments.Where(m => m.DeviceSerialNumber == d.SerialNumber && !m.UnassignedDate.HasValue))
                 dua.UnassignedDate = DateTime.Now;
 
             if (u != null)
@@ -147,7 +163,7 @@ namespace Disco.BI.Extensions
                     AssignedUserId = u.Id,
                     AssignedDate = DateTime.Now
                 };
-                dbContext.DeviceUserAssignments.Add(newDua);
+                Database.DeviceUserAssignments.Add(newDua);
 
                 d.AssignedUserId = u.Id;
                 d.AssignedUser = u;
diff --git a/Disco.BI/BI/Extensions/DeviceModelExtensions.cs b/Disco.BI/BI/Extensions/DeviceModelExtensions.cs
index a885c70d..a1b46923 100644
--- a/Disco.BI/BI/Extensions/DeviceModelExtensions.cs
+++ b/Disco.BI/BI/Extensions/DeviceModelExtensions.cs
@@ -6,6 +6,8 @@ using Disco.Models.Repository;
 using System.IO;
 using System.Drawing;
 using Disco.Data.Repository;
+using Disco.Services.Users;
+using Disco.Services.Authorization;
 
 namespace Disco.BI.Extensions
 {
@@ -73,22 +75,24 @@ namespace Disco.BI.Extensions
         }
 
         #region Actions
-        // Added 2012-11-26 G# - Need ability to delete Device Models
-        public static bool CanDelete(this DeviceModel dm, DiscoDataContext dbContext)
+        public static bool CanDelete(this DeviceModel dm, DiscoDataContext Database)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Config.DeviceModel.Delete))
+                return false;
+
             // Can't Delete Default Model (Id: 1)
             if (dm.Id == 1)
                 return false;
 
             // Can't Delete if Contains Devices
-            if (dbContext.Devices.Count(d => d.DeviceModelId == dm.Id) > 0)
+            if (Database.Devices.Count(d => d.DeviceModelId == dm.Id) > 0)
                 return false;
 
             return true;
         }
-        public static void Delete(this DeviceModel dm, DiscoDataContext dbContext)
+        public static void Delete(this DeviceModel dm, DiscoDataContext Database)
         {
-            if (!dm.CanDelete(dbContext))
+            if (!dm.CanDelete(Database))
                 throw new InvalidOperationException("The state of this Device Model doesn't allow it to be deleted");
 
             // Delete Image
@@ -97,13 +101,13 @@ namespace Disco.BI.Extensions
                 File.Delete(deviceModelImagePath);
 
             // Delete any Device Model Components
-            foreach (var deviceModelComponent in dbContext.DeviceComponents.Where(dc => dc.DeviceModelId == dm.Id).ToList())
+            foreach (var deviceModelComponent in Database.DeviceComponents.Where(dc => dc.DeviceModelId == dm.Id).ToList())
             {
-                dbContext.DeviceComponents.Remove(deviceModelComponent);
+                Database.DeviceComponents.Remove(deviceModelComponent);
             }
 
             // Delete Model
-            dbContext.DeviceModels.Remove(dm);
+            Database.DeviceModels.Remove(dm);
         }
         // End Added 2012-11-26 G#
         #endregion
diff --git a/Disco.BI/BI/Extensions/DeviceProfileExtensions.cs b/Disco.BI/BI/Extensions/DeviceProfileExtensions.cs
index 20537ffe..c339317c 100644
--- a/Disco.BI/BI/Extensions/DeviceProfileExtensions.cs
+++ b/Disco.BI/BI/Extensions/DeviceProfileExtensions.cs
@@ -6,6 +6,8 @@ using Disco.Models.Repository;
 using Disco.Data.Repository;
 using Disco.Data.Configuration.Modules;
 using Disco.Models.BI.Config;
+using Disco.Services.Users;
+using Disco.Services.Authorization;
 
 namespace Disco.BI.Extensions
 {
@@ -18,11 +20,11 @@ namespace Disco.BI.Extensions
             Expressions.ExpressionCache.InvalidateKey(ComputerNameExpressionCacheModule, deviceProfile.Id.ToString());
         }
 
-        public static OrganisationAddress DefaultOrganisationAddressDetails(this DeviceProfile deviceProfile, DiscoDataContext dbContext)
+        public static OrganisationAddress DefaultOrganisationAddressDetails(this DeviceProfile deviceProfile, DiscoDataContext Database)
         {
             if (deviceProfile.DefaultOrganisationAddress.HasValue)
             {
-                return dbContext.DiscoConfiguration.OrganisationAddresses.GetAddress(deviceProfile.DefaultOrganisationAddress.Value);
+                return Database.DiscoConfiguration.OrganisationAddresses.GetAddress(deviceProfile.DefaultOrganisationAddress.Value);
             }
             else
             {
@@ -30,38 +32,35 @@ namespace Disco.BI.Extensions
             }
         }
 
-        public static bool CanDelete(this DeviceProfile dp, DiscoDataContext dbContext)
+        public static bool CanDelete(this DeviceProfile dp, DiscoDataContext Database)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Config.DeviceProfile.Delete))
+                return false;
+
             // Can't Delete Default Profile (Id: 1)
             if (dp.Id == 1)
                 return false;
 
             // Can't Delete if Contains Devices
-            if (dbContext.Devices.Count(d => d.DeviceProfileId == dp.Id) > 0)
+            if (Database.Devices.Count(d => d.DeviceProfileId == dp.Id) > 0)
                 return false;
 
             return true;
         }
-        public static void Delete(this DeviceProfile dp, DiscoDataContext dbContext)
+        public static void Delete(this DeviceProfile dp, DiscoDataContext Database)
         {
-            if (!dp.CanDelete(dbContext))
+            if (!dp.CanDelete(Database))
                 throw new InvalidOperationException("The state of this Device Profile doesn't allow it to be deleted");
 
             // Update Defaults
-            if (dbContext.DiscoConfiguration.DeviceProfiles.DefaultDeviceProfileId == dp.Id)
-                dbContext.DiscoConfiguration.DeviceProfiles.DefaultDeviceProfileId = 1;
-            if (dbContext.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId == dp.Id)
-                dbContext.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId = 1;
+            if (Database.DiscoConfiguration.DeviceProfiles.DefaultDeviceProfileId == dp.Id)
+                Database.DiscoConfiguration.DeviceProfiles.DefaultDeviceProfileId = 1;
+            if (Database.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId == dp.Id)
+                Database.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId = 1;
 
             // Delete Profile
-            dbContext.DeviceProfiles.Remove(dp);
+            Database.DeviceProfiles.Remove(dp);
         }
 
-        // Removed 2012-06-14 G# - Properties moved to DeviceProfile model & DB Migrated in DBv3.
-        //public static DeviceProfileConfiguration Configuration(this DeviceProfile dp, DiscoDataContext dbContext)
-        //{
-        //    return dbContext.DiscoConfiguration.DeviceProfiles.DeviceProfile(dp);
-        //}
-
     }
 }
diff --git a/Disco.BI/BI/Extensions/DocumentTemplateExtensions.cs b/Disco.BI/BI/Extensions/DocumentTemplateExtensions.cs
index 2318dc25..1fafd3e0 100644
--- a/Disco.BI/BI/Extensions/DocumentTemplateExtensions.cs
+++ b/Disco.BI/BI/Extensions/DocumentTemplateExtensions.cs
@@ -19,13 +19,13 @@ namespace Disco.BI.Extensions
     {
         private const string DocumentTemplateExpressionCacheTemplate = "DocumentTemplate_{0}";
 
-        public static string RepositoryFilename(this DocumentTemplate dt, DiscoDataContext dbContext)
+        public static string RepositoryFilename(this DocumentTemplate dt, DiscoDataContext Database)
         {
-            return System.IO.Path.Combine(DataStore.CreateLocation(dbContext, "DocumentTemplates"), string.Format("{0}.pdf", dt.Id));
+            return System.IO.Path.Combine(DataStore.CreateLocation(Database, "DocumentTemplates"), string.Format("{0}.pdf", dt.Id));
         }
-        public static string SavePdfTemplate(this DocumentTemplate dt, DiscoDataContext dbContext, Stream TemplateFile)
+        public static string SavePdfTemplate(this DocumentTemplate dt, DiscoDataContext Database, Stream TemplateFile)
         {
-            string filePath = dt.RepositoryFilename(dbContext);
+            string filePath = dt.RepositoryFilename(Database);
             using (FileStream fs = new FileStream(filePath, FileMode.Create, FileAccess.Write))
             {
                 TemplateFile.CopyTo(fs);
@@ -39,14 +39,14 @@ namespace Disco.BI.Extensions
             return Interop.Pdf.PdfImporter.GetPageImages(pdfReader, PageNumber);
         }
 
-        public static ConcurrentDictionary<string, Expression> PdfExpressionsFromCache(this DocumentTemplate dt, DiscoDataContext dbContext)
+        public static ConcurrentDictionary<string, Expression> PdfExpressionsFromCache(this DocumentTemplate dt, DiscoDataContext Database)
         {
             string cacheModuleKey = string.Format(DocumentTemplateExpressionCacheTemplate, dt.Id);
             var module = Expressions.ExpressionCache.GetModule(cacheModuleKey);
             if (module == null)
             {
                 // Cache
-                string templateFilename = dt.RepositoryFilename(dbContext);
+                string templateFilename = dt.RepositoryFilename(Database);
                 PdfReader pdfReader = new PdfReader(templateFilename);
                 int pdfFieldOrdinal = 0;
                 foreach (string pdfFieldKey in pdfReader.AcroFields.Fields.Keys)
@@ -61,21 +61,21 @@ namespace Disco.BI.Extensions
             return module;
         }
 
-        public static List<BI.Expressions.Expression> ExtractPdfExpressions(this DocumentTemplate dt, DiscoDataContext dbContext)
+        public static List<BI.Expressions.Expression> ExtractPdfExpressions(this DocumentTemplate dt, DiscoDataContext Database)
         {
-            return dt.PdfExpressionsFromCache(dbContext).Values.OrderBy(e => e.Ordinal).ToList();
+            return dt.PdfExpressionsFromCache(Database).Values.OrderBy(e => e.Ordinal).ToList();
         }
-        public static System.IO.Stream GeneratePdfBulk(this DocumentTemplate dt, DiscoDataContext dbContext, User CreatorUser, System.DateTime Timestamp, params string[] DataObjectsIds)
+        public static System.IO.Stream GeneratePdfBulk(this DocumentTemplate dt, DiscoDataContext Database, User CreatorUser, System.DateTime Timestamp, params string[] DataObjectsIds)
         {
-            return Interop.Pdf.PdfGenerator.GenerateBulkFromTemplate(dt, dbContext, CreatorUser, Timestamp, DataObjectsIds);
+            return Interop.Pdf.PdfGenerator.GenerateBulkFromTemplate(dt, Database, CreatorUser, Timestamp, DataObjectsIds);
         }
-        public static System.IO.Stream GeneratePdfBulk(this DocumentTemplate dt, DiscoDataContext dbContext, User CreatorUser, System.DateTime Timestamp, params object[] DataObjects)
+        public static System.IO.Stream GeneratePdfBulk(this DocumentTemplate dt, DiscoDataContext Database, User CreatorUser, System.DateTime Timestamp, params object[] DataObjects)
         {
-            return Interop.Pdf.PdfGenerator.GenerateBulkFromTemplate(dt, dbContext, CreatorUser, Timestamp, DataObjects);
+            return Interop.Pdf.PdfGenerator.GenerateBulkFromTemplate(dt, Database, CreatorUser, Timestamp, DataObjects);
         }
-        public static System.IO.Stream GeneratePdf(this DocumentTemplate dt, DiscoDataContext dbContext, object Data, User CreatorUser, System.DateTime TimeStamp, DocumentState State, bool FlattenFields = false)
+        public static System.IO.Stream GeneratePdf(this DocumentTemplate dt, DiscoDataContext Database, object Data, User CreatorUser, System.DateTime TimeStamp, DocumentState State, bool FlattenFields = false)
         {
-            return Interop.Pdf.PdfGenerator.GenerateFromTemplate(dt, dbContext, Data, CreatorUser, TimeStamp, State, FlattenFields);
+            return Interop.Pdf.PdfGenerator.GenerateFromTemplate(dt, Database, Data, CreatorUser, TimeStamp, State, FlattenFields);
         }
 
         public static Expression FilterExpressionFromCache(this DocumentTemplate dt)
@@ -86,12 +86,12 @@ namespace Disco.BI.Extensions
         {
             ExpressionCache.InvalidateKey("DocumentTemplateFilterExpression", dt.Id);
         }
-        public static bool FilterExpressionMatches(this DocumentTemplate dt, object Data, DiscoDataContext DataContext, User User, System.DateTime TimeStamp, DocumentState State)
+        public static bool FilterExpressionMatches(this DocumentTemplate dt, object Data, DiscoDataContext Database, User User, System.DateTime TimeStamp, DocumentState State)
         {
             if (!string.IsNullOrEmpty(dt.FilterExpression))
             {
                 Expression compiledExpression = dt.FilterExpressionFromCache();
-                System.Collections.IDictionary evaluatorVariables = Expression.StandardVariables(dt, DataContext, User, TimeStamp, State);
+                System.Collections.IDictionary evaluatorVariables = Expression.StandardVariables(dt, Database, User, TimeStamp, State);
                 try
                 {
                     object er = compiledExpression.EvaluateFirst<object>(Data, evaluatorVariables);
@@ -170,14 +170,14 @@ namespace Disco.BI.Extensions
                 Page
             );
         }
-        public static List<RectangleF> QRCodeLocations(this DocumentTemplate dt, DiscoDataContext dbContext)
+        public static List<RectangleF> QRCodeLocations(this DocumentTemplate dt, DiscoDataContext Database)
         {
-            return DocumentTemplateBI.DocumentTemplateQRCodeLocationCache.GetLocations(dt, dbContext);
+            return DocumentTemplateBI.DocumentTemplateQRCodeLocationCache.GetLocations(dt, Database);
         }
-        public static void Delete(this DocumentTemplate dt, DiscoDataContext Context)
+        public static void Delete(this DocumentTemplate dt, DiscoDataContext Database)
         {
             // Find & Rename all references
-            foreach (DeviceAttachment a in Context.DeviceAttachments.Where(a => a.DocumentTemplateId == dt.Id))
+            foreach (DeviceAttachment a in Database.DeviceAttachments.Where(a => a.DocumentTemplateId == dt.Id))
             {
                 a.Comments = string.Format("{0} - {1}", dt.Description, a.Comments);
                 if (a.Comments.Length > 500)
@@ -185,7 +185,7 @@ namespace Disco.BI.Extensions
                 a.DocumentTemplateId = null;
                 a.DocumentTemplate = null;
             }
-            foreach (JobAttachment a in Context.JobAttachments.Where(a => a.DocumentTemplateId == dt.Id))
+            foreach (JobAttachment a in Database.JobAttachments.Where(a => a.DocumentTemplateId == dt.Id))
             {
                 a.Comments = string.Format("{0} - {1}", dt.Description, a.Comments);
                 if (a.Comments.Length > 500)
@@ -193,7 +193,7 @@ namespace Disco.BI.Extensions
                 a.DocumentTemplateId = null;
                 a.DocumentTemplate = null;
             }
-            foreach (UserAttachment a in Context.UserAttachments.Where(a => a.DocumentTemplateId == dt.Id))
+            foreach (UserAttachment a in Database.UserAttachments.Where(a => a.DocumentTemplateId == dt.Id))
             {
                 a.Comments = string.Format("{0} - {1}", dt.Description, a.Comments);
                 if (a.Comments.Length > 500)
@@ -206,7 +206,7 @@ namespace Disco.BI.Extensions
             dt.JobSubTypes.Clear();
 
             // Delete Template
-            string templateRepositoryFilename = dt.RepositoryFilename(Context);
+            string templateRepositoryFilename = dt.RepositoryFilename(Database);
             if (System.IO.File.Exists(templateRepositoryFilename))
                 System.IO.File.Delete(templateRepositoryFilename);
 
@@ -214,7 +214,7 @@ namespace Disco.BI.Extensions
             dt.FilterExpressionInvalidateCache();
 
             // Delete Document Template from Repository
-            Context.DocumentTemplates.Remove(dt);
+            Database.DocumentTemplates.Remove(dt);
         }
     }
 }
diff --git a/Disco.BI/BI/Extensions/JobActionExtensions.cs b/Disco.BI/BI/Extensions/JobActionExtensions.cs
index bd75644d..14b3be1e 100644
--- a/Disco.BI/BI/Extensions/JobActionExtensions.cs
+++ b/Disco.BI/BI/Extensions/JobActionExtensions.cs
@@ -6,6 +6,8 @@ using Disco.Models.BI.Config;
 using Disco.Models.Repository;
 using Disco.Services.Plugins;
 using Disco.Services.Plugins.Features.WarrantyProvider;
+using Disco.Services.Users;
+using Disco.Services.Authorization;
 
 namespace Disco.BI.Extensions
 {
@@ -15,6 +17,9 @@ namespace Disco.BI.Extensions
         #region Device Held
         public static bool CanDeviceHeld(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Properties.DeviceHeld))
+                return false;
+
             return (!j.ClosedDate.HasValue) && (j.DeviceSerialNumber != null) &&
                 (!j.DeviceHeld.HasValue || j.DeviceReturnedDate.HasValue);
         }
@@ -35,6 +40,9 @@ namespace Disco.BI.Extensions
         #region Device Ready for Return
         public static bool CanDeviceReadyForReturn(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Properties.DeviceReadyForReturn))
+                return false;
+
             return (!j.ClosedDate.HasValue) && j.DeviceHeld.HasValue &&
                 !j.DeviceReadyForReturn.HasValue && !j.DeviceReturnedDate.HasValue;
         }
@@ -51,6 +59,9 @@ namespace Disco.BI.Extensions
         #region Device Returned
         public static bool CanDeviceReturned(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Properties.DeviceReturned))
+                return false;
+
             return (!j.ClosedDate.HasValue) && j.DeviceHeld.HasValue &&
                 !j.DeviceReturnedDate.HasValue;
         }
@@ -67,9 +78,12 @@ namespace Disco.BI.Extensions
         #region Waiting For User Action
         public static bool CanWaitingForUserAction(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Properties.WaitingForUserAction))
+                return false;
+
             return !j.ClosedDate.HasValue && (j.UserId != null) && !j.WaitingForUserAction.HasValue;
         }
-        public static void OnWaitingForUserAction(this Job j, DiscoDataContext dbContext, User Technician, string Reason)
+        public static void OnWaitingForUserAction(this Job j, DiscoDataContext Database, User Technician, string Reason)
         {
             if (!j.CanWaitingForUserAction())
                 throw new InvalidOperationException("Waiting for User Action was Denied");
@@ -84,16 +98,19 @@ namespace Disco.BI.Extensions
                 Timestamp = DateTime.Now,
                 Comments = string.Format("Waiting on User Action{0}Reason: {1}", Environment.NewLine, Reason)
             };
-            dbContext.JobLogs.Add(jobLog);
+            Database.JobLogs.Add(jobLog);
         }
         #endregion
 
         #region Not Waiting For User Action
         public static bool CanNotWaitingForUserAction(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Properties.NotWaitingForUserAction))
+                return false;
+
             return j.WaitingForUserAction.HasValue;
         }
-        public static void OnNotWaitingForUserAction(this Job j, DiscoDataContext dbContext, User Technician, string Resolution)
+        public static void OnNotWaitingForUserAction(this Job j, DiscoDataContext Database, User Technician, string Resolution)
         {
             if (!j.CanNotWaitingForUserAction())
                 throw new InvalidOperationException("Not Waiting for User Action was Denied");
@@ -108,31 +125,34 @@ namespace Disco.BI.Extensions
                 Timestamp = DateTime.Now,
                 Comments = string.Format("User Action Resolved{0}Resolution: {1}", Environment.NewLine, Resolution)
             };
-            dbContext.JobLogs.Add(jobLog);
+            Database.JobLogs.Add(jobLog);
         }
         #endregion
 
         #region Log Warranty
         public static bool CanLogWarranty(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Actions.LogWarranty))
+                return false;
+            
             return !j.ClosedDate.HasValue &&
                 (j.DeviceSerialNumber != null) &&
                 j.JobTypeId == JobType.JobTypeIds.HWar &&
                 string.IsNullOrEmpty(j.JobMetaWarranty.ExternalReference);
         }
-        public static void OnLogWarranty(this Job j, DiscoDataContext dbContext, string FaultDescription, PluginFeatureManifest WarrantyProviderDefinition, OrganisationAddress Address, User TechUser, Dictionary<string, string> WarrantyProviderProperties)
+        public static void OnLogWarranty(this Job j, DiscoDataContext Database, string FaultDescription, PluginFeatureManifest WarrantyProviderDefinition, OrganisationAddress Address, User TechUser, Dictionary<string, string> WarrantyProviderProperties)
         {
             if (!j.CanLogWarranty())
                 throw new InvalidOperationException("Log Warranty was Denied");
 
             if (string.IsNullOrWhiteSpace(FaultDescription))
-                FaultDescription = j.GenerateFaultDescriptionFooter(dbContext, WarrantyProviderDefinition);
+                FaultDescription = j.GenerateFaultDescriptionFooter(Database, WarrantyProviderDefinition);
             else
-                FaultDescription = string.Concat(FaultDescription, Environment.NewLine, Environment.NewLine, j.GenerateFaultDescriptionFooter(dbContext, WarrantyProviderDefinition));
+                FaultDescription = string.Concat(FaultDescription, Environment.NewLine, Environment.NewLine, j.GenerateFaultDescriptionFooter(Database, WarrantyProviderDefinition));
 
             using (WarrantyProviderFeature WarrantyProvider = WarrantyProviderDefinition.CreateInstance<WarrantyProviderFeature>())
             {
-                string providerRef = WarrantyProvider.SubmitJob(dbContext, j, Address, TechUser, FaultDescription, WarrantyProviderProperties);
+                string providerRef = WarrantyProvider.SubmitJob(Database, j, Address, TechUser, FaultDescription, WarrantyProviderProperties);
 
                 j.JobMetaWarranty.ExternalLoggedDate = DateTime.Now;
                 j.JobMetaWarranty.ExternalName = WarrantyProvider.WarrantyProviderId;
@@ -150,7 +170,7 @@ namespace Disco.BI.Extensions
                     Timestamp = DateTime.Now,
                     Comments = string.Format("Warranty Claim Submitted{0}{0}Provider: {1}{0}Repair Address: {2}{0}Provider Reference: {3}{0}{0}{4}", Environment.NewLine, WarrantyProvider.Manifest.Name, Address.Name, providerRef, FaultDescription)
                 };
-                dbContext.JobLogs.Add(jobLog);
+                Database.JobLogs.Add(jobLog);
             }
         }
         #endregion
@@ -158,32 +178,35 @@ namespace Disco.BI.Extensions
         #region Convert HWar to HNWar
         public static bool CanConvertHWarToHNWar(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Actions.ConvertHWarToHNWar))
+                return false;
+
             return !j.ClosedDate.HasValue && (j.DeviceSerialNumber != null) &&
                 j.JobTypeId == JobType.JobTypeIds.HWar && string.IsNullOrEmpty(j.JobMetaWarranty.ExternalReference);
         }
-        public static void OnConvertHWarToHNWar(this Job j, DiscoDataContext dbContext)
+        public static void OnConvertHWarToHNWar(this Job j, DiscoDataContext Database)
         {
             if (!j.CanConvertHWarToHNWar())
                 throw new InvalidOperationException("Convert HWar to HNWar was Denied");
 
-            var techUser = UserBI.UserCache.CurrentUser;
+            var techUser = UserService.CurrentUser;
 
             // Remove JobMetaWarranty
             if (j.JobMetaWarranty != null)
-                dbContext.JobMetaWarranties.Remove(j.JobMetaWarranty);
+                Database.JobMetaWarranties.Remove(j.JobMetaWarranty);
 
             // Add JobMetaNonWarranty
             var metaHNWar = new JobMetaNonWarranty() { Job = j };
-            dbContext.JobMetaNonWarranties.Add(metaHNWar);
+            Database.JobMetaNonWarranties.Add(metaHNWar);
 
             // Swap Job Sub Types
             List<string> jobSubTypes = j.JobSubTypes.Select(jst => jst.Id).ToList();
             j.JobSubTypes.Clear();
-            foreach (var jst in dbContext.JobSubTypes.Where(i => i.JobTypeId == JobType.JobTypeIds.HNWar && jobSubTypes.Contains(i.Id)))
+            foreach (var jst in Database.JobSubTypes.Where(i => i.JobTypeId == JobType.JobTypeIds.HNWar && jobSubTypes.Contains(i.Id)))
                 j.JobSubTypes.Add(jst);
 
             // Add Components
-            var components = dbContext.DeviceComponents.Include("JobSubTypes").Where(c => !c.DeviceModelId.HasValue || c.DeviceModelId == j.Device.DeviceModelId);
+            var components = Database.DeviceComponents.Include("JobSubTypes").Where(c => !c.DeviceModelId.HasValue || c.DeviceModelId == j.Device.DeviceModelId);
             var jobComponents = new List<DeviceComponent>();
             foreach (var component in components)
             {
@@ -210,7 +233,7 @@ namespace Disco.BI.Extensions
             }
             foreach (var component in jobComponents)
             {
-                dbContext.JobComponents.Add(new JobComponent()
+                Database.JobComponents.Add(new JobComponent()
                 {
                     Job = j,
                     TechUserId = techUser.Id,
@@ -225,9 +248,9 @@ namespace Disco.BI.Extensions
                 JobId = j.Id,
                 TechUserId = techUser.Id,
                 Timestamp = DateTime.Now,
-                Comments = string.Format("Job Type Converted{0}From: {1}{0}To: {2}", Environment.NewLine, dbContext.JobTypes.Find(JobType.JobTypeIds.HWar), dbContext.JobTypes.Find(JobType.JobTypeIds.HNWar))
+                Comments = string.Format("Job Type Converted{0}From: {1}{0}To: {2}", Environment.NewLine, Database.JobTypes.Find(JobType.JobTypeIds.HWar), Database.JobTypes.Find(JobType.JobTypeIds.HNWar))
             };
-            dbContext.JobLogs.Add(jobLog);
+            Database.JobLogs.Add(jobLog);
 
             j.JobTypeId = JobType.JobTypeIds.HNWar;
         }
@@ -252,6 +275,9 @@ namespace Disco.BI.Extensions
         #region Insurance Claim Form Sent
         public static bool CanInsuranceClaimFormSent(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Properties.NonWarrantyProperties.InsuranceClaimFormSent))
+                return false;
+
             return (j.JobTypeId == JobType.JobTypeIds.HNWar) &&
                 j.JobMetaNonWarranty.IsInsuranceClaim &&
                 !j.JobMetaInsurance.ClaimFormSentDate.HasValue;
@@ -261,7 +287,7 @@ namespace Disco.BI.Extensions
             if (!j.CanInsuranceClaimFormSent())
                 throw new InvalidOperationException("Insurance Claim Form Sent was Denied");
 
-            var techUser = UserBI.UserCache.CurrentUser;
+            var techUser = UserService.CurrentUser;
 
             j.JobMetaInsurance.ClaimFormSentDate = DateTime.Now;
             j.JobMetaInsurance.ClaimFormSentUserId = techUser.Id;
@@ -271,6 +297,9 @@ namespace Disco.BI.Extensions
         #region Log Repair
         public static bool CanLogRepair(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Actions.LogRepair))
+                return false;
+
             return (j.JobTypeId == JobType.JobTypeIds.HNWar) &&
                 (j.DeviceSerialNumber != null) &&
                 !j.JobMetaNonWarranty.RepairerLoggedDate.HasValue &&
@@ -292,6 +321,9 @@ namespace Disco.BI.Extensions
         #region Repair Complete
         public static bool CanRepairComplete(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Properties.NonWarrantyProperties.RepairerCompletedDate))
+                return false;
+
             return (j.JobTypeId == JobType.JobTypeIds.HNWar) &&
                 j.JobMetaNonWarranty.RepairerLoggedDate.HasValue &&
                 !j.JobMetaNonWarranty.RepairerCompletedDate.HasValue;
@@ -308,6 +340,9 @@ namespace Disco.BI.Extensions
         #region Close
         public static bool CanClose(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Actions.Close))
+                return false;
+
             if (j.ClosedDate.HasValue)
                 return false; // Job already Closed
 
@@ -352,6 +387,9 @@ namespace Disco.BI.Extensions
         #region Force Close
         public static bool CanForceClose(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Actions.ForceClose))
+                return false;
+
             var canCloseNormally = j.CanClose();
 
             if (canCloseNormally)
@@ -389,7 +427,7 @@ namespace Disco.BI.Extensions
 
             return false;
         }
-        public static void OnForceClose(this Job j, DiscoDataContext dbContext, User Technician, string Reason)
+        public static void OnForceClose(this Job j, DiscoDataContext Database, User Technician, string Reason)
         {
             if (!j.CanForceClose())
                 throw new InvalidOperationException("Force Close was Denied");
@@ -402,7 +440,7 @@ namespace Disco.BI.Extensions
                 Timestamp = DateTime.Now,
                 Comments = string.Format("Job Forcibly Closed{0}Reason: {1}", Environment.NewLine, Reason)
             };
-            dbContext.JobLogs.Add(jobLog);
+            Database.JobLogs.Add(jobLog);
 
             j.ClosedDate = DateTime.Now;
             j.ClosedTechUserId = Technician.Id;
@@ -412,6 +450,9 @@ namespace Disco.BI.Extensions
         #region Reopen
         public static bool CanReopen(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Actions.Reopen))
+                return false;
+
             return j.ClosedDate.HasValue;
         }
         public static void OnReopen(this Job j)
@@ -427,47 +468,50 @@ namespace Disco.BI.Extensions
         #region Delete
         public static bool CanDelete(this Job j)
         {
+            if (!UserService.CurrentAuthorization.Has(Claims.Job.Actions.Delete))
+                return false;
+
             return j.ClosedDate.HasValue;
         }
-        public static void OnDelete(this Job j, DiscoDataContext dbContext)
+        public static void OnDelete(this Job j, DiscoDataContext Database)
         {
             // Job Sub Types
             j.JobSubTypes.Clear();
 
             // Job Attachments
             foreach (var ja in j.JobAttachments.ToArray())
-                ja.OnDelete(dbContext);
+                ja.OnDelete(Database);
             j.JobAttachments.Clear();
 
             // Job Components
             foreach (var jc in j.JobComponents.ToArray())
-                dbContext.JobComponents.Remove(jc);
+                Database.JobComponents.Remove(jc);
             j.JobComponents.Clear();
 
             // Job Logs
             foreach (var jl in j.JobLogs.ToArray())
-                dbContext.JobLogs.Remove(jl);
+                Database.JobLogs.Remove(jl);
             j.JobLogs.Clear();
 
             // Job Meta
             if (j.JobMetaInsurance != null)
             {
-                dbContext.JobMetaInsurances.Remove(j.JobMetaInsurance);
+                Database.JobMetaInsurances.Remove(j.JobMetaInsurance);
                 j.JobMetaInsurance = null;
             }
             if (j.JobMetaNonWarranty != null)
             {
-                dbContext.JobMetaNonWarranties.Remove(j.JobMetaNonWarranty);
+                Database.JobMetaNonWarranties.Remove(j.JobMetaNonWarranty);
                 j.JobMetaNonWarranty = null;
             }
             if (j.JobMetaWarranty != null)
             {
-                dbContext.JobMetaWarranties.Remove(j.JobMetaWarranty);
+                Database.JobMetaWarranties.Remove(j.JobMetaWarranty);
                 j.JobMetaWarranty = null;
             }
 
             // Job
-            dbContext.Jobs.Remove(j);
+            Database.Jobs.Remove(j);
         }
         #endregion
     }
diff --git a/Disco.BI/BI/Extensions/JobExtensions.cs b/Disco.BI/BI/Extensions/JobExtensions.cs
index f9c6d219..edb4513b 100644
--- a/Disco.BI/BI/Extensions/JobExtensions.cs
+++ b/Disco.BI/BI/Extensions/JobExtensions.cs
@@ -13,7 +13,7 @@ namespace Disco.BI.Extensions
 {
     public static class JobExtensions
     {
-        public static JobAttachment CreateAttachment(this Job Job, DiscoDataContext dbContext, User CreatorUser, string Filename, string MimeType, string Comments, Stream Content, DocumentTemplate DocumentTemplate = null, byte[] PdfThumbnail = null)
+        public static JobAttachment CreateAttachment(this Job Job, DiscoDataContext Database, User CreatorUser, string Filename, string MimeType, string Comments, Stream Content, DocumentTemplate DocumentTemplate = null, byte[] PdfThumbnail = null)
         {
             if (string.IsNullOrEmpty(MimeType) || MimeType.Equals("unknown/unknown", StringComparison.InvariantCultureIgnoreCase))
                 MimeType = Interop.MimeTypes.ResolveMimeType(Filename);
@@ -31,15 +31,15 @@ namespace Disco.BI.Extensions
             if (DocumentTemplate != null)
                 ja.DocumentTemplateId = DocumentTemplate.Id;
 
-            dbContext.JobAttachments.Add(ja);
-            dbContext.SaveChanges();
+            Database.JobAttachments.Add(ja);
+            Database.SaveChanges();
 
-            ja.SaveAttachment(dbContext, Content);
+            ja.SaveAttachment(Database, Content);
             Content.Position = 0;
             if (PdfThumbnail == null)
-                ja.GenerateThumbnail(dbContext, Content);
+                ja.GenerateThumbnail(Database, Content);
             else
-                ja.SaveThumbnailAttachment(dbContext, PdfThumbnail);
+                ja.SaveThumbnailAttachment(Database, PdfThumbnail);
 
             return ja;
         }
@@ -146,9 +146,9 @@ namespace Disco.BI.Extensions
             return Job.JobStatusIds.Open;
         }
 
-        public static List<DocumentTemplate> AvailableDocumentTemplates(this Job j, DiscoDataContext dbContext, User User, DateTime TimeStamp)
+        public static List<DocumentTemplate> AvailableDocumentTemplates(this Job j, DiscoDataContext Database, User User, DateTime TimeStamp)
         {
-            var dts = dbContext.DocumentTemplates.Include("JobSubTypes")
+            var dts = Database.DocumentTemplates.Include("JobSubTypes")
                 .Where(dt => dt.Scope == DocumentTemplate.DocumentTemplateScopes.Job)
                 .ToList();
 
@@ -171,7 +171,7 @@ namespace Disco.BI.Extensions
             }
 
             // Evaluate Filters
-            dts = dts.Where(dt => dt.FilterExpressionMatches(j, dbContext, User, TimeStamp, DocumentState.DefaultState())).ToList();
+            dts = dts.Where(dt => dt.FilterExpressionMatches(j, Database, User, TimeStamp, DocumentState.DefaultState())).ToList();
 
             return dts;
         }
@@ -188,7 +188,7 @@ namespace Disco.BI.Extensions
             return d;
         }
 
-        public static string GenerateFaultDescription(this Job j, DiscoDataContext dbContext)
+        public static string GenerateFaultDescription(this Job j, DiscoDataContext Database)
         {
             StringBuilder sb = new StringBuilder();
 
@@ -199,14 +199,14 @@ namespace Disco.BI.Extensions
             return sb.ToString();
         }
 
-        public static string GenerateFaultDescriptionFooter(this Job j, DiscoDataContext dbContext, PluginFeatureManifest WarrantyProviderDefinition)
+        public static string GenerateFaultDescriptionFooter(this Job j, DiscoDataContext Database, PluginFeatureManifest WarrantyProviderDefinition)
         {
             var versionDisco = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
             return string.Format("Automation by Disco v{0}.{1}.{2:0000}.{3:0000} (Provider: {4} v{5})",
                 versionDisco.Major, versionDisco.Minor, versionDisco.Build, versionDisco.Revision, WarrantyProviderDefinition.Id, WarrantyProviderDefinition.PluginManifest.Version.ToString(4));
         }
 
-        public static void UpdateSubTypes(this Job j, DiscoDataContext dbContext, List<JobSubType> SubTypes, bool AddComponents, User TechUser)
+        public static void UpdateSubTypes(this Job j, DiscoDataContext Database, List<JobSubType> SubTypes, bool AddComponents, User TechUser)
         {
             if (SubTypes == null || SubTypes.Count == 0)
                 throw new ArgumentException("The Job must contain at least one Sub Type");
@@ -246,7 +246,7 @@ namespace Disco.BI.Extensions
                     foreach (var t in addedSubTypes)
                         logBuilder.Append("- ").AppendLine(t.ToString());
                 }
-                dbContext.JobLogs.Add(new JobLog()
+                Database.JobLogs.Add(new JobLog()
                 {
                     JobId = j.Id,
                     TechUserId = TechUser.Id,
@@ -258,7 +258,7 @@ namespace Disco.BI.Extensions
             // Add Components
             if (AddComponents && addedSubTypes.Count > 0 && j.DeviceSerialNumber != null)
             {
-                var components = dbContext.DeviceComponents.Include("JobSubTypes").Where(c => !c.DeviceModelId.HasValue || c.DeviceModelId == j.Device.DeviceModelId);
+                var components = Database.DeviceComponents.Include("JobSubTypes").Where(c => !c.DeviceModelId.HasValue || c.DeviceModelId == j.Device.DeviceModelId);
                 var addedComponents = new List<DeviceComponent>();
                 foreach (var c in components)
                 {
@@ -280,7 +280,7 @@ namespace Disco.BI.Extensions
                 {
                     if (!j.JobComponents.Any(jc => jc.Description.Equals(c.Description, StringComparison.InvariantCultureIgnoreCase)))
                     { // Job Component with matching Description doesn't exist.
-                        dbContext.JobComponents.Add(new JobComponent()
+                        Database.JobComponents.Add(new JobComponent()
                         {
                             Job = j,
                             TechUserId = TechUser.Id,
diff --git a/Disco.BI/BI/Extensions/JobTableExtensions.cs b/Disco.BI/BI/Extensions/JobTableExtensions.cs
index f7981f63..381daa56 100644
--- a/Disco.BI/BI/Extensions/JobTableExtensions.cs
+++ b/Disco.BI/BI/Extensions/JobTableExtensions.cs
@@ -5,16 +5,94 @@ using System.Text;
 using Disco.Models.BI.Job;
 using Disco.Models.Repository;
 using Disco.Data.Repository;
+using Disco.Services.Users;
+using Disco.Services.Authorization;
 
 namespace Disco.BI.Extensions
 {
     public static class JobTableExtensions
     {
+        private static List<string> FilterAllowedTypes(AuthorizationToken Authorization)
+        {
+            if (!Authorization.HasAll(Claims.Job.Types.ShowHMisc, Claims.Job.Types.ShowHNWar, Claims.Job.Types.ShowHWar, Claims.Job.Types.ShowSApp, Claims.Job.Types.ShowSImg, Claims.Job.Types.ShowSOS, Claims.Job.Types.ShowUMgmt))
+            {
+                // Must Filter
+                List<string> allowedTypes = new List<string>(6);
+                if (Authorization.Has(Claims.Job.Types.ShowHMisc))
+                    allowedTypes.Add(JobType.JobTypeIds.HMisc);
+                if (Authorization.Has(Claims.Job.Types.ShowHNWar))
+                    allowedTypes.Add(JobType.JobTypeIds.HNWar);
+                if (Authorization.Has(Claims.Job.Types.ShowHWar))
+                    allowedTypes.Add(JobType.JobTypeIds.HWar);
+                if (Authorization.Has(Claims.Job.Types.ShowSApp))
+                    allowedTypes.Add(JobType.JobTypeIds.SApp);
+                if (Authorization.Has(Claims.Job.Types.ShowSImg))
+                    allowedTypes.Add(JobType.JobTypeIds.SImg);
+                if (Authorization.Has(Claims.Job.Types.ShowSOS))
+                    allowedTypes.Add(JobType.JobTypeIds.SOS);
+                if (Authorization.Has(Claims.Job.Types.ShowUMgmt))
+                    allowedTypes.Add(JobType.JobTypeIds.UMgmt);
 
-        public static List<JobTableModel.JobTableItemModel> DetermineItems(this JobTableModel model, DiscoDataContext dbContext, IQueryable<Job> Jobs)
+                return allowedTypes;
+            }
+            return null;
+        }
+
+        public static IQueryable<Job> FilterPermissions(this JobTableModel model, IQueryable<Job> Jobs, AuthorizationToken Authorization)
+        {
+            var allowedTypes = FilterAllowedTypes(Authorization);
+
+            if (allowedTypes != null)
+            {
+                return Jobs.Where(j => allowedTypes.Contains(j.JobTypeId));
+            }
+
+            return Jobs;
+        }
+
+        public static List<JobTableModel.JobTableItemModel> PermissionsFiltered(this List<JobTableModel.JobTableItemModel> Items, AuthorizationToken Authorization)
+        {
+            if (Items != null && Items.Count > 0)
+            {
+                var allowedTypes = FilterAllowedTypes(Authorization);
+
+                if (allowedTypes != null)
+                {
+                    return Items.Where(j => allowedTypes.Contains(j.TypeId)).ToList();
+                }
+            }
+
+            return Items;
+        }
+
+        public static List<JobTableModel.JobTableItemModel> DetermineItems(this JobTableModel model, DiscoDataContext Database, IQueryable<Job> Jobs)
         {
             List<JobTableModel.JobTableItemModel> items;
 
+            // Permissions
+            var auth = UserService.CurrentAuthorization;
+            if (!auth.HasAll(Claims.Job.Types.ShowHMisc, Claims.Job.Types.ShowHNWar, Claims.Job.Types.ShowHWar, Claims.Job.Types.ShowSApp, Claims.Job.Types.ShowSImg, Claims.Job.Types.ShowSOS, Claims.Job.Types.ShowUMgmt))
+            {
+                // Must Filter
+                List<string> allowedTypes = new List<string>(6);
+                if (auth.Has(Claims.Job.Types.ShowHMisc))
+                    allowedTypes.Add(JobType.JobTypeIds.HMisc);
+                if (auth.Has(Claims.Job.Types.ShowHNWar))
+                    allowedTypes.Add(JobType.JobTypeIds.HNWar);
+                if (auth.Has(Claims.Job.Types.ShowHWar))
+                    allowedTypes.Add(JobType.JobTypeIds.HWar);
+                if (auth.Has(Claims.Job.Types.ShowSApp))
+                    allowedTypes.Add(JobType.JobTypeIds.SApp);
+                if (auth.Has(Claims.Job.Types.ShowSImg))
+                    allowedTypes.Add(JobType.JobTypeIds.SImg);
+                if (auth.Has(Claims.Job.Types.ShowSOS))
+                    allowedTypes.Add(JobType.JobTypeIds.SOS);
+                if (auth.Has(Claims.Job.Types.ShowUMgmt))
+                    allowedTypes.Add(JobType.JobTypeIds.UMgmt);
+
+                Jobs = Jobs.Where(j => allowedTypes.Contains(j.JobTypeId));
+            }
+
             if (model.ShowStatus)
             {
 
@@ -86,18 +164,18 @@ namespace Disco.BI.Extensions
             }
 
             if (!model.ShowDeviceAddress.HasValue)
-                model.ShowDeviceAddress = dbContext.DiscoConfiguration.MultiSiteMode;
+                model.ShowDeviceAddress = Database.DiscoConfiguration.MultiSiteMode;
 
             foreach (var j in items)
                 if (j.DeviceAddressId.HasValue)
-                    j.DeviceAddress = dbContext.DiscoConfiguration.OrganisationAddresses.GetAddress(j.DeviceAddressId.Value).Name;
+                    j.DeviceAddress = Database.DiscoConfiguration.OrganisationAddresses.GetAddress(j.DeviceAddressId.Value).Name;
 
             return items;
         }
 
-        public static void Fill(this JobTableModel model, DiscoDataContext dbContext, IQueryable<Job> Jobs)
+        public static void Fill(this JobTableModel model, DiscoDataContext Database, IQueryable<Job> Jobs)
         {
-            model.Items = model.DetermineItems(dbContext, Jobs);
+            model.Items = model.DetermineItems(Database, Jobs);
         }
     }
 }
diff --git a/Disco.BI/BI/Extensions/UserExtensions.cs b/Disco.BI/BI/Extensions/UserExtensions.cs
index 37cc30df..8fd01e00 100644
--- a/Disco.BI/BI/Extensions/UserExtensions.cs
+++ b/Disco.BI/BI/Extensions/UserExtensions.cs
@@ -12,7 +12,7 @@ namespace Disco.BI.Extensions
 {
     public static class UserExtensions
     {
-        public static UserAttachment CreateAttachment(this User User, DiscoDataContext dbContext, User CreatorUser, string Filename, string MimeType, string Comments, Stream Content, DocumentTemplate DocumentTemplate = null, byte[] PdfThumbnail = null)
+        public static UserAttachment CreateAttachment(this User User, DiscoDataContext Database, User CreatorUser, string Filename, string MimeType, string Comments, Stream Content, DocumentTemplate DocumentTemplate = null, byte[] PdfThumbnail = null)
         {
             if (string.IsNullOrEmpty(MimeType) || MimeType.Equals("unknown/unknown", StringComparison.InvariantCultureIgnoreCase))
                 MimeType = Interop.MimeTypes.ResolveMimeType(Filename);
@@ -30,25 +30,25 @@ namespace Disco.BI.Extensions
             if (DocumentTemplate != null)
                 ua.DocumentTemplateId = DocumentTemplate.Id;
 
-            dbContext.UserAttachments.Add(ua);
-            dbContext.SaveChanges();
+            Database.UserAttachments.Add(ua);
+            Database.SaveChanges();
 
-            ua.SaveAttachment(dbContext, Content);
+            ua.SaveAttachment(Database, Content);
             Content.Position = 0;
             if (PdfThumbnail == null)
-                ua.GenerateThumbnail(dbContext, Content);
+                ua.GenerateThumbnail(Database, Content);
             else
-                ua.SaveThumbnailAttachment(dbContext, PdfThumbnail);
+                ua.SaveThumbnailAttachment(Database, PdfThumbnail);
 
             return ua;
         }
 
-        public static List<DocumentTemplate> AvailableDocumentTemplates(this User u, DiscoDataContext dbContext, User User, DateTime TimeStamp)
+        public static List<DocumentTemplate> AvailableDocumentTemplates(this User u, DiscoDataContext Database, User User, DateTime TimeStamp)
         {
-            var dts = dbContext.DocumentTemplates.Include("JobSubTypes")
+            var dts = Database.DocumentTemplates.Include("JobSubTypes")
                .Where(dt => dt.Scope == DocumentTemplate.DocumentTemplateScopes.User)
                .ToArray()
-               .Where(dt => dt.FilterExpressionMatches(u, dbContext, User, TimeStamp, DocumentState.DefaultState())).ToList();
+               .Where(dt => dt.FilterExpressionMatches(u, Database, User, TimeStamp, DocumentState.DefaultState())).ToList();
 
             return dts;
         }
diff --git a/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectory.cs b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectory.cs
index c91df41f..d9cccfec 100644
--- a/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectory.cs
+++ b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectory.cs
@@ -12,6 +12,17 @@ namespace Disco.BI.Interop.ActiveDirectory
 {
     public static class ActiveDirectory
     {
+        #region Machine Accounts
+
+        private static readonly string[] MachineLoadProperties = {
+                                                                     "name",
+                                                                     "distinguishedName",
+                                                                     "sAMAccountName",
+                                                                     "objectSid",
+                                                                     "dNSHostName",
+                                                                     "netbootGUID",
+                                                                     "isCriticalSystemObject"
+                                                                 };
         public static ActiveDirectoryMachineAccount GetMachineAccount(string ComputerName, System.Guid? UUIDNetbootGUID = null, System.Guid? MacAddressNetbootGUID = null, params string[] AdditionalProperties)
         {
             if (string.IsNullOrWhiteSpace(ComputerName))
@@ -26,36 +37,36 @@ namespace Disco.BI.Interop.ActiveDirectory
 
             using (DirectoryEntry dRootEntry = ActiveDirectoryHelpers.DefaultLdapRoot)
             {
-                var loadProperties = new List<string> { "name", "distinguishedName", "sAMAccountName", "objectSid", "dNSHostName", "netbootGUID", "isCriticalSystemObject" };
-                loadProperties.AddRange(AdditionalProperties);
-                using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(objectClass=computer)(sAMAccountName={0}))", ActiveDirectoryHelpers.EscapeLdapQuery(sAMAccountName)), loadProperties.ToArray(), SearchScope.Subtree))
+                var loadProperties = AdditionalProperties == null ? MachineLoadProperties : MachineLoadProperties.Concat(AdditionalProperties).ToArray();
+                
+                using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(objectCategory=computer)(sAMAccountName={0}))", ActiveDirectoryHelpers.EscapeLdapQuery(sAMAccountName)), loadProperties, SearchScope.Subtree))
                 {
                     SearchResult dResult = dSearcher.FindOne();
                     if (dResult != null)
                     {
-                        return ActiveDirectory.DirectorySearchResultToMachineAccount(dResult, AdditionalProperties);
+                        return ActiveDirectory.ActiveDirectoryMachineAccountFromSearchResult(dResult, AdditionalProperties);
                     }
                 }
 
                 if (UUIDNetbootGUID.HasValue)
                 {
-                    using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(objectClass=computer)(netbootGUID={0}))", ActiveDirectoryHelpers.FormatGuidForLdapQuery(UUIDNetbootGUID.Value)), loadProperties.ToArray(), SearchScope.Subtree))
+                    using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(objectCategory=computer)(netbootGUID={0}))", ActiveDirectoryHelpers.FormatGuidForLdapQuery(UUIDNetbootGUID.Value)), loadProperties, SearchScope.Subtree))
                     {
                         SearchResult dResult = dSearcher.FindOne();
                         if (dResult != null)
                         {
-                            return ActiveDirectory.DirectorySearchResultToMachineAccount(dResult, AdditionalProperties);
+                            return ActiveDirectory.ActiveDirectoryMachineAccountFromSearchResult(dResult, AdditionalProperties);
                         }
                     }
                 }
                 if (MacAddressNetbootGUID.HasValue)
                 {
-                    using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(objectClass=computer)(netbootGUID={0}))", ActiveDirectoryHelpers.FormatGuidForLdapQuery(MacAddressNetbootGUID.Value)), loadProperties.ToArray(), SearchScope.Subtree))
+                    using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(objectCategory=computer)(netbootGUID={0}))", ActiveDirectoryHelpers.FormatGuidForLdapQuery(MacAddressNetbootGUID.Value)), loadProperties, SearchScope.Subtree))
                     {
                         SearchResult dResult = dSearcher.FindOne();
                         if (dResult != null)
                         {
-                            return ActiveDirectory.DirectorySearchResultToMachineAccount(dResult, AdditionalProperties);
+                            return ActiveDirectory.ActiveDirectoryMachineAccountFromSearchResult(dResult, AdditionalProperties);
                         }
                     }
                 }
@@ -64,7 +75,7 @@ namespace Disco.BI.Interop.ActiveDirectory
 
             return null;
         }
-        private static ActiveDirectoryMachineAccount DirectorySearchResultToMachineAccount(SearchResult result, params string[] AdditionalProperties)
+        private static ActiveDirectoryMachineAccount ActiveDirectoryMachineAccountFromSearchResult(SearchResult result, params string[] AdditionalProperties)
         {
             string name = result.Properties["name"][0].ToString();
             string sAMAccountName = result.Properties["sAMAccountName"][0].ToString();
@@ -89,21 +100,22 @@ namespace Disco.BI.Interop.ActiveDirectory
 
             // Additional Properties
             Dictionary<string, object[]> additionalProperties = new Dictionary<string, object[]>();
-            foreach (string propertyName in AdditionalProperties)
-            {
-                var property = result.Properties[propertyName];
-                var propertyValues = new List<object>();
-                for (int index = 0; index < property.Count; index++)
-                    propertyValues.Add(property[index]);
-                additionalProperties.Add(propertyName, propertyValues.ToArray());
-            }
+            if (AdditionalProperties != null)
+                foreach (string propertyName in AdditionalProperties)
+                {
+                    var property = result.Properties[propertyName];
+                    var propertyValues = new List<object>();
+                    for (int index = 0; index < property.Count; index++)
+                        propertyValues.Add(property[index]);
+                    additionalProperties.Add(propertyName, propertyValues.ToArray());
+                }
 
             return new ActiveDirectoryMachineAccount
             {
                 Name = name,
                 DistinguishedName = distinguishedName,
-                sAMAccountName = sAMAccountName,
-                ObjectSid = objectSid,
+                SamAccountName = sAMAccountName,
+                SecurityIdentifier = objectSid,
                 NetbootGUID = netbootGUIDResult,
                 Path = result.Path,
                 Domain = ActiveDirectoryHelpers.DefaultDomainNetBiosName,
@@ -112,132 +124,9 @@ namespace Disco.BI.Interop.ActiveDirectory
                 LoadedProperties = additionalProperties
             };
         }
-        private static ActiveDirectoryUserAccount SearchResultToActiveDirectoryUserAccount(SearchResult result, params string[] AdditionalProperties)
-        {
-            string name = result.Properties["name"][0].ToString();
-            string username = result.Properties["sAMAccountName"][0].ToString();
-            string distinguishedName = result.Properties["distinguishedName"][0].ToString();
-            byte[] objectSid = (byte[])result.Properties["objectSid"][0];
-            string objectSidSDDL = ActiveDirectoryHelpers.ConvertBytesToSDDLString(objectSid);
 
-            ResultPropertyValueCollection displayNameProp = result.Properties["displayName"];
-            string displayName = username;
-            if (displayNameProp.Count > 0)
-                displayName = displayNameProp[0].ToString();
-            string surname = null;
-            ResultPropertyValueCollection surnameProp = result.Properties["sn"];
-            if (surnameProp.Count > 0)
-                surname = surnameProp[0].ToString();
-            string givenName = null;
-            ResultPropertyValueCollection givenNameProp = result.Properties["givenName"];
-            if (givenNameProp.Count > 0)
-                givenName = givenNameProp[0].ToString();
-            string email = null;
-            ResultPropertyValueCollection emailProp = result.Properties["mail"];
-            if (emailProp.Count > 0)
-                email = emailProp[0].ToString();
-            string phone = null;
-            ResultPropertyValueCollection phoneProp = result.Properties["telephoneNumber"];
-            if (phoneProp.Count > 0)
-                phone = phoneProp[0].ToString();
+        #endregion
 
-            int primaryGroupID = (int)result.Properties["primaryGroupID"][0];
-            string primaryGroupSid = ActiveDirectoryHelpers.ConvertBytesToSDDLString(ActiveDirectoryHelpers.BuildPrimaryGroupSid(objectSid, primaryGroupID));
-            var groupCNs = result.Properties["memberOf"].Cast<string>().ToList();
-            groupCNs.Add(ActiveDirectoryCachedGroups.GetGroupsCnForSid(primaryGroupSid));
-            List<string> groups = ActiveDirectoryCachedGroups.GetGroups(groupCNs).Select(g => g.ToLower()).ToList();
-
-            //foreach (string groupCN in result.Properties["memberOf"])
-            //{
-            // Removed 2012-11-30 G# - Moved to Recursive Cache
-            //var groupCNlower = groupCN.ToLower();
-            //if (groupCNlower.StartsWith("cn="))
-            //    groups.Add(groupCNlower.Substring(3, groupCNlower.IndexOf(",") - 3));
-            // End Removed 2012-11-30 G#
-            //}
-
-            string type = null;
-            if (groups.Contains("domain admins") || groups.Contains("disco admins"))
-            {
-                type = "Admin";
-            }
-            else
-            {
-                if (groups.Contains("staff"))
-                {
-                    type = "Staff";
-                }
-                else
-                {
-                    if (groups.Contains("students"))
-                    {
-                        type = "Student";
-                    }
-                }
-            }
-
-            // Additional Properties
-            Dictionary<string, object[]> additionalProperties = new Dictionary<string, object[]>();
-            foreach (string propertyName in AdditionalProperties)
-            {
-                var property = result.Properties[propertyName];
-                var propertyValues = new List<object>();
-                for (int index = 0; index < property.Count; index++)
-                    propertyValues.Add(property[index]);
-                additionalProperties.Add(propertyName, propertyValues.ToArray());
-            }
-
-            return new ActiveDirectoryUserAccount
-            {
-                Domain = ActiveDirectoryHelpers.DefaultDomainNetBiosName,
-                Name = name,
-                Surname = surname,
-                GivenName = givenName,
-                Email = email,
-                Phone = phone,
-                DistinguishedName = distinguishedName,
-                sAMAccountName = username,
-                DisplayName = displayName,
-                ObjectSid = objectSidSDDL,
-                Type = type,
-                Path = result.Path,
-                LoadedProperties = additionalProperties
-            };
-        }
-        public static ActiveDirectoryUserAccount GetUserAccount(string Username, params string[] AdditionalProperties)
-        {
-            if (string.IsNullOrWhiteSpace(Username))
-                throw new System.ArgumentException("Invalid User Account", "Username");
-            string sAMAccountName = Username;
-            if (sAMAccountName.Contains("\\"))
-                sAMAccountName = sAMAccountName.Substring(checked(sAMAccountName.IndexOf("\\") + 1));
-
-            using (DirectoryEntry dRootEntry = ActiveDirectoryHelpers.DefaultLdapRoot)
-            {
-                var loadProperties = new List<string> {
-                    "name", 
-					"distinguishedName", 
-					"sAMAccountName", 
-					"objectSid", 
-					"displayName", 
-					"sn", 
-					"givenName", 
-					"memberOf", 
-					"primaryGroupID",
-                    "mail", 
-					"telephoneNumber"
-                };
-                loadProperties.AddRange(AdditionalProperties);
-                using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(objectClass=user)(sAMAccountName={0}))", ActiveDirectoryHelpers.EscapeLdapQuery(sAMAccountName)), loadProperties.ToArray(), SearchScope.Subtree))
-                {
-                    SearchResult dResult = dSearcher.FindOne();
-                    if (dResult != null)
-                        return ActiveDirectory.SearchResultToActiveDirectoryUserAccount(dResult, AdditionalProperties);
-                    else
-                        return null;
-                }
-            }
-        }
         public static string OfflineDomainJoinProvision(ref ActiveDirectoryMachineAccount ExistingAccount, string ComputerName, string OrganisationalUnit = null, string EnrolSessionId = null)
         {
             if (ExistingAccount != null && ExistingAccount.IsCriticalSystemObject)
@@ -323,6 +212,21 @@ namespace Disco.BI.Interop.ActiveDirectory
             return DJoinResult;
         }
 
+        #region Users
+
+        private static readonly string[] UserLoadProperties = {
+                                                                   "name", 
+                                                                   "distinguishedName", 
+                                                                   "sAMAccountName", 
+                                                                   "objectSid", 
+                                                                   "displayName", 
+                                                                   "sn", 
+                                                                   "givenName", 
+                                                                   "memberOf", 
+                                                                   "primaryGroupID",
+                                                                   "mail", 
+                                                                   "telephoneNumber"
+                                                               };
         public static List<ActiveDirectoryUserAccount> SearchUsers(string term)
         {
             List<ActiveDirectoryUserAccount> users = new List<ActiveDirectoryUserAccount>();
@@ -331,31 +235,118 @@ namespace Disco.BI.Interop.ActiveDirectory
             term = ActiveDirectoryHelpers.EscapeLdapQuery(term);
             using (DirectoryEntry entry = new DirectoryEntry(string.Format("LDAP://{0}", defaultQualifiedDomainName)))
             {
-                using (DirectorySearcher searcher = new DirectorySearcher(entry, string.Format("(&(objectClass=User)(objectCategory=Person)(|(sAMAccountName=*{0}*)(displayName=*{0}*)))", term), new string[]
-				{
-					"name", 
-					"distinguishedName", 
-					"sAMAccountName", 
-					"objectSid", 
-					"displayName", 
-					"sn", 
-					"givenName", 
-					"memberOf", 
-                    "primaryGroupID",
-					"mail", 
-					"telephoneNumber"
-				}, SearchScope.Subtree))
+                using (DirectorySearcher searcher = new DirectorySearcher(entry, string.Format("(&(objectCategory=Person)(objectCategory=Person)(|(sAMAccountName=*{0}*)(displayName=*{0}*)))", term), UserLoadProperties, SearchScope.Subtree))
                 {
                     searcher.SizeLimit = 30;
                     SearchResultCollection results = searcher.FindAll();
                     foreach (SearchResult result in results)
                     {
-                        users.Add(ActiveDirectory.SearchResultToActiveDirectoryUserAccount(result));
+                        users.Add(ActiveDirectory.ActiveDirectoryUserAccountFromSearchResult(result));
                     }
                 }
             }
             return users;
         }
+        private static ActiveDirectoryUserAccount ActiveDirectoryUserAccountFromSearchResult(SearchResult result, params string[] AdditionalProperties)
+        {
+            string name = result.Properties["name"][0].ToString();
+            string username = result.Properties["sAMAccountName"][0].ToString();
+            string distinguishedName = result.Properties["distinguishedName"][0].ToString();
+            byte[] objectSid = (byte[])result.Properties["objectSid"][0];
+            string objectSidSDDL = ActiveDirectoryHelpers.ConvertBytesToSDDLString(objectSid);
+
+            ResultPropertyValueCollection displayNameProp = result.Properties["displayName"];
+            string displayName = username;
+            if (displayNameProp.Count > 0)
+                displayName = displayNameProp[0].ToString();
+            string surname = null;
+            ResultPropertyValueCollection surnameProp = result.Properties["sn"];
+            if (surnameProp.Count > 0)
+                surname = surnameProp[0].ToString();
+            string givenName = null;
+            ResultPropertyValueCollection givenNameProp = result.Properties["givenName"];
+            if (givenNameProp.Count > 0)
+                givenName = givenNameProp[0].ToString();
+            string email = null;
+            ResultPropertyValueCollection emailProp = result.Properties["mail"];
+            if (emailProp.Count > 0)
+                email = emailProp[0].ToString();
+            string phone = null;
+            ResultPropertyValueCollection phoneProp = result.Properties["telephoneNumber"];
+            if (phoneProp.Count > 0)
+                phone = phoneProp[0].ToString();
+
+            int primaryGroupID = (int)result.Properties["primaryGroupID"][0];
+            string primaryGroupSid = ActiveDirectoryHelpers.ConvertBytesToSDDLString(ActiveDirectoryHelpers.BuildPrimaryGroupSid(objectSid, primaryGroupID));
+            var groupDistinguishedNames = result.Properties["memberOf"].Cast<string>().ToList();
+            groupDistinguishedNames.Add(ActiveDirectoryCachedGroups.GetGroupsDistinguishedNameForSecurityIdentifier(primaryGroupSid));
+            List<string> groups = ActiveDirectoryCachedGroups.GetGroups(groupDistinguishedNames).ToList();
+
+            //foreach (string groupCN in result.Properties["memberOf"])
+            //{
+            // Removed 2012-11-30 G# - Moved to Recursive Cache
+            //var groupCNlower = groupCN.ToLower();
+            //if (groupCNlower.StartsWith("cn="))
+            //    groups.Add(groupCNlower.Substring(3, groupCNlower.IndexOf(",") - 3));
+            // End Removed 2012-11-30 G#
+            //}
+
+            // Additional Properties
+            Dictionary<string, object[]> additionalProperties = new Dictionary<string, object[]>();
+            if (AdditionalProperties != null)
+                foreach (string propertyName in AdditionalProperties)
+                {
+                    var property = result.Properties[propertyName];
+                    var propertyValues = new List<object>();
+                    for (int index = 0; index < property.Count; index++)
+                        propertyValues.Add(property[index]);
+                    additionalProperties.Add(propertyName, propertyValues.ToArray());
+                }
+
+            return new ActiveDirectoryUserAccount
+            {
+                Domain = ActiveDirectoryHelpers.DefaultDomainNetBiosName,
+                Name = name,
+                Surname = surname,
+                GivenName = givenName,
+                Email = email,
+                Phone = phone,
+                DistinguishedName = distinguishedName,
+                SamAccountName = username,
+                DisplayName = displayName,
+                SecurityIdentifier = objectSidSDDL,
+                Groups = groups,
+                Path = result.Path,
+                LoadedProperties = additionalProperties
+            };
+        }
+        public static ActiveDirectoryUserAccount GetUserAccount(string Username, params string[] AdditionalProperties)
+        {
+            if (string.IsNullOrWhiteSpace(Username))
+                throw new System.ArgumentException("Invalid User Account", "Username");
+            string sAMAccountName = Username;
+            if (sAMAccountName.Contains("\\"))
+                sAMAccountName = sAMAccountName.Substring(checked(sAMAccountName.IndexOf("\\") + 1));
+
+            using (DirectoryEntry dRootEntry = ActiveDirectoryHelpers.DefaultLdapRoot)
+            {
+                var loadProperties = AdditionalProperties == null ? UserLoadProperties : UserLoadProperties.Concat(AdditionalProperties).ToArray();
+
+                using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(objectCategory=Person)(sAMAccountName={0}))", ActiveDirectoryHelpers.EscapeLdapQuery(sAMAccountName)), loadProperties, SearchScope.Subtree))
+                {
+                    SearchResult dResult = dSearcher.FindOne();
+                    if (dResult != null)
+                        return ActiveDirectory.ActiveDirectoryUserAccountFromSearchResult(dResult, AdditionalProperties);
+                    else
+                        return null;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Organisation Units
+
         public static List<ActiveDirectoryOrganisationalUnit> GetOrganisationalUnitStructure()
         {
             ActiveDirectoryOrganisationalUnit DomainOUs = new ActiveDirectoryOrganisationalUnit
@@ -399,5 +390,173 @@ namespace Disco.BI.Interop.ActiveDirectory
             }
 
         }
+
+        #endregion
+
+        #region Groups
+
+        private static readonly string[] GroupLoadProperties = {
+                                                                   "name", 
+                                                                   "distinguishedName", 
+                                                                   "cn", 
+                                                                   "sAMAccountName", 
+                                                                   "objectSid", 
+                                                                   "memberOf"
+                                                               };
+        public static ActiveDirectoryGroup GetGroup(string SamAccountName)
+        {
+            if (string.IsNullOrWhiteSpace(SamAccountName))
+                throw new System.ArgumentException("Invalid Group Account", "SamAccountName");
+            string sAMAccountName = SamAccountName;
+            if (sAMAccountName.Contains("\\"))
+                sAMAccountName = sAMAccountName.Substring(checked(sAMAccountName.IndexOf("\\") + 1));
+
+            using (DirectoryEntry dRootEntry = ActiveDirectoryHelpers.DefaultLdapRoot)
+            {
+                using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(objectCategory=Group)(objectSid={0}))", ActiveDirectoryHelpers.EscapeLdapQuery(sAMAccountName)), GroupLoadProperties, SearchScope.Subtree))
+                {
+                    SearchResult dResult = dSearcher.FindOne();
+                    if (dResult != null)
+                    {
+                        return ActiveDirectoryGroupFromSearchResult(dResult);
+                    }
+                    else
+                        return null;
+                }
+            }
+        }
+        public static ActiveDirectoryGroup GetGroupFromDistinguishedName(string DistinguishedName)
+        {
+            ActiveDirectoryGroup group = null;
+
+            using (DirectoryEntry groupDE = new DirectoryEntry(string.Concat(ActiveDirectoryHelpers.DefaultLdapPath, DistinguishedName)))
+            {
+                if (groupDE != null)
+                {
+                    return ActiveDirectoryGroupFromDirectoryEntry(groupDE);
+                }
+            }
+
+            return group;
+        }
+        public static ActiveDirectoryGroup GetGroupFromSecurityIdentifier(string SecurityIdentifier)
+        {
+            using (DirectoryEntry dRootEntry = ActiveDirectoryHelpers.DefaultLdapRoot)
+            {
+                var sidBytes = ActiveDirectoryHelpers.ConvertSDDLStringToBytes(SecurityIdentifier);
+                var sidBinaryString = ActiveDirectoryHelpers.ConvertBytesToBinarySidString(sidBytes);
+
+                using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(objectCategory=Group)(objectSid={0}))", sidBinaryString), GroupLoadProperties, SearchScope.Subtree))
+                {
+                    SearchResult dResult = dSearcher.FindOne();
+                    if (dResult != null)
+                    {
+                        return ActiveDirectoryGroupFromSearchResult(dResult);
+                    }
+                    else
+                        return null;
+                }
+            }
+        }
+
+        public static List<ActiveDirectoryGroup> SearchGroups(string term)
+        {
+            List<ActiveDirectoryGroup> results = new List<ActiveDirectoryGroup>();
+            string defaultQualifiedDomainName = ActiveDirectoryHelpers.DefaultDomainQualifiedName;
+            string defaultNetBiosDomainName = ActiveDirectoryHelpers.DefaultDomainNetBiosName;
+            term = ActiveDirectoryHelpers.EscapeLdapQuery(term);
+            using (DirectoryEntry entry = new DirectoryEntry(string.Format("LDAP://{0}", defaultQualifiedDomainName)))
+            {
+                using (DirectorySearcher searcher = new DirectorySearcher(entry, string.Format("(&(objectCategory=Group)(|(sAMAccountName=*{0}*)(name=*{0}*)(cn=*{0}*)))", term), GroupLoadProperties, SearchScope.Subtree))
+                {
+                    searcher.SizeLimit = 30;
+                    SearchResultCollection searchResults = searcher.FindAll();
+                    foreach (SearchResult result in searchResults)
+                    {
+                        results.Add(ActiveDirectory.ActiveDirectoryGroupFromSearchResult(result));
+                    }
+                }
+            }
+            return results;
+        }
+
+        private static ActiveDirectoryGroup ActiveDirectoryGroupFromDirectoryEntry(DirectoryEntry entry)
+        {
+            var name = (string)entry.Properties["name"].Value;
+            var distinguishedName = (string)entry.Properties["distinguishedName"].Value;
+            var cn = (string)entry.Properties["cn"].Value;
+            var sAMAccountName = (string)entry.Properties["sAMAccountName"].Value;
+            var objectSid = ActiveDirectoryHelpers.ConvertBytesToSDDLString((byte[])entry.Properties["objectSid"].Value);
+            var memberOf = entry.Properties["memberOf"].Cast<string>().ToList();
+
+            return new ActiveDirectoryGroup()
+            {
+                Name = name,
+                DistinguishedName = distinguishedName,
+                CommonName = cn,
+                SamAccountName = sAMAccountName,
+                SecurityIdentifier = objectSid,
+                MemberOf = memberOf
+            };
+        }
+        private static ActiveDirectoryGroup ActiveDirectoryGroupFromSearchResult(SearchResult result)
+        {
+            var name = (string)result.Properties["name"][0];
+            var distinguishedName = (string)result.Properties["distinguishedName"][0];
+            var cn = (string)result.Properties["cn"][0];
+            var sAMAccountName = (string)result.Properties["sAMAccountName"][0];
+            var objectSid = ActiveDirectoryHelpers.ConvertBytesToSDDLString((byte[])result.Properties["objectSid"][0]);
+            var memberOf = result.Properties["memberOf"].Cast<string>().ToList();
+
+            return new ActiveDirectoryGroup()
+            {
+                Name = name,
+                DistinguishedName = distinguishedName,
+                CommonName = cn,
+                SamAccountName = sAMAccountName,
+                SecurityIdentifier = objectSid,
+                MemberOf = memberOf
+            };
+        }
+
+        #endregion
+
+        private static readonly string[] ObjectLoadProperties = { "objectCategory" };
+        private static readonly string[] ObjectLoadPropertiesAll = ObjectLoadProperties.Concat(UserLoadProperties).Concat(MachineLoadProperties).Concat(GroupLoadProperties).Distinct().ToArray();
+
+        public static IActiveDirectoryObject GetObject(string SamAccountName)
+        {
+            if (string.IsNullOrWhiteSpace(SamAccountName))
+                throw new System.ArgumentException("Invalid Object Account Name", "SamAccountName");
+            string sAMAccountName = SamAccountName;
+            if (sAMAccountName.Contains("\\"))
+                sAMAccountName = sAMAccountName.Substring(checked(sAMAccountName.IndexOf("\\") + 1));
+
+            using (DirectoryEntry dRootEntry = ActiveDirectoryHelpers.DefaultLdapRoot)
+            {
+                using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(|(objectCategory=Person)(objectCategory=Computer)(objectCategory=Group))(sAMAccountName={0}))", ActiveDirectoryHelpers.EscapeLdapQuery(sAMAccountName)), ObjectLoadPropertiesAll, SearchScope.Subtree))
+                {
+                    SearchResult dResult = dSearcher.FindOne();
+                    if (dResult != null)
+                    {
+                        var objectCategory = (string)dResult.Properties["objectCategory"][0];
+                        objectCategory = objectCategory.Substring(0, objectCategory.IndexOf(',')).ToLower();
+                        switch (objectCategory)
+                        {
+                            case "cn=person":
+                                return ActiveDirectoryUserAccountFromSearchResult(dResult);
+                            case "cn=computer":
+                                return ActiveDirectoryMachineAccountFromSearchResult(dResult);
+                            case "cn=group":
+                                return ActiveDirectoryGroupFromSearchResult(dResult);
+                            default:
+                                throw new InvalidOperationException("Unexpected objectCategory");
+                        }
+                    }
+                    else
+                        return null;
+                }
+            }
+        }
     }
 }
diff --git a/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryCachedGroups.cs b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryCachedGroups.cs
index e1e2892b..abbb510a 100644
--- a/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryCachedGroups.cs
+++ b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryCachedGroups.cs
@@ -8,43 +8,44 @@ using System.Threading.Tasks;
 using Disco.Data.Repository;
 using Disco.Services.Tasks;
 using Quartz;
+using Disco.Models.Interop.ActiveDirectory;
 
 namespace Disco.BI.Interop.ActiveDirectory
 {
     public class ActiveDirectoryCachedGroups : ScheduledTask
     {
-        private static ConcurrentDictionary<string, Tuple<ADCachedGroup, DateTime>> _SidCache = new ConcurrentDictionary<string, Tuple<ADCachedGroup, DateTime>>();
-        private static ConcurrentDictionary<string, Tuple<ADCachedGroup, DateTime>> _Cache = new ConcurrentDictionary<string, Tuple<ADCachedGroup, DateTime>>();
+        private static ConcurrentDictionary<string, Tuple<ActiveDirectoryGroup, DateTime>> _SecurityIdentifierCache = new ConcurrentDictionary<string, Tuple<ActiveDirectoryGroup, DateTime>>();
+        private static ConcurrentDictionary<string, Tuple<ActiveDirectoryGroup, DateTime>> _DistinguishedNameCache = new ConcurrentDictionary<string, Tuple<ActiveDirectoryGroup, DateTime>>();
         private const long CacheTimeoutTicks = 6000000000; // 10 Minutes
 
-        public static IEnumerable<string> GetGroups(IEnumerable<string> GroupCNs)
+        public static IEnumerable<string> GetGroups(IEnumerable<string> DistinguishedNames)
         {
-            List<ADCachedGroup> groups = new List<ADCachedGroup>();
+            List<ActiveDirectoryGroup> groups = new List<ActiveDirectoryGroup>();
 
-            foreach (var groupCN in GroupCNs)
-                foreach (var group in GetGroupsRecursive(groupCN, new Stack<ADCachedGroup>()))
+            foreach (var distinguishedName in DistinguishedNames)
+                foreach (var group in GetGroupsRecursive(distinguishedName, new Stack<ActiveDirectoryGroup>()))
                     if (!groups.Contains(group))
                     {
                         groups.Add(group);
-                        yield return group.FriendlyName;
+                        yield return group.SamAccountName;
                     }
         }
-        public static IEnumerable<string> GetGroups(string GroupCN)
+        public static IEnumerable<string> GetGroups(string DistinguishedName)
         {
-            foreach (var group in GetGroupsRecursive(GroupCN, new Stack<ADCachedGroup>()))
-                yield return group.FriendlyName;
+            foreach (var group in GetGroupsRecursive(DistinguishedName, new Stack<ActiveDirectoryGroup>()))
+                yield return group.SamAccountName;
         }
-        public static string GetGroupsCnForSid(string GroupSid)
+        public static string GetGroupsDistinguishedNameForSecurityIdentifier(string SecurityIdentifier)
         {
-            var sidGroup = GetGroupBySid(GroupSid);
-            if (sidGroup == null)
+            var group = GetGroupBySecurityIdentifier(SecurityIdentifier);
+            if (group == null)
                 return null;
             else
-                return sidGroup.CN;
+                return group.DistinguishedName;
         }
-        private static IEnumerable<ADCachedGroup> GetGroupsRecursive(string GroupCN, Stack<ADCachedGroup> RecursiveTree)
+        private static IEnumerable<ActiveDirectoryGroup> GetGroupsRecursive(string DistinguishedName, Stack<ActiveDirectoryGroup> RecursiveTree)
         {
-            var group = GetGroup(GroupCN);
+            var group = GetGroup(DistinguishedName);
 
             if (group != null && !RecursiveTree.Contains(group))
             {
@@ -54,24 +55,24 @@ namespace Disco.BI.Interop.ActiveDirectory
                 {
                     RecursiveTree.Push(group);
 
-                    foreach (var memberOfGroupCN in group.MemberOf)
-                        foreach (var memberOfGroup in GetGroupsRecursive(memberOfGroupCN, RecursiveTree))
-                            yield return memberOfGroup;
+                    foreach (var parentDistinguishedName in group.MemberOf)
+                        foreach (var parentGroup in GetGroupsRecursive(parentDistinguishedName, RecursiveTree))
+                            yield return parentGroup;
 
                     RecursiveTree.Pop();
                 }
             }
         }
 
-        private static ADCachedGroup GetGroup(string GroupCN)
+        private static ActiveDirectoryGroup GetGroup(string DistinguishedName)
         {
             // Check Cache
-            Tuple<ADCachedGroup, DateTime> groupRecord = TryCache(GroupCN);
+            Tuple<ActiveDirectoryGroup, DateTime> groupRecord = TryCache(DistinguishedName);
 
             if (groupRecord == null)
             {
                 // Load from AD
-                var group = ADCachedGroup.LoadWithCN(GroupCN);
+                var group = ActiveDirectory.GetGroupFromDistinguishedName(DistinguishedName);
                 SetValue(group);
 
                 return group;
@@ -82,15 +83,15 @@ namespace Disco.BI.Interop.ActiveDirectory
                 return groupRecord.Item1;
             }
         }
-        private static ADCachedGroup GetGroupBySid(string GroupSid)
+        private static ActiveDirectoryGroup GetGroupBySecurityIdentifier(string SecurityIdentifier)
         {
             // Check Cache
-            Tuple<ADCachedGroup, DateTime> groupRecord = TrySidCache(GroupSid);
+            Tuple<ActiveDirectoryGroup, DateTime> groupRecord = TrySecurityIdentifierCache(SecurityIdentifier);
 
             if (groupRecord == null)
             {
                 // Load from AD
-                var group = ADCachedGroup.LoadWithSid(GroupSid);
+                var group = ActiveDirectory.GetGroupFromSecurityIdentifier(SecurityIdentifier);
                 SetValue(group);
 
                 return group;
@@ -102,177 +103,96 @@ namespace Disco.BI.Interop.ActiveDirectory
             }
         }
 
-        private static Tuple<ADCachedGroup, DateTime> TryCache(string GroupCN)
+        private static Tuple<ActiveDirectoryGroup, DateTime> TryCache(string DistinguishedName)
         {
-            string groupCN = GroupCN.ToLower();
-            Tuple<ADCachedGroup, DateTime> groupRecord;
-            if (_Cache.TryGetValue(groupCN, out groupRecord))
+            string distinguishedName = DistinguishedName.ToLower();
+            Tuple<ActiveDirectoryGroup, DateTime> groupRecord;
+            if (_DistinguishedNameCache.TryGetValue(distinguishedName, out groupRecord))
             {
                 if (groupRecord.Item2 > DateTime.Now)
                     return groupRecord;
                 else
                 {
-                    if (_Cache.TryRemove(groupCN, out groupRecord))
-                        _SidCache.TryRemove(groupRecord.Item1.ObjectSid, out groupRecord);
+                    if (_DistinguishedNameCache.TryRemove(distinguishedName, out groupRecord))
+                        _SecurityIdentifierCache.TryRemove(groupRecord.Item1.SecurityIdentifier, out groupRecord);
                 }
             }
             return null;
         }
-        private static Tuple<ADCachedGroup, DateTime> TrySidCache(string GroupSid)
+        private static Tuple<ActiveDirectoryGroup, DateTime> TrySecurityIdentifierCache(string SecurityIdentifier)
         {
-            Tuple<ADCachedGroup, DateTime> groupRecord;
-            if (_SidCache.TryGetValue(GroupSid, out groupRecord))
+            Tuple<ActiveDirectoryGroup, DateTime> groupRecord;
+            if (_SecurityIdentifierCache.TryGetValue(SecurityIdentifier, out groupRecord))
             {
                 if (groupRecord.Item2 > DateTime.Now)
                     return groupRecord;
                 else
                 {
-                    if (_SidCache.TryRemove(GroupSid, out groupRecord))
-                        _Cache.TryRemove(groupRecord.Item1.CN.ToLower(), out groupRecord);
+                    if (_SecurityIdentifierCache.TryRemove(SecurityIdentifier, out groupRecord))
+                        _DistinguishedNameCache.TryRemove(groupRecord.Item1.DistinguishedName.ToLower(), out groupRecord);
                 }
             }
             return null;
         }
-        private static bool SetValue(ADCachedGroup GroupRecord)
+        private static bool SetValue(ActiveDirectoryGroup Group)
         {
-            Tuple<ADCachedGroup, DateTime> groupRecord = new Tuple<ADCachedGroup, DateTime>(GroupRecord, DateTime.Now.AddTicks(CacheTimeoutTicks));
-            Tuple<ADCachedGroup, DateTime> oldGroupRecord;
+            Tuple<ActiveDirectoryGroup, DateTime> groupRecord = new Tuple<ActiveDirectoryGroup, DateTime>(Group, DateTime.Now.AddTicks(CacheTimeoutTicks));
+            Tuple<ActiveDirectoryGroup, DateTime> oldGroupRecord;
 
-            string key = GroupRecord.CN.ToLower();
-            if (_Cache.ContainsKey(key))
+            string key = Group.DistinguishedName.ToLower();
+            if (_DistinguishedNameCache.ContainsKey(key))
             {
-                if (_Cache.TryGetValue(key, out oldGroupRecord))
+                if (_DistinguishedNameCache.TryGetValue(key, out oldGroupRecord))
                 {
-                    _Cache.TryUpdate(key, groupRecord, oldGroupRecord);
+                    _DistinguishedNameCache.TryUpdate(key, groupRecord, oldGroupRecord);
                 }
             }
             else
             {
-                _Cache.TryAdd(key, groupRecord);
+                _DistinguishedNameCache.TryAdd(key, groupRecord);
             }
 
-            string sid = GroupRecord.ObjectSid;
-            if (_SidCache.ContainsKey(sid))
+            string securityIdentifier = Group.SecurityIdentifier;
+            if (_SecurityIdentifierCache.ContainsKey(securityIdentifier))
             {
-                if (_SidCache.TryGetValue(sid, out oldGroupRecord))
+                if (_SecurityIdentifierCache.TryGetValue(securityIdentifier, out oldGroupRecord))
                 {
-                    _SidCache.TryUpdate(sid, groupRecord, oldGroupRecord);
+                    _SecurityIdentifierCache.TryUpdate(securityIdentifier, groupRecord, oldGroupRecord);
                 }
             }
             else
             {
-                _SidCache.TryAdd(sid, groupRecord);
+                _SecurityIdentifierCache.TryAdd(securityIdentifier, groupRecord);
             }
             return true;
         }
 
-        private class ADCachedGroup
-        {
-            public string ObjectSid { get; set; }
-            public string CN { get; private set; }
-            public string FriendlyName { get; private set; }
-
-            public List<string> MemberOf { get; private set; }
-
-            public static ADCachedGroup LoadWithCN(string CN)
-            {
-                ADCachedGroup group = null;
-
-                using (DirectoryEntry groupDE = new DirectoryEntry(string.Concat(ActiveDirectoryHelpers.DefaultLdapPath, CN)))
-                {
-                    if (groupDE != null)
-                    {
-                        group = new ADCachedGroup()
-                        {
-                            CN = CN
-                        };
-
-                        group.ObjectSid = ActiveDirectoryHelpers.ConvertBytesToSDDLString((byte[])groupDE.Properties["objectSid"].Value);
-                        group.FriendlyName = (string)groupDE.Properties["sAMAccountName"].Value;
-
-                        var groupMemberOf = groupDE.Properties["memberOf"];
-                        if (groupMemberOf != null && groupMemberOf.Count > 0)
-                        {
-                            group.MemberOf = groupMemberOf.Cast<string>().ToList();
-                        }
-                    }
-                }
-
-                return group;
-            }
-
-            public static ADCachedGroup LoadWithSid(string Sid)
-            {
-                using (DirectoryEntry dRootEntry = ActiveDirectoryHelpers.DefaultLdapRoot)
-                {
-                    var loadProperties = new List<string> {
-					"distinguishedName", 
-					"objectSid", 
-                    "sAMAccountName",
-					"memberOf"
-                };
-
-                    var sidBytes = ActiveDirectoryHelpers.ConvertSDDLStringToBytes(Sid);
-                    var sidBinaryString = ActiveDirectoryHelpers.ConvertBytesToBinarySidString(sidBytes);
-
-                    using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(objectClass=group)(objectSid={0}))", sidBinaryString), loadProperties.ToArray(), SearchScope.Subtree))
-                    {
-                        SearchResult dResult = dSearcher.FindOne();
-                        if (dResult != null)
-                        {
-                            var group = new ADCachedGroup()
-                            {
-                                CN = (string)dResult.Properties["distinguishedName"][0],
-                                ObjectSid = ActiveDirectoryHelpers.ConvertBytesToSDDLString((byte[])dResult.Properties["objectSid"][0]),
-                                FriendlyName = (string)dResult.Properties["sAMAccountName"][0]
-                            };
-
-                            var groupMemberOf = dResult.Properties["memberOf"];
-                            if (groupMemberOf != null && groupMemberOf.Count > 0)
-                            {
-                                group.MemberOf = groupMemberOf.Cast<string>().ToList();
-                            }
-
-                            return group;
-                        }
-                        else
-                            return null;
-                    }
-                }
-            }
-
-            private ADCachedGroup()
-            {
-                // Private Constructor
-            }
-        }
-
         private static void CleanStaleCache()
         {
             // Clean Cache
-            var groupKeys = _Cache.Keys.ToArray();
+            var groupKeys = _DistinguishedNameCache.Keys.ToArray();
             foreach (string groupKey in groupKeys)
             {
-                Tuple<ADCachedGroup, DateTime> groupRecord;
-                if (_Cache.TryGetValue(groupKey, out groupRecord))
+                Tuple<ActiveDirectoryGroup, DateTime> groupRecord;
+                if (_DistinguishedNameCache.TryGetValue(groupKey, out groupRecord))
                 {
                     if (groupRecord.Item2 <= DateTime.Now)
                     {
-                        _Cache.TryRemove(groupKey, out groupRecord);
+                        _DistinguishedNameCache.TryRemove(groupKey, out groupRecord);
                     }
                 }
             }
 
             // Clean SID Cache
-            groupKeys = _SidCache.Keys.ToArray();
+            groupKeys = _SecurityIdentifierCache.Keys.ToArray();
             foreach (string groupKey in groupKeys)
             {
-                Tuple<ADCachedGroup, DateTime> groupRecord;
-                if (_SidCache.TryGetValue(groupKey, out groupRecord))
+                Tuple<ActiveDirectoryGroup, DateTime> groupRecord;
+                if (_SecurityIdentifierCache.TryGetValue(groupKey, out groupRecord))
                 {
                     if (groupRecord.Item2 <= DateTime.Now)
                     {
-                        _SidCache.TryRemove(groupKey, out groupRecord);
+                        _SecurityIdentifierCache.TryRemove(groupKey, out groupRecord);
                     }
                 }
             }
@@ -284,7 +204,7 @@ namespace Disco.BI.Interop.ActiveDirectory
         public override bool CancelInitiallySupported { get { return false; } }
         public override bool LogExceptionsOnly { get { return true; } }
 
-        public override void InitalizeScheduledTask(DiscoDataContext dbContext)
+        public override void InitalizeScheduledTask(DiscoDataContext Database)
         {
             // Run @ every 15mins
 
diff --git a/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryGroupExtensions.cs b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryGroupExtensions.cs
new file mode 100644
index 00000000..8de7ad15
--- /dev/null
+++ b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryGroupExtensions.cs
@@ -0,0 +1,19 @@
+using Disco.Models.Interop.ActiveDirectory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.BI.Interop.ActiveDirectory
+{
+    public static class ActiveDirectoryGroupExtensions
+    {
+
+        public static IEnumerable<Tuple<string, string>> GetMembers(ActiveDirectoryGroup group)
+        {
+            throw new NotImplementedException();
+        }
+
+    }
+}
diff --git a/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryMachineAccountExtensions.cs b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryMachineAccountExtensions.cs
index ffcd85a1..d3c7e404 100644
--- a/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryMachineAccountExtensions.cs
+++ b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryMachineAccountExtensions.cs
@@ -191,11 +191,11 @@ namespace Disco.BI.Interop.ActiveDirectory
                 case "name":
                     return account.Name;
                 case "samaccountname":
-                    return account.sAMAccountName;
+                    return account.SamAccountName;
                 case "distinguishedname":
                     return account.DistinguishedName;
                 case "objectsid":
-                    return account.ObjectSid;
+                    return account.SecurityIdentifier;
                 case "netbootguid":
                     return account.NetbootGUID;
                 default:
@@ -268,7 +268,9 @@ namespace Disco.BI.Interop.ActiveDirectory
             if (account.IsCriticalSystemObject)
                 throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco refuses to modify it", account.DistinguishedName));
 
-            if (!account.ParentDistinguishedName.Equals(NewOrganisationUnit, StringComparison.InvariantCultureIgnoreCase))
+            var parentDistinguishedName = account.ParentDistinguishedName();
+
+            if (parentDistinguishedName != null && !parentDistinguishedName.Equals(NewOrganisationUnit, StringComparison.InvariantCultureIgnoreCase))
             {
                 string ouPath;
                 if (string.IsNullOrWhiteSpace(NewOrganisationUnit))
@@ -286,5 +288,14 @@ namespace Disco.BI.Interop.ActiveDirectory
             }
         }
 
+        public static string ParentDistinguishedName(this ActiveDirectoryMachineAccount account)
+        {
+            // Determine Parent
+            if (!string.IsNullOrWhiteSpace(account.DistinguishedName))
+                return account.DistinguishedName.Substring(0, account.DistinguishedName.IndexOf(",DC=")).Substring(account.DistinguishedName.IndexOf(",") + 1);
+            else
+                return null;
+        }
+
     }
 }
diff --git a/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryUpdateLastNetworkLogonDateJob.cs b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryUpdateLastNetworkLogonDateJob.cs
index 1c5c9e4e..63ca1fe4 100644
--- a/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryUpdateLastNetworkLogonDateJob.cs
+++ b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryUpdateLastNetworkLogonDateJob.cs
@@ -21,7 +21,7 @@ namespace Disco.BI.Interop.ActiveDirectory
         public override bool SingleInstanceTask { get { return true; } }
         public override bool CancelInitiallySupported { get { return false; } }
 
-        public override void InitalizeScheduledTask(DiscoDataContext dbContext)
+        public override void InitalizeScheduledTask(DiscoDataContext Database)
         {
             // ActiveDirectoryUpdateLastNetworkLogonDateJob @ 11:30pm
             TriggerBuilder triggerBuilder = TriggerBuilder.Create().
@@ -35,11 +35,11 @@ namespace Disco.BI.Interop.ActiveDirectory
             int changeCount;
 
             this.Status.UpdateStatus(1, "Starting", "Connecting to the Database and initializing the environment");
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                UpdateLastNetworkLogonDates(dbContext, this.Status);
+                UpdateLastNetworkLogonDates(database, this.Status);
                 this.Status.UpdateStatus(95, "Updating Database", "Writing last network logon dates to the Database");
-                changeCount = dbContext.SaveChanges();
+                changeCount = database.SaveChanges();
                 this.Status.Finished(string.Format("{0} Device last network logon dates updated", changeCount), "/Config/SystemConfig");
             }
 
@@ -86,7 +86,7 @@ namespace Disco.BI.Interop.ActiveDirectory
                         {
                             using (DirectoryEntry dRootEntry = ActiveDirectoryHelpers.DefaultDCLdapRoot(dcName))
                             {
-                                DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(objectClass=computer)(sAMAccountName={0}$))", ActiveDirectoryHelpers.EscapeLdapQuery(Device.ComputerName)), new string[]
+                                DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, string.Format("(&(objectCategory=Computer)(sAMAccountName={0}$))", ActiveDirectoryHelpers.EscapeLdapQuery(Device.ComputerName)), new string[]
 									{
 										"lastLogon"
 									}, SearchScope.Subtree);
@@ -150,7 +150,7 @@ namespace Disco.BI.Interop.ActiveDirectory
             UpdateLastNetworkLogonDate = false;
             return UpdateLastNetworkLogonDate;
         }
-        private static void UpdateLastNetworkLogonDates(DiscoDataContext context, ScheduledTaskStatus status)
+        private static void UpdateLastNetworkLogonDates(DiscoDataContext Database, ScheduledTaskStatus status)
         {
             System.Collections.Generic.Dictionary<string, System.DateTime> computerLastLogonDates = new System.Collections.Generic.Dictionary<string, System.DateTime>();
 
@@ -176,7 +176,7 @@ namespace Disco.BI.Interop.ActiveDirectory
                             double progressDCStart = 5 + (progressDCCount * progressDCProgress);
                             status.UpdateStatus(progressDCStart, string.Format("Querying Domain Controller: {0}", dcName), "Searching...");
 
-                            using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, "(objectClass=computer)", new string[] { "sAMAccountName", "lastLogon" }, SearchScope.Subtree))
+                            using (DirectorySearcher dSearcher = new DirectorySearcher(dRootEntry, "(objectCategory=Computer)", new string[] { "sAMAccountName", "lastLogon" }, SearchScope.Subtree))
                             {
                                 using (SearchResultCollection dResults = dSearcher.FindAll())
                                 {
@@ -238,7 +238,7 @@ namespace Disco.BI.Interop.ActiveDirectory
             }
 
 
-            foreach (Device d in context.Devices.Where(device => device.ComputerName != null))
+            foreach (Device d in Database.Devices.Where(device => device.ComputerName != null))
             {
                 DateTime computerLastLogonDate;
                 if (computerLastLogonDates.TryGetValue(d.ComputerName.ToUpper(), out computerLastLogonDate))
diff --git a/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryUserAccountExtensions.cs b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryUserAccountExtensions.cs
index 4b0bc303..d34e897c 100644
--- a/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryUserAccountExtensions.cs
+++ b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryUserAccountExtensions.cs
@@ -5,11 +5,6 @@ namespace Disco.BI.Interop.ActiveDirectory
 {
     internal static class ActiveDirectoryUserAccountExtensions
     {
-        public static bool HasRole(this ActiveDirectoryUserAccount account, string Role)
-        {
-            return account.Groups != null && account.Groups.Contains(Role.ToLower());
-        }
-
         public static object GetPropertyValue(this ActiveDirectoryUserAccount account, string PropertyName, int Index = 0)
         {
             switch (PropertyName.ToLower())
@@ -17,11 +12,11 @@ namespace Disco.BI.Interop.ActiveDirectory
                 case "name":
                     return account.Name;
                 case "samaccountname":
-                    return account.sAMAccountName;
+                    return account.SamAccountName;
                 case "distinguishedname":
                     return account.DistinguishedName;
                 case "objectsid":
-                    return account.ObjectSid;
+                    return account.SecurityIdentifier;
                 case "sn":
                     return account.Surname;
                 case "givenname":
diff --git a/Disco.BI/BI/Interop/Community/UpdateCheck.cs b/Disco.BI/BI/Interop/Community/UpdateCheck.cs
index 129adcad..6393006d 100644
--- a/Disco.BI/BI/Interop/Community/UpdateCheck.cs
+++ b/Disco.BI/BI/Interop/Community/UpdateCheck.cs
@@ -31,12 +31,12 @@ namespace Disco.BI.Interop.Community
             return string.Format("{0}.{1}.{2:0000}.{3:0000}", v.Major, v.Minor, v.Build, v.Revision);
         }
 
-        public static UpdateResponse Check(DiscoDataContext db, bool UseProxy, ScheduledTaskStatus status = null)
+        public static UpdateResponse Check(DiscoDataContext Database, bool UseProxy, ScheduledTaskStatus status = null)
         {
             if (status != null)
                 status.UpdateStatus(10, "Building Update Request");
 
-            var request = BuildRequest(db);
+            var request = BuildRequest(Database);
             //var requestJson = JsonConvert.SerializeObject(request);
 
             if (status != null)
@@ -78,8 +78,8 @@ namespace Disco.BI.Interop.Community
                         result = (UpdateResponse)xml.Deserialize(wResStream);
                     }
                     //var result = JsonConvert.DeserializeObject<UpdateResponse>(responseContent);
-                    db.DiscoConfiguration.UpdateLastCheck = result;
-                    db.SaveChanges();
+                    Database.DiscoConfiguration.UpdateLastCheck = result;
+                    Database.SaveChanges();
 
                     status.SetFinishedMessage(string.Format("The update server reported Version {0} is the latest.", result.Version));
 
@@ -94,23 +94,28 @@ namespace Disco.BI.Interop.Community
             }
         }
 
-        private static UpdateRequestV1 BuildRequest(DiscoDataContext db)
+        private static UpdateRequestV1 BuildRequest(DiscoDataContext Database)
         {
             var m = new UpdateRequestV1();
 
-            m.DeploymentId = db.DiscoConfiguration.DeploymentId;
+            m.DeploymentId = Database.DiscoConfiguration.DeploymentId;
 
             m.CurrentDiscoVersion = CurrentDiscoVersionFormatted();
 
-            m.OrganisationName = db.DiscoConfiguration.OrganisationName;
+            m.OrganisationName = Database.DiscoConfiguration.OrganisationName;
             m.BroadbandDoeWanId = GetBroadbandDoeWanId();
-            m.BetaDeployment = db.DiscoConfiguration.UpdateBetaDeployment;
+            m.BetaDeployment = Database.DiscoConfiguration.UpdateBetaDeployment;
 
-            m.Stat_JobCounts = db.Jobs.GroupBy(j => j.JobTypeId).Select(g => new Disco.Models.BI.Interop.Community.UpdateRequestV1.Stat { Key = g.Key, Count = g.Count() }).ToList();
-            m.Stat_OpenJobCounts = db.Jobs.Where(j => j.ClosedDate == null).GroupBy(j => j.JobTypeId).Select(g => new Disco.Models.BI.Interop.Community.UpdateRequestV1.Stat { Key = g.Key, Count = g.Count() }).ToList();
+            m.Stat_JobCounts = Database.Jobs.GroupBy(j => j.JobTypeId).Select(g => new Disco.Models.BI.Interop.Community.UpdateRequestV1.Stat { Key = g.Key, Count = g.Count() }).ToList();
+            m.Stat_OpenJobCounts = Database.Jobs.Where(j => j.ClosedDate == null).GroupBy(j => j.JobTypeId).Select(g => new Disco.Models.BI.Interop.Community.UpdateRequestV1.Stat { Key = g.Key, Count = g.Count() }).ToList();
             var activeThreshold = DateTime.Now.AddDays(-60);
-            m.Stat_ActiveDeviceModelCounts = db.DeviceModels.Select(dm => new Disco.Models.BI.Interop.Community.UpdateRequestV1.Stat { Key = dm.Manufacturer + ";" + dm.Model, Count = dm.Devices.Count(d => d.DecommissionedDate == null && (d.LastNetworkLogonDate == null || d.LastNetworkLogonDate > activeThreshold)) }).ToList();
-            m.Stat_UserCounts = db.Users.GroupBy(u => u.Type).Select(g => new Disco.Models.BI.Interop.Community.UpdateRequestV1.Stat { Key = g.Key, Count = g.Count() }).ToList();
+            m.Stat_ActiveDeviceModelCounts = Database.DeviceModels.Select(dm => new Disco.Models.BI.Interop.Community.UpdateRequestV1.Stat { Key = dm.Manufacturer + ";" + dm.Model, Count = dm.Devices.Count(d => d.DecommissionedDate == null && (d.LastNetworkLogonDate == null || d.LastNetworkLogonDate > activeThreshold)) }).ToList();
+            m.Stat_UserCounts = new List<UpdateRequestV1.Stat>() {
+                new UpdateRequestV1.Stat(){
+                     Key = "All Users",
+                     Count = Database.Users.Count()
+                }
+            };
 
             m.InstalledPlugins = Disco.Services.Plugins.Plugins.GetPlugins().Select(manifest => new Disco.Models.BI.Interop.Community.UpdateRequestV1.PluginRef { Id = manifest.Id, Version = manifest.VersionFormatted }).ToList();
 
diff --git a/Disco.BI/BI/Interop/Community/UpdateCheckTask.cs b/Disco.BI/BI/Interop/Community/UpdateCheckTask.cs
index f5ba475c..e80035d3 100644
--- a/Disco.BI/BI/Interop/Community/UpdateCheckTask.cs
+++ b/Disco.BI/BI/Interop/Community/UpdateCheckTask.cs
@@ -53,7 +53,7 @@ namespace Disco.BI.Interop.Community
             }
         }
 
-        public override void InitalizeScheduledTask(Data.Repository.DiscoDataContext dbContext)
+        public override void InitalizeScheduledTask(Data.Repository.DiscoDataContext Database)
         {
             // Random time between midday and midnight.
             var rnd = new Random();
@@ -69,17 +69,17 @@ namespace Disco.BI.Interop.Community
 
         protected override void ExecuteTask()
         {
-            using (DiscoDataContext db = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
                 try
                 {
-                    UpdateCheck.Check(db, true, this.Status);
+                    UpdateCheck.Check(database, true, this.Status);
                 }
                 catch (Exception ex)
                 {
                     ScheduledTasksLog.LogScheduledTaskException(this.Status.TaskName, this.Status.SessionId, this.Status.TaskType, ex);
                     // Could be proxy error - try again without proxy:
-                    UpdateCheck.Check(db, false, this.Status);
+                    UpdateCheck.Check(database, false, this.Status);
                 }
             }
         }
diff --git a/Disco.BI/BI/Interop/Pdf/PdfGenerator.cs b/Disco.BI/BI/Interop/Pdf/PdfGenerator.cs
index f2368369..7669e45b 100644
--- a/Disco.BI/BI/Interop/Pdf/PdfGenerator.cs
+++ b/Disco.BI/BI/Interop/Pdf/PdfGenerator.cs
@@ -12,13 +12,14 @@ using Disco.BI.Expressions;
 using System.Collections;
 using Disco.BI.Extensions;
 using Disco.Models.BI.Expressions;
+using Disco.Services.Users;
 
 namespace Disco.BI.Interop.Pdf
 {
     public static class PdfGenerator
     {
 
-        public static System.IO.Stream GenerateBulkFromTemplate(DocumentTemplate dt, DiscoDataContext dbContext, User CreatorUser, System.DateTime Timestamp, params object[] DataObjects)
+        public static System.IO.Stream GenerateBulkFromTemplate(DocumentTemplate dt, DiscoDataContext Database, User CreatorUser, System.DateTime Timestamp, params object[] DataObjects)
         {
             if (DataObjects.Length > 0)
             {
@@ -27,7 +28,7 @@ namespace Disco.BI.Interop.Pdf
                 {
                     foreach (object d in DataObjects)
                     {
-                        generatedPdfs.Add(dt.GeneratePdf(dbContext, d, CreatorUser, Timestamp, state, true));
+                        generatedPdfs.Add(dt.GeneratePdf(Database, d, CreatorUser, Timestamp, state, true));
                         state.SequenceNumber++;
                         state.FlushScopeCache();
                     }
@@ -47,24 +48,24 @@ namespace Disco.BI.Interop.Pdf
             return null;
         }
 
-        public static System.IO.Stream GenerateBulkFromTemplate(DocumentTemplate dt, DiscoDataContext dbContext, User CreatorUser, System.DateTime Timestamp, params string[] DataObjectsIds)
+        public static System.IO.Stream GenerateBulkFromTemplate(DocumentTemplate dt, DiscoDataContext Database, User CreatorUser, System.DateTime Timestamp, params string[] DataObjectsIds)
         {
             object[] DataObjects;
 
             switch (dt.Scope)
             {
                 case DocumentTemplate.DocumentTemplateScopes.Device:
-                    DataObjects = dbContext.Devices.Where(d => DataObjectsIds.Contains(d.SerialNumber)).ToArray();
+                    DataObjects = Database.Devices.Where(d => DataObjectsIds.Contains(d.SerialNumber)).ToArray();
                     break;
                 case DocumentTemplate.DocumentTemplateScopes.Job:
                     int[] intDataObjectsIds = DataObjectsIds.Select(i => int.Parse(i)).ToArray();
-                    DataObjects = dbContext.Jobs.Where(j => intDataObjectsIds.Contains(j.Id)).ToArray();
+                    DataObjects = Database.Jobs.Where(j => intDataObjectsIds.Contains(j.Id)).ToArray();
                     break;
                 case DocumentTemplate.DocumentTemplateScopes.User:
                     DataObjects = new object[DataObjectsIds.Length];
                     for (int idIndex = 0; idIndex < DataObjectsIds.Length; idIndex++)
                     {
-                        DataObjects[idIndex] = UserBI.UserCache.GetUser(DataObjectsIds[idIndex], dbContext, true);
+                        DataObjects[idIndex] = UserService.GetUser(DataObjectsIds[idIndex], Database, true);
                         if (DataObjects[idIndex] == null)
                             throw new Exception(string.Format("Unknown Username specified: {0}", DataObjectsIds[idIndex]));
                     }
@@ -73,10 +74,10 @@ namespace Disco.BI.Interop.Pdf
                     throw new InvalidOperationException("Invalid DocumentType Scope");
             }
 
-            return GenerateBulkFromTemplate(dt, dbContext, CreatorUser, Timestamp, DataObjects);
+            return GenerateBulkFromTemplate(dt, Database, CreatorUser, Timestamp, DataObjects);
         }
 
-        public static System.IO.Stream GenerateFromTemplate(DocumentTemplate dt, DiscoDataContext dbContext, object Data, User CreatorUser, System.DateTime TimeStamp, DocumentState State, bool FlattenFields = false)
+        public static System.IO.Stream GenerateFromTemplate(DocumentTemplate dt, DiscoDataContext Database, object Data, User CreatorUser, System.DateTime TimeStamp, DocumentState State, bool FlattenFields = false)
         {
             // Validate Data
             switch (dt.Scope)
@@ -97,15 +98,15 @@ namespace Disco.BI.Interop.Pdf
                     throw new InvalidOperationException("Invalid AttachmentType Scope");
             }
 
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
 
             // Override FlattenFields if Document Template instructs.
             if (dt.FlattenForm)
                 FlattenFields = true;
 
-            ConcurrentDictionary<string, Expression> expressionCache = dt.PdfExpressionsFromCache(dbContext);
+            ConcurrentDictionary<string, Expression> expressionCache = dt.PdfExpressionsFromCache(Database);
 
-            string templateFilename = dt.RepositoryFilename(dbContext);
+            string templateFilename = dt.RepositoryFilename(Database);
             PdfReader pdfReader = new PdfReader(templateFilename);
 
             MemoryStream pdfGeneratedStream = new MemoryStream();
@@ -114,7 +115,7 @@ namespace Disco.BI.Interop.Pdf
             pdfStamper.FormFlattening = FlattenFields;
             pdfStamper.Writer.CloseStream = false;
 
-            IDictionary expressionVariables = Expression.StandardVariables(dt, dbContext, CreatorUser, TimeStamp, State);
+            IDictionary expressionVariables = Expression.StandardVariables(dt, Database, CreatorUser, TimeStamp, State);
 
             foreach (string pdfFieldKey in pdfStamper.AcroFields.Fields.Keys)
             {
@@ -240,7 +241,7 @@ namespace Disco.BI.Interop.Pdf
                     Timestamp = DateTime.Now
                 };
                 jl.Comments = string.Format("Document Generated{0}{1} [{2}]", Environment.NewLine, dt.Description, dt.Id);
-                dbContext.JobLogs.Add(jl);
+                Database.JobLogs.Add(jl);
             }
 
             pdfGeneratedStream.Position = 0;
diff --git a/Disco.BI/BI/Interop/Pdf/PdfImporter.cs b/Disco.BI/BI/Interop/Pdf/PdfImporter.cs
index ca9ea4cd..6f196766 100644
--- a/Disco.BI/BI/Interop/Pdf/PdfImporter.cs
+++ b/Disco.BI/BI/Interop/Pdf/PdfImporter.cs
@@ -205,7 +205,7 @@ namespace Disco.BI.Interop.Pdf
             return null;
         }
 
-        private static DetectImageResult DetectImage(DiscoDataContext dbContext, Bitmap pageImageOriginal, string SessionId, IEnumerable<DocumentTemplate> detectDocumentTemplates, DetectStateHints StateHints)
+        private static DetectImageResult DetectImage(DiscoDataContext Database, Bitmap pageImageOriginal, string SessionId, IEnumerable<DocumentTemplate> detectDocumentTemplates, DetectStateHints StateHints)
         {
             Bitmap pageImage = pageImageOriginal;
             double pageImageModifiedScale = 1;
@@ -270,7 +270,7 @@ namespace Disco.BI.Interop.Pdf
                     {
                         foreach (DocumentTemplate dt in detectDocumentTemplates)
                         {
-                            var locationBag = dt.QRCodeLocations(dbContext);
+                            var locationBag = dt.QRCodeLocations(Database);
                             foreach (var location in locationBag)
                             {
                                 result = DetectImageFromSegment(pageImage, zxingMfr, zxingMfrHints,
@@ -303,7 +303,7 @@ namespace Disco.BI.Interop.Pdf
             }
         }
 
-        private static DetectPageResult DetectPage(DiscoDataContext dbContext, PdfReader pdfReader, int PageNumber, string SessionId, string DataStoreSessionCacheLocation, IEnumerable<DocumentTemplate> detectDocumentTemplates, DetectStateHints StateHints)
+        private static DetectPageResult DetectPage(DiscoDataContext Database, PdfReader pdfReader, int PageNumber, string SessionId, string DataStoreSessionCacheLocation, IEnumerable<DocumentTemplate> detectDocumentTemplates, DetectStateHints StateHints)
         {
             DetectPageResult result = new DetectPageResult() { PageNumber = PageNumber };
 
@@ -325,7 +325,7 @@ namespace Disco.BI.Interop.Pdf
                     {
                         DocumentImporterLog.LogImportPageProgress(SessionId, PageNumber, (int)(10 + (pageProgressInterval * pageImages.IndexOf(pageImageOriginal))), String.Format("Processing Page Image {0} of {1}", pageImages.IndexOf(pageImageOriginal) + 1, pageImages.Count));
 
-                        using (var zxingResult = DetectImage(dbContext, pageImageOriginal, SessionId, detectDocumentTemplates, StateHints))
+                        using (var zxingResult = DetectImage(Database, pageImageOriginal, SessionId, detectDocumentTemplates, StateHints))
                         {
                             if (zxingResult != null)
                             {
@@ -377,9 +377,9 @@ namespace Disco.BI.Interop.Pdf
             }
         }
 
-        public static bool ProcessPdfAttachment(string Filename, DiscoDataContext dbContext, string SessionId, Cache HttpCache)
+        public static bool ProcessPdfAttachment(string Filename, DiscoDataContext Database, string SessionId, Cache HttpCache)
         {
-            var dataStoreUnassignedLocation = DataStore.CreateLocation(dbContext, "DocumentDropBox_Unassigned");
+            var dataStoreUnassignedLocation = DataStore.CreateLocation(Database, "DocumentDropBox_Unassigned");
 
             DocumentImporterLog.LogImportProgress(SessionId, 0, "Reading File");
 
@@ -389,8 +389,8 @@ namespace Disco.BI.Interop.Pdf
 
                 var pdfPagesAssigned = new Dictionary<int, Tuple<DocumentUniqueIdentifier, byte[]>>();
 
-                var dataStoreSessionPagesCacheLocation = DataStore.CreateLocation(dbContext, "Cache\\DocumentDropBox_SessionPages");
-                var detectDocumentTemplates = dbContext.DocumentTemplates.ToArray();
+                var dataStoreSessionPagesCacheLocation = DataStore.CreateLocation(Database, "Cache\\DocumentDropBox_SessionPages");
+                var detectDocumentTemplates = Database.DocumentTemplates.ToArray();
 
                 double progressInterval = 70 / pdfReader.NumberOfPages;
 
@@ -401,14 +401,14 @@ namespace Disco.BI.Interop.Pdf
                     DocumentImporterLog.LogImportProgress(SessionId, (int)(PageNumber * progressInterval), string.Format("Processing Page {0} of {1}", PageNumber, pdfReader.NumberOfPages));
                     DocumentImporterLog.LogImportPageStarting(SessionId, PageNumber);
 
-                    using (var pageResult = DetectPage(dbContext, pdfReader, PageNumber, SessionId, dataStoreSessionPagesCacheLocation, detectDocumentTemplates, detectStateHints))
+                    using (var pageResult = DetectPage(Database, pdfReader, PageNumber, SessionId, dataStoreSessionPagesCacheLocation, detectDocumentTemplates, detectStateHints))
                     {
                         if (pageResult.DetectedIdentifier != null)
                         {
                             var docId = pageResult.DetectedIdentifier;
                             pdfPagesAssigned.Add(PageNumber, new Tuple<DocumentUniqueIdentifier, byte[]>(docId, pageResult.AttachmentThumbnailImage.ToArray()));
 
-                            docId.LoadComponents(dbContext);
+                            docId.LoadComponents(Database);
                             DocumentImporterLog.LogImportPageDetected(SessionId, PageNumber, docId.DocumentUniqueId, docId.DocumentTemplate.Description, docId.DocumentTemplate.Scope, docId.DataId, docId.DataDescription);
                         }
                         else
@@ -441,7 +441,7 @@ namespace Disco.BI.Interop.Pdf
                         var documentPortionIdentifier = documentPortionInfo.Item1;
                         var documentPortionThumbnail = documentPortionInfo.Item2;
 
-                        if (!documentPortionIdentifier.LoadComponents(dbContext))
+                        if (!documentPortionIdentifier.LoadComponents(Database))
                         {
                             // Unknown Document Unique Id
                             foreach (var dp in documentPortion)
@@ -477,7 +477,7 @@ namespace Disco.BI.Interop.Pdf
 
                                 msBuilder.Position = 0;
 
-                                var attachmentSuccess = documentPortionIdentifier.ImportPdfAttachment(dbContext, msBuilder, documentPortionThumbnail);
+                                var attachmentSuccess = documentPortionIdentifier.ImportPdfAttachment(Database, msBuilder, documentPortionThumbnail);
 
                                 if (!attachmentSuccess)
                                 { // Unable to add Attachment
@@ -538,13 +538,13 @@ namespace Disco.BI.Interop.Pdf
 
             return true;
         }
-        public static bool ProcessPdfAttachment(string Filename, DiscoDataContext dbContext, string DocumentTemplateId, string DataId, string UserId, DateTime Timestamp)
+        public static bool ProcessPdfAttachment(string Filename, DiscoDataContext Database, string DocumentTemplateId, string DataId, string UserId, DateTime Timestamp)
         {
             using (FileStream fs = new FileStream(Filename, FileMode.Open, FileAccess.ReadWrite, FileShare.None))
             {
                 DocumentUniqueIdentifier identifier = new DocumentUniqueIdentifier(DocumentTemplateId, DataId, UserId, Timestamp);
-                identifier.LoadComponents(dbContext);
-                return identifier.ImportPdfAttachment(dbContext, fs, null);
+                identifier.LoadComponents(Database);
+                return identifier.ImportPdfAttachment(Database, fs, null);
             }
         }
 
diff --git a/Disco.BI/BI/Interop/PluginServices/IDiscoScheduledTask.cs b/Disco.BI/BI/Interop/PluginServices/IDiscoScheduledTask.cs
deleted file mode 100644
index 0f5916c3..00000000
--- a/Disco.BI/BI/Interop/PluginServices/IDiscoScheduledTask.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Disco.Data.Repository;
-//using Quartz;
-
-//namespace Disco.BI.Interop.PluginServices
-//{
-//    interface IDiscoScheduledTask
-//    {
-//        void InitalizeScheduledTask(DiscoDataContext dbContext, IScheduler Scheduler);
-//    }
-//}
diff --git a/Disco.BI/BI/Interop/PluginServices/Utilities.cs b/Disco.BI/BI/Interop/PluginServices/Utilities.cs
deleted file mode 100644
index 14a8d9b4..00000000
--- a/Disco.BI/BI/Interop/PluginServices/Utilities.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Disco.Data.Repository;
-//using Quartz;
-
-//namespace Disco.BI.Interop.PluginServices
-//{
-//    public static class Utilities
-//    {
-
-//        public static void InitalizeScheduledTasks(DiscoDataContext dbContext, ISchedulerFactory SchedulerFactory)
-//        {
-
-//            var scheduler = SchedulerFactory.GetScheduler();
-
-//            // Discover IDiscoScheduledTasks (Only from Disco Assemblies)
-//            var appDomain = AppDomain.CurrentDomain;
-
-//            var scheduledTaskTypes = (from a in appDomain.GetAssemblies()
-//                                      where !a.GlobalAssemblyCache && !a.IsDynamic && a.FullName.StartsWith("Disco.", StringComparison.InvariantCultureIgnoreCase)
-//                                      from type in a.GetTypes()
-//                                      where typeof(IDiscoScheduledTask).IsAssignableFrom(type) && !type.IsAbstract
-//                                      select type);
-//            foreach (Type scheduledTaskType in scheduledTaskTypes)
-//            {
-//                IDiscoScheduledTask instance = (IDiscoScheduledTask)Activator.CreateInstance(scheduledTaskType);
-//                try
-//                {
-//                    instance.InitalizeScheduledTask(dbContext, scheduler);
-//                }
-//                catch (Exception ex)
-//                {
-//                    if (instance == null)
-//                        Logging.SystemLog.LogException("Initializing Scheduled Task; Disco.BI.Interop.Plugins.Utilities.InitalizeScheduledTasks()", ex);
-//                    else
-//                        Logging.SystemLog.LogException(string.Format("Initializing Scheduled Task: '{0}'; Disco.BI.Interop.Plugins.Utilities.InitalizeScheduledTasks()", instance.GetType().Name), ex);
-//                }
-//            }
-
-//        }
-
-//    }
-//}
diff --git a/Disco.BI/BI/Interop/SignalRHandlers/AdminAuthorizedPersistentConnection.cs b/Disco.BI/BI/Interop/SignalRHandlers/AdminAuthorizedPersistentConnection.cs
deleted file mode 100644
index 85c082f9..00000000
--- a/Disco.BI/BI/Interop/SignalRHandlers/AdminAuthorizedPersistentConnection.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Disco.Models.Repository;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Disco.BI.Interop.SignalRHandlers
-{
-    public class AdminAuthorizedPersistentConnection : AuthorizedPersistentConnection
-    {
-        private string[] authorizedUserTypes = { User.Types.Admin };
-
-        protected override string[] AuthorizedUserTypes { get { return authorizedUserTypes; } }
-    }
-}
\ No newline at end of file
diff --git a/Disco.BI/BI/Interop/SignalRHandlers/AuthorizedPersistentConnection.cs b/Disco.BI/BI/Interop/SignalRHandlers/AuthorizedPersistentConnection.cs
index 6d32d41f..4ced4fba 100644
--- a/Disco.BI/BI/Interop/SignalRHandlers/AuthorizedPersistentConnection.cs
+++ b/Disco.BI/BI/Interop/SignalRHandlers/AuthorizedPersistentConnection.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNet.SignalR;
+using Disco.Services.Users;
+using Microsoft.AspNet.SignalR;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,9 +10,9 @@ namespace Disco.BI.Interop.SignalRHandlers
 {
     public class AuthorizedPersistentConnection : PersistentConnection
     {
-        private string[] authorizedUserTypes = null;
+        private string authorizedClaim = null;
 
-        protected virtual string[] AuthorizedUserTypes { get { return authorizedUserTypes; } }
+        protected virtual string AuthorizedClaim { get { return authorizedClaim; } }
 
         protected override bool AuthorizeRequest(IRequest request)
         {
@@ -19,17 +20,15 @@ namespace Disco.BI.Interop.SignalRHandlers
                 return false;
             else
             {
-                var user = UserBI.UserCache.CurrentUser;
-                if (user == null)
-                    return false;
+                var authToken = UserService.CurrentAuthorization;
+                
+                if (authToken == null)
+                    return false; // No Current User
 
-                if (AuthorizedUserTypes == null || AuthorizedUserTypes.Length == 0)
-                    return true;
-
-                if (AuthorizedUserTypes.Contains(user.Type))
-                    return true;
-
-                return false;
+                if (authorizedClaim == null)
+                    return true; // Just Authenticate - no Authorization
+                else
+                    return authToken.Has(authorizedClaim);
             }
         }
     }
diff --git a/Disco.BI/BI/Interop/SignalRHandlers/HeldDeviceNotifications.cs b/Disco.BI/BI/Interop/SignalRHandlers/HeldDeviceNotifications.cs
index 566a2ce8..31233dbb 100644
--- a/Disco.BI/BI/Interop/SignalRHandlers/HeldDeviceNotifications.cs
+++ b/Disco.BI/BI/Interop/SignalRHandlers/HeldDeviceNotifications.cs
@@ -61,7 +61,7 @@ namespace Disco.BI.Interop.SignalRHandlers
         {
             User u = (User)e.Entity;
 
-            var userDevices = e.dbContext.Devices.Where(d => d.AssignedUserId == u.Id);
+            var userDevices = e.Database.Devices.Where(d => d.AssignedUserId == u.Id);
 
             foreach (var userDevice in userDevices)
             {
diff --git a/Disco.BI/BI/Interop/SignalRHandlers/LogNotifications.cs b/Disco.BI/BI/Interop/SignalRHandlers/LogNotifications.cs
index 2c297851..29f1dc50 100644
--- a/Disco.BI/BI/Interop/SignalRHandlers/LogNotifications.cs
+++ b/Disco.BI/BI/Interop/SignalRHandlers/LogNotifications.cs
@@ -1,4 +1,5 @@
-using Disco.Services.Logging;
+using Disco.Services.Authorization;
+using Disco.Services.Logging;
 using Disco.Services.Logging.Models;
 using Microsoft.AspNet.SignalR;
 using System;
@@ -9,10 +10,12 @@ using System.Threading.Tasks;
 
 namespace Disco.BI.Interop.SignalRHandlers
 {
-    public class LogNotifications : AdminAuthorizedPersistentConnection
+    public class LogNotifications : AuthorizedPersistentConnection
     {
         public static bool initialized = false;
 
+        protected override string AuthorizedClaim { get { return Claims.DiscoAdminAccount; } }
+
         public LogNotifications()
         {
             if (!initialized)
diff --git a/Disco.BI/BI/Interop/SignalRHandlers/RepositoryMonitorNotifications.cs b/Disco.BI/BI/Interop/SignalRHandlers/RepositoryMonitorNotifications.cs
index e50742d9..57635705 100644
--- a/Disco.BI/BI/Interop/SignalRHandlers/RepositoryMonitorNotifications.cs
+++ b/Disco.BI/BI/Interop/SignalRHandlers/RepositoryMonitorNotifications.cs
@@ -1,4 +1,5 @@
 using Disco.Data.Repository.Monitor;
+using Disco.Services.Authorization;
 using Microsoft.AspNet.SignalR;
 using System;
 using System.Collections.Generic;
@@ -8,8 +9,10 @@ using System.Threading.Tasks;
 
 namespace Disco.BI.Interop.SignalRHandlers
 {
-    public class RepositoryMonitorNotifications : AdminAuthorizedPersistentConnection
+    public class RepositoryMonitorNotifications : AuthorizedPersistentConnection
     {
+        protected override string AuthorizedClaim { get { return Claims.DiscoAdminAccount; } }
+
         public static void Initialize()
         {
             RepositoryMonitor.StreamAfterCommit.Subscribe(AfterCommit);
diff --git a/Disco.BI/BI/Interop/SignalRHandlers/ScheduledTasksStatusNotifications.cs b/Disco.BI/BI/Interop/SignalRHandlers/ScheduledTasksStatusNotifications.cs
index 45389d75..9de3b197 100644
--- a/Disco.BI/BI/Interop/SignalRHandlers/ScheduledTasksStatusNotifications.cs
+++ b/Disco.BI/BI/Interop/SignalRHandlers/ScheduledTasksStatusNotifications.cs
@@ -1,4 +1,5 @@
-using Disco.Services.Tasks;
+using Disco.Services.Authorization;
+using Disco.Services.Tasks;
 using Microsoft.AspNet.SignalR;
 using System;
 using System.Collections.Generic;
@@ -8,10 +9,12 @@ using System.Threading.Tasks;
 
 namespace Disco.BI.Interop.SignalRHandlers
 {
-    public class ScheduledTasksStatusNotifications : AdminAuthorizedPersistentConnection
+    public class ScheduledTasksStatusNotifications : AuthorizedPersistentConnection
     {
         public static bool initialized = false;
 
+        protected override string AuthorizedClaim { get { return Claims.DiscoAdminAccount; } }
+
         public ScheduledTasksStatusNotifications()
         {
             if (!initialized)
diff --git a/Disco.BI/BI/Interop/SignalRHandlers/UserHeldDeviceNotifications.cs b/Disco.BI/BI/Interop/SignalRHandlers/UserHeldDeviceNotifications.cs
index a45d036f..6fd9a990 100644
--- a/Disco.BI/BI/Interop/SignalRHandlers/UserHeldDeviceNotifications.cs
+++ b/Disco.BI/BI/Interop/SignalRHandlers/UserHeldDeviceNotifications.cs
@@ -48,7 +48,7 @@ namespace Disco.BI.Interop.SignalRHandlers
 
             if (j.DeviceSerialNumber != null)
             {
-                var jobDevice = e.dbContext.Devices.Where(d => d.SerialNumber == j.DeviceSerialNumber).FirstOrDefault();
+                var jobDevice = e.Database.Devices.Where(d => d.SerialNumber == j.DeviceSerialNumber).FirstOrDefault();
 
                 if (jobDevice.AssignedUserId != null)
                     notificationContext.Connection.Broadcast(jobDevice.AssignedUserId);
diff --git a/Disco.BI/BI/JobBI/ManagedJobList.cs b/Disco.BI/BI/JobBI/ManagedJobList.cs
index 606b2fac..aed5e35f 100644
--- a/Disco.BI/BI/JobBI/ManagedJobList.cs
+++ b/Disco.BI/BI/JobBI/ManagedJobList.cs
@@ -9,6 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Disco.BI.Extensions;
 using System.Reactive.Linq;
+using Disco.Services.Users;
 
 namespace Disco.BI.JobBI
 {
@@ -20,10 +21,22 @@ namespace Disco.BI.JobBI
         private IDisposable unsubscribeToken;
         private object updateLock = new object();
 
-        public ManagedJobList Initialize(DiscoDataContext dbContext)
+        public override List<JobTableItemModel> Items
+        {
+            get
+            {
+                return base.Items.PermissionsFiltered(UserService.CurrentAuthorization);
+            }
+            set
+            {
+                throw new InvalidOperationException("Items cannot be manually set in a Managed Job List");
+            }
+        }
+
+        public ManagedJobList Initialize(DiscoDataContext Database)
         {
             // Initially fill table
-            this.Items = this.SortFunction(this.DetermineItems(dbContext, this.FilterFunction(dbContext.Jobs))).ToList();
+            base.Items = this.SortFunction(this.DetermineItems(Database, this.FilterFunction(Database.Jobs))).ToList();
 
             // Subscribe for Changes
             // - Job (or Job Meta) Changes
@@ -65,19 +78,19 @@ namespace Disco.BI.JobBI
                             if (e.EntityType == typeof(DeviceProfile))
                             {
                                 int deviceProfileId = ((DeviceProfile)e.Entity).Id;
-                                existingItems = this.Items.Where(i => i.DeviceProfileId == deviceProfileId).ToArray();
+                                existingItems = base.Items.Where(i => i.DeviceProfileId == deviceProfileId).ToArray();
                             }
                             else
                                 if (e.EntityType == typeof(DeviceModel))
                                 {
                                     int deviceModelId = ((DeviceModel)e.Entity).Id;
-                                    existingItems = this.Items.Where(i => i.DeviceModelId == deviceModelId).ToArray();
+                                    existingItems = base.Items.Where(i => i.DeviceModelId == deviceModelId).ToArray();
                                 }
                                 else
                                     if (e.EntityType == typeof(Device))
                                     {
                                         string deviceSerialNumber = ((Device)e.Entity).SerialNumber;
-                                        existingItems = this.Items.Where(i => i.DeviceSerialNumber == deviceSerialNumber).ToArray();
+                                        existingItems = base.Items.Where(i => i.DeviceSerialNumber == deviceSerialNumber).ToArray();
                                     }
                                     else
                                         return;  // Subscription should never reach
@@ -93,20 +106,20 @@ namespace Disco.BI.JobBI
             if (jobIds.Count == 0)
                 return;
             else
-                UpdateJobs(e.dbContext, jobIds, existingItems);
+                UpdateJobs(e.Database, jobIds, existingItems);
         }
 
-        private void UpdateJobs(DiscoDataContext dbContext, List<int> jobIds, JobTableItemModel[] existingItems = null)
+        private void UpdateJobs(DiscoDataContext Database, List<int> jobIds, JobTableItemModel[] existingItems = null)
         {
             lock (updateLock)
             {
                 // Check for existing items, if not handed them
                 if (existingItems == null)
-                    existingItems = this.Items.Where(i => jobIds.Contains(i.Id)).ToArray();
+                    existingItems = base.Items.Where(i => jobIds.Contains(i.Id)).ToArray();
+                
+                var updatedItems = this.DetermineItems(Database, this.FilterFunction(Database.Jobs.Where(j => jobIds.Contains(j.Id))));
 
-                var updatedItems = this.DetermineItems(dbContext, this.FilterFunction(dbContext.Jobs.Where(j => jobIds.Contains(j.Id))));
-
-                var refreshedList = this.Items.ToList();
+                var refreshedList = base.Items.ToList();
 
                 // Remove Existing
                 if (existingItems.Length > 0)
@@ -119,7 +132,7 @@ namespace Disco.BI.JobBI
                         refreshedList.Add(updatedItem);
 
                 // Reorder
-                this.Items = this.SortFunction(refreshedList).ToList();
+                base.Items = this.SortFunction(refreshedList).ToList();
             }
         }
 
diff --git a/Disco.BI/BI/JobBI/Searching.cs b/Disco.BI/BI/JobBI/Searching.cs
index 85cfc78f..6b6ecf9c 100644
--- a/Disco.BI/BI/JobBI/Searching.cs
+++ b/Disco.BI/BI/JobBI/Searching.cs
@@ -11,7 +11,7 @@ namespace Disco.BI.JobBI
 {
     public static class Searching
     {
-        public static JobTableModel Search(DiscoDataContext dbContext, string Term, int? LimitCount = null, bool IncludeJobStatus = true, bool SearchDetails = false)
+        public static JobTableModel Search(DiscoDataContext Database, string Term, int? LimitCount = null, bool IncludeJobStatus = true, bool SearchDetails = false)
         {
             int termInt = default(int);
 
@@ -22,7 +22,7 @@ namespace Disco.BI.JobBI
                 // Term is a Number (int)
                 if (SearchDetails)
                 {
-                    query = BuildJobTableModel(dbContext).Where(j =>
+                    query = BuildJobTableModel(Database).Where(j =>
                         j.Id == termInt ||
                         j.DeviceHeldLocation.Contains(Term) ||
                         j.Device.SerialNumber.Contains(Term) ||
@@ -36,7 +36,7 @@ namespace Disco.BI.JobBI
                 }
                 else
                 {
-                    query = BuildJobTableModel(dbContext).Where(j =>
+                    query = BuildJobTableModel(Database).Where(j =>
                         j.Id == termInt ||
                         j.DeviceHeldLocation.Contains(Term) ||
                         j.Device.SerialNumber.Contains(Term) ||
@@ -51,7 +51,7 @@ namespace Disco.BI.JobBI
             {
                 if (SearchDetails)
                 {
-                    query = BuildJobTableModel(dbContext).Where(j =>
+                    query = BuildJobTableModel(Database).Where(j =>
                         j.DeviceHeldLocation.Contains(Term) ||
                         j.Device.SerialNumber.Contains(Term) ||
                         j.Device.AssetNumber.Contains(Term) ||
@@ -64,7 +64,7 @@ namespace Disco.BI.JobBI
                 }
                 else
                 {
-                    query = BuildJobTableModel(dbContext).Where(j =>
+                    query = BuildJobTableModel(Database).Where(j =>
                         j.DeviceHeldLocation.Contains(Term) ||
                         j.Device.SerialNumber.Contains(Term) ||
                         j.Device.AssetNumber.Contains(Term) ||
@@ -79,14 +79,14 @@ namespace Disco.BI.JobBI
                 query = query.Take(LimitCount.Value);
 
             JobTableModel model = new JobTableModel() { ShowStatus = IncludeJobStatus };
-            model.Fill(dbContext, query);
+            model.Fill(Database, query);
 
             return model;
         }
 
-        public static IQueryable<Job> BuildJobTableModel(DiscoDataContext dbContext)
+        public static IQueryable<Job> BuildJobTableModel(DiscoDataContext Database)
         {
-            return dbContext.Jobs.Include("JobType").Include("Device").Include("User").Include("OpenedTechUser");
+            return Database.Jobs.Include("JobType").Include("Device").Include("User").Include("OpenedTechUser");
         }
 
     }
diff --git a/Disco.BI/BI/JobBI/Statistics/DailyOpenedClosed.cs b/Disco.BI/BI/JobBI/Statistics/DailyOpenedClosed.cs
index 7c37a845..1a90d4b2 100644
--- a/Disco.BI/BI/JobBI/Statistics/DailyOpenedClosed.cs
+++ b/Disco.BI/BI/JobBI/Statistics/DailyOpenedClosed.cs
@@ -25,7 +25,7 @@ namespace Disco.BI.JobBI.Statistics
         public override bool SingleInstanceTask { get { return true; } }
         public override bool CancelInitiallySupported { get { return false; } }
 
-        public override void InitalizeScheduledTask(DiscoDataContext dbContext)
+        public override void InitalizeScheduledTask(DiscoDataContext Database)
         {
             // Trigger Daily @ 12:29am
             TriggerBuilder triggerBuilder = TriggerBuilder.Create().WithSchedule(CronScheduleBuilder.DailyAtHourAndMinute(0, 29));
@@ -34,40 +34,13 @@ namespace Disco.BI.JobBI.Statistics
         }
         protected override void ExecuteTask()
         {
-            using (var dbContext = new DiscoDataContext())
+            using (var database = new DiscoDataContext())
             {
-                UpdateDataHistory(dbContext, true);
+                UpdateDataHistory(database, true);
             }
         }
 
-        //public void InitalizeScheduledTask(DiscoDataContext dbContext, IScheduler Scheduler)
-        //{
-        //    // Run @ 12:29am
-        //    IJobDetail jobDetail = new JobDetailImpl("JobStatisticsDailyOpenedClosed", typeof(DailyOpenedClosed));
-        //    ITrigger trigger = TriggerBuilder.Create().
-        //        WithIdentity("JobStatisticsDailyOpenedClosedTrigger").
-        //        StartNow().
-        //        WithSchedule(CronScheduleBuilder.DailyAtHourAndMinute(0, 29)).
-        //        Build();
-        //    Scheduler.ScheduleJob(jobDetail, trigger);
-        //}
-
-        //public void Execute(IJobExecutionContext context)
-        //{
-        //    try
-        //    {
-        //        using (var dbContext = new DiscoDataContext())
-        //        {
-        //            UpdateDataHistory(dbContext, true);
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        Logging.SystemLog.LogException("Disco.BI.JobBI.Statistics.DailyOpenedClosed", ex);
-        //    }
-        //}
-
-        private static void UpdateDataHistory(DiscoDataContext dbContext, bool Refresh = false)
+        private static void UpdateDataHistory(DiscoDataContext Database, bool Refresh = false)
         {
             DateTime historyEnd = DateTime.Now.Date;
 
@@ -98,7 +71,7 @@ namespace Disco.BI.JobBI.Statistics
                         // Cache Data
                         while (processDate <= historyEnd)
                         {
-                            resultData.Add(Data(dbContext, processDate));
+                            resultData.Add(Data(Database, processDate));
                             processDate = processDate.AddDays(1);
                         }
                         _data = resultData;
@@ -162,14 +135,14 @@ namespace Disco.BI.JobBI.Statistics
             }
         }
 
-        private static DailyOpenedClosedItem Data(DiscoDataContext dbContext, DateTime ProcessDate)
+        private static DailyOpenedClosedItem Data(DiscoDataContext Database, DateTime ProcessDate)
         {
             DateTime processDateStart = ProcessDate;
             DateTime processDateEnd = ProcessDate.AddDays(1);
 
-            int totalJobs = dbContext.Jobs.Where(j => j.OpenedDate < processDateEnd && (!j.ClosedDate.HasValue || j.ClosedDate > processDateEnd)).Count();
-            int openedJobs = dbContext.Jobs.Where(j => j.OpenedDate > processDateStart && j.OpenedDate < processDateEnd).Count();
-            int closedJobs = dbContext.Jobs.Where(j => j.ClosedDate > processDateStart && j.ClosedDate < processDateEnd).Count();
+            int totalJobs = Database.Jobs.Where(j => j.OpenedDate < processDateEnd && (!j.ClosedDate.HasValue || j.ClosedDate > processDateEnd)).Count();
+            int openedJobs = Database.Jobs.Where(j => j.OpenedDate > processDateStart && j.OpenedDate < processDateEnd).Count();
+            int closedJobs = Database.Jobs.Where(j => j.ClosedDate > processDateStart && j.ClosedDate < processDateEnd).Count();
 
             return new DailyOpenedClosedItem()
             {
@@ -180,11 +153,11 @@ namespace Disco.BI.JobBI.Statistics
             };
         }
 
-        public static List<DailyOpenedClosedItem> Data(DiscoDataContext dbContext, bool FilterUnimportantWeekends = false)
+        public static List<DailyOpenedClosedItem> Data(DiscoDataContext Database, bool FilterUnimportantWeekends = false)
         {
             List<DailyOpenedClosedItem> resultData;
 
-            UpdateDataHistory(dbContext);
+            UpdateDataHistory(Database);
 
             if (FilterUnimportantWeekends)
                 resultData = _data.Where(i => (i.Timestamp.DayOfWeek != DayOfWeek.Saturday && i.Timestamp.DayOfWeek != DayOfWeek.Sunday) ||
@@ -192,9 +165,6 @@ namespace Disco.BI.JobBI.Statistics
             else
                 resultData = _data.ToList();
 
-            // Removed - Live Updated via Repository Monitor; See: RepositoryEvent_JobChange
-            //resultData.Add(Data(dbContext, DateTime.Today));
-
             return resultData;
         }
     }
diff --git a/Disco.BI/BI/JobBI/Utilities.cs b/Disco.BI/BI/JobBI/Utilities.cs
index 52cb983d..f043e825 100644
--- a/Disco.BI/BI/JobBI/Utilities.cs
+++ b/Disco.BI/BI/JobBI/Utilities.cs
@@ -10,7 +10,7 @@ namespace Disco.BI.JobBI
 {
     public static class Utilities
     {
-        public static Job Create(DiscoDataContext dbContext, Device device, User user, JobType type, List<JobSubType> subTypes, User initialTech)
+        public static Job Create(DiscoDataContext Database, Device device, User user, JobType type, List<JobSubType> subTypes, User initialTech)
         {
             Job j = new Job()
             {
@@ -38,19 +38,19 @@ namespace Disco.BI.JobBI
             List<JobSubType> jobSubTypes = subTypes.ToList();
             j.JobSubTypes = jobSubTypes;
 
-            dbContext.Jobs.Add(j);
+            Database.Jobs.Add(j);
 
             switch (type.Id)
             {
                 case JobType.JobTypeIds.HWar:
-                    dbContext.JobMetaWarranties.Add(new JobMetaWarranty() { Job = j });
+                    Database.JobMetaWarranties.Add(new JobMetaWarranty() { Job = j });
                     break;
                 case JobType.JobTypeIds.HNWar:
-                    dbContext.JobMetaNonWarranties.Add(new JobMetaNonWarranty() { Job = j });
+                    Database.JobMetaNonWarranties.Add(new JobMetaNonWarranty() { Job = j });
                     if (device != null)
                     {
                         // Add Job Components
-                        var components = dbContext.DeviceComponents.Include("JobSubTypes").Where(c => !c.DeviceModelId.HasValue || c.DeviceModelId == j.Device.DeviceModelId);
+                        var components = Database.DeviceComponents.Include("JobSubTypes").Where(c => !c.DeviceModelId.HasValue || c.DeviceModelId == j.Device.DeviceModelId);
                         var addedComponents = new List<DeviceComponent>();
                         foreach (var c in components)
                         {
@@ -76,7 +76,7 @@ namespace Disco.BI.JobBI
                             }
                         }
                         foreach (var c in addedComponents)
-                            dbContext.JobComponents.Add(new JobComponent()
+                            Database.JobComponents.Add(new JobComponent()
                             {
                                 Job = j,
                                 TechUserId = initialTech.Id,
diff --git a/Disco.BI/BI/UserBI/Searching.cs b/Disco.BI/BI/UserBI/Searching.cs
index 096792d5..e4d80794 100644
--- a/Disco.BI/BI/UserBI/Searching.cs
+++ b/Disco.BI/BI/UserBI/Searching.cs
@@ -5,6 +5,7 @@ using System.Text;
 using Disco.Models.BI.Search;
 using Disco.Models.Repository;
 using Disco.Data.Repository;
+using Disco.Services.Users;
 
 namespace Disco.BI.UserBI
 {
@@ -32,7 +33,7 @@ namespace Disco.BI.UserBI
             }).ToList();
         }
 
-        public static List<UserSearchResultItem> Search(DiscoDataContext dbContext, string Term, int? LimitCount = null)
+        public static List<UserSearchResultItem> Search(DiscoDataContext Database, string Term, int? LimitCount = null)
         {
             if (string.IsNullOrWhiteSpace(Term) || Term.Length < 2)
                 throw new ArgumentException("Search Term must contain at least two characters", "Term");
@@ -41,16 +42,16 @@ namespace Disco.BI.UserBI
             var adImportedUsers = Interop.ActiveDirectory.ActiveDirectory.SearchUsers(Term).Select(adU => adU.ToRepositoryUser());
             foreach (var adU in adImportedUsers)
             {
-                var existingUser = dbContext.Users.Find(adU.Id);
+                var existingUser = Database.Users.Find(adU.Id);
                 if (existingUser != null)
                     existingUser.UpdateSelf(adU);
                 else
-                    dbContext.Users.Add(adU);
-                dbContext.SaveChanges();
-                UserCache.InvalidateValue(adU.Id);
+                    Database.Users.Add(adU);
+                Database.SaveChanges();
+                UserService.InvalidateCachedUser(adU.Id);
             }
 
-            return Search_SelectUserSearchResultItems(dbContext.Users.Where(u =>
+            return Search_SelectUserSearchResultItems(Database.Users.Where(u =>
                 u.Id.Contains(Term) ||
                 u.Surname.Contains(Term) ||
                 u.GivenName.Contains(Term) ||
diff --git a/Disco.BI/BI/UserBI/UserCache.cs b/Disco.BI/BI/UserBI/UserCache.cs
deleted file mode 100644
index 2339ef81..00000000
--- a/Disco.BI/BI/UserBI/UserCache.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections.Concurrent;
-using Disco.Models.Repository;
-using Disco.Data.Repository;
-using System.Web;
-using Quartz;
-using Quartz.Impl;
-using Disco.Services.Tasks;
-
-namespace Disco.BI.UserBI
-{
-    public class UserCache
-    {
-        private static ConcurrentDictionary<string, Tuple<User, DateTime>> _Cache = new ConcurrentDictionary<string, Tuple<User, DateTime>>();
-        private const long CacheTimeoutTicks = 6000000000; // 10 Minutes
-        private const string CacheHttpRequestKey = "Disco_CurrentUser";
-
-        public static User CurrentUser
-        {
-            get
-            {
-                string username = null;
-                User user;
-
-                // Check for ASP.NET
-                if (HttpContext.Current != null)
-                {
-                    if (HttpContext.Current.Request.IsAuthenticated)
-                    {
-                        user = (User)HttpContext.Current.Items[CacheHttpRequestKey];
-                        if (user != null)
-                            return user;
-
-                        username = HttpContext.Current.User.Identity.Name;
-                    }
-                    else
-                    {
-                        return null;
-                        //throw new PlatformNotSupportedException("ASP.NET Authentication is not correctly configured");
-                    }
-                }
-
-                // User default User
-                if (username == null)
-                {
-                    username = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
-                }
-
-                user = GetUser(username);
-
-                if (HttpContext.Current != null && HttpContext.Current.Request.IsAuthenticated)
-                {
-                    // Cache in current request
-                    HttpContext.Current.Items[CacheHttpRequestKey] = user;
-                }
-
-                return user;
-            }
-        }
-
-        public static User GetUser(string Username)
-        {
-            // Check Cache
-            User u = TryUserCache(Username);
-
-            if (u == null)
-            {
-                // Load from Repository
-                using (DiscoDataContext dbContext = new DiscoDataContext())
-                {
-                    u = GetUser(Username, dbContext, true);
-                }
-            }
-            return u;
-        }
-
-        public static User GetUser(string Username, DiscoDataContext dbContext, bool ForceRefresh = false)
-        {
-            User u = null;
-
-            // Check Cache
-            if (!ForceRefresh)
-                u = TryUserCache(Username);
-
-            if (u == null)
-            {
-                string username = Username.ToLower();
-                u = UserBI.Utilities.LoadUser(dbContext, username);
-                SetValue(username, u);
-            }
-            return u;
-        }
-
-        private static User TryUserCache(string Username)
-        {
-            string username = Username.ToLower();
-            Tuple<User, DateTime> userRecord;
-            if (_Cache.TryGetValue(username, out userRecord))
-            {
-                if (userRecord.Item2 > DateTime.Now)
-                    return userRecord.Item1;
-                else
-                    _Cache.TryRemove(username, out userRecord);
-            }
-            return null;
-        }
-
-        public static bool InvalidateValue(string Key)
-        {
-            Tuple<User, DateTime> userRecord;
-            return _Cache.TryRemove(Key.ToLower(), out userRecord);
-        }
-
-        private static bool SetValue(string Key, User User)
-        {
-            string key = Key.ToLower();
-            Tuple<User, DateTime> userRecord = new Tuple<User, DateTime>(User, DateTime.Now.AddTicks(CacheTimeoutTicks));
-            if (_Cache.ContainsKey(key))
-            {
-                Tuple<User, DateTime> oldUser;
-                if (_Cache.TryGetValue(key, out oldUser))
-                {
-                    return _Cache.TryUpdate(key, userRecord, oldUser);
-                }
-            }
-            return _Cache.TryAdd(key, userRecord);
-        }
-
-        internal static void CleanStaleCache()
-        {
-            var usernames = _Cache.Keys.ToArray();
-            foreach (string username in usernames)
-            {
-                Tuple<User, DateTime> userRecord;
-                if (_Cache.TryGetValue(username, out userRecord))
-                {
-                    if (userRecord.Item2 <= DateTime.Now)
-                        _Cache.TryRemove(username, out userRecord);
-                }   
-            }
-        }
-    }
-}
diff --git a/Disco.BI/BI/UserBI/Utilities.cs b/Disco.BI/BI/UserBI/Utilities.cs
deleted file mode 100644
index a5ba7e15..00000000
--- a/Disco.BI/BI/UserBI/Utilities.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Disco.Models.Repository;
-using Disco.Data.Repository;
-using Disco.Models.BI.Search;
-using System.Runtime.InteropServices;
-using System.DirectoryServices.ActiveDirectory;
-using Disco.Services.Logging;
-
-namespace Disco.BI.UserBI
-{
-    public static class Utilities
-    {
-
-        public static User LoadUser(DiscoDataContext dbContext, string Username)
-        {
-            // Machine Account ?
-            if (Username.EndsWith("$"))
-            {
-                return Interop.ActiveDirectory.ActiveDirectory.GetMachineAccount(Username).ToRepositoryUser();
-            }
-
-            // User Account
-            User user = null;
-            try
-            {
-                var ADUser = Interop.ActiveDirectory.ActiveDirectory.GetUserAccount(Username);
-                if (ADUser == null)
-                    throw new ArgumentException(string.Format("Invalid Username: '{0}'", Username), "Username");
-                user = ADUser.ToRepositoryUser();
-            }
-            catch (COMException ex)
-            {
-                // If "Server is not operational" then Try Cache
-                if (ex.ErrorCode != -2147016646)
-                {
-                    throw ex;
-                }
-                SystemLog.LogException("Primary Domain Controller Down? Disco.BI.UserBI.Utilities.LoadUser", ex);
-            }
-            catch (ActiveDirectoryOperationException ex)
-            {
-                // Try From Cache...
-                SystemLog.LogException("Primary Domain Controller Down? Disco.BI.UserBI.Utilities.LoadUser", ex);
-            }
-
-            // Update Repository
-            User existingUser;
-            if (user == null)
-            {
-                string username = Username.Contains(@"\") ? Username.Substring(Username.IndexOf(@"\") + 1) : Username;
-                existingUser = dbContext.Users.Find(username);
-                if (existingUser == null)
-                    throw new ArgumentException(string.Format("Invalid User - Not In Disco DB: '{0}'", Username), "Username");
-                else
-                    return existingUser;
-            }
-            existingUser = dbContext.Users.Find(user.Id);
-            if (existingUser == null)
-            {
-                dbContext.Users.Add(user);
-            }
-            else
-            {
-                existingUser.UpdateSelf(user);
-                user = existingUser;
-            }
-            dbContext.SaveChanges();
-
-            return user;
-        }
-
-    }
-}
diff --git a/Disco.BI/Disco.BI.csproj b/Disco.BI/Disco.BI.csproj
index 374e9ee2..c654d758 100644
--- a/Disco.BI/Disco.BI.csproj
+++ b/Disco.BI/Disco.BI.csproj
@@ -143,6 +143,7 @@
     <Compile Include="BI\Expressions\Extensions\UserExt.cs" />
     <Compile Include="BI\Extensions\AttachmentActionExtensions.cs" />
     <Compile Include="BI\Extensions\AttachmentExtensions.cs" />
+    <Compile Include="BI\Extensions\AuthorizationRoleExtensions.cs" />
     <Compile Include="BI\Extensions\ClientServicesExtensions.cs" />
     <Compile Include="BI\Extensions\DeviceActionExtensions.cs" />
     <Compile Include="BI\Extensions\DeviceBatchExtensions.cs" />
@@ -175,6 +176,7 @@
     <Compile Include="BI\DocumentTemplateBI\Importer\DocumentImporterLog.cs" />
     <Compile Include="BI\Interop\ActiveDirectory\ActiveDirectory.cs" />
     <Compile Include="BI\Interop\ActiveDirectory\ActiveDirectoryCachedGroups.cs" />
+    <Compile Include="BI\Interop\ActiveDirectory\ActiveDirectoryGroupExtensions.cs" />
     <Compile Include="BI\Interop\ActiveDirectory\ActiveDirectoryHelpers.cs" />
     <Compile Include="BI\Interop\ActiveDirectory\ActiveDirectoryMachineAccountExtensions.cs" />
     <Compile Include="BI\Interop\ActiveDirectory\ActiveDirectoryOrganisationalUnit.cs" />
@@ -186,9 +188,6 @@
     <Compile Include="BI\Interop\MimeTypes.cs" />
     <Compile Include="BI\Interop\Pdf\PdfGenerator.cs" />
     <Compile Include="BI\Interop\Pdf\PdfImporter.cs" />
-    <Compile Include="BI\Interop\PluginServices\IDiscoScheduledTask.cs" />
-    <Compile Include="BI\Interop\PluginServices\Utilities.cs" />
-    <Compile Include="BI\Interop\SignalRHandlers\AdminAuthorizedPersistentConnection.cs" />
     <Compile Include="BI\Interop\SignalRHandlers\AuthorizedPersistentConnection.cs" />
     <Compile Include="BI\Interop\SignalRHandlers\HeldDeviceNotifications.cs" />
     <Compile Include="BI\Interop\SignalRHandlers\LogNotifications.cs" />
@@ -201,9 +200,6 @@
     <Compile Include="BI\JobBI\Statistics\DailyOpenedClosed.cs" />
     <Compile Include="BI\JobBI\Utilities.cs" />
     <Compile Include="BI\UserBI\Searching.cs" />
-    <Compile Include="BI\UserBI\UserCache.cs" />
-    <Compile Include="BI\UserBI\UserCachePruneTask.cs" />
-    <Compile Include="BI\UserBI\Utilities.cs" />
     <Compile Include="BI\Extensions\UtilityExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
diff --git a/Disco.BI/Properties/AssemblyInfo.cs b/Disco.BI/Properties/AssemblyInfo.cs
index f5598df3..949b9e72 100644
--- a/Disco.BI/Properties/AssemblyInfo.cs
+++ b/Disco.BI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.2249")]
-[assembly: AssemblyFileVersion("1.2.0725.2249")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.1001.1541")]
+[assembly: AssemblyFileVersion("1.2.1001.1541")]
\ No newline at end of file
diff --git a/Disco.Client/Program.cs b/Disco.Client/Program.cs
index 8bb62bab..05908f6c 100644
--- a/Disco.Client/Program.cs
+++ b/Disco.Client/Program.cs
@@ -44,7 +44,7 @@ namespace Disco.Client
 
             // Ignore Local Proxies
             WebRequest.DefaultWebProxy = new WebProxy();
-            // Override Http 100 Continue Behavour
+            // Override Http 100 Continue Behaviour
             ServicePointManager.Expect100Continue = false;
 
             // Assume success unless otherwise notified
diff --git a/Disco.Client/Properties/AssemblyInfo.cs b/Disco.Client/Properties/AssemblyInfo.cs
index 75379e8e..69efccad 100644
--- a/Disco.Client/Properties/AssemblyInfo.cs
+++ b/Disco.Client/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.2102")]
-[assembly: AssemblyFileVersion("1.2.0725.2102")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.1001.1300")]
+[assembly: AssemblyFileVersion("1.2.1001.1300")]
\ No newline at end of file
diff --git a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs
index fb6252c0..dc237ce2 100644
--- a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs
+++ b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.2102")]
-[assembly: AssemblyFileVersion("1.2.0725.2102")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.1001.1300")]
+[assembly: AssemblyFileVersion("1.2.1001.1300")]
\ No newline at end of file
diff --git a/Disco.Data/Configuration/ConfigurationBase.cs b/Disco.Data/Configuration/ConfigurationBase.cs
index 03aed9af..3e42cc49 100644
--- a/Disco.Data/Configuration/ConfigurationBase.cs
+++ b/Disco.Data/Configuration/ConfigurationBase.cs
@@ -11,30 +11,30 @@ namespace Disco.Data.Configuration
 {
     public abstract class ConfigurationBase
     {
-        private DiscoDataContext dbContext;
+        private DiscoDataContext Database;
 
         public abstract string Scope { get; }
 
-        public ConfigurationBase(DiscoDataContext dbContext)
+        public ConfigurationBase(DiscoDataContext Database)
         {
-            this.dbContext = dbContext;
+            this.Database = Database;
         }
 
         protected List<ConfigurationItem> Items
         {
             get
             {
-                return ConfigurationCache.GetConfigurationItems(dbContext, this.Scope);
+                return ConfigurationCache.GetConfigurationItems(Database, this.Scope);
             }
         }
 
         private void SetValue<ValueType>(string Key, ValueType Value)
         {
-            ConfigurationCache.SetConfigurationValue(dbContext, this.Scope, Key, Value);
+            ConfigurationCache.SetConfigurationValue(Database, this.Scope, Key, Value);
         }
         private ValueType GetValue<ValueType>(string Key, ValueType Default)
         {
-            return ConfigurationCache.GetConfigurationValue(dbContext, this.Scope, Key, Default);
+            return ConfigurationCache.GetConfigurationValue(Database, this.Scope, Key, Default);
         }
 
         protected void Set<ValueType>(ValueType Value, [CallerMemberName] string Key = null)
diff --git a/Disco.Data/Configuration/ConfigurationCache.cs b/Disco.Data/Configuration/ConfigurationCache.cs
index 29dcf782..0810b086 100644
--- a/Disco.Data/Configuration/ConfigurationCache.cs
+++ b/Disco.Data/Configuration/ConfigurationCache.cs
@@ -16,7 +16,7 @@ namespace Disco.Data.Configuration
         private static List<ConfigurationItem> configurationItems = new List<ConfigurationItem>();
         private static object configurationItemsLock = new object();
 
-        private static void LoadConfigurationItems(DiscoDataContext dbContext, string Scope, bool Reload)
+        private static void LoadConfigurationItems(DiscoDataContext Database, string Scope, bool Reload)
         {
             if (Reload || !configDictionary.ContainsKey(Scope))
             {
@@ -24,10 +24,10 @@ namespace Disco.Data.Configuration
                 {
                     if (Reload || !configDictionary.ContainsKey(Scope))
                     {
-                        if (dbContext == null)
+                        if (Database == null)
                             throw new InvalidOperationException("Cache-miss where Configuration Item requested from Cache-Only Configuration Context");
 
-                        var newItems = dbContext.ConfigurationItems.Where(ci => ci.Scope == Scope).ToArray();
+                        var newItems = Database.ConfigurationItems.Where(ci => ci.Scope == Scope).ToArray();
 
                         if (configDictionary.ContainsKey(Scope))
                         {
@@ -43,15 +43,15 @@ namespace Disco.Data.Configuration
                 }
             }
         }
-        private static Dictionary<string, Dictionary<string, ConfigurationItem>> ConfigurationDictionary(DiscoDataContext dbContext, string IncludingScope)
+        private static Dictionary<string, Dictionary<string, ConfigurationItem>> ConfigurationDictionary(DiscoDataContext Database, string IncludingScope)
         {
-            LoadConfigurationItems(dbContext, IncludingScope, false);
+            LoadConfigurationItems(Database, IncludingScope, false);
             return configDictionary;
         }
-        private static ConfigurationItem ConfigurationItem(DiscoDataContext dbContext, string Scope, string Key)
+        private static ConfigurationItem ConfigurationItem(DiscoDataContext Database, string Scope, string Key)
         {
             Dictionary<string, ConfigurationItem> scopeDict = default(Dictionary<string, ConfigurationItem>);
-            if (ConfigurationDictionary(dbContext, Scope).TryGetValue(Scope, out scopeDict))
+            if (ConfigurationDictionary(Database, Scope).TryGetValue(Scope, out scopeDict))
             {
                 ConfigurationItem item = default(ConfigurationItem);
                 if (scopeDict.TryGetValue(Key, out item))
@@ -59,42 +59,42 @@ namespace Disco.Data.Configuration
             }
             return null;
         }
-        private static List<ConfigurationItem> ConfigurationItems(DiscoDataContext dbContext, string IncludingScope)
+        private static List<ConfigurationItem> ConfigurationItems(DiscoDataContext Database, string IncludingScope)
         {
-            LoadConfigurationItems(dbContext, IncludingScope, false);
+            LoadConfigurationItems(Database, IncludingScope, false);
             return configurationItems;
         }
 
         #endregion
 
         #region Public Helpers
-        internal static ValueType GetConfigurationValue<ValueType>(DiscoDataContext dbContext, string Scope, string Key, ValueType Default)
+        internal static ValueType GetConfigurationValue<ValueType>(DiscoDataContext Database, string Scope, string Key, ValueType Default)
         {
-            var ci = ConfigurationItem(dbContext, Scope, Key);
+            var ci = ConfigurationItem(Database, Scope, Key);
             if (ci == null)
                 return Default;
             else
                 return (ValueType)Convert.ChangeType(ci.Value, typeof(ValueType));
         }
-        internal static void SetConfigurationValue<ValueType>(DiscoDataContext dbContext, string Scope, string Key, ValueType Value)
+        internal static void SetConfigurationValue<ValueType>(DiscoDataContext Database, string Scope, string Key, ValueType Value)
         {
-            if (dbContext == null)
+            if (Database == null)
                 throw new InvalidOperationException("Cannot save changes with a CacheOnly Context");
 
-            var ci = ConfigurationItem(dbContext, Scope, Key);
+            var ci = ConfigurationItem(Database, Scope, Key);
             if (ci == null && Value != null)
             {
                 lock (configurationItemsLock)
                 {
-                    ci = ConfigurationItem(dbContext, Scope, Key);
+                    ci = ConfigurationItem(Database, Scope, Key);
                     if (ci == null)
                     {
                         // Create Configuration Item
                         ci = new ConfigurationItem() { Scope = Scope, Key = Key, Value = Value.ToString() };
                         // Add Item to DB & Internal Collections
-                        dbContext.ConfigurationItems.Add(ci);
-                        ConfigurationItems(dbContext, Scope).Add(ci);
-                        ConfigurationDictionary(dbContext, Scope)[Scope].Add(Key, ci);
+                        Database.ConfigurationItems.Add(ci);
+                        ConfigurationItems(Database, Scope).Add(ci);
+                        ConfigurationDictionary(Database, Scope)[Scope].Add(Key, ci);
                         ci = null;
                     }
                 }
@@ -103,17 +103,17 @@ namespace Disco.Data.Configuration
             {
                 lock (configurationItemsLock)
                 {
-                    var entityInfo = dbContext.Entry(ci);
+                    var entityInfo = Database.Entry(ci);
                     if (entityInfo.State == System.Data.EntityState.Detached)
                     {
                         // Reload Scope from DB
-                        LoadConfigurationItems(dbContext, Scope, true);
-                        ci = ConfigurationItem(dbContext, Scope, Key);
+                        LoadConfigurationItems(Database, Scope, true);
+                        ci = ConfigurationItem(Database, Scope, Key);
                     }
 
                     if (Value == null)
                     {
-                        dbContext.ConfigurationItems.Remove(ci);
+                        Database.ConfigurationItems.Remove(ci);
                         configurationItems.Remove(ci);
                         configDictionary[Scope].Remove(Key);
                     }
@@ -125,9 +125,9 @@ namespace Disco.Data.Configuration
             }
         }
 
-        internal static List<ConfigurationItem> GetConfigurationItems(DiscoDataContext dbContext, string Scope)
+        internal static List<ConfigurationItem> GetConfigurationItems(DiscoDataContext Database, string Scope)
         {
-            return ConfigurationDictionary(dbContext, Scope)[Scope].Values.ToList();
+            return ConfigurationDictionary(Database, Scope)[Scope].Values.ToList();
         }
 
         internal static string ObsfucateValue(string Value)
diff --git a/Disco.Data/Configuration/Modules/BootstrapperConfiguration.cs b/Disco.Data/Configuration/Modules/BootstrapperConfiguration.cs
index 1eba4020..c9f754bd 100644
--- a/Disco.Data/Configuration/Modules/BootstrapperConfiguration.cs
+++ b/Disco.Data/Configuration/Modules/BootstrapperConfiguration.cs
@@ -8,7 +8,7 @@ namespace Disco.Data.Configuration.Modules
 {
     public class BootstrapperConfiguration : ConfigurationBase
     {
-        public BootstrapperConfiguration(DiscoDataContext dbContext) : base(dbContext) { }
+        public BootstrapperConfiguration(DiscoDataContext Database) : base(Database) { }
 
         public override string Scope
         {
diff --git a/Disco.Data/Configuration/Modules/DeviceProfilesConfiguration.cs b/Disco.Data/Configuration/Modules/DeviceProfilesConfiguration.cs
index 942ac218..f54f079e 100644
--- a/Disco.Data/Configuration/Modules/DeviceProfilesConfiguration.cs
+++ b/Disco.Data/Configuration/Modules/DeviceProfilesConfiguration.cs
@@ -9,7 +9,7 @@ namespace Disco.Data.Configuration.Modules
 {
     public class DeviceProfilesConfiguration : ConfigurationBase
     {
-        public DeviceProfilesConfiguration(DiscoDataContext dbContext) : base(dbContext) { }
+        public DeviceProfilesConfiguration(DiscoDataContext Database) : base(Database) { }
 
         public override string Scope { get { return "DeviceProfiles"; } }
 
diff --git a/Disco.Data/Configuration/Modules/OrganisationAddressesConfiguration.cs b/Disco.Data/Configuration/Modules/OrganisationAddressesConfiguration.cs
index f35d94db..e15a0275 100644
--- a/Disco.Data/Configuration/Modules/OrganisationAddressesConfiguration.cs
+++ b/Disco.Data/Configuration/Modules/OrganisationAddressesConfiguration.cs
@@ -11,7 +11,7 @@ namespace Disco.Data.Configuration.Modules
 {
     public class OrganisationAddressesConfiguration : ConfigurationBase
     {
-        public OrganisationAddressesConfiguration(DiscoDataContext dbContext) : base(dbContext) { }
+        public OrganisationAddressesConfiguration(DiscoDataContext Database) : base(Database) { }
 
         public override string Scope { get { return "OrganisationAddresses"; } }
 
diff --git a/Disco.Data/Configuration/SystemConfiguration.cs b/Disco.Data/Configuration/SystemConfiguration.cs
index 3ec1fe24..40a3a3fc 100644
--- a/Disco.Data/Configuration/SystemConfiguration.cs
+++ b/Disco.Data/Configuration/SystemConfiguration.cs
@@ -13,13 +13,13 @@ namespace Disco.Data.Configuration
 {
     public class SystemConfiguration : ConfigurationBase
     {
-        public SystemConfiguration(DiscoDataContext dbContext)
-            : base(dbContext)
+        public SystemConfiguration(DiscoDataContext Database)
+            : base(Database)
         {
             // Init Modules
-            this.moduleBootstrapperConfiguration = new Lazy<Modules.BootstrapperConfiguration>(() => new Modules.BootstrapperConfiguration(dbContext));
-            this.moduleDeviceProfilesConfiguration = new Lazy<Modules.DeviceProfilesConfiguration>(() => new Modules.DeviceProfilesConfiguration(dbContext));
-            this.moduleOrganisationAddressesConfiguration = new Lazy<Modules.OrganisationAddressesConfiguration>(() => new Modules.OrganisationAddressesConfiguration(dbContext));
+            this.moduleBootstrapperConfiguration = new Lazy<Modules.BootstrapperConfiguration>(() => new Modules.BootstrapperConfiguration(Database));
+            this.moduleDeviceProfilesConfiguration = new Lazy<Modules.DeviceProfilesConfiguration>(() => new Modules.DeviceProfilesConfiguration(Database));
+            this.moduleOrganisationAddressesConfiguration = new Lazy<Modules.OrganisationAddressesConfiguration>(() => new Modules.OrganisationAddressesConfiguration(Database));
         }
 
         #region Configuration Modules
diff --git a/Disco.Data/Disco.Data.csproj b/Disco.Data/Disco.Data.csproj
index e35c82ed..67914316 100644
--- a/Disco.Data/Disco.Data.csproj
+++ b/Disco.Data/Disco.Data.csproj
@@ -113,6 +113,10 @@
     <Compile Include="Migrations\201309050648129_DBv8.Designer.cs">
       <DependentUpon>201309050648129_DBv8.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\201310010352238_DBv9.cs" />
+    <Compile Include="Migrations\201310010352238_DBv9.Designer.cs">
+      <DependentUpon>201310010352238_DBv9.cs</DependentUpon>
+    </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Migrations\DiscoDataMigrator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -123,7 +127,6 @@
     </Compile>
     <Compile Include="Repository\DiscoDatabaseConnectionFactory.cs" />
     <Compile Include="Repository\DiscoDataContext.cs" />
-    <Compile Include="Repository\DiscoDataContextInitializer.cs" />
     <Compile Include="Repository\DiscoDataSeeder.cs" />
     <Compile Include="Repository\Monitor\RepositoryMonitor.cs" />
     <Compile Include="Repository\Monitor\RepositoryMonitorEvent.cs" />
@@ -153,6 +156,9 @@
     <EmbeddedResource Include="Migrations\201309050648129_DBv8.resx">
       <DependentUpon>201309050648129_DBv8.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\201310010352238_DBv9.resx">
+      <DependentUpon>201310010352238_DBv9.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -166,7 +172,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_StartDate="2011/7/1" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" />
+      <UserProperties BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
diff --git a/Disco.Data/Migrations/201310010352238_DBv9.Designer.cs b/Disco.Data/Migrations/201310010352238_DBv9.Designer.cs
new file mode 100644
index 00000000..6a802a3b
--- /dev/null
+++ b/Disco.Data/Migrations/201310010352238_DBv9.Designer.cs
@@ -0,0 +1,27 @@
+// <auto-generated />
+namespace Disco.Data.Migrations
+{
+    using System.Data.Entity.Migrations;
+    using System.Data.Entity.Migrations.Infrastructure;
+    using System.Resources;
+    
+    public sealed partial class DBv9 : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(DBv9));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "201310010352238_DBv9"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}
diff --git a/Disco.Data/Migrations/201310010352238_DBv9.cs b/Disco.Data/Migrations/201310010352238_DBv9.cs
new file mode 100644
index 00000000..ee895e09
--- /dev/null
+++ b/Disco.Data/Migrations/201310010352238_DBv9.cs
@@ -0,0 +1,30 @@
+namespace Disco.Data.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class DBv9 : DbMigration
+    {
+        public override void Up()
+        {
+            CreateTable(
+                "dbo.AuthorizationRoles",
+                c => new
+                    {
+                        Id = c.Int(nullable: false, identity: true),
+                        Name = c.String(nullable: false, maxLength: 100),
+                        SubjectIds = c.String(),
+                        ClaimsJson = c.String(),
+                    })
+                .PrimaryKey(t => t.Id);
+            
+            DropColumn("dbo.Users", "Type");
+        }
+        
+        public override void Down()
+        {
+            AddColumn("dbo.Users", "Type", c => c.String(maxLength: 8));
+            DropTable("dbo.AuthorizationRoles");
+        }
+    }
+}
diff --git a/Disco.Data/Migrations/201310010352238_DBv9.resx b/Disco.Data/Migrations/201310010352238_DBv9.resx
new file mode 100644
index 00000000..5da5f53c
--- /dev/null
+++ b/Disco.Data/Migrations/201310010352238_DBv9.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Target" xml:space="preserve">
+    <value>H4sIAAAAAAAEAO19WXPcuJLu+0Tc/6DQ052JGMt72yfkmVBLco90bEsj2d2PDroKquIcFllDsnyk89fmYX7S/QsX3LFkYiO4lFov3VYBTGQmPiQSW+b/+5//Pf73+0108JOkWZjEHw5fPHt+eEDiRbIM49WHw11+96/vDv/93/7PPx2fLzf3B7839V4V9eiXcfbhcJ3n278cHWWLNdkE2bNNuEiTLLnLny2SzVGwTI5ePn/+/ujFiyNCSRxSWgcHxze7OA83pPyD/nmaxAuyzXdB9DlZkiirf6cltyXVgy/BhmTbYEE+HJ6F2SJ5dhbkwbMbsk2yME/Sh8ODkygMKDO3JLo7PNi+/su3jNzmaRKvbrdBHgbR14ctoeV3QZSRmvW/bF+bcv/8ZcH9URDHSU7JJbGT9IetXFSyc6qB/KFgq5TuwyFVwl242qUl/YuccNXpB38lD9wP9KfrNNmSNH+4IXc1kdsF/eXw4Ehfk5IT6x0fiW203/HkC67pH3lKUXJ48DG8J8tPJF7l61bBn4P75pd3FCrf4pBiin6Tpzta+mUXRcGPiLTVj5StlqyO3ObvQbSzlZT+U9Fs9Tfb6vFRBwIlNM6SxW5D4vwr2WyjICcuyLhY2nd38Y2VBl711vsZyRZpuK3GmFXbL9/0btwF3m/7NvoxjHKSnt9vU5JlvsWWQQcwQCGVk/hjkm6atn9NkogEsV6WL8HPcFVaLIHoZfLjdvejtLqHBzckKutk63Bb2ehnIqS/cx98TJPNTRIB0Gfrfb9Ndumi6LDEoPLXIF2R3HEEdoT8jD2wGm2kaGGUkfqy92BhuLVq+c10JuLFc3upUYSf5HmwWJdwGxblDXCNUN4MCVMpzsjPcEFOk802iSlNRAy+EioFXk0WQlHXVoYaiSDrdRnGMlAssQrVcWARVi0tUPCm40vLk7mLwffH+B7GRZy/egkMR+rL31IXn/xGYkJ9Y7K8LmarNC6+JaUUentRiFauLBTNmcyUQ1kek7ZPkyxvGj0ji3ATRIcH1yn9V710e3d4cLsICnKQGu3sQakshSkoy7/LtkO0BXA9xBgglR2Gmtrz6G/MJL/DwPD1GJVVbzyqEek6jt70Hkefg3h3FyzyXUpSa5+pd+PVuJqi1WqGtGr5dd+Gz8hdsIvyazpa1kFGzoqla2PC6L+/hhsHktVQczOGFkz/EaRpEOcPtPRnuLTGir3ufLhoPe0ybNc0RtxODBX337nJR+SZLUVmEK6KB3fIaQeOpGEQfdltfhSYsd5g476224jovaI7yTKSO7Xd21J8ShaB9z0fc3vixzksKNEf78KI6GdRE2K/Bvli3ZOtYsTu6PRc/GWr3dc9lUsBFa5isvyWkdR+n6A3poIs/0Lyvyfp3z4lqyT2Mf2cRFHy929xsMvXhauzKNyf8zhN2kndeOdM7KaUFLR0PBrRKhmK9MRMlVjS8zN5L5LNJiy3Of2wx1K8IUHGWJBqXhGLs77zsG5pZDGJwdMtOM/Z8VgbIQWXdY3v7aQsMipUQCZcsZbb7lNp5hTMluU4q1wxwihfx5ZN1o6pup6vJ/U9W4x1PlfHrfeLTysyG427yNes1SMzDlZDFA3XdcPFGcmDMFIJUNVAGeeKEYb5Om6MdlvBKma7WijDUhWEabmetw3Jml5VLkG4+BmDblnmYbujsV6PaMPDwflyOasQFxPrJM2dmp7uiKb/Bk+9fr9KV0EcZiW8T5bL4nDVmx/dnsP7vB9gptgwo2392BVScTs65dAVCjNr8qzSgoiymnsV0UTP5/FdklYbDY26T5P4ZzHOOjC5etk1cVxMV8LlLlHhZZ6cnSwWyS7uTfGU/ju8K1cYzRaU9RLqrfUCrsfujbVLCU8jmOPZY0Kp/Ms/93TS366a7uKaTU277TYKJ9iBb6VofMuRtVgYmyF3rwv6/7kLahj12s4qp1F/+2PNhvrvQRQuv1EGo76L/4aiW1/2n6ou4myX+tnHKEkF8YJMNjBqYbx0TCvNVD1DvYd6NTZ0w4oJUxw/Bjsc8ifYZodYE5lN0er+T2+sdmnU3HqY+cstmLlek+1/U5W6+nQF8uCyqd/bUtzu0niKdn8L6SpgEomv10lMnA7G+t/7Od9QCyosYE0btz9CQcd/MZ5U+3Fd+Xdx91Mokra0xHLbraxyy1GzA8fXAVkUikE2xTpu24XOG7Tq/WVFZbPNWnB/uveGYklN3E5sf5Rmgq6kt/2vQOUyCzQHlgaXtgd+ceP/6HSwlxAediztX/p4aHSMpz46+9XXpkKjCLK5zmOps3yPaSNlmosJX8liPdG4/hhGxMF5U+97GLX8ma4jHe4gemi5WMFmebDZ9t61clxWepBBfPPh92WeR3tl6WRBdgtzxEz5a4aXCY9dXZTPpoqO17ae9dJafN1pwLf8Dcq/9FxII4dU38MOPO9ouswgFR3V5Urws8alrfbobKcgqNHx72QyAvS0X9Pex/sWB4bC2Nkjw9s53tZS8N6VyerLbpk41MUdI/6F6yeuj2Yfk7M44YPXIc2Q0dCdxGBcbWlfLSf0lisG/NzJvd+SBUXdaZRkfo6MKkrDaMe8fR+SfIyCVedTN97O5yAOVqQwRnW5y3X8/yDRsi97HaXplN3x4PhSov9GdMXCDQmWDx+T9IbkuzT2o1qe5tRKrrjwdT2dpTidZH8EYU4bojoup/kFC6D+Dpjm/f33tlx62178LPkjbJmt56R7/Gvx3B5hS/mwt5dTp7xzizx447bQvSzgFVv10ImIGwf8zI72lFiN7yy+FOwvoYptl/FTLMqmWI1nky8F2RSquCGLnaBQVqGqPLtyDZBloJob27Dx1wiAfQSJAtdVCIV84Coeb/u1gonVYZH4WkphhKoOFlV3uMpVKQyCwDVfCMUxEWo4nD1qnkezNQAOuTKIQb6CA3+fkhXKGS0DeKp/hbhpihz4+EzyoL2ehTHEVQJYk8ohJuVKjuw21/xU3DZ1EGbZYoxXro4jq1+S2IRbphrCsFAD41ms1uvNe+OmzfbW1FwDh1l7yzoXtXR9LSJWAeZfqtN3J+9xHgBTwfo+1X86zR215afTXL+nueX809+pA0wQ4vZ5OcblySPesskhLlJtkDNcvi3VEa66pkYIvwe4rPP7ZPnnYvmnfGA7UiRChWEyX8oBIwVe6/mySh11xCjJFdRMKk2SzSimi8an8TuX8Tu5F+PyFt1lqKr3NgDki9sevgZmQRcZkmwRxpK3YchvwDgMyBr4tmPSw3j5lGTZVXoWbIKVl1iO58WrftfIbx7OM12n0P7vE7+uw5SaPPrDabDLSNsvrsECRHqTvJISmfhjbXuZ/21vHv4I85hkGcmKP7P62RSxfjjVXxm/7tJVFKQPX9fkLqdjfp0sr+6oPUhtdeLh9Vr9ZxHK7ZYQL3HwrpMoXJAvSRGioj98eWq3+TQGgefCv5ZOU0qiyFmU5l8SS+le95buhiySnyS9IcvdgvA3AIyT6vS+0JWvqbcVU0ePOj+ktBWh9eD0ECGIdufVXRMJov89rCDcFMlTbuls5udiF0NwpPsiLq6d/SkR4FvhR0nmh/SCusz4BT5TcC/V1ssif+LDdWyPl/bKczy/LxZ3QeTgl3h4QV03Tt34lR+73lCkqqWmrDxInUimYp8gIgaBY72OepvTVmScgKebfQYGe/S6V2PjImttRmky+jpTdfwxisPTdaHXG/Lfu9BTmBqM9jS3GkVuqLs/jJgl4XnIeB2Eg4hY0J1GwsYPu0qX1D0NQk+XygGyc5DPccZQpmuz5sKXpyoRnUbDF/HPpLzqtiDhT1/xuDiS08hF14oBta4uofv7exhN4/68pobidF5Tw8FAXpNqdjS9DqamobwnpvoUc8OMv7ddlaFTqKsiGAJWWmi/c1FB93Ff+Zv51VX87nsr6ZvPXIRvv7WVHZl6TUVHP1dKjnxlIjj2aS+5TXYjUCYUexLab6wlVu5PqOQFJklTacFPlbICX5hICn3mcAXe721eA757L4vZ7AYjBlwYOBzWDCIyPIXGGjOIqubNnFUCEDjwAZwkpMeYe5w3pacPQvB00XrUlie/ovTILlprbZlTfiDYpuF5hLxcp5IagS5WoZX0PA97DVtWkeImtrayQQ94vY99ssvXSRr+o5SqaPExTTLed7oMk1H8+C+yyC+WEwSqL058ssts8Dtolj4Mk33mMeHrepBMOmZ3nJqm4yW573di6HK7713vS/9xTpisRmEcFFfZdIPz7at3r63PtuOibu9LZef32zAtraSvxK8Lkwyt5mFhRvWl3d0SxhSgfolcB5kWgYp2s+Fuw9kqIL3rRVbGi2rV9o0OuDR6oGplxxyvnc+k6IQWf8uru0/hHf22XP9+OHwuqZP74DYpgkzVdV/oKudUHXFb/aWm+qfysU1d+ZWmcnU1u+Plta5+EheQbuu/eS53Q6VwVSfIWed6d8FVTL4mn4P4wbQLyg/of7pucJAEjDrWylINK0AUOjcoOLuI74ohXZL8XlvR34rLyRirJgQuooisimdXDYrsSfweFjhcdBp7bU/jOknjZJUG23XXUe8syPxHsPhbae4aTby1+JjasfuHXx+2Qdap8pWNIn5NSVCsM2h/n6xSUv7YUnpro46K0kc6J8YLatJlai9eatRSKDRYUKGKTCNdl7x8//r9219evtfopfm6zBXS9cSbd+/fv3r95r1GKc3XF/E1SUtPtOH6lxe/vH/39v2LdxplNBRuP992XfH61Zv3v7x69+qtoeifWd7fvvvlxfvXv7z95dVbk4F8kmUJ1Xxhgrhprcp1VE89XYQYnhtq7w/YOQr+qJvQHtowhVymps+7KA+3Ubig8xa1V8+eyePasKU22IfYUvcQV2jtX6Sm6kP2PCzuCMbUQgdhnMuOe0gBuw0iC/kFGobuf9FxbWtiyRnZkrjw4C2UY8KGkLtO5qhtWFiq6JR3fMQAzgSHXFJ4NSbgDPEiEvQAUNJFEWaO5R4Ag1gZDVaQfvcLTNdColV1v19jWVfFrq8rip2vt2JiCyi4BrVaiJyj4QrRgjm0agITgwvNRKjGgD4toQiGKimvtRnTJjScxqTp2BoNhrqOMMMjlPp1BqA0sXdInkkj+Bk5bXCSynGNHSjk6BhzNHTl55MhSsiMhaJJzKAFIKmrYmPHRMIAgqqjNN087IQfpPURsIMo1KTl5tR/MsCIWY1UfYumOOL7l7klYgkeNFGlGkD+pjwFEyPhCNHxvmGpPTY37G75BH0ATEmH7+MZJgUX4wNLVLYJB+wVpTkATLrZYIgB/JLDAIBD70ewPpV0RWMk44YxNz4esT4xcryAe1AT+vOlZEgqLrXzrfgS9/X5j+zXnKpGR598jVkabTlg0CcmvIjJ6eaDz3pBZwUS8RR8YEwKZ+na1eiQYOR5Mel6zSuDnoDku8J8narjagQ4QrHAMVwoA4N3eGiivFts86rCifOU6+KB9j4UEo5g7BRaMGn9ssseOBWU2kRMio6WszJxHWxjqFhqMFzMgOiKFbHxcTAiKnCPsGFiYgzMiwNGvJgVS4Gv+ORSKg6vkExTvcS+gnNTjbPaxhkYaZTAKjVpnP9y0jEjJP5S9TaWBawXhJC8YaOtRXAeRkIRrFWTxuXsqZOhSE6lpkQSkHnND5oAwpMgCudjJFThGjZfPIjpYidGF5IwTw8HXfY8D4jT5NubAHtqjkZFoVr/5njEc+xOjkwh46EJYLD0h17QiCRMnASHMC8jIxDWtg325PzHU6FOyGmkwAOW4IjDmNsBiEwdXvcM5/zDzY+DK1ixhuvkmWDHxFoZHtx6QtF0C8lpT23VijZhYGZmyfjMVv3ZgFCb14GtGW+jI/FRHNdeirm2FABBEm9x6LN4wKKgPfZkCbY+DqBApe7BVAmkQTPqXs1E2R8/002TOA9jQ2lfJ8kml5iio6XEYhx8ihR4dsCRkrCPZHKEdsdBiKC8PTAzXFI3TTdqTIsbNqYzJ1Dr48FkX02InLNG0cGKBDYcdPiUfnZvSsBmxrY2KAfjAArV8x5YIF1SIeN+V2QYMgebxmKZJigac6vTkKcpkIh2iQkzYBavKVHKxSjWgASOVizhsE2442TzwFjHY5o8iIHxcAbpeE8MnnHCAg0C7LMXSBBk0z7ZG0Pr9AdjW0ZbBseDr23fmXCmSy81V8x3uSl64A1IVDEi2uVMF3OCusTdPHAudZkLyLnkYnNFeJt+pAfE5FwkI+JbSmYyJ3iLzM0D3WJ/uYCbTSs3F2xj+WUs0KVNNjMgsnXZaqYEtoa3aXCt6SwTphTJBGeJatPtB4tkQmMhevLNCGPOZoBml40JNGnjXJAM5YayQJMyUdSAKFZlmpoSwwq+pkGwooOMGIJTc84FvQa7a2g6MBt0mu2xYSnFxtxmQ3iYBnx7tNlWDgzKAP4er62BxeewBE1Hzwwnnt71SmKMAA1JVJM2ZxCawCZYhmF4DIdYsnMIgTFt0IvHEOaCT56n7nIkk56IJftweBD5acJYgDyYdKnn8BWgqk34mE3YiooROZ+ZGgOK5GYiDtxuMWPNGMPNtwlDWZkAdaj29xt52tth6BeDo2+iu2NaPkabQ/f93YY8cEyfbmi/HN70zeoNhzF7U2DzUbzkqG26cjnJ1DFfLRjFzJ5gUQkIM8Gsar3EnNlMyr0/0cYHUnyDA8rpTYeqpZFiCElmwUhDio9AFWlMsFJHqrbGUlLVT3IKQU3HKvIJSvhhUpXaIwjPRzj6agDnZQLDhffAjK3YeZk0skwoFsZdlsMwWyRnQR6UWevucwl7xUe3JG8u7ibxXbjaValDL3KyyQ4PzttslDUipEoA0niy4miEqMqjXUOUNTkyOXZA67jj7SnInGitjUiW6UNwcnVyFiNSOBVDAnWGHZxOmwLJiFyZx0JBrU4xoqFVrGAgGtUK0ODjarsII9FsyBkQ6lxejBi79jBSUflRG4kVVxVfzwT2CN5NPlUMF6Oxcsm+80YIWWjqknmaiVAzH3TV8yyETPnETU+AewSBkBJeoZgRrQ/hQhXR7rjTjGZ3tqckyx2kGkEXH1b8TrcRMTVe5IW9hujJLl8nafiPcvYpZm2IqlTJdBLoZn7FNMA6XQJZZnIGZwM5H+cB84k8PWjydwJenSaDZyu3OElJLooh4cZllAizMgpaOuLVZKxCLpUkqjg84SS0OmeFQ5Vkoh8wyaShup01IuZDRJWiTJwISIOlTpQE6hwLrYawZIl6dTvrB03phyrKLAkgIJ02DaAkZutEaTWnzfw3NM74LHRa5ZlhDE5X50FNI8Cr8y+rrFiASsQqOPdCTUgVnLerUIRIClBC7XV7UYGYHAxRgzKHmMQ/lkVMkIFzLDQqwfKGDa+W9hBOrxr4vE4li3Re50dF0unc8GqSl/9adalPnFTyoSdOftSHni+xlkjeEvFkqvn1JH9nCjXcqo90VlfxLW7UpdWx1rirmhkQp2DjzdaLoTqhfV+9hMLmr38VCpu+g8yTl0AWF0BtUDVcGqA2pKZuv0OhGYgWoBGOfx9aaROSwNqA85WInEsZS3iOtZJLOUoMtOcurgYA5p1v0PFGoo/b4ULSDUQJqtQckgxIcg5bVSDpOAawppdy5ghED6r8EpIASIYJWz0gOSUG0kNlZLncB4gugJpqQeQPnHUCkBpFL0jUfqWGTCL9IwJqYv27aU0T3X9g/Qmx5TWaU0WiR8VDYtG7aguJPj+MnoRo6LB6VCHTRTGQoOm8MkyXFDI9eI7yrwwNYOzWq/AHXnUzPlxM1qqaL0yFM1mpOmtuqnXqpRhZGdafIvqyKBQcf5nXEX4eoaY26LgDYgXrlGE26hRhhfurZaQh18S8hTUCRsQVeRZj4vKyV8fFaqnFKLiDwICL5YqLa9b1YMBXN8FH6mg5MimsA00EU1ECPIYprw3x0F+tFzxk6SDQ0AXZNNGUJjSnWkI8OKc/LeLhOIcDHPdqHdci/rgdEgl82y7rib22odcT+Ip9MLAZBzjEdeYWIxES3TpKoqxr4ZaMXt3WgRGHw6hZ4D23jkAC99lqRA7dN3AXyNH6ptF/GxbOTf1wVDlbZUhx5QZWvhRKbhzdY2HLzFRvFPRMpwld2DPPitdFOptA7wYuh2VQLislGLgf/jQ+oh+iC/9kpm1t4Cid+KrQUZ41rYoWNY6e1S6fMqSRTji149dLb8O6f2U3VLTgqxfAA0rpFgT/gFLXmcjnw8lYn3ib3YmwuwVheO/B6CbpuHcb+FAoqDoUEVMAGeCYKZI6TK60QQRHuDoqh/BAVaOJ9gFIg8f7kCQy3dvFCI+rKtUuFl7ZQirVzlZPhY2x2yX3ksFhgv4jG1gYHCn0Rd6kF+DQSYwt1tpgbCKzMOOjTGbwK3VUeoNH7YAo6mftknYMzxRUtAe/kaN8wg6pz/jJOy+jyaN3m2FhTn14FYrPobQTpe4xPAQP/Dm8jDvu+ZYeefgD+F6T5fFR9Xn7GLstOz66XazJJqh/OD6iVRZkm++CqHqw0RR8DrbbMF5l3Zf1Lwe322BBJTj919vDg/tNFGcfDtd5vv3L0VFWks6ebcJFmmTJXf5skWyOgmVy9PL58/dHL14cbSoaRwsOseLT8balPEmDFRFKi0fiS/IxTLO8eFf+g66YDw9OlxupmunT86Y59AW63I3Ns7zm0+LfzHv3Z0Wrz27INslCKsMD8GJdoNnp9yMVuRhRpfSEgYEBDUrldhFEQdoEBWjCEyyS4p7naRLtNjH3kwhRnMZfyQNPofzB/Pvfg2gn8FD/JNM4PhKUIfbAkdQFwtAQO9eo62XT17/ndY6SQcfrSWA6LwIesQqHAiDhX5+RbJGG2wJuPBmuwJyeDxR+DKOcpOf325TQJarImFxqQZmqNidxcQYoEGULZoNV9eRvi9KOmgM+VR8Pg8zL6ma4SIT5eXiUT2WjRP/Wg4niSbpYKB2FoQxU+9BUJCQUTWf0TpMs5wlVv8wMUPVrXV9gAh8sGwMJ+Xo/ZrnPQby7Cxb5Li32oFiCfIkFxeq9OEcKityjpVG99pHoQHFX1BorX4E3x1Vn5Z4Rrzmggu2wlgcO+7s1t80ZBi39GS7FrkErzWyY+huhzoPTYtXBRSDj3D5lbDKcIl3wkhwiyBWY0/uULAJ54He/Tj0VMTErYKpMoS3dMlQBTLUtspnmNtsd9b2Lv8Tpji2x6msuVL/Q3cow/ooeD7L8C8n/nqR/+5Ssklg2XnANC76jKPn7tzjY5Ws6iMq9neV5nCaCBVdUs9B6SorvZCG4AnN6JQMRRJAvsdN3+S2saKbIBr+LZLMJyxUexCtU7kb9hgSZ7BbI5TObJdqIOL4miyY0n+ucgX4/jEsnGyFb43O7TtJcJsP8PJ2DWfsqV+kqiMOsnKlOlstixwP0acB6boa9OyHEDDwWO1MpT5jlafhjVzAoe6hyqTllVvQg+haHgkMJldsYy7skrVa9jfinSfyzsOZiT2uqWrepE0xRzbyt0gkurNzJWX0Jk28EKrfAVXf00Xjb4qBHqszM2DbBoXzZ2ipwqaulRb6eq53F15Cui8fb3XYbhdKCo/3VgbfmhhDIHnZ9CKdbjEN5cdv9akfpP3dBiQGZWldiPbcoVzNQDfMWmiX270EULr9RBgW/GCq3pw72mVRoTrd8KAT5mlyBJb3i4REMV6DYmldAt3yJA7egWuVSK++ivt0jeBTInZ/JbH11+6q/jYcumxkYd/izgTZEw4z6cA+ycecKbCxyGsuedPOjOZ3fQuowyVwxP1vY9jVdGkIbSVyBhV+2ocgHvXC+ZFZ4bsarH1TXIZndsI19jM58wKaQ/WbQ07UIY6ywNzH94IWJuO2GGRWBYSyjH9SxmdNYSqqMaji1j2FEZPPa/WpxRBTS9bt8QtT+aiEh/SbLg81WELD7eUgPAZ3XgGxg3PRmkC1s4rWmGHDR15qTp+u8+NSRUR9I4MdFULn9QYLsvPMlUx9NfIsDlFOxbDa4RK6yO9w/crt4tJ83joaEu59Jig/IKNKTS20pyxBnf7dwvO+3ZJGTZRU4ETi3AsotJh8uHKO0PymV2lIGDu6c+PwYBSthhqx/skVlEWYRQmP1uws1THtwDZcW4FN8qNyWOh8+EaIv1ujXglpXeF37VqtAh9DZqVzuSl0njVzLZqMvLGJCUG2UTsdC7n+4xpwmTo+Xd91v7o55bXfPrtpe8mENvXRUr1Wv5vvBPB/A63la8j4tebvyoYaf12vuLD23wTf6Bff5jb0/3fX4JlalF/wVOSCdkAd++GfB3LS2dTrcCfEsvSCQTx3qhEUNiSFx9SnJsqv0LNgEK+DKiFxqsY9QXMaCF5JC0XS28us6TJfXAf3hNNhlRBxbUqk75S+SdwXXcG/hj/WDuoGygsV6MMxjkmUkK/7M6vNWIl4AwSqZt/PrLl3RXx++rsldTkfCOlle3dHxkQriqOpZXcEr/yyuSt8SAtxWh2tYtJBEdC3+JSku2omIEstcqd7mwKhCqri2AWgGKHelfprSuaYwpGn+JVE1I1Q0b++GLJKfJL0hy92CQNsZYAWLXdd8TafdOCcU8jkpB1ooDg+sjoXFo1q+umvuxglGTyiz2StlYjNDW6ZSsSNteJMXqDA3L4GJ6OfNS2gzdjs7CTiFIX2E83sK4DiI5DmML7GnSJ3wFXzGIJfbU78hd3TglQndIeJMsT3tYuEaEfClEFJlbgjnw1Z6Azmbmd4Z50oiQ0L9Imv98NJMCcs+qdTihBuJOg6coStr9m8RPGPX1HVvtQztrReSqdazLRPxuIru7RWRs/WidbX6tWQiGFvP/l4+E5gafz4gVerVDiSUopprW/BMgNVxbAV2ppAqPdrQ6kztWKG2jw/hDN3MByo404ekQKrYOP3bgNot4NE0X2JPEXNVoHJ76ghAgWJ72gpXBakyG1eFDyjc30dh6TnfybO9WT3s5aSnG9cWSPJ7+CzSdEbU+EfQw2Ly6XD66XDaeoSe7PJ1kob/KLcti5CuPoaoRNRhjBrQGGaQyk6MrfNyu/vxX2SRXywFcLG/W+7sZZdS/A7299nACYge7MviM0TdI/upaAwDp2skKMC1MhKAllq8JPcIwapoTMCXcYnFsArtjxbbfHHwIxJPb9ofrS5Th1V4YfAiNVdmsTsQRckCDlMkFI3tEQw92Pn43NK+Jh/w3WDHkv8A2I3EI7EWocflHUgoFrysJaPRXVCDxmSho7Zle6bqcOjuTNWUQN4Ue7PIY4+GmuLdBy6wGLDdGjPKfAuWUV7VWBIqW+HKIGGDY3eKlD3gzSADxBP2IG/cEnzKr3UBz+3gZ5DvwhV/ImkfADRIoPEnQaCUtUKs0s7X9S/t323WijpjBJfKopSzSExRypfV2SvEFBJVlcODxh2ky46HLCebCsq3/x2dRmHpljUVPgdxeEfXz1+Tv5H4w+HL58/fHR6cRGGQVQlH7JNjkOXmKMuW3GYd4/Z3TqMqDcTxX4mEuqY/bsgdvw8n9Z5cE9hcOz4S2zgWIFSTL7j+cBj/DIrdfuqBfQ7uP5F4la8/HL57fnjwZRdFhY/64fAuiOQrISLRkhO/JOt9P57o/90E9//MkspTcXOQdQyVnaVO3WDWV/Iw03dA8Y1CVa/sVcXdWVSQfvnGnrYeLm+tacqpIMyZljscoM9mhahI/yji6ynZNMYNNuO5Igashprx3vh6aY8BhhkF4TeD4fbFcx3P5oNelQ1hjDEfFvNU6VT9Rug0GpSX+fLink9Ri9RR4awVyUV8Y1qyGziOHWJCuno6UtFckkW4CaJivqb/yso8YC/oDF24PLT4pd/OBjIW7HFHm3XQG/sO4jMgKA2IPe0qJcIARKvjFgXh19Z0wQwJNXDpv/Ow2Ei0JdllR7AfAhZMy0kSeqjGcpw5+bqKXUADV5b7WuWi2M95XNYCr/jqnqv49Xr8TQJC9gKQksW81KYscGaJz1OgUttrW9JiTCClUbXuajBfQT9bokhOYOrqAgpmcxLg/BnR4tMR9BNWyEPQ1wrLuQf8UWzyDRiC3NK4XkNR+vfWjdGOY73HD8wGXQIAJeU5OV2qPABerGUX9F+zkWKmCSngv/vcAAXAt97sgayPMpy/u4lUxO13J3oNxOnvYcUJGJRf5Rhp5ktLKwVEuH+8NsphuJuuKczsXRt/3O+6Sgqf71cHXTD9YVZCfHj9Hl4wFEvfmRwUOr+f7yFFzPdgPLmI+f3YA8Lk+4UpHzDfE7M+ldnduxzuDEOOPT/ZuYXD2QIXtN4vOtoY9n7JMgHtPRtdNra9351XPsq9irZugWsFS+hxgxk4sYvd45+VWm8KeDpSc1n+6I5gXWgOfgarihW/t57jIFtJ7IsHv3Ds3j+YO3pGhLvnEJ4JM48jevrQ2Bzdm0XogYTxoX/vdZgq2LvZsDK5pAt8porarh+XUKPed/UZ/nqCZ9CtYzGqvI2Da3OV4ZHY3OGuKPSApFE/DwGeKykGvN8p44qJB9/3tAAIAt9vMSeHfveqW3+M1mHgm/2+lfNZXRUA3scRtRjy3avmoKjvfpc6cNx3H4rB47sPoCI+xLsf9uWA7l4ZhyO6DzVp+bt813/bY6xbb/009ugWWXVAJvfzp6cF1dOCymzsPLbbojMeOgMetU9xARWKDv4EG/+wGd5+mdyXsIGFIlC3GUDAgIR6jPTuRDmQdz//VIjg7fdURWFOnI705Dje7pc14KjdfuUHA3crty/sHX8sbrfKs3UQRRW02/NRXP0nH7a7H8rFcN09bgzBsbk9qwCIz+1TAUIobgXzr+2ZB6NxK5p4Z98EFo3b8+VAISp3320xKRS3R4IeNhVsp084ru+8Z08+zLXnc34g1HXPuVmObz0My0LUyKG2jZQBoecNHDlgtPsUog4L3Q8yuvDPXjcdFaGf/UrBRXkeVIQuxLNfCdhwzl4FQIM59/QX8MjNA7JvZOde9mvE1/SLxmn2qh8wUnPfy5ZgaGavbPMxmv1OWlCc5n4aAYIzD8PyGPMsHtp40JsnA98EHP5qytOtQAFCj+7IavC7JE9HWk9HWgbDSxOGeG/Hl+1kb/jKqgtw7GEHmY1wPLQBRSMD720PX7u8arSjXEUadl+o67fx39mfXNZRhyuqlOiPMA7SB8f3sUXdXlvQYrjhnitVPs6wj9tO3qZYm82lfmHB0BC9YFVV6Ej1Fz3iijUsuo8NgXPjNbYtcT+XgV1jivUDglEc3fmAAmL3CSCaSJM9EWIU6XZGEIH4NfZz/0S4YWLwdk037bYRmXlez+PlQeHCd9dia86KMLfP2t8+76I83EbhgjZL/WBJZI5Mg02BUvszT+xfJGL1NlYeFgc7cZanQSiH779Ow3gRboNIYF+oZ+iZFkptKYolZ2RL4sLllEU0aU0ZUbmlLQwKnQ64iMtqEDAhCL4L5hZHAxv6kO1H7ne+I58/e6YChhg5U6bKlA0CETSc4zAwUYYKRZoUwkVMiJfvePDL4VECEHtMmNgzKFxXscNqROhsRl0b6MK2xHw2mQYO11CwtJkA4rqLqzghJMpATYaAqII6yV1Y/74H5gEISzUTNLShMaecKdh3zCgWykK236ofZt37skCTd7v4ZnwGNkCMczW6t2BlYPbZbzC3Q3D0sUnA0sXy+d7fQKjAwAQNEsk0P++1lcCCIiGtTWoh+Lg8HjpeYwiEOEAiNbZo7zGgTPM8bxw0FwyGNQJPQABbVOW8ngIMmvxJzCwvVuSmeqlwrwyHWgmzwY5Jvu4RXU8+PtXYCxAhOpbseIoV9trS6COCIe3OaKki4AXMN+KwzNwXqFisLzX3ZkeAjdH93TGgU6crBo5Zhzg0E0k8imOyvTgfK/r5igt4Npx7Ol5HjzU9mPbylRRSbrLO5gO8Deow/Hn7W46iN1l/y6Hpnvp8kD6HYwBO3O9w5L0nBAyIADzY4eRY4MMYPqFgUBTIMSMn23cqPHn8oPqpu/t09wwW+OruNV7Qz6aLp1ix243ueSzQme1kORa5Vcdp+h3ZIxZKhlqyjzTaLTeFwVgmk/T9KAv3CSEwosXft0MlHgizOFOaFitTnCjZ42Y2B0psfN6B5xD47jtfsOcziN1t94knkK7fR5k/Juv+EWcPu/6fw+TxKVkNPOyLCM4ChfKnPR/qUmBqpKWJB3nRv6MM71G7ecQhbdrPcxjMXFTsgYc1H4FboCUUGriPMx/tinjjSJsTj3seClKs2aG3At3RsX8Wwh4bYOjfKZHShHQdwWa00WMBUHRlj8NiwJFykSZnYDCY4L7fVZFox7AebKBhACpc8WOwIGhgZaRVXaTgueKojQX8BKL5gYgL1DxXBDWxmJ8AND8AsXGy54IfJBb2E3ymh48iTPks0TPm8ukJOxbYmctCikUOEKj9CTfT4waJnz8X1Ay/AncHyL6uw20hMuVSnI3/P+JLLSByAF/waO554QkWkJZnc+FLjOvvDR5Gzz6ROx1y4SNDiu3NjtmiZfhjwDkAZdx3wft2XUw2IXO4MTYH3Exxb8zNwMzl6piUJWHc+YhNzwAEU2VLH9mMhCamwBAzlynpsnpS3sRi/n6b0DW88nW5frkjynEVn5EiR9dBlbr2w+FpkC2CpRym+og2pGj5Eg3kfDlCLOeRFkeX1qGc4djnU4Dna7HfLOa24rrQLhD3Y4WSTQdDnYshAQ9aMCwCVUH4dd8o2R5vymQvXJsawx7xwwdCNp63Q8Hb4Ih3CTvuN9K5JaSNMpZMDc49MbbzhOS8jXA/9O67QRaTq9hY5D4r4qEGAJ4qR8Xd8FZ5itW1YdogpHWzPEGTg3RfLPNMgTlz29wPwntlnM/LpE5Fskb6BUmbq9LJknwM06zI+R78CDLZHBdf3ZK8rR/fhatdlV/xIiebw4PzNltUDTKgzu1iTTbBh8Plj4TisUo9xVUDtqP4hmWDL7UrV4GaFWtl2qbZQSI1yhZCzTG2RC+juM6QRRRrgBKKWZjM2q0j5CNt1qV4e2UF07bQZlQtmBJvE8EgbbTleFN1FdMW61QASHt1Kd5aWcGgseq8SGql+hkiX5SYkW2OoUHiTSHWRFVu1hB70AA2xlbAGuzqmPaQGAgV6SqxGt5nfE0jIwJbD9RsGNHErZLSJJnZo0s+ngDUiq63uCpGLarMH1+MtGdh+Or3h2BDZQHSBC0zIi68xIKaEaogDXK1jJvu7hlhLXc1FA3XlULzhrk7TljbXCVF8109Ew74WzXIMFcZNLaGaXPKUSJXwZu1GSsnu3ydpOE/Sv+p8GeBtoE6UONSNWNfhT0GxLwVto7CX+mqGeFM55UZOGbZ9x7embJ9RV0Tj82OL8WaTusjazkTvWUla8zSQ5ql+A+ZmvyUhSeTFdfdrIS0NeY3aTUFr9f5T9ufxVU3L5SBwIw/LGdEBSRX1sdFAbz2Uhbud4UqkNUGQ4Mp86QULu0nqgo8OegACgA+9SaumNoSlViZAxNgWljiMLy3JZMKzidwRMVW5HkEGOZWWQzX9e+TCswnCcGRjecS4RhmV3olu9UPs+hTKSGftnvVKfwGGNNWSHFQSLfo/Y71t1jFZ1/LC/b2u+ZnLyKKKdYQMZWZ2DyIKnvX7bdskW+R2/u8erHhq7/7K7q8k6pVge4ESnmwxw5UqXAmKoK2fQytvuoj/3MAvNXFWEGxwjCqaWYfQ6XA1z1dJrhZqOSSye4DL3bg5D++FjniN55EEhLZIJKp0t30hPhwoglpWxDRVMldZitahXEuQwkiHlBzn0REknEohTVJ4DF7sYW8ExqBVVkqZilq0WwVgx9xRIAA/bMUpF4FYqKwxb5nwsFAKATJh7GniqRvy6ZYH/EAhRLPomrG2tCLg6nENlkZaL4YY2Ewqnr4AN+wQhRBwPvCH97B5Qv8iqnBvi7wdX/ojyVyE70ZlhOM7dy3N5nz6OaT8idf4mj6Do9n3L/XhhRNDs0Ly6cJ4du398AD/+ZjodC/2HIYWhMlaILX9u/3KZTCxXvBtYCHhfGBBPEOBCtzV+ZLZOPoorg63AKU+kEIcGeE1RdXPIbKukCabvpCAnE+TmW1MSPddAWHnHwcqsLCI5ppyii44iNUlMEMZhlF8HEoCQp6Z6Yibbi8x6Eg9XyvjATnY8ofVXz2qqL2vEUR8szbOQtwKM0XeBJZjtGFiq0J5+VNdGS7QS70rwLVkg6v7P/gcUIVmGxL6T8aY2dqGlUBUYRQDekiDnkbMsDlYYYAV+rrPFZ8e4wfzSpfKfedKS7RW6iXPi+iiqLUb1kNhIZevYpC2N2jnUgFwkVWQwwYfKUFt8u9WhUdRGGKWoMqD8eSwVdD4WoGKjMIeADpzDZOwlCzk/YtAUhzPBUqYGf7it8n7kZUWxEGoKDYvuRuy46Pqhcc9Q/0zzxJg1X9Mrf89fjopth32ZDqrzNS3kRrSBxTmjEpoxB0RJs6F/Fd0jxnFzhqqjTFdUcWC55lkAcnxUQeLHJavCBZFsarw4Pfg2hHq5xvfpDlRXy1y7e7nIpMNj8ibmVUPIRXtX98JPF8fLUt/sp8iEDZDKkI5Cr+dRdGy5bvj0GUCZ2GkShe2P9G6O9VX+b0/2T10FKiK0JDQrX62sAA7ZOcq/g2+Elw3vQ65DV2fBYGqzTYZDWN7nv6J4XfcnP/b/8fUpcne4OkAgA=</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Disco.Data/Migrations/Configuration.cs b/Disco.Data/Migrations/Configuration.cs
index 6cdabeb6..25c0b270 100644
--- a/Disco.Data/Migrations/Configuration.cs
+++ b/Disco.Data/Migrations/Configuration.cs
@@ -13,9 +13,9 @@ namespace Disco.Data.Migrations
             AutomaticMigrationsEnabled = false;
         }
 
-        protected override void Seed(DiscoDataContext context)
+        protected override void Seed(DiscoDataContext Database)
         {
-            context.SeedDatabase();
+            Database.SeedDatabase();
         }
     }
 }
diff --git a/Disco.Data/Migrations/DiscoDataMigrator.cs b/Disco.Data/Migrations/DiscoDataMigrator.cs
index 0148b6d4..5b9dae75 100644
--- a/Disco.Data/Migrations/DiscoDataMigrator.cs
+++ b/Disco.Data/Migrations/DiscoDataMigrator.cs
@@ -49,12 +49,12 @@ namespace Disco.Data.Migrations
         public static void SeedDatabase()
         {
             // Seed/Update Database
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                dbContext.SeedDatabase();
+                database.SeedDatabase();
                 try
                 {
-                    dbContext.SaveChanges();
+                    database.SaveChanges();
                 }
                 catch (Exception ex)
                 {
diff --git a/Disco.Data/Properties/AssemblyInfo.cs b/Disco.Data/Properties/AssemblyInfo.cs
index 9ccb1356..67c11b3c 100644
--- a/Disco.Data/Properties/AssemblyInfo.cs
+++ b/Disco.Data/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.2249")]
-[assembly: AssemblyFileVersion("1.2.0725.2249")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.1001.1541")]
+[assembly: AssemblyFileVersion("1.2.1001.1541")]
\ No newline at end of file
diff --git a/Disco.Data/Repository/DiscoDataContext.cs b/Disco.Data/Repository/DiscoDataContext.cs
index fa939189..73d84d7a 100644
--- a/Disco.Data/Repository/DiscoDataContext.cs
+++ b/Disco.Data/Repository/DiscoDataContext.cs
@@ -23,6 +23,7 @@ namespace Disco.Data.Repository
 
         public virtual DbSet<User> Users { get; set; }
         public virtual DbSet<UserAttachment> UserAttachments { get; set; }
+        public virtual DbSet<AuthorizationRole> AuthorizationRoles { get; set; }
 
         public virtual DbSet<DeviceUserAssignment> DeviceUserAssignments { get; set; }
 
diff --git a/Disco.Data/Repository/DiscoDataContextInitializer.cs b/Disco.Data/Repository/DiscoDataContextInitializer.cs
deleted file mode 100644
index aabb3b52..00000000
--- a/Disco.Data/Repository/DiscoDataContextInitializer.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Shouldn't Need this => Moved to Entity Migrations...
-
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using System.Data.Entity;
-
-//namespace Disco.Data.Repository
-//{
-//    class DiscoDataContextInitializer : CreateDatabaseIfNotExists<DiscoDataContext>
-//    {
-//        protected override void Seed(DiscoDataContext context)
-//        {
-//            context.SeedDatabase();
-//            context.SaveChanges();
-//        }
-//    }
-//}
diff --git a/Disco.Data/Repository/DiscoDataSeeder.cs b/Disco.Data/Repository/DiscoDataSeeder.cs
index c9878f1b..54b3218b 100644
--- a/Disco.Data/Repository/DiscoDataSeeder.cs
+++ b/Disco.Data/Repository/DiscoDataSeeder.cs
@@ -8,224 +8,224 @@ namespace Disco.Data.Repository
 {
     public static class DiscoDataSeeder
     {
-        public static void SeedDatabase(this DiscoDataContext context)
+        public static void SeedDatabase(this DiscoDataContext Database)
         {
-            context.SeedDeploymentId();
-            context.SeedDeviceModels();
-            context.SeedDeviceProfiles();
-            context.SeedJobTypes();
-            context.SeedJobSubTypes();
+            Database.SeedDeploymentId();
+            Database.SeedDeviceModels();
+            Database.SeedDeviceProfiles();
+            Database.SeedJobTypes();
+            Database.SeedJobSubTypes();
         }
 
-        public static void SeedDeploymentId(this DiscoDataContext context)
+        public static void SeedDeploymentId(this DiscoDataContext Database)
         {
-            if (context.ConfigurationItems.Count(ci => ci.Scope == "System" && ci.Key == "DeploymentId") == 0)
+            if (Database.ConfigurationItems.Count(ci => ci.Scope == "System" && ci.Key == "DeploymentId") == 0)
             {
                 var deploymentId = Guid.NewGuid().ToString("D");
-                context.ConfigurationItems.Add(new ConfigurationItem { Scope = "System", Key = "DeploymentId", Value = deploymentId });
+                Database.ConfigurationItems.Add(new ConfigurationItem { Scope = "System", Key = "DeploymentId", Value = deploymentId });
             }
         }
-        public static void SeedJobTypes(this DiscoDataContext context)
+        public static void SeedJobTypes(this DiscoDataContext Database)
         {
-            if (context.JobTypes.Count() == 0)
+            if (Database.JobTypes.Count() == 0)
             {
-                context.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.HWar, Description = "Hardware - Warranty" });
-                context.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.HNWar, Description = "Hardware - Non-Warranty" });
-                context.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.HMisc, Description = "Hardware - Misc" });
-                context.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.SImg, Description = "Software - Reimage" });
-                context.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.SApp, Description = "Software - Application" });
-                context.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.SOS, Description = "Software - Operating System" });
+                Database.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.HWar, Description = "Hardware - Warranty" });
+                Database.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.HNWar, Description = "Hardware - Non-Warranty" });
+                Database.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.HMisc, Description = "Hardware - Misc" });
+                Database.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.SImg, Description = "Software - Reimage" });
+                Database.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.SApp, Description = "Software - Application" });
+                Database.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.SOS, Description = "Software - Operating System" });
             }
             // 2012-05-22
             #region "User Management" Added
-            if (context.JobTypes.Count(jt => jt.Id == JobType.JobTypeIds.UMgmt) == 0)
-                context.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.UMgmt, Description = "User - Management" });
+            if (Database.JobTypes.Count(jt => jt.Id == JobType.JobTypeIds.UMgmt) == 0)
+                Database.JobTypes.Add(new JobType { Id = JobType.JobTypeIds.UMgmt, Description = "User - Management" });
             #endregion
             // End
         }
-        public static void SeedDeviceModels(this DiscoDataContext context)
+        public static void SeedDeviceModels(this DiscoDataContext Database)
         {
-            if (context.DeviceModels.Count() == 0)
+            if (Database.DeviceModels.Count() == 0)
             {
-                context.DeviceModels.Add(new DeviceModel { Manufacturer = "Unknown", Model = "Unknown", Description = "Unknown Device Model" });
+                Database.DeviceModels.Add(new DeviceModel { Manufacturer = "Unknown", Model = "Unknown", Description = "Unknown Device Model" });
             }
-            UpdateDeviceModelConfiguration(context);
+            UpdateDeviceModelConfiguration(Database);
             // Removed: 2013-01-14 G#
             //UpdateDeviceModelImageStorage(context);
 
             // Added: 2013-02-07 G#
-            UpdateDeviceModelDuplicates(context);
+            UpdateDeviceModelDuplicates(Database);
         }
-        public static void SeedDeviceProfiles(this DiscoDataContext context)
+        public static void SeedDeviceProfiles(this DiscoDataContext Database)
         {
-            if (context.DeviceProfiles.Count() == 0)
+            if (Database.DeviceProfiles.Count() == 0)
             {
-                context.DeviceProfiles.Add(new DeviceProfile { ShortName = "WS", Name = "Default", Description = "Initial Default Workstation Profile", ComputerNameTemplate = "DeviceProfile.ShortName + ''-'' + SerialNumber" });
+                Database.DeviceProfiles.Add(new DeviceProfile { ShortName = "WS", Name = "Default", Description = "Initial Default Workstation Profile", ComputerNameTemplate = "DeviceProfile.ShortName + ''-'' + SerialNumber" });
             }
         }
-        public static void SeedJobSubTypes(this DiscoDataContext context)
+        public static void SeedJobSubTypes(this DiscoDataContext Database)
         {
-            if (context.JobSubTypes.Count() == 0)
+            if (Database.JobSubTypes.Count() == 0)
             {
-                context.JobSubTypes.Add(new JobSubType { Id = "Bag", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bag" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Battery", JobTypeId = JobType.JobTypeIds.HWar, Description = "Battery" });
-                context.JobSubTypes.Add(new JobSubType { Id = "BezelCaseBottom", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bezel - Case Bottom" });
-                context.JobSubTypes.Add(new JobSubType { Id = "BezelCaseTop", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bezel - Case Top" });
-                context.JobSubTypes.Add(new JobSubType { Id = "BezelScreenInner", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bezel - Screen Inner" });
-                context.JobSubTypes.Add(new JobSubType { Id = "BezelScreenTop", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bezel - Screen Top" });
-                context.JobSubTypes.Add(new JobSubType { Id = "BluetoothAdapter", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bluetooth Adapter" });
-                context.JobSubTypes.Add(new JobSubType { Id = "CPU", JobTypeId = JobType.JobTypeIds.HWar, Description = "CPU" });
-                context.JobSubTypes.Add(new JobSubType { Id = "HardDrive", JobTypeId = JobType.JobTypeIds.HWar, Description = "Hard Drive" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Keyboard", JobTypeId = JobType.JobTypeIds.HWar, Description = "Keyboard" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Motherboard", JobTypeId = JobType.JobTypeIds.HWar, Description = "Motherboard" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Mouse", JobTypeId = JobType.JobTypeIds.HWar, Description = "Mouse/Track Pad" });
-                context.JobSubTypes.Add(new JobSubType { Id = "PowerAdapter", JobTypeId = JobType.JobTypeIds.HWar, Description = "Power Adapter" });
-                context.JobSubTypes.Add(new JobSubType { Id = "PowerCord", JobTypeId = JobType.JobTypeIds.HWar, Description = "Power Cord/Socket" });
-                context.JobSubTypes.Add(new JobSubType { Id = "RAM", JobTypeId = JobType.JobTypeIds.HWar, Description = "RAM" });
-                context.JobSubTypes.Add(new JobSubType { Id = "ReplacementDevice", JobTypeId = JobType.JobTypeIds.HWar, Description = "Replacement Device" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Screen", JobTypeId = JobType.JobTypeIds.HWar, Description = "Screen" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Speakers", JobTypeId = JobType.JobTypeIds.HWar, Description = "Speakers" });
-                context.JobSubTypes.Add(new JobSubType { Id = "WebCamera", JobTypeId = JobType.JobTypeIds.HWar, Description = "Web Camera" });
-                context.JobSubTypes.Add(new JobSubType { Id = "WirelessAdapter", JobTypeId = JobType.JobTypeIds.HWar, Description = "Wireless Adapter" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Other", JobTypeId = JobType.JobTypeIds.HWar, Description = "Other" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Bag", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bag" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Battery", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Battery" });
-                context.JobSubTypes.Add(new JobSubType { Id = "BezelCaseBottom", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bezel - Case Bottom" });
-                context.JobSubTypes.Add(new JobSubType { Id = "BezelCaseTop", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bezel - Case Top" });
-                context.JobSubTypes.Add(new JobSubType { Id = "BezelScreenInner", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bezel - Screen Inner" });
-                context.JobSubTypes.Add(new JobSubType { Id = "BezelScreenTop", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bezel - Screen Top" });
-                context.JobSubTypes.Add(new JobSubType { Id = "BluetoothAdapter", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bluetooth Adapter" });
-                context.JobSubTypes.Add(new JobSubType { Id = "CPU", JobTypeId = JobType.JobTypeIds.HNWar, Description = "CPU" });
-                context.JobSubTypes.Add(new JobSubType { Id = "HardDrive", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Hard Drive" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Keyboard", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Keyboard" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Motherboard", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Motherboard" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Mouse", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Mouse/Track Pad" });
-                context.JobSubTypes.Add(new JobSubType { Id = "PowerAdapter", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Power Adapter" });
-                context.JobSubTypes.Add(new JobSubType { Id = "PowerCord", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Power Cord/Socket" });
-                context.JobSubTypes.Add(new JobSubType { Id = "RAM", JobTypeId = JobType.JobTypeIds.HNWar, Description = "RAM" });
-                context.JobSubTypes.Add(new JobSubType { Id = "ReplacementDevice", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Replacement Device" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Screen", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Screen" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Speakers", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Speakers" });
-                context.JobSubTypes.Add(new JobSubType { Id = "WebCamera", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Web Camera" });
-                context.JobSubTypes.Add(new JobSubType { Id = "WirelessAdapter", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Wireless Adapter" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Other", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Other" });
-                context.JobSubTypes.Add(new JobSubType { Id = "ExternalHardDrive", JobTypeId = JobType.JobTypeIds.HMisc, Description = "External Hard Drive" });
-                context.JobSubTypes.Add(new JobSubType { Id = "IWB", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Interactive Whiteboard" });
-                context.JobSubTypes.Add(new JobSubType { Id = "InternetDongle", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Internet Dongle" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Keyboard", JobTypeId = JobType.JobTypeIds.HMisc, Description = "External Keyboard" });
-                context.JobSubTypes.Add(new JobSubType { Id = "MobilePhone", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Mobile Phone" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Mouse", JobTypeId = JobType.JobTypeIds.HMisc, Description = "External Mouse" });
-                context.JobSubTypes.Add(new JobSubType { Id = "MP3Player", JobTypeId = JobType.JobTypeIds.HMisc, Description = "MP3 Player" });
-                context.JobSubTypes.Add(new JobSubType { Id = "PrinterScanner", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Printer/Scanner" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Projector", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Projector" });
-                context.JobSubTypes.Add(new JobSubType { Id = "USBFlashDrive", JobTypeId = JobType.JobTypeIds.HMisc, Description = "USB Flash Drive" });
-                context.JobSubTypes.Add(new JobSubType { Id = "WebCamera", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Web Camera" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Other", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Other" });
-                context.JobSubTypes.Add(new JobSubType { Id = "ContentIllegal", JobTypeId = JobType.JobTypeIds.SImg, Description = "Content - Illegal" });
-                context.JobSubTypes.Add(new JobSubType { Id = "ContentInappropriate", JobTypeId = JobType.JobTypeIds.SImg, Description = "Content - Inappropriate" });
-                context.JobSubTypes.Add(new JobSubType { Id = "CorruptOS", JobTypeId = JobType.JobTypeIds.SImg, Description = "Corrupt Operating System" });
-                context.JobSubTypes.Add(new JobSubType { Id = "HardwareChanges", JobTypeId = JobType.JobTypeIds.SImg, Description = "Hardware Changes" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Malware", JobTypeId = JobType.JobTypeIds.SImg, Description = "Malware" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Performance", JobTypeId = JobType.JobTypeIds.SImg, Description = "Performance" });
-                context.JobSubTypes.Add(new JobSubType { Id = "UserRequest", JobTypeId = JobType.JobTypeIds.SImg, Description = "User Request" });
-                context.JobSubTypes.Add(new JobSubType { Id = "UpdatedImage", JobTypeId = JobType.JobTypeIds.SImg, Description = "Updated Image" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Other", JobTypeId = JobType.JobTypeIds.SImg, Description = "Other" });
-                context.JobSubTypes.Add(new JobSubType { Id = "CurriculumTool", JobTypeId = JobType.JobTypeIds.SApp, Description = "Curriculum Tool" });
-                context.JobSubTypes.Add(new JobSubType { Id = "GamingEntertainment", JobTypeId = JobType.JobTypeIds.SApp, Description = "Gaming/Entertainment" });
-                context.JobSubTypes.Add(new JobSubType { Id = "ImageManipulation", JobTypeId = JobType.JobTypeIds.SApp, Description = "Image Manipulation" });
-                context.JobSubTypes.Add(new JobSubType { Id = "MultimediaPlayback", JobTypeId = JobType.JobTypeIds.SApp, Description = "Multimedia Playback" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Presentation", JobTypeId = JobType.JobTypeIds.SApp, Description = "Presentation" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Spreadsheet", JobTypeId = JobType.JobTypeIds.SApp, Description = "Spreadsheet" });
-                context.JobSubTypes.Add(new JobSubType { Id = "StaffTool", JobTypeId = JobType.JobTypeIds.SApp, Description = "Staff Tool" });
-                context.JobSubTypes.Add(new JobSubType { Id = "StudentReporting", JobTypeId = JobType.JobTypeIds.SApp, Description = "Student Reporting" });
-                context.JobSubTypes.Add(new JobSubType { Id = "VideoEditing", JobTypeId = JobType.JobTypeIds.SApp, Description = "Video Editing" });
-                context.JobSubTypes.Add(new JobSubType { Id = "WebBrowser", JobTypeId = JobType.JobTypeIds.SApp, Description = "Web Browser" });
-                context.JobSubTypes.Add(new JobSubType { Id = "WebBrowserPlugin", JobTypeId = JobType.JobTypeIds.SApp, Description = "Web Browser Plugin" });
-                context.JobSubTypes.Add(new JobSubType { Id = "WordProcessing", JobTypeId = JobType.JobTypeIds.SApp, Description = "Word Processing" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Other", JobTypeId = JobType.JobTypeIds.SApp, Description = "Other" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Appearance", JobTypeId = JobType.JobTypeIds.SOS, Description = "Appearance & Personalisation" });
-                context.JobSubTypes.Add(new JobSubType { Id = "DisplaySettings", JobTypeId = JobType.JobTypeIds.SOS, Description = "Display Settings" });
-                context.JobSubTypes.Add(new JobSubType { Id = "DriversIWB", JobTypeId = JobType.JobTypeIds.SOS, Description = "Drivers - Interactive Whiteboard" });
-                context.JobSubTypes.Add(new JobSubType { Id = "DriversPrintScan", JobTypeId = JobType.JobTypeIds.SOS, Description = "Drivers - Printers/Scanners" });
-                context.JobSubTypes.Add(new JobSubType { Id = "DriversSystem", JobTypeId = JobType.JobTypeIds.SOS, Description = "Drivers - System" });
-                context.JobSubTypes.Add(new JobSubType { Id = "DriversOther", JobTypeId = JobType.JobTypeIds.SOS, Description = "Drivers - Other" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Group Policy", JobTypeId = JobType.JobTypeIds.SOS, Description = "Group Policy" });
-                context.JobSubTypes.Add(new JobSubType { Id = "KeyboardMouseConfig", JobTypeId = JobType.JobTypeIds.SOS, Description = "Keyboard/Mouse Configuration" });
-                context.JobSubTypes.Add(new JobSubType { Id = "MalwareProtection", JobTypeId = JobType.JobTypeIds.SOS, Description = "Malware Protection" });
-                context.JobSubTypes.Add(new JobSubType { Id = "NetworkDrives", JobTypeId = JobType.JobTypeIds.SOS, Description = "Network Drives" });
-                context.JobSubTypes.Add(new JobSubType { Id = "NetworkWired", JobTypeId = JobType.JobTypeIds.SOS, Description = "Network - Wired" });
-                context.JobSubTypes.Add(new JobSubType { Id = "NetworkWireless", JobTypeId = JobType.JobTypeIds.SOS, Description = "Network - Wireless" });
-                context.JobSubTypes.Add(new JobSubType { Id = "NetworkOther", JobTypeId = JobType.JobTypeIds.SOS, Description = "Network - Other" });
-                context.JobSubTypes.Add(new JobSubType { Id = "PatchUpdate", JobTypeId = JobType.JobTypeIds.SOS, Description = "Patches/Updates" });
-                context.JobSubTypes.Add(new JobSubType { Id = "PowerManagement", JobTypeId = JobType.JobTypeIds.SOS, Description = "Power Management" });
-                context.JobSubTypes.Add(new JobSubType { Id = "PrintersScanners", JobTypeId = JobType.JobTypeIds.SOS, Description = "Printers/Scanners" });
-                context.JobSubTypes.Add(new JobSubType { Id = "SoundConfig", JobTypeId = JobType.JobTypeIds.SOS, Description = "Sound Configuration" });
-                context.JobSubTypes.Add(new JobSubType { Id = "Other", JobTypeId = JobType.JobTypeIds.SOS, Description = "Other" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Bag", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bag" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Battery", JobTypeId = JobType.JobTypeIds.HWar, Description = "Battery" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "BezelCaseBottom", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bezel - Case Bottom" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "BezelCaseTop", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bezel - Case Top" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "BezelScreenInner", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bezel - Screen Inner" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "BezelScreenTop", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bezel - Screen Top" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "BluetoothAdapter", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bluetooth Adapter" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "CPU", JobTypeId = JobType.JobTypeIds.HWar, Description = "CPU" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "HardDrive", JobTypeId = JobType.JobTypeIds.HWar, Description = "Hard Drive" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Keyboard", JobTypeId = JobType.JobTypeIds.HWar, Description = "Keyboard" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Motherboard", JobTypeId = JobType.JobTypeIds.HWar, Description = "Motherboard" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Mouse", JobTypeId = JobType.JobTypeIds.HWar, Description = "Mouse/Track Pad" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "PowerAdapter", JobTypeId = JobType.JobTypeIds.HWar, Description = "Power Adapter" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "PowerCord", JobTypeId = JobType.JobTypeIds.HWar, Description = "Power Cord/Socket" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "RAM", JobTypeId = JobType.JobTypeIds.HWar, Description = "RAM" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "ReplacementDevice", JobTypeId = JobType.JobTypeIds.HWar, Description = "Replacement Device" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Screen", JobTypeId = JobType.JobTypeIds.HWar, Description = "Screen" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Speakers", JobTypeId = JobType.JobTypeIds.HWar, Description = "Speakers" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "WebCamera", JobTypeId = JobType.JobTypeIds.HWar, Description = "Web Camera" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "WirelessAdapter", JobTypeId = JobType.JobTypeIds.HWar, Description = "Wireless Adapter" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Other", JobTypeId = JobType.JobTypeIds.HWar, Description = "Other" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Bag", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bag" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Battery", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Battery" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "BezelCaseBottom", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bezel - Case Bottom" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "BezelCaseTop", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bezel - Case Top" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "BezelScreenInner", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bezel - Screen Inner" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "BezelScreenTop", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bezel - Screen Top" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "BluetoothAdapter", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bluetooth Adapter" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "CPU", JobTypeId = JobType.JobTypeIds.HNWar, Description = "CPU" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "HardDrive", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Hard Drive" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Keyboard", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Keyboard" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Motherboard", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Motherboard" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Mouse", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Mouse/Track Pad" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "PowerAdapter", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Power Adapter" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "PowerCord", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Power Cord/Socket" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "RAM", JobTypeId = JobType.JobTypeIds.HNWar, Description = "RAM" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "ReplacementDevice", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Replacement Device" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Screen", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Screen" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Speakers", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Speakers" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "WebCamera", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Web Camera" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "WirelessAdapter", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Wireless Adapter" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Other", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Other" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "ExternalHardDrive", JobTypeId = JobType.JobTypeIds.HMisc, Description = "External Hard Drive" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "IWB", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Interactive Whiteboard" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "InternetDongle", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Internet Dongle" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Keyboard", JobTypeId = JobType.JobTypeIds.HMisc, Description = "External Keyboard" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "MobilePhone", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Mobile Phone" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Mouse", JobTypeId = JobType.JobTypeIds.HMisc, Description = "External Mouse" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "MP3Player", JobTypeId = JobType.JobTypeIds.HMisc, Description = "MP3 Player" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "PrinterScanner", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Printer/Scanner" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Projector", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Projector" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "USBFlashDrive", JobTypeId = JobType.JobTypeIds.HMisc, Description = "USB Flash Drive" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "WebCamera", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Web Camera" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Other", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Other" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "ContentIllegal", JobTypeId = JobType.JobTypeIds.SImg, Description = "Content - Illegal" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "ContentInappropriate", JobTypeId = JobType.JobTypeIds.SImg, Description = "Content - Inappropriate" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "CorruptOS", JobTypeId = JobType.JobTypeIds.SImg, Description = "Corrupt Operating System" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "HardwareChanges", JobTypeId = JobType.JobTypeIds.SImg, Description = "Hardware Changes" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Malware", JobTypeId = JobType.JobTypeIds.SImg, Description = "Malware" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Performance", JobTypeId = JobType.JobTypeIds.SImg, Description = "Performance" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "UserRequest", JobTypeId = JobType.JobTypeIds.SImg, Description = "User Request" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "UpdatedImage", JobTypeId = JobType.JobTypeIds.SImg, Description = "Updated Image" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Other", JobTypeId = JobType.JobTypeIds.SImg, Description = "Other" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "CurriculumTool", JobTypeId = JobType.JobTypeIds.SApp, Description = "Curriculum Tool" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "GamingEntertainment", JobTypeId = JobType.JobTypeIds.SApp, Description = "Gaming/Entertainment" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "ImageManipulation", JobTypeId = JobType.JobTypeIds.SApp, Description = "Image Manipulation" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "MultimediaPlayback", JobTypeId = JobType.JobTypeIds.SApp, Description = "Multimedia Playback" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Presentation", JobTypeId = JobType.JobTypeIds.SApp, Description = "Presentation" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Spreadsheet", JobTypeId = JobType.JobTypeIds.SApp, Description = "Spreadsheet" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "StaffTool", JobTypeId = JobType.JobTypeIds.SApp, Description = "Staff Tool" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "StudentReporting", JobTypeId = JobType.JobTypeIds.SApp, Description = "Student Reporting" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "VideoEditing", JobTypeId = JobType.JobTypeIds.SApp, Description = "Video Editing" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "WebBrowser", JobTypeId = JobType.JobTypeIds.SApp, Description = "Web Browser" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "WebBrowserPlugin", JobTypeId = JobType.JobTypeIds.SApp, Description = "Web Browser Plugin" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "WordProcessing", JobTypeId = JobType.JobTypeIds.SApp, Description = "Word Processing" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Other", JobTypeId = JobType.JobTypeIds.SApp, Description = "Other" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Appearance", JobTypeId = JobType.JobTypeIds.SOS, Description = "Appearance & Personalisation" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "DisplaySettings", JobTypeId = JobType.JobTypeIds.SOS, Description = "Display Settings" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "DriversIWB", JobTypeId = JobType.JobTypeIds.SOS, Description = "Drivers - Interactive Whiteboard" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "DriversPrintScan", JobTypeId = JobType.JobTypeIds.SOS, Description = "Drivers - Printers/Scanners" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "DriversSystem", JobTypeId = JobType.JobTypeIds.SOS, Description = "Drivers - System" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "DriversOther", JobTypeId = JobType.JobTypeIds.SOS, Description = "Drivers - Other" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Group Policy", JobTypeId = JobType.JobTypeIds.SOS, Description = "Group Policy" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "KeyboardMouseConfig", JobTypeId = JobType.JobTypeIds.SOS, Description = "Keyboard/Mouse Configuration" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "MalwareProtection", JobTypeId = JobType.JobTypeIds.SOS, Description = "Malware Protection" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "NetworkDrives", JobTypeId = JobType.JobTypeIds.SOS, Description = "Network Drives" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "NetworkWired", JobTypeId = JobType.JobTypeIds.SOS, Description = "Network - Wired" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "NetworkWireless", JobTypeId = JobType.JobTypeIds.SOS, Description = "Network - Wireless" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "NetworkOther", JobTypeId = JobType.JobTypeIds.SOS, Description = "Network - Other" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "PatchUpdate", JobTypeId = JobType.JobTypeIds.SOS, Description = "Patches/Updates" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "PowerManagement", JobTypeId = JobType.JobTypeIds.SOS, Description = "Power Management" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "PrintersScanners", JobTypeId = JobType.JobTypeIds.SOS, Description = "Printers/Scanners" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "SoundConfig", JobTypeId = JobType.JobTypeIds.SOS, Description = "Sound Configuration" });
+                Database.JobSubTypes.Add(new JobSubType { Id = "Other", JobTypeId = JobType.JobTypeIds.SOS, Description = "Other" });
             }
 
             // Feature Request 2012-04-27 by Elijah: https://disco.uservoice.com/forums/159707-feedback/suggestions/2803945-customisable-job-sub-types
             #region "Optical Drive" Added
-            if (context.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HNWar && jst.Id == "OpticalDrive") == 0)
-                context.JobSubTypes.Add(new JobSubType { Id = "OpticalDrive", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Optical Drive" });
-            if (context.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HWar && jst.Id == "OpticalDrive") == 0)
-                context.JobSubTypes.Add(new JobSubType { Id = "OpticalDrive", JobTypeId = JobType.JobTypeIds.HWar, Description = "Optical Drive" });
+            if (Database.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HNWar && jst.Id == "OpticalDrive") == 0)
+                Database.JobSubTypes.Add(new JobSubType { Id = "OpticalDrive", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Optical Drive" });
+            if (Database.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HWar && jst.Id == "OpticalDrive") == 0)
+                Database.JobSubTypes.Add(new JobSubType { Id = "OpticalDrive", JobTypeId = JobType.JobTypeIds.HWar, Description = "Optical Drive" });
             #endregion
             // End Feature Request
 
             // 2012-05-22
             #region "User Management" Added
-            if (context.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.UMgmt) == 0)
+            if (Database.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.UMgmt) == 0)
             {
-                context.JobSubTypes.Add(new JobSubType { Id = JobSubType.UserManagementJobSubTypes.Infringement, JobTypeId = JobType.JobTypeIds.UMgmt, Description = JobSubType.UserManagementJobSubTypes.Infringement });
-                context.JobSubTypes.Add(new JobSubType { Id = JobSubType.UserManagementJobSubTypes.Contact, JobTypeId = JobType.JobTypeIds.UMgmt, Description = JobSubType.UserManagementJobSubTypes.Contact });
+                Database.JobSubTypes.Add(new JobSubType { Id = JobSubType.UserManagementJobSubTypes.Infringement, JobTypeId = JobType.JobTypeIds.UMgmt, Description = JobSubType.UserManagementJobSubTypes.Infringement });
+                Database.JobSubTypes.Add(new JobSubType { Id = JobSubType.UserManagementJobSubTypes.Contact, JobTypeId = JobType.JobTypeIds.UMgmt, Description = JobSubType.UserManagementJobSubTypes.Contact });
             }
             #endregion
             // End
 
             // 2012-05-29 - Audits
             #region "Audit" Added
-            if (context.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HMisc && jst.Id == "Audit") == 0)
-                context.JobSubTypes.Add(new JobSubType { Id = "Audit", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Audit" });
-            if (context.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.SApp && jst.Id == "Audit") == 0)
-                context.JobSubTypes.Add(new JobSubType { Id = "Audit", JobTypeId = JobType.JobTypeIds.SApp, Description = "Audit" });
+            if (Database.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HMisc && jst.Id == "Audit") == 0)
+                Database.JobSubTypes.Add(new JobSubType { Id = "Audit", JobTypeId = JobType.JobTypeIds.HMisc, Description = "Audit" });
+            if (Database.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.SApp && jst.Id == "Audit") == 0)
+                Database.JobSubTypes.Add(new JobSubType { Id = "Audit", JobTypeId = JobType.JobTypeIds.SApp, Description = "Audit" });
             #endregion
             // End
 
             // Feature Request 2012-06-16 by James: https://disco.uservoice.com/forums/159707-feedback/suggestions/3002911-add-in-microphone-in-hardware-warranty-and-non-war
             #region "Microphone" Added
-            if (context.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HNWar && jst.Id == "Microphone") == 0)
-                context.JobSubTypes.Add(new JobSubType { Id = "Microphone", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Microphone" });
-            if (context.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HWar && jst.Id == "Microphone") == 0)
-                context.JobSubTypes.Add(new JobSubType { Id = "Microphone", JobTypeId = JobType.JobTypeIds.HWar, Description = "Microphone" });
+            if (Database.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HNWar && jst.Id == "Microphone") == 0)
+                Database.JobSubTypes.Add(new JobSubType { Id = "Microphone", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Microphone" });
+            if (Database.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HWar && jst.Id == "Microphone") == 0)
+                Database.JobSubTypes.Add(new JobSubType { Id = "Microphone", JobTypeId = JobType.JobTypeIds.HWar, Description = "Microphone" });
             #endregion
             // End Feature Request
 
             // Feature Request 2013-05-16 by Michael
             #region "Bezel - Case Bottom Load Cover" Added
-            if (context.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HNWar && jst.Id == "BezelCaseBottomCover") == 0)
-                context.JobSubTypes.Add(new JobSubType { Id = "BezelCaseBottomCover", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bezel - Case Bottom Load Cover" });
-            if (context.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HWar && jst.Id == "BezelCaseBottomCover") == 0)
-                context.JobSubTypes.Add(new JobSubType { Id = "BezelCaseBottomCover", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bezel - Case Bottom Load Cover" });
+            if (Database.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HNWar && jst.Id == "BezelCaseBottomCover") == 0)
+                Database.JobSubTypes.Add(new JobSubType { Id = "BezelCaseBottomCover", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Bezel - Case Bottom Load Cover" });
+            if (Database.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HWar && jst.Id == "BezelCaseBottomCover") == 0)
+                Database.JobSubTypes.Add(new JobSubType { Id = "BezelCaseBottomCover", JobTypeId = JobType.JobTypeIds.HWar, Description = "Bezel - Case Bottom Load Cover" });
             #endregion
             // End Feature Request
 
             // Feature Request https://github.com/garysharp/Disco/issues/1
             #region "Device Stolen/Lost"
-            if (context.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HNWar && jst.Id == "DeviceStolen") == 0)
-                context.JobSubTypes.Add(new JobSubType { Id = "DeviceStolen", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Device Stolen" });
-            if (context.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HNWar && jst.Id == "DeviceLost") == 0)
-                context.JobSubTypes.Add(new JobSubType { Id = "DeviceLost", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Device Lost" });
+            if (Database.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HNWar && jst.Id == "DeviceStolen") == 0)
+                Database.JobSubTypes.Add(new JobSubType { Id = "DeviceStolen", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Device Stolen" });
+            if (Database.JobSubTypes.Count(jst => jst.JobTypeId == JobType.JobTypeIds.HNWar && jst.Id == "DeviceLost") == 0)
+                Database.JobSubTypes.Add(new JobSubType { Id = "DeviceLost", JobTypeId = JobType.JobTypeIds.HNWar, Description = "Device Lost" });
             #endregion
             // End Feature Request
         }
 
-        private static void UpdateDeviceModelConfiguration(this DiscoDataContext context)
+        private static void UpdateDeviceModelConfiguration(this DiscoDataContext Database)
         {
-            if (context.ConfigurationItems.Where(c => c.Scope.StartsWith("DeviceProfile:")).Count() > 0)
+            if (Database.ConfigurationItems.Where(c => c.Scope.StartsWith("DeviceProfile:")).Count() > 0)
             {
-                var configurationItems = context.ConfigurationItems.Where(c => c.Scope.StartsWith("DeviceProfile:")).ToList();
+                var configurationItems = Database.ConfigurationItems.Where(c => c.Scope.StartsWith("DeviceProfile:")).ToList();
 
-                var deviceProfiles = context.DeviceProfiles.ToDictionary(dp => dp.Id);
+                var deviceProfiles = Database.DeviceProfiles.ToDictionary(dp => dp.Id);
                 foreach (var configurationItem in configurationItems)
                 {
                     int profileId = int.Parse(configurationItem.Scope.Substring(configurationItem.Scope.IndexOf(":") + 1));
@@ -254,47 +254,19 @@ namespace Disco.Data.Repository
                         }
                     }
                     // Remove from DB
-                    context.ConfigurationItems.Remove(configurationItem);
+                    Database.ConfigurationItems.Remove(configurationItem);
                 }
             }
 
         }
 
-        // Removed: 2013-01-14 G#
-        //        private static void UpdateDeviceModelImageStorage(this DiscoDataContext dbContext)
-        //        {
-        //#pragma warning disable 0618
-        //            var updateModels = dbContext.DeviceModels.Where(dm => dm.Image != null);
-        //            if (updateModels.Count() > 0)
-        //            {
-        //                var dataStoreLocation = dbContext.ConfigurationItems.Where(ci => ci.Scope == "System" && ci.Key == "DataStoreLocation").Select(ci => ci.Value).FirstOrDefault();
-        //                if (!string.IsNullOrEmpty(dataStoreLocation) && System.IO.Directory.Exists(dataStoreLocation))
-        //                {
-        //                    var deviceModelImagesLocation = System.IO.Path.Combine(dataStoreLocation, "DeviceModelImages");
-        //                    if (!System.IO.Directory.Exists(deviceModelImagesLocation))
-        //                        System.IO.Directory.CreateDirectory(deviceModelImagesLocation);
-        //                    foreach (var model in updateModels)
-        //                    {
-        //                        var modelpath = System.IO.Path.Combine(deviceModelImagesLocation, string.Format("{0}.png", model.Id));
-
-        //                        if (model.Image != null && model.Image.Length > 0)
-        //                        {
-        //                            System.IO.File.WriteAllBytes(modelpath, model.Image);
-        //                        }
-        //                        model.Image = null;
-        //                    }
-        //                }
-        //            }
-        //#pragma warning restore 0618
-        //        }
-
         // Added: 2013-02-07 G#
         // Fix previous problem with duplicate device models being created if new devices enrol at the same time
         // http://www.discoict.com.au/forum/support/2013/2/duplicate-device-models.aspx
         // Thanks to Michael Vorster for reporting this problem.
-        private static void UpdateDeviceModelDuplicates(this DiscoDataContext dbContext)
+        private static void UpdateDeviceModelDuplicates(this DiscoDataContext Database)
         {
-            var deviceModels = dbContext.DeviceModels.ToList();
+            var deviceModels = Database.DeviceModels.ToList();
             var duplicateModels = deviceModels.GroupBy(g => string.Format("{0}|{1}", g.Manufacturer, g.Model)).Where(g => g.Count() > 1);
             foreach (var duplicateModel in duplicateModels)
             {
@@ -302,7 +274,7 @@ namespace Disco.Data.Repository
 
                 foreach (var redundantModel in duplicateModel.Where(m => m != primaryModel))
                 {
-                    foreach (var affectedDevice in dbContext.Devices.Where(d => d.DeviceModelId == redundantModel.Id))
+                    foreach (var affectedDevice in Database.Devices.Where(d => d.DeviceModelId == redundantModel.Id))
                     {
                         affectedDevice.DeviceModelId = primaryModel.Id;
                     }
diff --git a/Disco.Data/Repository/Monitor/RepositoryMonitor.cs b/Disco.Data/Repository/Monitor/RepositoryMonitor.cs
index fdcd6ff7..dd6c1c8a 100644
--- a/Disco.Data/Repository/Monitor/RepositoryMonitor.cs
+++ b/Disco.Data/Repository/Monitor/RepositoryMonitor.cs
@@ -21,17 +21,17 @@ namespace Disco.Data.Repository.Monitor
         public static Subject<RepositoryMonitorEvent> StreamBeforeCommit { get { return streamBefore; } }
         public static Subject<RepositoryMonitorEvent> StreamAfterCommit { get { return streamAfter; } }
 
-        internal static RepositoryMonitorEvent[] BeforeSaveChanges(DiscoDataContext dbContext)
+        internal static RepositoryMonitorEvent[] BeforeSaveChanges(DiscoDataContext Database)
         {
-            var contextStateManager = ((IObjectContextAdapter)dbContext).ObjectContext.ObjectStateManager;
+            var contextStateManager = ((IObjectContextAdapter)Database).ObjectContext.ObjectStateManager;
 
-            dbContext.ChangeTracker.DetectChanges();
-            var changes = dbContext.ChangeTracker.Entries().Where(entry => entry.State == System.Data.EntityState.Added || entry.State == System.Data.EntityState.Deleted || entry.State == System.Data.EntityState.Modified);
+            Database.ChangeTracker.DetectChanges();
+            var changes = Database.ChangeTracker.Entries().Where(entry => entry.State == System.Data.EntityState.Added || entry.State == System.Data.EntityState.Deleted || entry.State == System.Data.EntityState.Modified);
 
             var events = changes.Select(entryState =>
             {
                 ObjectStateEntry stateEntry = contextStateManager.GetObjectStateEntry(entryState.Entity);
-                var monitorEvent = EventFromEntryState(dbContext, entryState, stateEntry);
+                var monitorEvent = EventFromEntryState(Database, entryState, stateEntry);
 
                 // Push to Stream
                 streamBefore.OnNext(monitorEvent);
@@ -41,7 +41,7 @@ namespace Disco.Data.Repository.Monitor
 
             return events;
         }
-        internal static void AfterSaveChanges(DiscoDataContext dbContext, IEnumerable<RepositoryMonitorEvent> changes)
+        internal static void AfterSaveChanges(DiscoDataContext Database, IEnumerable<RepositoryMonitorEvent> changes)
         {
             foreach (var change in changes)
             {
@@ -88,7 +88,7 @@ namespace Disco.Data.Repository.Monitor
                     deferredAction.Invoke(monitorEvent);
         }
 
-        internal static RepositoryMonitorEvent EventFromEntryState(DiscoDataContext dbContext, DbEntityEntry entityEntry, ObjectStateEntry entryState)
+        internal static RepositoryMonitorEvent EventFromEntryState(DiscoDataContext Database, DbEntityEntry entityEntry, ObjectStateEntry entryState)
         {
             RepositoryMonitorEventType eventType;
             string[] modifiedProperties = null;
@@ -135,7 +135,7 @@ namespace Disco.Data.Repository.Monitor
                 EntityKey = entityKey,
                 EntityType = entityType,
                 ModifiedProperties = modifiedProperties,
-                dbContext = dbContext,
+                Database = Database,
                 dbEntityState = entityEntry,
                 objectEntryState = entryState
             };
diff --git a/Disco.Data/Repository/Monitor/RepositoryMonitorEvent.cs b/Disco.Data/Repository/Monitor/RepositoryMonitorEvent.cs
index 467ff817..36e89136 100644
--- a/Disco.Data/Repository/Monitor/RepositoryMonitorEvent.cs
+++ b/Disco.Data/Repository/Monitor/RepositoryMonitorEvent.cs
@@ -21,7 +21,7 @@ namespace Disco.Data.Repository.Monitor
         internal List<Action<RepositoryMonitorEvent>> executeAfterCommit;
 
         [JsonIgnore]
-        public DiscoDataContext dbContext { get; set; }
+        public DiscoDataContext Database { get; set; }
 
         public RepositoryMonitorEventType EventType { get; set; }
 
diff --git a/Disco.Models/Authorization/IAuthorizationToken.cs b/Disco.Models/Authorization/IAuthorizationToken.cs
new file mode 100644
index 00000000..39ef4e4f
--- /dev/null
+++ b/Disco.Models/Authorization/IAuthorizationToken.cs
@@ -0,0 +1,26 @@
+using Disco.Models.Repository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Models.Authorization
+{
+    public interface IAuthorizationToken
+    {
+        User User { get; set; }
+        List<string> GroupMembership { get; set; }
+        List<IRoleToken> RoleTokens { get; set; }
+
+        bool HasAny(params string[] ClaimKeys);
+        bool HasAny(IEnumerable<string> ClaimKeys);
+        bool HasAll(params string[] ClaimKeys);
+        bool HasAll(IEnumerable<string> ClaimKeys);
+        bool Has(string ClaimKey);
+
+        void Require(string ClaimKey);
+        void RequireAll(params string[] ClaimKeys);
+        void RequireAny(params string[] ClaimKeys);
+    }
+}
diff --git a/Disco.Models/Authorization/IClaimNavigatorItem.cs b/Disco.Models/Authorization/IClaimNavigatorItem.cs
new file mode 100644
index 00000000..1900869a
--- /dev/null
+++ b/Disco.Models/Authorization/IClaimNavigatorItem.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Models.Authorization
+{
+    public interface IClaimNavigatorItem
+    {
+        string Key { get; }
+        string Name { get; }
+        string Description { get; }
+        bool Hidden { get; }
+
+        List<IClaimNavigatorItem> Children { get; }
+        bool IsGroup { get; }
+        bool? Value { get; }
+    }
+}
diff --git a/Disco.Models/Authorization/IRoleToken.cs b/Disco.Models/Authorization/IRoleToken.cs
new file mode 100644
index 00000000..a209e3bf
--- /dev/null
+++ b/Disco.Models/Authorization/IRoleToken.cs
@@ -0,0 +1,15 @@
+using Disco.Models.Repository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Models.Authorization
+{
+    public interface IRoleToken
+    {
+        AuthorizationRole Role { get; set; }
+        List<string> SubjectIds { get; set; }
+    }
+}
diff --git a/Disco.Models/BI/Config/OrganisationAddress.cs b/Disco.Models/BI/Config/OrganisationAddress.cs
index 391f2ec3..7b4dc69b 100644
--- a/Disco.Models/BI/Config/OrganisationAddress.cs
+++ b/Disco.Models/BI/Config/OrganisationAddress.cs
@@ -34,7 +34,7 @@ namespace Disco.Models.BI.Config
         public string ToConfigurationEntry()
         {
             StringBuilder entryBuilder = new StringBuilder();
-            
+
             entryBuilder.AppendLine(Name.Trim());
             entryBuilder.AppendLine(Address.Trim());
             entryBuilder.AppendLine(Suburb.Trim());
@@ -46,7 +46,7 @@ namespace Disco.Models.BI.Config
             {
                 entryBuilder.AppendLine(ShortName.Trim());
             }
-            
+
             return entryBuilder.ToString();
         }
 
@@ -70,5 +70,9 @@ namespace Disco.Models.BI.Config
             throw new ArgumentException("Invalid Configuration Address Entry", "entry");
         }
 
+        public override string ToString()
+        {
+            return string.Format("{0} ({1})", this.Name, this.ShortName);
+        }
     }
 }
diff --git a/Disco.Models/Disco.Models.csproj b/Disco.Models/Disco.Models.csproj
index 83e4f38f..48e280da 100644
--- a/Disco.Models/Disco.Models.csproj
+++ b/Disco.Models/Disco.Models.csproj
@@ -45,6 +45,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Authorization\IAuthorizationToken.cs" />
+    <Compile Include="Authorization\IClaimNavigatorItem.cs" />
+    <Compile Include="Authorization\IRoleToken.cs" />
     <Compile Include="BI\Config\OrganisationAddress.cs" />
     <Compile Include="BI\Device\ImportDevice.cs" />
     <Compile Include="BI\Device\ImportDeviceSession.cs" />
@@ -72,7 +75,9 @@
     <Compile Include="ClientServices\WhoAmI.cs" />
     <Compile Include="ClientServices\WhoAmIResponse.cs" />
     <Compile Include="Interop\ActiveDirectory\ActiveDirectoryMachineAccount.cs" />
+    <Compile Include="Interop\ActiveDirectory\ActiveDirectoryGroup.cs" />
     <Compile Include="Interop\ActiveDirectory\ActiveDirectoryUserAccount.cs" />
+    <Compile Include="Interop\ActiveDirectory\IActiveDirectoryObject.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Repository\ConfigurationItem.cs" />
     <Compile Include="Repository\Device\Device.cs" />
@@ -98,7 +103,11 @@
     <Compile Include="Repository\User\User.cs" />
     <Compile Include="Repository\User\UserAttachment.cs" />
     <Compile Include="Repository\User\UserDetail.cs" />
+    <Compile Include="Repository\User\AuthorizationRole.cs" />
     <Compile Include="UI\BaseUIModel.cs" />
+    <Compile Include="UI\Config\AuthorizationRole\ConfigAuthorizationRoleCreateModel.cs" />
+    <Compile Include="UI\Config\AuthorizationRole\ConfigAuthorizationRoleIndexModel.cs" />
+    <Compile Include="UI\Config\AuthorizationRole\ConfigAuthorizationRoleShowModel.cs" />
     <Compile Include="UI\Config\DeviceBatch\ConfigDeviceBatchCreateModel.cs" />
     <Compile Include="UI\Config\DeviceBatch\ConfigDeviceBatchIndexModel.cs" />
     <Compile Include="UI\Config\DeviceBatch\ConfigDeviceBatchIndexModelItem.cs" />
diff --git a/Disco.Models/Interop/ActiveDirectory/ActiveDirectoryGroup.cs b/Disco.Models/Interop/ActiveDirectory/ActiveDirectoryGroup.cs
new file mode 100644
index 00000000..4f88d54e
--- /dev/null
+++ b/Disco.Models/Interop/ActiveDirectory/ActiveDirectoryGroup.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Models.Interop.ActiveDirectory
+{
+    public class ActiveDirectoryGroup : IActiveDirectoryObject
+    {
+        public string Name { get; set; }
+        public string DistinguishedName { get; set; }
+        public string SamAccountName { get; set; }
+        public string SecurityIdentifier { get; set; }
+        public string CommonName { get; set; }
+
+        public List<string> MemberOf { get; set; }
+    }
+}
diff --git a/Disco.Models/Interop/ActiveDirectory/ActiveDirectoryMachineAccount.cs b/Disco.Models/Interop/ActiveDirectory/ActiveDirectoryMachineAccount.cs
index 5654fe6c..bf4ac261 100644
--- a/Disco.Models/Interop/ActiveDirectory/ActiveDirectoryMachineAccount.cs
+++ b/Disco.Models/Interop/ActiveDirectory/ActiveDirectoryMachineAccount.cs
@@ -6,37 +6,24 @@ using Disco.Models.Repository;
 
 namespace Disco.Models.Interop.ActiveDirectory
 {
-    public class ActiveDirectoryMachineAccount
+    public class ActiveDirectoryMachineAccount : IActiveDirectoryObject
     {
         public string DistinguishedName { get; set; }
         public string DnsName { get; set; }
         public string Domain { get; set; }
         public string Name { get; set; }
         public Guid NetbootGUID { get; set; }
-        public string ObjectSid { get; set; }
+        public string SecurityIdentifier { get; set; }
         public string Path { get; set; }
-        public string sAMAccountName { get; set; }
+        public string SamAccountName { get; set; }
         public bool IsCriticalSystemObject { get; set; }
         public Dictionary<string, object[]> LoadedProperties { get; set; }
 
-        public string ParentDistinguishedName
-        {
-            get
-            {
-                // Determine Parent
-                if (!string.IsNullOrWhiteSpace(DistinguishedName))
-                    return DistinguishedName.Substring(0, DistinguishedName.IndexOf(",DC=")).Substring(DistinguishedName.IndexOf(",") + 1);
-                else
-                    return null;
-            }
-        }
-
         public User ToRepositoryUser()
         {
             return new User
             {
-                Id = this.sAMAccountName,
-                Type = "Computer",
+                Id = this.SamAccountName,
                 DisplayName = this.Name
             };
         }
diff --git a/Disco.Models/Interop/ActiveDirectory/ActiveDirectoryUserAccount.cs b/Disco.Models/Interop/ActiveDirectory/ActiveDirectoryUserAccount.cs
index d0db5827..7ba9ec5d 100644
--- a/Disco.Models/Interop/ActiveDirectory/ActiveDirectoryUserAccount.cs
+++ b/Disco.Models/Interop/ActiveDirectory/ActiveDirectoryUserAccount.cs
@@ -6,7 +6,7 @@ using Disco.Models.Repository;
 
 namespace Disco.Models.Interop.ActiveDirectory
 {
-    public class ActiveDirectoryUserAccount
+    public class ActiveDirectoryUserAccount : IActiveDirectoryObject
     {
         public string DisplayName { get; set; }
         public string DistinguishedName { get; set; }
@@ -15,25 +15,23 @@ namespace Disco.Models.Interop.ActiveDirectory
         public string GivenName { get; set; }
         public List<string> Groups { get; set; }
         public string Name { get; set; }
-        public string ObjectSid { get; set; }
+        public string SecurityIdentifier { get; set; }
         public string Path { get; set; }
         public string Phone { get; set; }
-        public string sAMAccountName { get; set; }
+        public string SamAccountName { get; set; }
         public string Surname { get; set; }
-        public string Type { get; set; }
         public Dictionary<string, object[]> LoadedProperties { get; set; }
 
         public User ToRepositoryUser()
         {
             return new User
             {
-                Id = this.sAMAccountName,
+                Id = this.SamAccountName,
                 DisplayName = this.DisplayName,
                 Surname = this.Surname,
                 GivenName = this.GivenName,
                 EmailAddress = this.Email,
                 PhoneNumber = this.Phone,
-                Type = this.Type
             };
         }
 
diff --git a/Disco.Models/Interop/ActiveDirectory/IActiveDirectoryObject.cs b/Disco.Models/Interop/ActiveDirectory/IActiveDirectoryObject.cs
new file mode 100644
index 00000000..15db7abf
--- /dev/null
+++ b/Disco.Models/Interop/ActiveDirectory/IActiveDirectoryObject.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Models.Interop.ActiveDirectory
+{
+    public interface IActiveDirectoryObject
+    {
+        string DistinguishedName { get; set; }
+        string SecurityIdentifier { get; set; }
+        
+        string SamAccountName { get; set; }
+
+        string Name { get; set; }
+    }
+}
diff --git a/Disco.Models/Properties/AssemblyInfo.cs b/Disco.Models/Properties/AssemblyInfo.cs
index d27853eb..fedaa987 100644
--- a/Disco.Models/Properties/AssemblyInfo.cs
+++ b/Disco.Models/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.2249")]
-[assembly: AssemblyFileVersion("1.2.0725.2249")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.1001.1541")]
+[assembly: AssemblyFileVersion("1.2.1001.1541")]
\ No newline at end of file
diff --git a/Disco.Models/Repository/User/AuthorizationRole.cs b/Disco.Models/Repository/User/AuthorizationRole.cs
new file mode 100644
index 00000000..9ced2ca0
--- /dev/null
+++ b/Disco.Models/Repository/User/AuthorizationRole.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Models.Repository
+{
+    public class AuthorizationRole
+    {
+        [Key]
+        public int Id { get; set; }
+        [Required, StringLength(100)]
+        public string Name { get; set; }
+
+        public string SubjectIds { get; set; }
+
+        public string ClaimsJson { get; set; }
+    }
+}
diff --git a/Disco.Models/Repository/User/User.cs b/Disco.Models/Repository/User/User.cs
index a6f338c7..544fcf61 100644
--- a/Disco.Models/Repository/User/User.cs
+++ b/Disco.Models/Repository/User/User.cs
@@ -19,8 +19,6 @@ namespace Disco.Models.Repository
         [StringLength(200)]
         public string GivenName { get; set; }
 
-        [StringLength(8)]
-        public string Type { get; set; }
         [StringLength(100)]
         public string PhoneNumber { get; set; }
         [StringLength(150)]
@@ -32,17 +30,6 @@ namespace Disco.Models.Repository
         [InverseProperty("UserId")]
         public virtual IList<Job> Jobs { get; set; }
 
-        //#region Helper Members
-        //[NotMapped, XmlIgnore, ScriptIgnore]
-        //public List<DeviceUserAssignment> CurrentDeviceUserAssignments
-        //{
-        //    get
-        //    {
-        //        return this.DeviceUserAssignments.Where(dua => !dua.UnassignedDate.HasValue).ToList();
-        //    }
-        //}
-        //#endregion
-
         public override string ToString()
         {
             return string.Format("{0} ({1})", this.DisplayName, this.Id);
@@ -63,17 +50,6 @@ namespace Disco.Models.Repository
                 this.EmailAddress = u.EmailAddress;
             if (this.PhoneNumber != u.PhoneNumber)
                 this.PhoneNumber = u.PhoneNumber;
-            if (this.Type != u.Type)
-                this.Type = u.Type;
         }
-
-        public static class Types
-        {
-            public const string Admin = "Admin";
-            public const string Computer = "Computer";
-            public const string Staff = "Staff";
-            public const string Student = "Student";
-        }
-
     }
 }
diff --git a/Disco.Models/UI/Config/AuthorizationRole/ConfigAuthorizationRoleCreateModel.cs b/Disco.Models/UI/Config/AuthorizationRole/ConfigAuthorizationRoleCreateModel.cs
new file mode 100644
index 00000000..a73a6a11
--- /dev/null
+++ b/Disco.Models/UI/Config/AuthorizationRole/ConfigAuthorizationRoleCreateModel.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Models.UI.Config.AuthorizationRole
+{
+    public interface ConfigAuthorizationRoleCreateModel : BaseUIModel
+    {
+        Models.Repository.AuthorizationRole AuthorizationRole { get; set; }
+    }
+}
diff --git a/Disco.Models/UI/Config/AuthorizationRole/ConfigAuthorizationRoleIndexModel.cs b/Disco.Models/UI/Config/AuthorizationRole/ConfigAuthorizationRoleIndexModel.cs
new file mode 100644
index 00000000..f0ee1e97
--- /dev/null
+++ b/Disco.Models/UI/Config/AuthorizationRole/ConfigAuthorizationRoleIndexModel.cs
@@ -0,0 +1,14 @@
+using Disco.Models.Authorization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Models.UI.Config.AuthorizationRole
+{
+    public interface ConfigAuthorizationRoleIndexModel : BaseUIModel
+    {
+        List<IRoleToken> Tokens { get; set; }
+    }
+}
diff --git a/Disco.Models/UI/Config/AuthorizationRole/ConfigAuthorizationRoleShowModel.cs b/Disco.Models/UI/Config/AuthorizationRole/ConfigAuthorizationRoleShowModel.cs
new file mode 100644
index 00000000..e3aa4b9b
--- /dev/null
+++ b/Disco.Models/UI/Config/AuthorizationRole/ConfigAuthorizationRoleShowModel.cs
@@ -0,0 +1,14 @@
+using Disco.Models.Authorization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Models.UI.Config.AuthorizationRole
+{
+    public interface ConfigAuthorizationRoleShowModel : BaseUIModel
+    {
+        IRoleToken Token { get; set; }
+    }
+}
diff --git a/Disco.Models/UI/Config/DeviceBatch/ConfigDeviceBatchShowModel.cs b/Disco.Models/UI/Config/DeviceBatch/ConfigDeviceBatchShowModel.cs
index 6344a51d..d4b0c6ec 100644
--- a/Disco.Models/UI/Config/DeviceBatch/ConfigDeviceBatchShowModel.cs
+++ b/Disco.Models/UI/Config/DeviceBatch/ConfigDeviceBatchShowModel.cs
@@ -9,6 +9,9 @@ namespace Disco.Models.UI.Config.DeviceBatch
     public interface ConfigDeviceBatchShowModel : BaseUIModel
     {
         Disco.Models.Repository.DeviceBatch DeviceBatch { get; set; }
+
+        Disco.Models.Repository.DeviceModel DefaultDeviceModel { get; set; }
+
         List<Disco.Models.Repository.DeviceModel> DeviceModels { get; set; }
 
         List<ConfigDeviceBatchShowModelMembership> DeviceModelMembers { get; set; }
diff --git a/Disco.Models/UI/Config/DeviceProfile/ConfigDeviceProfileShowModel.cs b/Disco.Models/UI/Config/DeviceProfile/ConfigDeviceProfileShowModel.cs
index c9dd868f..59761b64 100644
--- a/Disco.Models/UI/Config/DeviceProfile/ConfigDeviceProfileShowModel.cs
+++ b/Disco.Models/UI/Config/DeviceProfile/ConfigDeviceProfileShowModel.cs
@@ -9,6 +9,8 @@ namespace Disco.Models.UI.Config.DeviceProfile
     public interface ConfigDeviceProfileShowModel : BaseUIModel
     {
         Disco.Models.Repository.DeviceProfile DeviceProfile { get; set; }
+        Disco.Models.BI.Config.OrganisationAddress DefaultOrganisationAddress { get; set; }
+
         List<Disco.Models.BI.Config.OrganisationAddress> OrganisationAddresses { get; set; }
 
         int DeviceCount { get; set; }
diff --git a/Disco.Models/UI/User/UserShowModel.cs b/Disco.Models/UI/User/UserShowModel.cs
index 8c54743b..c8854c3b 100644
--- a/Disco.Models/UI/User/UserShowModel.cs
+++ b/Disco.Models/UI/User/UserShowModel.cs
@@ -1,4 +1,5 @@
-using System;
+using Disco.Models.Authorization;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -11,5 +12,6 @@ namespace Disco.Models.UI.User
         Disco.Models.Repository.User User { get; set; }
         Disco.Models.BI.Job.JobTableModel Jobs { get; set; }
         List<Disco.Models.Repository.DocumentTemplate> DocumentTemplates { get; set; }
+        IClaimNavigatorItem ClaimNavigator { get; set; }
     }
 }
diff --git a/Disco.Services/Authorization/AccessDeniedException.cs b/Disco.Services/Authorization/AccessDeniedException.cs
new file mode 100644
index 00000000..05a97a1e
--- /dev/null
+++ b/Disco.Services/Authorization/AccessDeniedException.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization
+{
+    public class AccessDeniedException : Exception
+    {
+        private string _message { get; set; }
+
+        public AccessDeniedException(string Message)
+        {
+            this._message = Message;
+        }
+
+        public override string Message
+        {
+            get
+            {
+                if (this._message == null)
+                {
+                    return "Your account does not have the required permission to access this Disco feature.";
+                }
+                else
+                {
+                    return this._message;
+                }
+            }
+        }
+    }
+}
diff --git a/Disco.Services/Authorization/AuthorizationToken.cs b/Disco.Services/Authorization/AuthorizationToken.cs
new file mode 100644
index 00000000..a9812c56
--- /dev/null
+++ b/Disco.Services/Authorization/AuthorizationToken.cs
@@ -0,0 +1,161 @@
+using Disco.Models.Authorization;
+using Disco.Models.Repository;
+using Disco.Services.Authorization.Roles;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization
+{
+    public class AuthorizationToken : IAuthorizationToken
+    {
+        public User User { get; set; }
+        public List<string> GroupMembership { get; set; }
+        public List<IRoleToken> RoleTokens { get; set; }
+
+        #region Token Builders
+
+        public static AuthorizationToken BuildToken(User User, List<string> GroupMembership)
+        {
+            return new AuthorizationToken()
+            {
+                User = User,
+                GroupMembership = GroupMembership,
+                RoleTokens = RoleCache.GetRoleTokens(GroupMembership, User)
+            };
+        }
+
+        public static AuthorizationToken BuildComputerAccountToken(User User)
+        {
+            return new AuthorizationToken()
+            {
+                User = User,
+                GroupMembership = new List<string>(),
+                RoleTokens = new List<IRoleToken>()
+                {
+                    (IRoleToken)RoleCache.GetRoleToken(RoleCache.ComputerAccountTokenId)
+                }
+            };
+        }
+
+        #endregion
+
+        #region Token Accessors
+
+        internal const string RequireAuthenticationMessage = "This Disco feature requires authentication.";
+        internal const string RequireDiscoAuthorizationMessage = "Your account does not have the required permission to access this Disco feature. This feature requires your account to be included in at least one Disco Authorization Role.";
+        internal const string RequireMessageTemplate = "Your account does not have the required permission ({0}) to access this Disco feature.";
+        internal const string RequireAllMessageTemplate = "Your account does not have the required permission to access this Disco feature. This feature requires permission for: {0}.";
+        internal const string RequireAnyMessageTemplate = "Your account does not have the required permission to access this Disco feature. This feature requires at least one of these permissions: {0}.";
+
+        internal static string BuildRequireMessage(string ClaimKey)
+        {
+            return string.Format(RequireMessageTemplate, Claims.GetClaimDetails(ClaimKey).Item1);
+        }
+        internal static string BuildRequireAllMessage(IEnumerable<string> ClaimKeys)
+        {
+            var claimFriendlyNames = ClaimKeys.Select(ck => Claims.GetClaimDetails(ck).Item1);
+            return string.Format(RequireAllMessageTemplate, string.Join("; ", claimFriendlyNames));
+        }
+        internal static string BuildRequireAnyMessage(IEnumerable<string> ClaimKeys)
+        {
+            var claimFriendlyNames = ClaimKeys.Select(ck => Claims.GetClaimDetails(ck).Item1);
+            return string.Format(RequireAnyMessageTemplate, string.Join("; ", claimFriendlyNames));
+        }
+
+        /// <summary>
+        /// Checks if token contains at least one of the claims requested.
+        /// </summary>
+        /// <param name="ClaimKeys">Claim Keys from <see cref="Disco.Services.Authorization.Claims"/></param>
+        /// <returns>true if the token satisfies the claim request, otherwise false.</returns>
+        public bool HasAny(params string[] ClaimKeys)
+        {
+            return HasAny((IEnumerable<string>)ClaimKeys);
+        }
+        
+        /// <summary>
+        /// Checks if token contains at least one of the claims requested.
+        /// </summary>
+        /// <param name="ClaimKeys">Claim Keys from <see cref="Disco.Services.Authorization.Claims"/></param>
+        /// <returns>true if the token satisfies the claim request, otherwise false.</returns>
+        public bool HasAny(IEnumerable<string> ClaimKeys)
+        {
+            return ClaimKeys.Any(ck => Has(Claims.GetClaimAccessor(ck)));
+        }
+
+        /// <summary>
+        /// Checks if token contains all the claims requested.
+        /// </summary>
+        /// <param name="ClaimKeys">Claim Keys from <see cref="Disco.Services.Authorization.Claims"/></param>
+        /// <returns>true if the token satisfies the claim request, otherwise false.</returns>
+        public bool HasAll(params string[] ClaimKeys)
+        {
+            return HasAll((IEnumerable<string>)ClaimKeys);
+        }
+        /// <summary>
+        /// Checks if token contains all the claims requested.
+        /// </summary>
+        /// <param name="ClaimKeys">Claim Keys from <see cref="Disco.Services.Authorization.Claims"/></param>
+        /// <returns>true if the token satisfies the claim request, otherwise false.</returns>
+        public bool HasAll(IEnumerable<string> ClaimKeys)
+        {
+            return ClaimKeys.All(ck => Has(Claims.GetClaimAccessor(ck)));
+        }
+
+        /// <summary>
+        /// Checks if token contains the claim requested.
+        /// </summary>
+        /// <param name="ClaimKey">Claim Key from <see cref="Disco.Services.Authorization.Claims"/></param>
+        /// <returns>true if the token satisfies the claim request, otherwise false.</returns>
+        public bool Has(string ClaimKey)
+        {
+            Func<RoleClaims, bool> claimAccessor = Claims.GetClaimAccessor(ClaimKey);
+
+            return Has(claimAccessor);
+        }
+
+        /// <summary>
+        /// Checks if token contains the claim requested.
+        /// </summary>
+        /// <param name="ClaimAccessor">A lambda which validates the tokens <see cref="RoleClaims"/></param>
+        /// <returns>true if the token satisfies the claim request, otherwise false.</returns>
+        public bool Has(Func<RoleClaims, bool> ClaimAccessor)
+        {
+            return RoleTokens.Any(rt => ClaimAccessor.Invoke(((RoleToken)rt).Claims));
+        }
+
+        /// <summary>
+        /// Validates the token contains the claim required. An <see cref="Disco.Services.Authorization.AccessDeniedException"/> is thrown if the requirements are not met.
+        /// </summary>
+        /// <param name="ClaimKey">Claim Key from <see cref="Disco.Services.Authorization.Claims"/></param>
+        public void Require(string ClaimKey)
+        {
+            if (!Has(ClaimKey))
+                throw new AccessDeniedException(BuildRequireMessage(ClaimKey));
+        }
+
+        /// <summary>
+        /// Validates the token contains all the claims required. An <see cref="Disco.Services.Authorization.AccessDeniedException"/> is thrown if the requirements are not met.
+        /// </summary>
+        /// <param name="ClaimKeys">Claim Keys from <see cref="Disco.Services.Authorization.Claims"/></param>
+        public void RequireAll(params string[] ClaimKeys)
+        {
+            if (!HasAll(ClaimKeys))
+                throw new AccessDeniedException(BuildRequireAllMessage(ClaimKeys));
+        }
+        
+        /// <summary>
+        /// Validates the token contains at least one of the claims required. An <see cref="Disco.Services.Authorization.AccessDeniedException"/> is thrown if the requirements are not met.
+        /// </summary>
+        /// <param name="ClaimKeys">Claim Keys from <see cref="Disco.Services.Authorization.Claims"/></param>
+        public void RequireAny(params string[] ClaimKeys)
+        {
+            if (!HasAny(ClaimKeys))
+                throw new AccessDeniedException(BuildRequireAnyMessage(ClaimKeys));
+        }
+
+        #endregion
+    }
+}
diff --git a/Disco.Services/Authorization/ClaimNavigatorItem.cs b/Disco.Services/Authorization/ClaimNavigatorItem.cs
new file mode 100644
index 00000000..e33cff5f
--- /dev/null
+++ b/Disco.Services/Authorization/ClaimNavigatorItem.cs
@@ -0,0 +1,84 @@
+using Disco.Models.Authorization;
+using Disco.Services.Authorization.Roles;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization
+{
+    public class ClaimNavigatorItem : IClaimNavigatorItem
+    {
+        private Func<Roles.RoleClaims, bool> accessor { get; set; }
+        
+        public string Key { get; private set; }
+        public string Name { get; private set; }
+        public string Description { get; private set; }
+        public bool Hidden { get; private set; }
+
+        public List<IClaimNavigatorItem> Children { get; private set; }
+        public bool IsGroup { get { return Children != null; } }
+
+        public bool? Value { get; private set; }
+
+        internal ClaimNavigatorItem(string Key, bool Hidden)
+        {
+            this.Key = Key;
+            var details = Claims.GetClaimDetails(Key);
+            this.Name = details.Item1;
+            this.Description = details.Item2;
+            this.accessor = Claims.GetClaimAccessor(Key);
+            this.Hidden = Hidden;
+        }
+
+        internal ClaimNavigatorItem(string Key, string Name, string Description, bool Hidden, List<IClaimNavigatorItem> Children)
+        {
+            this.Key = Key;
+            this.Name = Name;
+            this.Description = Description;
+
+            this.Hidden = Hidden;
+
+            this.Children = Children;
+        }
+
+        private ClaimNavigatorItem()
+        {
+            // Private Constructor
+        }
+
+        public IClaimNavigatorItem BuildClaimTree(RoleClaims RoleClaims)
+        {
+            return new ClaimNavigatorItem()
+                {
+                    Key = this.Key,
+                    Name = this.Name,
+                    Description = this.Description,
+                    Hidden = this.Hidden,
+                    accessor = this.accessor,
+                    Value = this.accessor == null ? (bool?)null : this.accessor(RoleClaims),
+                    Children = this.Children == null ? null : this.Children.Cast<ClaimNavigatorItem>().Select(c => c.BuildClaimTree(RoleClaims)).ToList()
+                };
+        }
+
+        public IClaimNavigatorItem BuildClaimTree(IEnumerable<RoleClaims> RoleClaims)
+        {
+            return new ClaimNavigatorItem()
+            {
+                Key = this.Key,
+                Name = this.Name,
+                Description = this.Description,
+                Hidden = this.Hidden,
+                accessor = this.accessor,
+                Value = this.accessor == null ? (bool?)null : RoleClaims.Any(rc => this.accessor(rc)),
+                Children = this.Children == null ? null : this.Children.Cast<ClaimNavigatorItem>().Select(c => c.BuildClaimTree(RoleClaims)).ToList()
+            };
+        }
+
+        public override string ToString()
+        {
+            return string.Format("{0}: {1}={2}", this.Name, this.Key, this.Value);
+        }
+    }
+}
diff --git a/Disco.Services/Authorization/Claims.cs b/Disco.Services/Authorization/Claims.cs
new file mode 100644
index 00000000..829f4c91
--- /dev/null
+++ b/Disco.Services/Authorization/Claims.cs
@@ -0,0 +1,1559 @@
+
+
+
+// <auto-generated />
+// This file was generated by a T4 template.
+// Don't change it directly as your change would get overwritten.  Instead, make changes
+// to the .tt file (i.e. the T4 template) and save it to regenerate this file.
+using Disco.Models.Authorization;
+using Disco.Models.Repository;
+using Disco.Services.Authorization.Roles;
+using System;
+using System.Collections.Generic;
+
+namespace Disco.Services.Authorization
+{
+	public static class Claims
+	{
+		private static Dictionary<string, Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>> _roleClaims;
+		private static ClaimNavigatorItem _claimNavigator;
+
+		static Claims()
+        {
+#region Role Claim Dictionary
+            _roleClaims = new Dictionary<string, Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>>()
+			{
+				{ "Config.DeviceCertificate.DownloadCertificates", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceCertificate.DownloadCertificates, (c, v) => c.Config.DeviceCertificate.DownloadCertificates = v, "Download Certificates", "Can download certificates") },
+				{ "Config.Enrolment.Configure", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Enrolment.Configure, (c, v) => c.Config.Enrolment.Configure = v, "Configure Enrolment", "Can configure device enrolment") },
+				{ "Config.Enrolment.DownloadBootstrapper", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Enrolment.DownloadBootstrapper, (c, v) => c.Config.Enrolment.DownloadBootstrapper = v, "Download Bootstrapper", "Can download the Device Bootstrapper") },
+				{ "Config.Enrolment.Show", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Enrolment.Show, (c, v) => c.Config.Enrolment.Show = v, "Show Enrolment", "Can show device enrolment") },
+				{ "Config.Enrolment.ShowStatus", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Enrolment.ShowStatus, (c, v) => c.Config.Enrolment.ShowStatus = v, "Show Enrolment Status", "Can show the enrolment status") },
+				{ "Config.DeviceBatch.Configure", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceBatch.Configure, (c, v) => c.Config.DeviceBatch.Configure = v, "Configure Device Batches", "Can configure device batches") },
+				{ "Config.DeviceBatch.Create", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceBatch.Create, (c, v) => c.Config.DeviceBatch.Create = v, "Create Device Batches", "Can create device batches") },
+				{ "Config.DeviceBatch.Delete", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceBatch.Delete, (c, v) => c.Config.DeviceBatch.Delete = v, "Delete Device Batches", "Can delete device batches") },
+				{ "Config.DeviceBatch.Show", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceBatch.Show, (c, v) => c.Config.DeviceBatch.Show = v, "Show Device Batches", "Can show device batches") },
+				{ "Config.DeviceBatch.ShowTimeline", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceBatch.ShowTimeline, (c, v) => c.Config.DeviceBatch.ShowTimeline = v, "Show Timeline", "Can show device batch timeline") },
+				{ "Config.DeviceModel.ConfigureComponents", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceModel.ConfigureComponents, (c, v) => c.Config.DeviceModel.ConfigureComponents = v, "Configure Device Model Components", "Can configure device model components") },
+				{ "Config.DeviceModel.Configure", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceModel.Configure, (c, v) => c.Config.DeviceModel.Configure = v, "Configure Device Models", "Can configure device models") },
+				{ "Config.DeviceModel.Delete", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceModel.Delete, (c, v) => c.Config.DeviceModel.Delete = v, "Delete Device Models", "Can delete device models") },
+				{ "Config.DeviceModel.Show", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceModel.Show, (c, v) => c.Config.DeviceModel.Show = v, "Show Device Models", "Can show device models") },
+				{ "Config.DeviceProfile.ConfigureComputerNameTemplate", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceProfile.ConfigureComputerNameTemplate, (c, v) => c.Config.DeviceProfile.ConfigureComputerNameTemplate = v, "Configure Computer Name Templates", "Can configure computer name templates for device profiles") },
+				{ "Config.DeviceProfile.ConfigureDefaults", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceProfile.ConfigureDefaults, (c, v) => c.Config.DeviceProfile.ConfigureDefaults = v, "Configure Default Device Profiles", "Can configure default device profiles") },
+				{ "Config.DeviceProfile.Configure", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceProfile.Configure, (c, v) => c.Config.DeviceProfile.Configure = v, "Configure Device Profiles", "Can configure device profiles") },
+				{ "Config.DeviceProfile.Create", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceProfile.Create, (c, v) => c.Config.DeviceProfile.Create = v, "Create Device Profiles", "Can create device profiles") },
+				{ "Config.DeviceProfile.Delete", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceProfile.Delete, (c, v) => c.Config.DeviceProfile.Delete = v, "Delete Device Profiles", "Can delete device profiles") },
+				{ "Config.DeviceProfile.Show", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DeviceProfile.Show, (c, v) => c.Config.DeviceProfile.Show = v, "Show Device Profiles", "Can show device profiles") },
+				{ "Config.DocumentTemplate.BulkGenerate", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DocumentTemplate.BulkGenerate, (c, v) => c.Config.DocumentTemplate.BulkGenerate = v, "Bulk Generate Document Templates", "Can bulk generate document templates") },
+				{ "Config.DocumentTemplate.Configure", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DocumentTemplate.Configure, (c, v) => c.Config.DocumentTemplate.Configure = v, "Configure Document Templates", "Can configure document templates") },
+				{ "Config.DocumentTemplate.ConfigureFilterExpression", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DocumentTemplate.ConfigureFilterExpression, (c, v) => c.Config.DocumentTemplate.ConfigureFilterExpression = v, "Configure Filter Expression", "Can configure filter expressions for document templates") },
+				{ "Config.DocumentTemplate.Create", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DocumentTemplate.Create, (c, v) => c.Config.DocumentTemplate.Create = v, "Create Document Templates", "Can create document templates") },
+				{ "Config.DocumentTemplate.Delete", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DocumentTemplate.Delete, (c, v) => c.Config.DocumentTemplate.Delete = v, "Delete Document Templates", "Can delete document templates") },
+				{ "Config.DocumentTemplate.ShowStatus", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DocumentTemplate.ShowStatus, (c, v) => c.Config.DocumentTemplate.ShowStatus = v, "Show Document Template Import Status", "Can show the document template import status") },
+				{ "Config.DocumentTemplate.Show", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DocumentTemplate.Show, (c, v) => c.Config.DocumentTemplate.Show = v, "Show Document Templates", "Can show document templates") },
+				{ "Config.DocumentTemplate.UndetectedPages", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DocumentTemplate.UndetectedPages, (c, v) => c.Config.DocumentTemplate.UndetectedPages = v, "Undetected Pages", "Can show and assign imported documents which were not undetected") },
+				{ "Config.DocumentTemplate.Upload", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.DocumentTemplate.Upload, (c, v) => c.Config.DocumentTemplate.Upload = v, "Upload Document Templates", "Can upload document templates") },
+				{ "Config.Logging.Show", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Logging.Show, (c, v) => c.Config.Logging.Show = v, "Show Logging", "Can show logging") },
+				{ "Config.Plugin.Configure", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Plugin.Configure, (c, v) => c.Config.Plugin.Configure = v, "Configure Plugins", "Can configure plugins") },
+				{ "Config.Plugin.InstallLocal", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Plugin.InstallLocal, (c, v) => c.Config.Plugin.InstallLocal = v, "Install/Update Local Plugins", "Can install and update locally uploaded plugins") },
+				{ "Config.Plugin.Install", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Plugin.Install, (c, v) => c.Config.Plugin.Install = v, "Install/Update Plugins", "Can install and update plugins") },
+				{ "Config.Plugin.Show", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Plugin.Show, (c, v) => c.Config.Plugin.Show = v, "Show Plugins", "Can show plugins") },
+				{ "Config.Plugin.Uninstall", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Plugin.Uninstall, (c, v) => c.Config.Plugin.Uninstall = v, "Uninstall Plugins", "Can uninstall plugins") },
+				{ "Config.System.ConfigureProxy", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.System.ConfigureProxy, (c, v) => c.Config.System.ConfigureProxy = v, "Configure Proxy Settings", "Can configure the proxy settings") },
+				{ "Config.System.Show", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.System.Show, (c, v) => c.Config.System.Show = v, "Show System Configuration", "Can show the system configuration") },
+				{ "Config.Organisation.ConfigureAddresses", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Organisation.ConfigureAddresses, (c, v) => c.Config.Organisation.ConfigureAddresses = v, "Configure Addresses", "Can configure organisation addresses") },
+				{ "Config.Organisation.ConfigureLogo", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Organisation.ConfigureLogo, (c, v) => c.Config.Organisation.ConfigureLogo = v, "Configure Logo", "Can configure the organisation logo") },
+				{ "Config.Organisation.ConfigureMultiSiteMode", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Organisation.ConfigureMultiSiteMode, (c, v) => c.Config.Organisation.ConfigureMultiSiteMode = v, "Configure Multi-Site Mode", "Can configure multi-site mode") },
+				{ "Config.Organisation.ConfigureName", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Organisation.ConfigureName, (c, v) => c.Config.Organisation.ConfigureName = v, "Configure Name", "Can configure the organisation name") },
+				{ "Config.Organisation.Show", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Organisation.Show, (c, v) => c.Config.Organisation.Show = v, "Show Organisation Details", "Can show the organisation details") },
+				{ "Config.Show", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Config.Show, (c, v) => c.Config.Show = v, "Show Configuration", "Can show the configuration menu") },
+				{ "Job.Lists.AllOpen", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Lists.AllOpen, (c, v) => c.Job.Lists.AllOpen = v, "All Open List", "Can show list") },
+				{ "Job.Lists.AwaitingFinanceAgreementBreach", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Lists.AwaitingFinanceAgreementBreach, (c, v) => c.Job.Lists.AwaitingFinanceAgreementBreach = v, "Awaiting Finance Agreement Breach List", "Can show list (NOTE: Requires Awaiting Finance List)") },
+				{ "Job.Lists.AwaitingFinanceCharge", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Lists.AwaitingFinanceCharge, (c, v) => c.Job.Lists.AwaitingFinanceCharge = v, "Awaiting Finance Charge List", "Can show list (NOTE: Requires Awaiting Finance List)") },
+				{ "Job.Lists.AwaitingFinanceInsuranceProcessing", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Lists.AwaitingFinanceInsuranceProcessing, (c, v) => c.Job.Lists.AwaitingFinanceInsuranceProcessing = v, "Awaiting Finance Insurance Processing List", "Can show list (NOTE: Requires Awaiting Finance List)") },
+				{ "Job.Lists.AwaitingFinance", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Lists.AwaitingFinance, (c, v) => c.Job.Lists.AwaitingFinance = v, "Awaiting Finance List", "Can show list") },
+				{ "Job.Lists.AwaitingFinancePayment", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Lists.AwaitingFinancePayment, (c, v) => c.Job.Lists.AwaitingFinancePayment = v, "Awaiting Finance Payment List", "Can show list (NOTE: Requires Awaiting Finance List)") },
+				{ "Job.Lists.AwaitingTechnicianAction", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Lists.AwaitingTechnicianAction, (c, v) => c.Job.Lists.AwaitingTechnicianAction = v, "Awaiting Technician Action List", "Can show list") },
+				{ "Job.Lists.AwaitingUserAction", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Lists.AwaitingUserAction, (c, v) => c.Job.Lists.AwaitingUserAction = v, "Awaiting User Action List", "Can show list") },
+				{ "Job.Lists.DevicesAwaitingRepair", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Lists.DevicesAwaitingRepair, (c, v) => c.Job.Lists.DevicesAwaitingRepair = v, "Devices Awaiting Repair List", "Can show list") },
+				{ "Job.Lists.DevicesReadyForReturn", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Lists.DevicesReadyForReturn, (c, v) => c.Job.Lists.DevicesReadyForReturn = v, "Devices Ready For Return List", "Can show list") },
+				{ "Job.Lists.Locations", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Lists.Locations, (c, v) => c.Job.Lists.Locations = v, "Locations List", "Can show list") },
+				{ "Job.Lists.LongRunningJobs", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Lists.LongRunningJobs, (c, v) => c.Job.Lists.LongRunningJobs = v, "Long Running Jobs List", "Can show list") },
+				{ "Job.Lists.RecentlyClosed", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Lists.RecentlyClosed, (c, v) => c.Job.Lists.RecentlyClosed = v, "Recently Closed List", "Can show list") },
+				{ "Job.Actions.AddAttachments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.AddAttachments, (c, v) => c.Job.Actions.AddAttachments = v, "Add Attachments", "Can add attachments to jobs") },
+				{ "Job.Actions.AddLogs", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.AddLogs, (c, v) => c.Job.Actions.AddLogs = v, "Add Logs", "Can add job logs") },
+				{ "Job.Actions.Close", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.Close, (c, v) => c.Job.Actions.Close = v, "Close Jobs", "Can close jobs") },
+				{ "Job.Actions.ConvertHWarToHNWar", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.ConvertHWarToHNWar, (c, v) => c.Job.Actions.ConvertHWarToHNWar = v, "Convert HWar Jobs To HNWar", "Can convert warranty jobs to non-warranty jobs") },
+				{ "Job.Actions.Create", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.Create, (c, v) => c.Job.Actions.Create = v, "Create Jobs", "Can create jobs") },
+				{ "Job.Actions.Delete", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.Delete, (c, v) => c.Job.Actions.Delete = v, "Delete Jobs", "Can delete jobs") },
+				{ "Job.Actions.ForceClose", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.ForceClose, (c, v) => c.Job.Actions.ForceClose = v, "Force Close Jobs", "Can force close jobs") },
+				{ "Job.Actions.GenerateDocuments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.GenerateDocuments, (c, v) => c.Job.Actions.GenerateDocuments = v, "Generate Documents", "Can generate documents for jobs") },
+				{ "Job.Actions.LogRepair", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.LogRepair, (c, v) => c.Job.Actions.LogRepair = v, "Log Repair", "Can log repair for non-warranty jobs") },
+				{ "Job.Actions.LogWarranty", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.LogWarranty, (c, v) => c.Job.Actions.LogWarranty = v, "Log Warranty", "Can log warranty for jobs") },
+				{ "Job.Actions.RemoveAnyAttachments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.RemoveAnyAttachments, (c, v) => c.Job.Actions.RemoveAnyAttachments = v, "Remove Any Attachments", "Can remove any attachments from jobs") },
+				{ "Job.Actions.RemoveAnyLogs", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.RemoveAnyLogs, (c, v) => c.Job.Actions.RemoveAnyLogs = v, "Remove Any Logs", "Can remove any job logs") },
+				{ "Job.Actions.RemoveOwnAttachments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.RemoveOwnAttachments, (c, v) => c.Job.Actions.RemoveOwnAttachments = v, "Remove Own Attachments", "Can remove own attachments from jobs") },
+				{ "Job.Actions.RemoveOwnLogs", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.RemoveOwnLogs, (c, v) => c.Job.Actions.RemoveOwnLogs = v, "Remove Own Logs", "Can remove own job logs") },
+				{ "Job.Actions.Reopen", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.Reopen, (c, v) => c.Job.Actions.Reopen = v, "Reopen Jobs", "Can reopen jobs") },
+				{ "Job.Actions.UpdateSubTypes", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Actions.UpdateSubTypes, (c, v) => c.Job.Actions.UpdateSubTypes = v, "Update Sub Types", "Can update sub types for jobs") },
+				{ "Job.Properties.WarrantyProperties.ExternalCompletedDate", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.WarrantyProperties.ExternalCompletedDate, (c, v) => c.Job.Properties.WarrantyProperties.ExternalCompletedDate = v, "External Completed Date Property", "Can update property") },
+				{ "Job.Properties.WarrantyProperties.ExternalLoggedDate", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.WarrantyProperties.ExternalLoggedDate, (c, v) => c.Job.Properties.WarrantyProperties.ExternalLoggedDate = v, "External Logged Date Property", "Can update property") },
+				{ "Job.Properties.WarrantyProperties.ExternalName", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.WarrantyProperties.ExternalName, (c, v) => c.Job.Properties.WarrantyProperties.ExternalName = v, "External Name Property", "Can update property") },
+				{ "Job.Properties.WarrantyProperties.ExternalReference", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.WarrantyProperties.ExternalReference, (c, v) => c.Job.Properties.WarrantyProperties.ExternalReference = v, "External Reference Property", "Can update property") },
+				{ "Job.Properties.WarrantyProperties.ProviderDetails", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.WarrantyProperties.ProviderDetails, (c, v) => c.Job.Properties.WarrantyProperties.ProviderDetails = v, "Provider Details", "Can access warranty provider details") },
+				{ "Job.Properties.WarrantyProperties.WarrantyCompleted", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.WarrantyProperties.WarrantyCompleted, (c, v) => c.Job.Properties.WarrantyProperties.WarrantyCompleted = v, "Warranty Completed Property", "Can update property") },
+				{ "Job.Properties.NonWarrantyProperties.AccountingChargeAdded", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.AccountingChargeAdded, (c, v) => c.Job.Properties.NonWarrantyProperties.AccountingChargeAdded = v, "Accounting Charge Added Property", "Can update property") },
+				{ "Job.Properties.NonWarrantyProperties.AccountingChargePaid", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.AccountingChargePaid, (c, v) => c.Job.Properties.NonWarrantyProperties.AccountingChargePaid = v, "Accounting Charge Paid Property", "Can update property") },
+				{ "Job.Properties.NonWarrantyProperties.AccountingChargeRequired", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.AccountingChargeRequired, (c, v) => c.Job.Properties.NonWarrantyProperties.AccountingChargeRequired = v, "Accounting Charge Required Property", "Can update property") },
+				{ "Job.Properties.NonWarrantyProperties.AddComponents", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.AddComponents, (c, v) => c.Job.Properties.NonWarrantyProperties.AddComponents = v, "Add Components", "Can add job components (NOTE: Requires Edit Components)") },
+				{ "Job.Properties.NonWarrantyProperties.EditComponents", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.EditComponents, (c, v) => c.Job.Properties.NonWarrantyProperties.EditComponents = v, "Edit Components", "Can edit and remove job components") },
+				{ "Job.Properties.NonWarrantyProperties.InsuranceClaimFormSent", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.InsuranceClaimFormSent, (c, v) => c.Job.Properties.NonWarrantyProperties.InsuranceClaimFormSent = v, "Insurance Claim Form Sent Property", "Can update property") },
+				{ "Job.Properties.NonWarrantyProperties.InsuranceDetails", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.InsuranceDetails, (c, v) => c.Job.Properties.NonWarrantyProperties.InsuranceDetails = v, "Insurance Detail Properties", "Can update insurance detail properties") },
+				{ "Job.Properties.NonWarrantyProperties.InvoiceReceived", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.InvoiceReceived, (c, v) => c.Job.Properties.NonWarrantyProperties.InvoiceReceived = v, "Invoice Received Property", "Can update property") },
+				{ "Job.Properties.NonWarrantyProperties.IsInsuranceClaim", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.IsInsuranceClaim, (c, v) => c.Job.Properties.NonWarrantyProperties.IsInsuranceClaim = v, "Is Insurance Claim  Property", "Can update property") },
+				{ "Job.Properties.NonWarrantyProperties.PurchaseOrderRaised", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.PurchaseOrderRaised, (c, v) => c.Job.Properties.NonWarrantyProperties.PurchaseOrderRaised = v, "Purchase Order Raised Property", "Can update property") },
+				{ "Job.Properties.NonWarrantyProperties.PurchaseOrderReference", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.PurchaseOrderReference, (c, v) => c.Job.Properties.NonWarrantyProperties.PurchaseOrderReference = v, "Purchase Order Reference Property", "Can update property") },
+				{ "Job.Properties.NonWarrantyProperties.PurchaseOrderSent", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.PurchaseOrderSent, (c, v) => c.Job.Properties.NonWarrantyProperties.PurchaseOrderSent = v, "Purchase Order Sent Property", "Can update property") },
+				{ "Job.Properties.NonWarrantyProperties.RepairerCompletedDate", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.RepairerCompletedDate, (c, v) => c.Job.Properties.NonWarrantyProperties.RepairerCompletedDate = v, "Repairer Completed Date Property", "Can update property") },
+				{ "Job.Properties.NonWarrantyProperties.RepairerLoggedDate", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.RepairerLoggedDate, (c, v) => c.Job.Properties.NonWarrantyProperties.RepairerLoggedDate = v, "Repairer Logged Date Property", "Can update property") },
+				{ "Job.Properties.NonWarrantyProperties.RepairerName", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.RepairerName, (c, v) => c.Job.Properties.NonWarrantyProperties.RepairerName = v, "Repairer Name Property", "Can update property") },
+				{ "Job.Properties.NonWarrantyProperties.RepairerReference", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NonWarrantyProperties.RepairerReference, (c, v) => c.Job.Properties.NonWarrantyProperties.RepairerReference = v, "Repairer Reference Property", "Can update property") },
+				{ "Job.Properties.DeviceHeldLocation", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.DeviceHeldLocation, (c, v) => c.Job.Properties.DeviceHeldLocation = v, "Device Held Location Property", "Can update property") },
+				{ "Job.Properties.DeviceHeld", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.DeviceHeld, (c, v) => c.Job.Properties.DeviceHeld = v, "Device Held Property", "Can update property") },
+				{ "Job.Properties.DeviceReadyForReturn", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.DeviceReadyForReturn, (c, v) => c.Job.Properties.DeviceReadyForReturn = v, "Device Ready For Return Property", "Can update property") },
+				{ "Job.Properties.DeviceReturned", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.DeviceReturned, (c, v) => c.Job.Properties.DeviceReturned = v, "Device Returned Property", "Can update property") },
+				{ "Job.Properties.ExpectedClosedDate", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.ExpectedClosedDate, (c, v) => c.Job.Properties.ExpectedClosedDate = v, "Expected Closed Date Property", "Can update property") },
+				{ "Job.Properties.Flags", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.Flags, (c, v) => c.Job.Properties.Flags = v, "Flags Property", "Can update property") },
+				{ "Job.Properties.NotWaitingForUserAction", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.NotWaitingForUserAction, (c, v) => c.Job.Properties.NotWaitingForUserAction = v, "Not Waiting For User Action Property", "Can update property") },
+				{ "Job.Properties.WaitingForUserAction", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Properties.WaitingForUserAction, (c, v) => c.Job.Properties.WaitingForUserAction = v, "Waiting For User Action Property", "Can update property") },
+				{ "Job.Types.ShowHMisc", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Types.ShowHMisc, (c, v) => c.Job.Types.ShowHMisc = v, "Show Hardware - Miscellaneous Jobs", "Can show jobs of this type") },
+				{ "Job.Types.ShowHNWar", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Types.ShowHNWar, (c, v) => c.Job.Types.ShowHNWar = v, "Show Hardware - Non-Warranty Jobs", "Can show jobs of this type") },
+				{ "Job.Types.ShowHWar", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Types.ShowHWar, (c, v) => c.Job.Types.ShowHWar = v, "Show Hardware - Warranty Jobs", "Can show jobs of this type") },
+				{ "Job.Types.ShowSApp", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Types.ShowSApp, (c, v) => c.Job.Types.ShowSApp = v, "Show Software - Application Jobs", "Can show jobs of this type") },
+				{ "Job.Types.ShowSOS", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Types.ShowSOS, (c, v) => c.Job.Types.ShowSOS = v, "Show Software - Operating System Jobs", "Can show jobs of this type") },
+				{ "Job.Types.ShowSImg", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Types.ShowSImg, (c, v) => c.Job.Types.ShowSImg = v, "Show Software - Reimage Jobs", "Can show jobs of this type") },
+				{ "Job.Types.ShowUMgmt", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Types.ShowUMgmt, (c, v) => c.Job.Types.ShowUMgmt = v, "Show User Management Jobs", "Can show jobs of this type") },
+				{ "Job.Search", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Search, (c, v) => c.Job.Search = v, "Search Jobs", "Can search jobs") },
+				{ "Job.ShowAttachments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.ShowAttachments, (c, v) => c.Job.ShowAttachments = v, "Show Attachments", "Can show job attachments") },
+				{ "Job.ShowDailyChart", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.ShowDailyChart, (c, v) => c.Job.ShowDailyChart = v, "Show Daily Opened & Closed", "Can show daily opened & closed chart") },
+				{ "Job.ShowFlags", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.ShowFlags, (c, v) => c.Job.ShowFlags = v, "Show Flags", "Can show job flags") },
+				{ "Job.Show", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.Show, (c, v) => c.Job.Show = v, "Show Jobs", "Can show jobs") },
+				{ "Job.ShowLogs", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.ShowLogs, (c, v) => c.Job.ShowLogs = v, "Show Logs", "Can show job logs") },
+				{ "Job.ShowNonWarrantyComponents", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.ShowNonWarrantyComponents, (c, v) => c.Job.ShowNonWarrantyComponents = v, "Show Non-Warranty Components", "Can show non-warranty job components") },
+				{ "Job.ShowNonWarrantyFinance", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.ShowNonWarrantyFinance, (c, v) => c.Job.ShowNonWarrantyFinance = v, "Show Non-Warranty Finance", "Can show non-warranty job finance") },
+				{ "Job.ShowNonWarrantyInsurance", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.ShowNonWarrantyInsurance, (c, v) => c.Job.ShowNonWarrantyInsurance = v, "Show Non-Warranty Insurance", "Can show non-warranty job insurance") },
+				{ "Job.ShowNonWarrantyRepairs", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.ShowNonWarrantyRepairs, (c, v) => c.Job.ShowNonWarrantyRepairs = v, "Show Non-Warranty Repairs", "Can show non-warranty job repairs") },
+				{ "Job.ShowWarranty", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Job.ShowWarranty, (c, v) => c.Job.ShowWarranty = v, "Show Warranty", "Can show job warranty") },
+				{ "Device.Properties.AssetNumber", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Properties.AssetNumber, (c, v) => c.Device.Properties.AssetNumber = v, "Asset Number Property", "Can update property") },
+				{ "Device.Properties.DeviceBatch", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Properties.DeviceBatch, (c, v) => c.Device.Properties.DeviceBatch = v, "Device Batch Property", "Can update property") },
+				{ "Device.Properties.DeviceProfile", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Properties.DeviceProfile, (c, v) => c.Device.Properties.DeviceProfile = v, "Device Profile Property", "Can update property") },
+				{ "Device.Properties.Location", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Properties.Location, (c, v) => c.Device.Properties.Location = v, "Location Property", "Can update property") },
+				{ "Device.Actions.AddAttachments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Actions.AddAttachments, (c, v) => c.Device.Actions.AddAttachments = v, "Add Attachments", "Can add attachments to devices") },
+				{ "Device.Actions.AllowUnauthenticatedEnrol", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Actions.AllowUnauthenticatedEnrol, (c, v) => c.Device.Actions.AllowUnauthenticatedEnrol = v, "Allow Unauthenticated Enrol", "Can allow devices to enrol without authentication") },
+				{ "Device.Actions.AssignUser", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Actions.AssignUser, (c, v) => c.Device.Actions.AssignUser = v, "Assign User", "Can update the user assignment of devices") },
+				{ "Device.Actions.Decommission", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Actions.Decommission, (c, v) => c.Device.Actions.Decommission = v, "Decommission", "Can decommission devices") },
+				{ "Device.Actions.Delete", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Actions.Delete, (c, v) => c.Device.Actions.Delete = v, "Delete", "Can delete devices") },
+				{ "Device.Actions.EnrolDevices", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Actions.EnrolDevices, (c, v) => c.Device.Actions.EnrolDevices = v, "Enrol Devices", "Can add devices offline and enrol devices with the Bootstrapper") },
+				{ "Device.Actions.Export", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Actions.Export, (c, v) => c.Device.Actions.Export = v, "Export Devices", "Can export devices in a bulk format") },
+				{ "Device.Actions.GenerateDocuments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Actions.GenerateDocuments, (c, v) => c.Device.Actions.GenerateDocuments = v, "Generate Documents", "Can generate documents for jobs") },
+				{ "Device.Actions.Import", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Actions.Import, (c, v) => c.Device.Actions.Import = v, "Import Devices", "Can bulk import devices") },
+				{ "Device.Actions.Recommission", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Actions.Recommission, (c, v) => c.Device.Actions.Recommission = v, "Recommission", "Can recommission devices") },
+				{ "Device.Actions.RemoveAnyAttachments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Actions.RemoveAnyAttachments, (c, v) => c.Device.Actions.RemoveAnyAttachments = v, "Remove Any Attachments", "Can remove any attachments from devices") },
+				{ "Device.Actions.RemoveOwnAttachments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Actions.RemoveOwnAttachments, (c, v) => c.Device.Actions.RemoveOwnAttachments = v, "Remove Own Attachments", "Can remove own attachments from devices") },
+				{ "Device.Search", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Search, (c, v) => c.Device.Search = v, "Search Devices", "Can search devices") },
+				{ "Device.ShowAssignmentHistory", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.ShowAssignmentHistory, (c, v) => c.Device.ShowAssignmentHistory = v, "Show Assignment History", "Can show the assignment history for devices") },
+				{ "Device.ShowAttachments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.ShowAttachments, (c, v) => c.Device.ShowAttachments = v, "Show Attachments", "Can show device attachments") },
+				{ "Device.ShowCertificates", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.ShowCertificates, (c, v) => c.Device.ShowCertificates = v, "Show Certificates", "Can show certificates associated with devices") },
+				{ "Device.ShowDetails", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.ShowDetails, (c, v) => c.Device.ShowDetails = v, "Show Details", "Can show details associated with devices") },
+				{ "Device.Show", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.Show, (c, v) => c.Device.Show = v, "Show Devices", "Can show devices") },
+				{ "Device.ShowJobs", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.Device.ShowJobs, (c, v) => c.Device.ShowJobs = v, "Show Devices Jobs", "Can show jobs associated with devices") },
+				{ "User.Actions.AddAttachments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.User.Actions.AddAttachments, (c, v) => c.User.Actions.AddAttachments = v, "Add Attachments", "Can add attachments to users") },
+				{ "User.Actions.GenerateDocuments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.User.Actions.GenerateDocuments, (c, v) => c.User.Actions.GenerateDocuments = v, "Generate Documents", "Can generate documents for users") },
+				{ "User.Actions.RemoveAnyAttachments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.User.Actions.RemoveAnyAttachments, (c, v) => c.User.Actions.RemoveAnyAttachments = v, "Remove Any Attachments", "Can remove any attachments from users") },
+				{ "User.Actions.RemoveOwnAttachments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.User.Actions.RemoveOwnAttachments, (c, v) => c.User.Actions.RemoveOwnAttachments = v, "Remove Own Attachments", "Can remove own attachments from users") },
+				{ "User.Search", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.User.Search, (c, v) => c.User.Search = v, "Search Users", "Can search users") },
+				{ "User.ShowAttachments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.User.ShowAttachments, (c, v) => c.User.ShowAttachments = v, "Show Attachments", "Can show user attachments") },
+				{ "User.ShowAssignmentHistory", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.User.ShowAssignmentHistory, (c, v) => c.User.ShowAssignmentHistory = v, "Show Device Assignment History", "Can show the device assignment history for users") },
+				{ "User.Show", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.User.Show, (c, v) => c.User.Show = v, "Show Users", "Can show users") },
+				{ "User.ShowAuthorization", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.User.ShowAuthorization, (c, v) => c.User.ShowAuthorization = v, "Show Users Authorization", "Can show authorization permissions associated with users") },
+				{ "User.ShowJobs", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.User.ShowJobs, (c, v) => c.User.ShowJobs = v, "Show Users Jobs", "Can show jobs associated with users") },
+				{ "ComputerAccount", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.ComputerAccount, (c, v) => c.ComputerAccount = v, "Computer Account", "Represents a computer account") },
+				{ "DiscoAdminAccount", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => c.DiscoAdminAccount, (c, v) => c.DiscoAdminAccount = v, "Disco Administrator Account", "Represents a Disco Administrator account") }
+			};
+#endregion
+
+#region Role Claim Navigator
+			_claimNavigator =
+				new ClaimNavigatorItem("Claims", "Permissions", "Top-level node for all permissions", false, new List<IClaimNavigatorItem>() {
+				    new ClaimNavigatorItem("Config", "Configuration", "Permissions related to Disco Configuration", false, new List<IClaimNavigatorItem>() {
+				        new ClaimNavigatorItem("Config.DeviceCertificate", "Device Certificate", "Permissions related to Device Certificates", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Config.DeviceCertificate.DownloadCertificates", false)
+				        }),
+				        new ClaimNavigatorItem("Config.Enrolment", "Enrolment", "Permissions related to Device Enrolment", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Config.Enrolment.Configure", false),
+				            new ClaimNavigatorItem("Config.Enrolment.DownloadBootstrapper", false),
+				            new ClaimNavigatorItem("Config.Enrolment.Show", false),
+				            new ClaimNavigatorItem("Config.Enrolment.ShowStatus", false)
+				        }),
+				        new ClaimNavigatorItem("Config.DeviceBatch", "Device Batch", "Permissions related to Device Batches", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Config.DeviceBatch.Configure", false),
+				            new ClaimNavigatorItem("Config.DeviceBatch.Create", false),
+				            new ClaimNavigatorItem("Config.DeviceBatch.Delete", false),
+				            new ClaimNavigatorItem("Config.DeviceBatch.Show", false),
+				            new ClaimNavigatorItem("Config.DeviceBatch.ShowTimeline", false)
+				        }),
+				        new ClaimNavigatorItem("Config.DeviceModel", "Device Model", "Permissions related to Device Models", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Config.DeviceModel.ConfigureComponents", false),
+				            new ClaimNavigatorItem("Config.DeviceModel.Configure", false),
+				            new ClaimNavigatorItem("Config.DeviceModel.Delete", false),
+				            new ClaimNavigatorItem("Config.DeviceModel.Show", false)
+				        }),
+				        new ClaimNavigatorItem("Config.DeviceProfile", "Device Profile", "Permissions related to Device Profiles", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Config.DeviceProfile.ConfigureComputerNameTemplate", false),
+				            new ClaimNavigatorItem("Config.DeviceProfile.ConfigureDefaults", false),
+				            new ClaimNavigatorItem("Config.DeviceProfile.Configure", false),
+				            new ClaimNavigatorItem("Config.DeviceProfile.Create", false),
+				            new ClaimNavigatorItem("Config.DeviceProfile.Delete", false),
+				            new ClaimNavigatorItem("Config.DeviceProfile.Show", false)
+				        }),
+				        new ClaimNavigatorItem("Config.DocumentTemplate", "Document Template", "Permissions related to Document Templates", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Config.DocumentTemplate.BulkGenerate", false),
+				            new ClaimNavigatorItem("Config.DocumentTemplate.Configure", false),
+				            new ClaimNavigatorItem("Config.DocumentTemplate.ConfigureFilterExpression", false),
+				            new ClaimNavigatorItem("Config.DocumentTemplate.Create", false),
+				            new ClaimNavigatorItem("Config.DocumentTemplate.Delete", false),
+				            new ClaimNavigatorItem("Config.DocumentTemplate.ShowStatus", false),
+				            new ClaimNavigatorItem("Config.DocumentTemplate.Show", false),
+				            new ClaimNavigatorItem("Config.DocumentTemplate.UndetectedPages", false),
+				            new ClaimNavigatorItem("Config.DocumentTemplate.Upload", false)
+				        }),
+				        new ClaimNavigatorItem("Config.Logging", "Logging", "Permissions related to Logging", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Config.Logging.Show", false)
+				        }),
+				        new ClaimNavigatorItem("Config.Plugin", "Plugin", "Permissions related to Plugins", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Config.Plugin.Configure", false),
+				            new ClaimNavigatorItem("Config.Plugin.InstallLocal", false),
+				            new ClaimNavigatorItem("Config.Plugin.Install", false),
+				            new ClaimNavigatorItem("Config.Plugin.Show", false),
+				            new ClaimNavigatorItem("Config.Plugin.Uninstall", false)
+				        }),
+				        new ClaimNavigatorItem("Config.System", "System", "Permissions related to System Configuration", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Config.System.ConfigureProxy", false),
+				            new ClaimNavigatorItem("Config.System.Show", false)
+				        }),
+				        new ClaimNavigatorItem("Config.Organisation", "Organisation Details", "Permissions related to the Organisation Details", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Config.Organisation.ConfigureAddresses", false),
+				            new ClaimNavigatorItem("Config.Organisation.ConfigureLogo", false),
+				            new ClaimNavigatorItem("Config.Organisation.ConfigureMultiSiteMode", false),
+				            new ClaimNavigatorItem("Config.Organisation.ConfigureName", false),
+				            new ClaimNavigatorItem("Config.Organisation.Show", false)
+				        }),
+				        new ClaimNavigatorItem("Config.Show", false)
+				    }),
+				    new ClaimNavigatorItem("Job", "Job", "Permissions related to Jobs", false, new List<IClaimNavigatorItem>() {
+				        new ClaimNavigatorItem("Job.Lists", "Lists", "Permissions related to Job Lists", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Job.Lists.AllOpen", false),
+				            new ClaimNavigatorItem("Job.Lists.AwaitingFinanceAgreementBreach", false),
+				            new ClaimNavigatorItem("Job.Lists.AwaitingFinanceCharge", false),
+				            new ClaimNavigatorItem("Job.Lists.AwaitingFinanceInsuranceProcessing", false),
+				            new ClaimNavigatorItem("Job.Lists.AwaitingFinance", false),
+				            new ClaimNavigatorItem("Job.Lists.AwaitingFinancePayment", false),
+				            new ClaimNavigatorItem("Job.Lists.AwaitingTechnicianAction", false),
+				            new ClaimNavigatorItem("Job.Lists.AwaitingUserAction", false),
+				            new ClaimNavigatorItem("Job.Lists.DevicesAwaitingRepair", false),
+				            new ClaimNavigatorItem("Job.Lists.DevicesReadyForReturn", false),
+				            new ClaimNavigatorItem("Job.Lists.Locations", false),
+				            new ClaimNavigatorItem("Job.Lists.LongRunningJobs", false),
+				            new ClaimNavigatorItem("Job.Lists.RecentlyClosed", false)
+				        }),
+				        new ClaimNavigatorItem("Job.Actions", "Actions", "Permissions related to Job Actions", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Job.Actions.AddAttachments", false),
+				            new ClaimNavigatorItem("Job.Actions.AddLogs", false),
+				            new ClaimNavigatorItem("Job.Actions.Close", false),
+				            new ClaimNavigatorItem("Job.Actions.ConvertHWarToHNWar", false),
+				            new ClaimNavigatorItem("Job.Actions.Create", false),
+				            new ClaimNavigatorItem("Job.Actions.Delete", false),
+				            new ClaimNavigatorItem("Job.Actions.ForceClose", false),
+				            new ClaimNavigatorItem("Job.Actions.GenerateDocuments", false),
+				            new ClaimNavigatorItem("Job.Actions.LogRepair", false),
+				            new ClaimNavigatorItem("Job.Actions.LogWarranty", false),
+				            new ClaimNavigatorItem("Job.Actions.RemoveAnyAttachments", false),
+				            new ClaimNavigatorItem("Job.Actions.RemoveAnyLogs", false),
+				            new ClaimNavigatorItem("Job.Actions.RemoveOwnAttachments", false),
+				            new ClaimNavigatorItem("Job.Actions.RemoveOwnLogs", false),
+				            new ClaimNavigatorItem("Job.Actions.Reopen", false),
+				            new ClaimNavigatorItem("Job.Actions.UpdateSubTypes", false)
+				        }),
+				        new ClaimNavigatorItem("Job.Properties", "Job Properties", "Permissions related to Job Properties", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Job.Properties.WarrantyProperties", "Warranty Properties", "Permissions related to Warranty Job Properties", false, new List<IClaimNavigatorItem>() {
+				                new ClaimNavigatorItem("Job.Properties.WarrantyProperties.ExternalCompletedDate", false),
+				                new ClaimNavigatorItem("Job.Properties.WarrantyProperties.ExternalLoggedDate", false),
+				                new ClaimNavigatorItem("Job.Properties.WarrantyProperties.ExternalName", false),
+				                new ClaimNavigatorItem("Job.Properties.WarrantyProperties.ExternalReference", false),
+				                new ClaimNavigatorItem("Job.Properties.WarrantyProperties.ProviderDetails", false),
+				                new ClaimNavigatorItem("Job.Properties.WarrantyProperties.WarrantyCompleted", false)
+				            }),
+				            new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties", "Non Warranty Properties", "Permissions related to Non-Warranty Job Properties", false, new List<IClaimNavigatorItem>() {
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.AccountingChargeAdded", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.AccountingChargePaid", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.AccountingChargeRequired", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.AddComponents", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.EditComponents", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.InsuranceClaimFormSent", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.InsuranceDetails", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.InvoiceReceived", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.IsInsuranceClaim", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.PurchaseOrderRaised", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.PurchaseOrderReference", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.PurchaseOrderSent", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.RepairerCompletedDate", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.RepairerLoggedDate", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.RepairerName", false),
+				                new ClaimNavigatorItem("Job.Properties.NonWarrantyProperties.RepairerReference", false)
+				            }),
+				            new ClaimNavigatorItem("Job.Properties.DeviceHeldLocation", false),
+				            new ClaimNavigatorItem("Job.Properties.DeviceHeld", false),
+				            new ClaimNavigatorItem("Job.Properties.DeviceReadyForReturn", false),
+				            new ClaimNavigatorItem("Job.Properties.DeviceReturned", false),
+				            new ClaimNavigatorItem("Job.Properties.ExpectedClosedDate", false),
+				            new ClaimNavigatorItem("Job.Properties.Flags", false),
+				            new ClaimNavigatorItem("Job.Properties.NotWaitingForUserAction", false),
+				            new ClaimNavigatorItem("Job.Properties.WaitingForUserAction", false)
+				        }),
+				        new ClaimNavigatorItem("Job.Types", "Types", "Permissions related to Job Types", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Job.Types.ShowHMisc", false),
+				            new ClaimNavigatorItem("Job.Types.ShowHNWar", false),
+				            new ClaimNavigatorItem("Job.Types.ShowHWar", false),
+				            new ClaimNavigatorItem("Job.Types.ShowSApp", false),
+				            new ClaimNavigatorItem("Job.Types.ShowSOS", false),
+				            new ClaimNavigatorItem("Job.Types.ShowSImg", false),
+				            new ClaimNavigatorItem("Job.Types.ShowUMgmt", false)
+				        }),
+				        new ClaimNavigatorItem("Job.Search", false),
+				        new ClaimNavigatorItem("Job.ShowAttachments", false),
+				        new ClaimNavigatorItem("Job.ShowDailyChart", false),
+				        new ClaimNavigatorItem("Job.ShowFlags", false),
+				        new ClaimNavigatorItem("Job.Show", false),
+				        new ClaimNavigatorItem("Job.ShowLogs", false),
+				        new ClaimNavigatorItem("Job.ShowNonWarrantyComponents", false),
+				        new ClaimNavigatorItem("Job.ShowNonWarrantyFinance", false),
+				        new ClaimNavigatorItem("Job.ShowNonWarrantyInsurance", false),
+				        new ClaimNavigatorItem("Job.ShowNonWarrantyRepairs", false),
+				        new ClaimNavigatorItem("Job.ShowWarranty", false)
+				    }),
+				    new ClaimNavigatorItem("Device", "Device", "Permissions related to Devices", false, new List<IClaimNavigatorItem>() {
+				        new ClaimNavigatorItem("Device.Properties", "Device Properties", "Permissions related to Device Properties", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Device.Properties.AssetNumber", false),
+				            new ClaimNavigatorItem("Device.Properties.DeviceBatch", false),
+				            new ClaimNavigatorItem("Device.Properties.DeviceProfile", false),
+				            new ClaimNavigatorItem("Device.Properties.Location", false)
+				        }),
+				        new ClaimNavigatorItem("Device.Actions", "Actions", "Permissions related to Device Actions", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("Device.Actions.AddAttachments", false),
+				            new ClaimNavigatorItem("Device.Actions.AllowUnauthenticatedEnrol", false),
+				            new ClaimNavigatorItem("Device.Actions.AssignUser", false),
+				            new ClaimNavigatorItem("Device.Actions.Decommission", false),
+				            new ClaimNavigatorItem("Device.Actions.Delete", false),
+				            new ClaimNavigatorItem("Device.Actions.EnrolDevices", false),
+				            new ClaimNavigatorItem("Device.Actions.Export", false),
+				            new ClaimNavigatorItem("Device.Actions.GenerateDocuments", false),
+				            new ClaimNavigatorItem("Device.Actions.Import", false),
+				            new ClaimNavigatorItem("Device.Actions.Recommission", false),
+				            new ClaimNavigatorItem("Device.Actions.RemoveAnyAttachments", false),
+				            new ClaimNavigatorItem("Device.Actions.RemoveOwnAttachments", false)
+				        }),
+				        new ClaimNavigatorItem("Device.Search", false),
+				        new ClaimNavigatorItem("Device.ShowAssignmentHistory", false),
+				        new ClaimNavigatorItem("Device.ShowAttachments", false),
+				        new ClaimNavigatorItem("Device.ShowCertificates", false),
+				        new ClaimNavigatorItem("Device.ShowDetails", false),
+				        new ClaimNavigatorItem("Device.Show", false),
+				        new ClaimNavigatorItem("Device.ShowJobs", false)
+				    }),
+				    new ClaimNavigatorItem("User", "User", "Permissions related to Users", false, new List<IClaimNavigatorItem>() {
+				        new ClaimNavigatorItem("User.Actions", "Actions", "Permissions related to User Actions", false, new List<IClaimNavigatorItem>() {
+				            new ClaimNavigatorItem("User.Actions.AddAttachments", false),
+				            new ClaimNavigatorItem("User.Actions.GenerateDocuments", false),
+				            new ClaimNavigatorItem("User.Actions.RemoveAnyAttachments", false),
+				            new ClaimNavigatorItem("User.Actions.RemoveOwnAttachments", false)
+				        }),
+				        new ClaimNavigatorItem("User.Search", false),
+				        new ClaimNavigatorItem("User.ShowAttachments", false),
+				        new ClaimNavigatorItem("User.ShowAssignmentHistory", false),
+				        new ClaimNavigatorItem("User.Show", false),
+				        new ClaimNavigatorItem("User.ShowAuthorization", false),
+				        new ClaimNavigatorItem("User.ShowJobs", false)
+				    }),
+				    new ClaimNavigatorItem("ComputerAccount", true),
+				    new ClaimNavigatorItem("DiscoAdminAccount", true)
+				});
+#endregion
+        }
+
+		public static ClaimNavigatorItem RoleClaimNavigator
+		{
+			get { return _claimNavigator; }
+		}
+
+		public static Func<RoleClaims, bool> GetClaimAccessor(string ClaimKey) {
+			Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string> claimFunc;
+
+            if (!_roleClaims.TryGetValue(ClaimKey, out claimFunc))
+                throw new ArgumentException("Unknown Claim Key", "ClaimKey");
+
+            return claimFunc.Item1;
+		}
+
+		public static Action<RoleClaims, bool> GetClaimSetter(string ClaimKey) {
+			Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string> claimFunc;
+
+            if (!_roleClaims.TryGetValue(ClaimKey, out claimFunc))
+                throw new ArgumentException("Unknown Claim Key", "ClaimKey");
+
+            return claimFunc.Item2;
+		}
+
+		public static Tuple<string, string> GetClaimDetails(string ClaimKey) {
+			Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string> claimFunc;
+
+            if (!_roleClaims.TryGetValue(ClaimKey, out claimFunc))
+                throw new ArgumentException("Unknown Claim Key", "ClaimKey");
+
+            return new Tuple<string, string>(claimFunc.Item3, claimFunc.Item4);
+		}
+
+		public static RoleClaims BuildClaims(IEnumerable<string> ClaimKeys){
+			var c = new RoleClaims();
+			foreach (var claimKey in ClaimKeys)
+				c.Set(claimKey, true);
+
+			return c;
+		}
+
+		public static RoleClaims AdministratorClaims() {
+			var c = new RoleClaims();
+#region Set All Administrator Claims
+			c.Config.DeviceCertificate.DownloadCertificates = true;
+			c.Config.Enrolment.Configure = true;
+			c.Config.Enrolment.DownloadBootstrapper = true;
+			c.Config.Enrolment.Show = true;
+			c.Config.Enrolment.ShowStatus = true;
+			c.Config.DeviceBatch.Configure = true;
+			c.Config.DeviceBatch.Create = true;
+			c.Config.DeviceBatch.Delete = true;
+			c.Config.DeviceBatch.Show = true;
+			c.Config.DeviceBatch.ShowTimeline = true;
+			c.Config.DeviceModel.ConfigureComponents = true;
+			c.Config.DeviceModel.Configure = true;
+			c.Config.DeviceModel.Delete = true;
+			c.Config.DeviceModel.Show = true;
+			c.Config.DeviceProfile.ConfigureComputerNameTemplate = true;
+			c.Config.DeviceProfile.ConfigureDefaults = true;
+			c.Config.DeviceProfile.Configure = true;
+			c.Config.DeviceProfile.Create = true;
+			c.Config.DeviceProfile.Delete = true;
+			c.Config.DeviceProfile.Show = true;
+			c.Config.DocumentTemplate.BulkGenerate = true;
+			c.Config.DocumentTemplate.Configure = true;
+			c.Config.DocumentTemplate.ConfigureFilterExpression = true;
+			c.Config.DocumentTemplate.Create = true;
+			c.Config.DocumentTemplate.Delete = true;
+			c.Config.DocumentTemplate.ShowStatus = true;
+			c.Config.DocumentTemplate.Show = true;
+			c.Config.DocumentTemplate.UndetectedPages = true;
+			c.Config.DocumentTemplate.Upload = true;
+			c.Config.Logging.Show = true;
+			c.Config.Plugin.Configure = true;
+			c.Config.Plugin.InstallLocal = true;
+			c.Config.Plugin.Install = true;
+			c.Config.Plugin.Show = true;
+			c.Config.Plugin.Uninstall = true;
+			c.Config.System.ConfigureProxy = true;
+			c.Config.System.Show = true;
+			c.Config.Organisation.ConfigureAddresses = true;
+			c.Config.Organisation.ConfigureLogo = true;
+			c.Config.Organisation.ConfigureMultiSiteMode = true;
+			c.Config.Organisation.ConfigureName = true;
+			c.Config.Organisation.Show = true;
+			c.Config.Show = true;
+			c.Job.Lists.AllOpen = true;
+			c.Job.Lists.AwaitingFinanceAgreementBreach = true;
+			c.Job.Lists.AwaitingFinanceCharge = true;
+			c.Job.Lists.AwaitingFinanceInsuranceProcessing = true;
+			c.Job.Lists.AwaitingFinance = true;
+			c.Job.Lists.AwaitingFinancePayment = true;
+			c.Job.Lists.AwaitingTechnicianAction = true;
+			c.Job.Lists.AwaitingUserAction = true;
+			c.Job.Lists.DevicesAwaitingRepair = true;
+			c.Job.Lists.DevicesReadyForReturn = true;
+			c.Job.Lists.Locations = true;
+			c.Job.Lists.LongRunningJobs = true;
+			c.Job.Lists.RecentlyClosed = true;
+			c.Job.Actions.AddAttachments = true;
+			c.Job.Actions.AddLogs = true;
+			c.Job.Actions.Close = true;
+			c.Job.Actions.ConvertHWarToHNWar = true;
+			c.Job.Actions.Create = true;
+			c.Job.Actions.Delete = true;
+			c.Job.Actions.ForceClose = true;
+			c.Job.Actions.GenerateDocuments = true;
+			c.Job.Actions.LogRepair = true;
+			c.Job.Actions.LogWarranty = true;
+			c.Job.Actions.RemoveAnyAttachments = true;
+			c.Job.Actions.RemoveAnyLogs = true;
+			c.Job.Actions.RemoveOwnAttachments = true;
+			c.Job.Actions.RemoveOwnLogs = true;
+			c.Job.Actions.Reopen = true;
+			c.Job.Actions.UpdateSubTypes = true;
+			c.Job.Properties.WarrantyProperties.ExternalCompletedDate = true;
+			c.Job.Properties.WarrantyProperties.ExternalLoggedDate = true;
+			c.Job.Properties.WarrantyProperties.ExternalName = true;
+			c.Job.Properties.WarrantyProperties.ExternalReference = true;
+			c.Job.Properties.WarrantyProperties.ProviderDetails = true;
+			c.Job.Properties.WarrantyProperties.WarrantyCompleted = true;
+			c.Job.Properties.NonWarrantyProperties.AccountingChargeAdded = true;
+			c.Job.Properties.NonWarrantyProperties.AccountingChargePaid = true;
+			c.Job.Properties.NonWarrantyProperties.AccountingChargeRequired = true;
+			c.Job.Properties.NonWarrantyProperties.AddComponents = true;
+			c.Job.Properties.NonWarrantyProperties.EditComponents = true;
+			c.Job.Properties.NonWarrantyProperties.InsuranceClaimFormSent = true;
+			c.Job.Properties.NonWarrantyProperties.InsuranceDetails = true;
+			c.Job.Properties.NonWarrantyProperties.InvoiceReceived = true;
+			c.Job.Properties.NonWarrantyProperties.IsInsuranceClaim = true;
+			c.Job.Properties.NonWarrantyProperties.PurchaseOrderRaised = true;
+			c.Job.Properties.NonWarrantyProperties.PurchaseOrderReference = true;
+			c.Job.Properties.NonWarrantyProperties.PurchaseOrderSent = true;
+			c.Job.Properties.NonWarrantyProperties.RepairerCompletedDate = true;
+			c.Job.Properties.NonWarrantyProperties.RepairerLoggedDate = true;
+			c.Job.Properties.NonWarrantyProperties.RepairerName = true;
+			c.Job.Properties.NonWarrantyProperties.RepairerReference = true;
+			c.Job.Properties.DeviceHeldLocation = true;
+			c.Job.Properties.DeviceHeld = true;
+			c.Job.Properties.DeviceReadyForReturn = true;
+			c.Job.Properties.DeviceReturned = true;
+			c.Job.Properties.ExpectedClosedDate = true;
+			c.Job.Properties.Flags = true;
+			c.Job.Properties.NotWaitingForUserAction = true;
+			c.Job.Properties.WaitingForUserAction = true;
+			c.Job.Types.ShowHMisc = true;
+			c.Job.Types.ShowHNWar = true;
+			c.Job.Types.ShowHWar = true;
+			c.Job.Types.ShowSApp = true;
+			c.Job.Types.ShowSOS = true;
+			c.Job.Types.ShowSImg = true;
+			c.Job.Types.ShowUMgmt = true;
+			c.Job.Search = true;
+			c.Job.ShowAttachments = true;
+			c.Job.ShowDailyChart = true;
+			c.Job.ShowFlags = true;
+			c.Job.Show = true;
+			c.Job.ShowLogs = true;
+			c.Job.ShowNonWarrantyComponents = true;
+			c.Job.ShowNonWarrantyFinance = true;
+			c.Job.ShowNonWarrantyInsurance = true;
+			c.Job.ShowNonWarrantyRepairs = true;
+			c.Job.ShowWarranty = true;
+			c.Device.Properties.AssetNumber = true;
+			c.Device.Properties.DeviceBatch = true;
+			c.Device.Properties.DeviceProfile = true;
+			c.Device.Properties.Location = true;
+			c.Device.Actions.AddAttachments = true;
+			c.Device.Actions.AllowUnauthenticatedEnrol = true;
+			c.Device.Actions.AssignUser = true;
+			c.Device.Actions.Decommission = true;
+			c.Device.Actions.Delete = true;
+			c.Device.Actions.EnrolDevices = true;
+			c.Device.Actions.Export = true;
+			c.Device.Actions.GenerateDocuments = true;
+			c.Device.Actions.Import = true;
+			c.Device.Actions.Recommission = true;
+			c.Device.Actions.RemoveAnyAttachments = true;
+			c.Device.Actions.RemoveOwnAttachments = true;
+			c.Device.Search = true;
+			c.Device.ShowAssignmentHistory = true;
+			c.Device.ShowAttachments = true;
+			c.Device.ShowCertificates = true;
+			c.Device.ShowDetails = true;
+			c.Device.Show = true;
+			c.Device.ShowJobs = true;
+			c.User.Actions.AddAttachments = true;
+			c.User.Actions.GenerateDocuments = true;
+			c.User.Actions.RemoveAnyAttachments = true;
+			c.User.Actions.RemoveOwnAttachments = true;
+			c.User.Search = true;
+			c.User.ShowAttachments = true;
+			c.User.ShowAssignmentHistory = true;
+			c.User.Show = true;
+			c.User.ShowAuthorization = true;
+			c.User.ShowJobs = true;
+			c.DiscoAdminAccount = true;
+#endregion
+			return c;
+		}
+
+		public static RoleClaims ComputerAccountClaims() {
+			return new RoleClaims() {
+				ComputerAccount = true
+			};
+		}
+
+#region Role Claim Constants
+
+        /// <summary>Configuration
+        /// <para>Permissions related to Disco Configuration</para>
+        /// </summary>
+        public static class Config
+        {
+
+            /// <summary>Device Certificate
+            /// <para>Permissions related to Device Certificates</para>
+            /// </summary>
+            public static class DeviceCertificate
+            {
+
+                /// <summary>Download Certificates
+                /// <para>Can download certificates</para>
+                /// </summary>
+                public const string DownloadCertificates = "Config.DeviceCertificate.DownloadCertificates";
+            }
+
+            /// <summary>Enrolment
+            /// <para>Permissions related to Device Enrolment</para>
+            /// </summary>
+            public static class Enrolment
+            {
+
+                /// <summary>Configure Enrolment
+                /// <para>Can configure device enrolment</para>
+                /// </summary>
+                public const string Configure = "Config.Enrolment.Configure";
+
+                /// <summary>Download Bootstrapper
+                /// <para>Can download the Device Bootstrapper</para>
+                /// </summary>
+                public const string DownloadBootstrapper = "Config.Enrolment.DownloadBootstrapper";
+
+                /// <summary>Show Enrolment
+                /// <para>Can show device enrolment</para>
+                /// </summary>
+                public const string Show = "Config.Enrolment.Show";
+
+                /// <summary>Show Enrolment Status
+                /// <para>Can show the enrolment status</para>
+                /// </summary>
+                public const string ShowStatus = "Config.Enrolment.ShowStatus";
+            }
+
+            /// <summary>Device Batch
+            /// <para>Permissions related to Device Batches</para>
+            /// </summary>
+            public static class DeviceBatch
+            {
+
+                /// <summary>Configure Device Batches
+                /// <para>Can configure device batches</para>
+                /// </summary>
+                public const string Configure = "Config.DeviceBatch.Configure";
+
+                /// <summary>Create Device Batches
+                /// <para>Can create device batches</para>
+                /// </summary>
+                public const string Create = "Config.DeviceBatch.Create";
+
+                /// <summary>Delete Device Batches
+                /// <para>Can delete device batches</para>
+                /// </summary>
+                public const string Delete = "Config.DeviceBatch.Delete";
+
+                /// <summary>Show Device Batches
+                /// <para>Can show device batches</para>
+                /// </summary>
+                public const string Show = "Config.DeviceBatch.Show";
+
+                /// <summary>Show Timeline
+                /// <para>Can show device batch timeline</para>
+                /// </summary>
+                public const string ShowTimeline = "Config.DeviceBatch.ShowTimeline";
+            }
+
+            /// <summary>Device Model
+            /// <para>Permissions related to Device Models</para>
+            /// </summary>
+            public static class DeviceModel
+            {
+
+                /// <summary>Configure Device Model Components
+                /// <para>Can configure device model components</para>
+                /// </summary>
+                public const string ConfigureComponents = "Config.DeviceModel.ConfigureComponents";
+
+                /// <summary>Configure Device Models
+                /// <para>Can configure device models</para>
+                /// </summary>
+                public const string Configure = "Config.DeviceModel.Configure";
+
+                /// <summary>Delete Device Models
+                /// <para>Can delete device models</para>
+                /// </summary>
+                public const string Delete = "Config.DeviceModel.Delete";
+
+                /// <summary>Show Device Models
+                /// <para>Can show device models</para>
+                /// </summary>
+                public const string Show = "Config.DeviceModel.Show";
+            }
+
+            /// <summary>Device Profile
+            /// <para>Permissions related to Device Profiles</para>
+            /// </summary>
+            public static class DeviceProfile
+            {
+
+                /// <summary>Configure Computer Name Templates
+                /// <para>Can configure computer name templates for device profiles</para>
+                /// </summary>
+                public const string ConfigureComputerNameTemplate = "Config.DeviceProfile.ConfigureComputerNameTemplate";
+
+                /// <summary>Configure Default Device Profiles
+                /// <para>Can configure default device profiles</para>
+                /// </summary>
+                public const string ConfigureDefaults = "Config.DeviceProfile.ConfigureDefaults";
+
+                /// <summary>Configure Device Profiles
+                /// <para>Can configure device profiles</para>
+                /// </summary>
+                public const string Configure = "Config.DeviceProfile.Configure";
+
+                /// <summary>Create Device Profiles
+                /// <para>Can create device profiles</para>
+                /// </summary>
+                public const string Create = "Config.DeviceProfile.Create";
+
+                /// <summary>Delete Device Profiles
+                /// <para>Can delete device profiles</para>
+                /// </summary>
+                public const string Delete = "Config.DeviceProfile.Delete";
+
+                /// <summary>Show Device Profiles
+                /// <para>Can show device profiles</para>
+                /// </summary>
+                public const string Show = "Config.DeviceProfile.Show";
+            }
+
+            /// <summary>Document Template
+            /// <para>Permissions related to Document Templates</para>
+            /// </summary>
+            public static class DocumentTemplate
+            {
+
+                /// <summary>Bulk Generate Document Templates
+                /// <para>Can bulk generate document templates</para>
+                /// </summary>
+                public const string BulkGenerate = "Config.DocumentTemplate.BulkGenerate";
+
+                /// <summary>Configure Document Templates
+                /// <para>Can configure document templates</para>
+                /// </summary>
+                public const string Configure = "Config.DocumentTemplate.Configure";
+
+                /// <summary>Configure Filter Expression
+                /// <para>Can configure filter expressions for document templates</para>
+                /// </summary>
+                public const string ConfigureFilterExpression = "Config.DocumentTemplate.ConfigureFilterExpression";
+
+                /// <summary>Create Document Templates
+                /// <para>Can create document templates</para>
+                /// </summary>
+                public const string Create = "Config.DocumentTemplate.Create";
+
+                /// <summary>Delete Document Templates
+                /// <para>Can delete document templates</para>
+                /// </summary>
+                public const string Delete = "Config.DocumentTemplate.Delete";
+
+                /// <summary>Show Document Template Import Status
+                /// <para>Can show the document template import status</para>
+                /// </summary>
+                public const string ShowStatus = "Config.DocumentTemplate.ShowStatus";
+
+                /// <summary>Show Document Templates
+                /// <para>Can show document templates</para>
+                /// </summary>
+                public const string Show = "Config.DocumentTemplate.Show";
+
+                /// <summary>Undetected Pages
+                /// <para>Can show and assign imported documents which were not undetected</para>
+                /// </summary>
+                public const string UndetectedPages = "Config.DocumentTemplate.UndetectedPages";
+
+                /// <summary>Upload Document Templates
+                /// <para>Can upload document templates</para>
+                /// </summary>
+                public const string Upload = "Config.DocumentTemplate.Upload";
+            }
+
+            /// <summary>Logging
+            /// <para>Permissions related to Logging</para>
+            /// </summary>
+            public static class Logging
+            {
+
+                /// <summary>Show Logging
+                /// <para>Can show logging</para>
+                /// </summary>
+                public const string Show = "Config.Logging.Show";
+            }
+
+            /// <summary>Plugin
+            /// <para>Permissions related to Plugins</para>
+            /// </summary>
+            public static class Plugin
+            {
+
+                /// <summary>Configure Plugins
+                /// <para>Can configure plugins</para>
+                /// </summary>
+                public const string Configure = "Config.Plugin.Configure";
+
+                /// <summary>Install/Update Local Plugins
+                /// <para>Can install and update locally uploaded plugins</para>
+                /// </summary>
+                public const string InstallLocal = "Config.Plugin.InstallLocal";
+
+                /// <summary>Install/Update Plugins
+                /// <para>Can install and update plugins</para>
+                /// </summary>
+                public const string Install = "Config.Plugin.Install";
+
+                /// <summary>Show Plugins
+                /// <para>Can show plugins</para>
+                /// </summary>
+                public const string Show = "Config.Plugin.Show";
+
+                /// <summary>Uninstall Plugins
+                /// <para>Can uninstall plugins</para>
+                /// </summary>
+                public const string Uninstall = "Config.Plugin.Uninstall";
+            }
+
+            /// <summary>System
+            /// <para>Permissions related to System Configuration</para>
+            /// </summary>
+            public static class System
+            {
+
+                /// <summary>Configure Proxy Settings
+                /// <para>Can configure the proxy settings</para>
+                /// </summary>
+                public const string ConfigureProxy = "Config.System.ConfigureProxy";
+
+                /// <summary>Show System Configuration
+                /// <para>Can show the system configuration</para>
+                /// </summary>
+                public const string Show = "Config.System.Show";
+            }
+
+            /// <summary>Organisation Details
+            /// <para>Permissions related to the Organisation Details</para>
+            /// </summary>
+            public static class Organisation
+            {
+
+                /// <summary>Configure Addresses
+                /// <para>Can configure organisation addresses</para>
+                /// </summary>
+                public const string ConfigureAddresses = "Config.Organisation.ConfigureAddresses";
+
+                /// <summary>Configure Logo
+                /// <para>Can configure the organisation logo</para>
+                /// </summary>
+                public const string ConfigureLogo = "Config.Organisation.ConfigureLogo";
+
+                /// <summary>Configure Multi-Site Mode
+                /// <para>Can configure multi-site mode</para>
+                /// </summary>
+                public const string ConfigureMultiSiteMode = "Config.Organisation.ConfigureMultiSiteMode";
+
+                /// <summary>Configure Name
+                /// <para>Can configure the organisation name</para>
+                /// </summary>
+                public const string ConfigureName = "Config.Organisation.ConfigureName";
+
+                /// <summary>Show Organisation Details
+                /// <para>Can show the organisation details</para>
+                /// </summary>
+                public const string Show = "Config.Organisation.Show";
+            }
+
+            /// <summary>Show Configuration
+            /// <para>Can show the configuration menu</para>
+            /// </summary>
+            public const string Show = "Config.Show";
+        }
+
+        /// <summary>Job
+        /// <para>Permissions related to Jobs</para>
+        /// </summary>
+        public static class Job
+        {
+
+            /// <summary>Lists
+            /// <para>Permissions related to Job Lists</para>
+            /// </summary>
+            public static class Lists
+            {
+
+                /// <summary>All Open List
+                /// <para>Can show list</para>
+                /// </summary>
+                public const string AllOpen = "Job.Lists.AllOpen";
+
+                /// <summary>Awaiting Finance Agreement Breach List
+                /// <para>Can show list (NOTE: Requires Awaiting Finance List)</para>
+                /// </summary>
+                public const string AwaitingFinanceAgreementBreach = "Job.Lists.AwaitingFinanceAgreementBreach";
+
+                /// <summary>Awaiting Finance Charge List
+                /// <para>Can show list (NOTE: Requires Awaiting Finance List)</para>
+                /// </summary>
+                public const string AwaitingFinanceCharge = "Job.Lists.AwaitingFinanceCharge";
+
+                /// <summary>Awaiting Finance Insurance Processing List
+                /// <para>Can show list (NOTE: Requires Awaiting Finance List)</para>
+                /// </summary>
+                public const string AwaitingFinanceInsuranceProcessing = "Job.Lists.AwaitingFinanceInsuranceProcessing";
+
+                /// <summary>Awaiting Finance List
+                /// <para>Can show list</para>
+                /// </summary>
+                public const string AwaitingFinance = "Job.Lists.AwaitingFinance";
+
+                /// <summary>Awaiting Finance Payment List
+                /// <para>Can show list (NOTE: Requires Awaiting Finance List)</para>
+                /// </summary>
+                public const string AwaitingFinancePayment = "Job.Lists.AwaitingFinancePayment";
+
+                /// <summary>Awaiting Technician Action List
+                /// <para>Can show list</para>
+                /// </summary>
+                public const string AwaitingTechnicianAction = "Job.Lists.AwaitingTechnicianAction";
+
+                /// <summary>Awaiting User Action List
+                /// <para>Can show list</para>
+                /// </summary>
+                public const string AwaitingUserAction = "Job.Lists.AwaitingUserAction";
+
+                /// <summary>Devices Awaiting Repair List
+                /// <para>Can show list</para>
+                /// </summary>
+                public const string DevicesAwaitingRepair = "Job.Lists.DevicesAwaitingRepair";
+
+                /// <summary>Devices Ready For Return List
+                /// <para>Can show list</para>
+                /// </summary>
+                public const string DevicesReadyForReturn = "Job.Lists.DevicesReadyForReturn";
+
+                /// <summary>Locations List
+                /// <para>Can show list</para>
+                /// </summary>
+                public const string Locations = "Job.Lists.Locations";
+
+                /// <summary>Long Running Jobs List
+                /// <para>Can show list</para>
+                /// </summary>
+                public const string LongRunningJobs = "Job.Lists.LongRunningJobs";
+
+                /// <summary>Recently Closed List
+                /// <para>Can show list</para>
+                /// </summary>
+                public const string RecentlyClosed = "Job.Lists.RecentlyClosed";
+            }
+
+            /// <summary>Actions
+            /// <para>Permissions related to Job Actions</para>
+            /// </summary>
+            public static class Actions
+            {
+
+                /// <summary>Add Attachments
+                /// <para>Can add attachments to jobs</para>
+                /// </summary>
+                public const string AddAttachments = "Job.Actions.AddAttachments";
+
+                /// <summary>Add Logs
+                /// <para>Can add job logs</para>
+                /// </summary>
+                public const string AddLogs = "Job.Actions.AddLogs";
+
+                /// <summary>Close Jobs
+                /// <para>Can close jobs</para>
+                /// </summary>
+                public const string Close = "Job.Actions.Close";
+
+                /// <summary>Convert HWar Jobs To HNWar
+                /// <para>Can convert warranty jobs to non-warranty jobs</para>
+                /// </summary>
+                public const string ConvertHWarToHNWar = "Job.Actions.ConvertHWarToHNWar";
+
+                /// <summary>Create Jobs
+                /// <para>Can create jobs</para>
+                /// </summary>
+                public const string Create = "Job.Actions.Create";
+
+                /// <summary>Delete Jobs
+                /// <para>Can delete jobs</para>
+                /// </summary>
+                public const string Delete = "Job.Actions.Delete";
+
+                /// <summary>Force Close Jobs
+                /// <para>Can force close jobs</para>
+                /// </summary>
+                public const string ForceClose = "Job.Actions.ForceClose";
+
+                /// <summary>Generate Documents
+                /// <para>Can generate documents for jobs</para>
+                /// </summary>
+                public const string GenerateDocuments = "Job.Actions.GenerateDocuments";
+
+                /// <summary>Log Repair
+                /// <para>Can log repair for non-warranty jobs</para>
+                /// </summary>
+                public const string LogRepair = "Job.Actions.LogRepair";
+
+                /// <summary>Log Warranty
+                /// <para>Can log warranty for jobs</para>
+                /// </summary>
+                public const string LogWarranty = "Job.Actions.LogWarranty";
+
+                /// <summary>Remove Any Attachments
+                /// <para>Can remove any attachments from jobs</para>
+                /// </summary>
+                public const string RemoveAnyAttachments = "Job.Actions.RemoveAnyAttachments";
+
+                /// <summary>Remove Any Logs
+                /// <para>Can remove any job logs</para>
+                /// </summary>
+                public const string RemoveAnyLogs = "Job.Actions.RemoveAnyLogs";
+
+                /// <summary>Remove Own Attachments
+                /// <para>Can remove own attachments from jobs</para>
+                /// </summary>
+                public const string RemoveOwnAttachments = "Job.Actions.RemoveOwnAttachments";
+
+                /// <summary>Remove Own Logs
+                /// <para>Can remove own job logs</para>
+                /// </summary>
+                public const string RemoveOwnLogs = "Job.Actions.RemoveOwnLogs";
+
+                /// <summary>Reopen Jobs
+                /// <para>Can reopen jobs</para>
+                /// </summary>
+                public const string Reopen = "Job.Actions.Reopen";
+
+                /// <summary>Update Sub Types
+                /// <para>Can update sub types for jobs</para>
+                /// </summary>
+                public const string UpdateSubTypes = "Job.Actions.UpdateSubTypes";
+            }
+
+            /// <summary>Job Properties
+            /// <para>Permissions related to Job Properties</para>
+            /// </summary>
+            public static class Properties
+            {
+
+                /// <summary>Warranty Properties
+                /// <para>Permissions related to Warranty Job Properties</para>
+                /// </summary>
+                public static class WarrantyProperties
+                {
+
+                    /// <summary>External Completed Date Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string ExternalCompletedDate = "Job.Properties.WarrantyProperties.ExternalCompletedDate";
+
+                    /// <summary>External Logged Date Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string ExternalLoggedDate = "Job.Properties.WarrantyProperties.ExternalLoggedDate";
+
+                    /// <summary>External Name Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string ExternalName = "Job.Properties.WarrantyProperties.ExternalName";
+
+                    /// <summary>External Reference Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string ExternalReference = "Job.Properties.WarrantyProperties.ExternalReference";
+
+                    /// <summary>Provider Details
+                    /// <para>Can access warranty provider details</para>
+                    /// </summary>
+                    public const string ProviderDetails = "Job.Properties.WarrantyProperties.ProviderDetails";
+
+                    /// <summary>Warranty Completed Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string WarrantyCompleted = "Job.Properties.WarrantyProperties.WarrantyCompleted";
+                }
+
+                /// <summary>Non Warranty Properties
+                /// <para>Permissions related to Non-Warranty Job Properties</para>
+                /// </summary>
+                public static class NonWarrantyProperties
+                {
+
+                    /// <summary>Accounting Charge Added Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string AccountingChargeAdded = "Job.Properties.NonWarrantyProperties.AccountingChargeAdded";
+
+                    /// <summary>Accounting Charge Paid Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string AccountingChargePaid = "Job.Properties.NonWarrantyProperties.AccountingChargePaid";
+
+                    /// <summary>Accounting Charge Required Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string AccountingChargeRequired = "Job.Properties.NonWarrantyProperties.AccountingChargeRequired";
+
+                    /// <summary>Add Components
+                    /// <para>Can add job components (NOTE: Requires Edit Components)</para>
+                    /// </summary>
+                    public const string AddComponents = "Job.Properties.NonWarrantyProperties.AddComponents";
+
+                    /// <summary>Edit Components
+                    /// <para>Can edit and remove job components</para>
+                    /// </summary>
+                    public const string EditComponents = "Job.Properties.NonWarrantyProperties.EditComponents";
+
+                    /// <summary>Insurance Claim Form Sent Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string InsuranceClaimFormSent = "Job.Properties.NonWarrantyProperties.InsuranceClaimFormSent";
+
+                    /// <summary>Insurance Detail Properties
+                    /// <para>Can update insurance detail properties</para>
+                    /// </summary>
+                    public const string InsuranceDetails = "Job.Properties.NonWarrantyProperties.InsuranceDetails";
+
+                    /// <summary>Invoice Received Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string InvoiceReceived = "Job.Properties.NonWarrantyProperties.InvoiceReceived";
+
+                    /// <summary>Is Insurance Claim  Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string IsInsuranceClaim = "Job.Properties.NonWarrantyProperties.IsInsuranceClaim";
+
+                    /// <summary>Purchase Order Raised Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string PurchaseOrderRaised = "Job.Properties.NonWarrantyProperties.PurchaseOrderRaised";
+
+                    /// <summary>Purchase Order Reference Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string PurchaseOrderReference = "Job.Properties.NonWarrantyProperties.PurchaseOrderReference";
+
+                    /// <summary>Purchase Order Sent Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string PurchaseOrderSent = "Job.Properties.NonWarrantyProperties.PurchaseOrderSent";
+
+                    /// <summary>Repairer Completed Date Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string RepairerCompletedDate = "Job.Properties.NonWarrantyProperties.RepairerCompletedDate";
+
+                    /// <summary>Repairer Logged Date Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string RepairerLoggedDate = "Job.Properties.NonWarrantyProperties.RepairerLoggedDate";
+
+                    /// <summary>Repairer Name Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string RepairerName = "Job.Properties.NonWarrantyProperties.RepairerName";
+
+                    /// <summary>Repairer Reference Property
+                    /// <para>Can update property</para>
+                    /// </summary>
+                    public const string RepairerReference = "Job.Properties.NonWarrantyProperties.RepairerReference";
+                }
+
+                /// <summary>Device Held Location Property
+                /// <para>Can update property</para>
+                /// </summary>
+                public const string DeviceHeldLocation = "Job.Properties.DeviceHeldLocation";
+
+                /// <summary>Device Held Property
+                /// <para>Can update property</para>
+                /// </summary>
+                public const string DeviceHeld = "Job.Properties.DeviceHeld";
+
+                /// <summary>Device Ready For Return Property
+                /// <para>Can update property</para>
+                /// </summary>
+                public const string DeviceReadyForReturn = "Job.Properties.DeviceReadyForReturn";
+
+                /// <summary>Device Returned Property
+                /// <para>Can update property</para>
+                /// </summary>
+                public const string DeviceReturned = "Job.Properties.DeviceReturned";
+
+                /// <summary>Expected Closed Date Property
+                /// <para>Can update property</para>
+                /// </summary>
+                public const string ExpectedClosedDate = "Job.Properties.ExpectedClosedDate";
+
+                /// <summary>Flags Property
+                /// <para>Can update property</para>
+                /// </summary>
+                public const string Flags = "Job.Properties.Flags";
+
+                /// <summary>Not Waiting For User Action Property
+                /// <para>Can update property</para>
+                /// </summary>
+                public const string NotWaitingForUserAction = "Job.Properties.NotWaitingForUserAction";
+
+                /// <summary>Waiting For User Action Property
+                /// <para>Can update property</para>
+                /// </summary>
+                public const string WaitingForUserAction = "Job.Properties.WaitingForUserAction";
+            }
+
+            /// <summary>Types
+            /// <para>Permissions related to Job Types</para>
+            /// </summary>
+            public static class Types
+            {
+
+                /// <summary>Show Hardware - Miscellaneous Jobs
+                /// <para>Can show jobs of this type</para>
+                /// </summary>
+                public const string ShowHMisc = "Job.Types.ShowHMisc";
+
+                /// <summary>Show Hardware - Non-Warranty Jobs
+                /// <para>Can show jobs of this type</para>
+                /// </summary>
+                public const string ShowHNWar = "Job.Types.ShowHNWar";
+
+                /// <summary>Show Hardware - Warranty Jobs
+                /// <para>Can show jobs of this type</para>
+                /// </summary>
+                public const string ShowHWar = "Job.Types.ShowHWar";
+
+                /// <summary>Show Software - Application Jobs
+                /// <para>Can show jobs of this type</para>
+                /// </summary>
+                public const string ShowSApp = "Job.Types.ShowSApp";
+
+                /// <summary>Show Software - Operating System Jobs
+                /// <para>Can show jobs of this type</para>
+                /// </summary>
+                public const string ShowSOS = "Job.Types.ShowSOS";
+
+                /// <summary>Show Software - Reimage Jobs
+                /// <para>Can show jobs of this type</para>
+                /// </summary>
+                public const string ShowSImg = "Job.Types.ShowSImg";
+
+                /// <summary>Show User Management Jobs
+                /// <para>Can show jobs of this type</para>
+                /// </summary>
+                public const string ShowUMgmt = "Job.Types.ShowUMgmt";
+            }
+
+            /// <summary>Search Jobs
+            /// <para>Can search jobs</para>
+            /// </summary>
+            public const string Search = "Job.Search";
+
+            /// <summary>Show Attachments
+            /// <para>Can show job attachments</para>
+            /// </summary>
+            public const string ShowAttachments = "Job.ShowAttachments";
+
+            /// <summary>Show Daily Opened & Closed
+            /// <para>Can show daily opened & closed chart</para>
+            /// </summary>
+            public const string ShowDailyChart = "Job.ShowDailyChart";
+
+            /// <summary>Show Flags
+            /// <para>Can show job flags</para>
+            /// </summary>
+            public const string ShowFlags = "Job.ShowFlags";
+
+            /// <summary>Show Jobs
+            /// <para>Can show jobs</para>
+            /// </summary>
+            public const string Show = "Job.Show";
+
+            /// <summary>Show Logs
+            /// <para>Can show job logs</para>
+            /// </summary>
+            public const string ShowLogs = "Job.ShowLogs";
+
+            /// <summary>Show Non-Warranty Components
+            /// <para>Can show non-warranty job components</para>
+            /// </summary>
+            public const string ShowNonWarrantyComponents = "Job.ShowNonWarrantyComponents";
+
+            /// <summary>Show Non-Warranty Finance
+            /// <para>Can show non-warranty job finance</para>
+            /// </summary>
+            public const string ShowNonWarrantyFinance = "Job.ShowNonWarrantyFinance";
+
+            /// <summary>Show Non-Warranty Insurance
+            /// <para>Can show non-warranty job insurance</para>
+            /// </summary>
+            public const string ShowNonWarrantyInsurance = "Job.ShowNonWarrantyInsurance";
+
+            /// <summary>Show Non-Warranty Repairs
+            /// <para>Can show non-warranty job repairs</para>
+            /// </summary>
+            public const string ShowNonWarrantyRepairs = "Job.ShowNonWarrantyRepairs";
+
+            /// <summary>Show Warranty
+            /// <para>Can show job warranty</para>
+            /// </summary>
+            public const string ShowWarranty = "Job.ShowWarranty";
+        }
+
+        /// <summary>Device
+        /// <para>Permissions related to Devices</para>
+        /// </summary>
+        public static class Device
+        {
+
+            /// <summary>Device Properties
+            /// <para>Permissions related to Device Properties</para>
+            /// </summary>
+            public static class Properties
+            {
+
+                /// <summary>Asset Number Property
+                /// <para>Can update property</para>
+                /// </summary>
+                public const string AssetNumber = "Device.Properties.AssetNumber";
+
+                /// <summary>Device Batch Property
+                /// <para>Can update property</para>
+                /// </summary>
+                public const string DeviceBatch = "Device.Properties.DeviceBatch";
+
+                /// <summary>Device Profile Property
+                /// <para>Can update property</para>
+                /// </summary>
+                public const string DeviceProfile = "Device.Properties.DeviceProfile";
+
+                /// <summary>Location Property
+                /// <para>Can update property</para>
+                /// </summary>
+                public const string Location = "Device.Properties.Location";
+            }
+
+            /// <summary>Actions
+            /// <para>Permissions related to Device Actions</para>
+            /// </summary>
+            public static class Actions
+            {
+
+                /// <summary>Add Attachments
+                /// <para>Can add attachments to devices</para>
+                /// </summary>
+                public const string AddAttachments = "Device.Actions.AddAttachments";
+
+                /// <summary>Allow Unauthenticated Enrol
+                /// <para>Can allow devices to enrol without authentication</para>
+                /// </summary>
+                public const string AllowUnauthenticatedEnrol = "Device.Actions.AllowUnauthenticatedEnrol";
+
+                /// <summary>Assign User
+                /// <para>Can update the user assignment of devices</para>
+                /// </summary>
+                public const string AssignUser = "Device.Actions.AssignUser";
+
+                /// <summary>Decommission
+                /// <para>Can decommission devices</para>
+                /// </summary>
+                public const string Decommission = "Device.Actions.Decommission";
+
+                /// <summary>Delete
+                /// <para>Can delete devices</para>
+                /// </summary>
+                public const string Delete = "Device.Actions.Delete";
+
+                /// <summary>Enrol Devices
+                /// <para>Can add devices offline and enrol devices with the Bootstrapper</para>
+                /// </summary>
+                public const string EnrolDevices = "Device.Actions.EnrolDevices";
+
+                /// <summary>Export Devices
+                /// <para>Can export devices in a bulk format</para>
+                /// </summary>
+                public const string Export = "Device.Actions.Export";
+
+                /// <summary>Generate Documents
+                /// <para>Can generate documents for jobs</para>
+                /// </summary>
+                public const string GenerateDocuments = "Device.Actions.GenerateDocuments";
+
+                /// <summary>Import Devices
+                /// <para>Can bulk import devices</para>
+                /// </summary>
+                public const string Import = "Device.Actions.Import";
+
+                /// <summary>Recommission
+                /// <para>Can recommission devices</para>
+                /// </summary>
+                public const string Recommission = "Device.Actions.Recommission";
+
+                /// <summary>Remove Any Attachments
+                /// <para>Can remove any attachments from devices</para>
+                /// </summary>
+                public const string RemoveAnyAttachments = "Device.Actions.RemoveAnyAttachments";
+
+                /// <summary>Remove Own Attachments
+                /// <para>Can remove own attachments from devices</para>
+                /// </summary>
+                public const string RemoveOwnAttachments = "Device.Actions.RemoveOwnAttachments";
+            }
+
+            /// <summary>Search Devices
+            /// <para>Can search devices</para>
+            /// </summary>
+            public const string Search = "Device.Search";
+
+            /// <summary>Show Assignment History
+            /// <para>Can show the assignment history for devices</para>
+            /// </summary>
+            public const string ShowAssignmentHistory = "Device.ShowAssignmentHistory";
+
+            /// <summary>Show Attachments
+            /// <para>Can show device attachments</para>
+            /// </summary>
+            public const string ShowAttachments = "Device.ShowAttachments";
+
+            /// <summary>Show Certificates
+            /// <para>Can show certificates associated with devices</para>
+            /// </summary>
+            public const string ShowCertificates = "Device.ShowCertificates";
+
+            /// <summary>Show Details
+            /// <para>Can show details associated with devices</para>
+            /// </summary>
+            public const string ShowDetails = "Device.ShowDetails";
+
+            /// <summary>Show Devices
+            /// <para>Can show devices</para>
+            /// </summary>
+            public const string Show = "Device.Show";
+
+            /// <summary>Show Devices Jobs
+            /// <para>Can show jobs associated with devices</para>
+            /// </summary>
+            public const string ShowJobs = "Device.ShowJobs";
+        }
+
+        /// <summary>User
+        /// <para>Permissions related to Users</para>
+        /// </summary>
+        public static class User
+        {
+
+            /// <summary>Actions
+            /// <para>Permissions related to User Actions</para>
+            /// </summary>
+            public static class Actions
+            {
+
+                /// <summary>Add Attachments
+                /// <para>Can add attachments to users</para>
+                /// </summary>
+                public const string AddAttachments = "User.Actions.AddAttachments";
+
+                /// <summary>Generate Documents
+                /// <para>Can generate documents for users</para>
+                /// </summary>
+                public const string GenerateDocuments = "User.Actions.GenerateDocuments";
+
+                /// <summary>Remove Any Attachments
+                /// <para>Can remove any attachments from users</para>
+                /// </summary>
+                public const string RemoveAnyAttachments = "User.Actions.RemoveAnyAttachments";
+
+                /// <summary>Remove Own Attachments
+                /// <para>Can remove own attachments from users</para>
+                /// </summary>
+                public const string RemoveOwnAttachments = "User.Actions.RemoveOwnAttachments";
+            }
+
+            /// <summary>Search Users
+            /// <para>Can search users</para>
+            /// </summary>
+            public const string Search = "User.Search";
+
+            /// <summary>Show Attachments
+            /// <para>Can show user attachments</para>
+            /// </summary>
+            public const string ShowAttachments = "User.ShowAttachments";
+
+            /// <summary>Show Device Assignment History
+            /// <para>Can show the device assignment history for users</para>
+            /// </summary>
+            public const string ShowAssignmentHistory = "User.ShowAssignmentHistory";
+
+            /// <summary>Show Users
+            /// <para>Can show users</para>
+            /// </summary>
+            public const string Show = "User.Show";
+
+            /// <summary>Show Users Authorization
+            /// <para>Can show authorization permissions associated with users</para>
+            /// </summary>
+            public const string ShowAuthorization = "User.ShowAuthorization";
+
+            /// <summary>Show Users Jobs
+            /// <para>Can show jobs associated with users</para>
+            /// </summary>
+            public const string ShowJobs = "User.ShowJobs";
+        }
+
+        /// <summary>Computer Account
+        /// <para>Represents a computer account</para>
+        /// </summary>
+        public const string ComputerAccount = "ComputerAccount";
+
+        /// <summary>Disco Administrator Account
+        /// <para>Represents a Disco Administrator account</para>
+        /// </summary>
+        public const string DiscoAdminAccount = "DiscoAdminAccount";
+#endregion
+	}
+	public static class ClaimExtensions
+	{
+        public static bool Has(this RoleClaims c, string ClaimKey)
+        {
+            Func<RoleClaims, bool> claimFunc = Claims.GetClaimAccessor(ClaimKey);
+
+            return claimFunc(c);
+        }
+
+		public static void Set(this RoleClaims c, string ClaimKey, bool Value)
+        {
+            Action<RoleClaims, bool> claimSetter = Claims.GetClaimSetter(ClaimKey);
+
+            claimSetter(c, Value);
+        }
+
+		public static void SetClaims(this AuthorizationRole role, RoleClaims Claims)
+        {
+            role.ClaimsJson = Newtonsoft.Json.JsonConvert.SerializeObject(Claims);
+        }
+	}
+}
diff --git a/Disco.Services/Authorization/Claims.tt b/Disco.Services/Authorization/Claims.tt
new file mode 100644
index 00000000..5e1632b3
--- /dev/null
+++ b/Disco.Services/Authorization/Claims.tt
@@ -0,0 +1,392 @@
+<#@ template language="C#" debug="true" hostspecific="true" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+<#@ assembly name="Microsoft.VisualStudio.Shell.Interop" #>
+<#@ assembly name="EnvDTE" #>
+<#@ assembly name="EnvDTE80" #>
+<#@ assembly name="VSLangProj" #>
+<#@ assembly name="System.Xml" #>
+<#@ assembly name="System.Xml.Linq" #>
+<#@ assembly name="C:\Windows\Microsoft.NET\Framework\v4.0.30319\CustomMarshalers.dll" #>
+<#@ import namespace="System.Collections.Generic" #>
+<#@ import namespace="System.IO" #>
+<#@ import namespace="System.Linq" #>
+<#@ import namespace="System.Text" #>
+<#@ import namespace="System.Text.RegularExpressions" #>
+<#@ import namespace="Microsoft.VisualStudio.Shell.Interop" #>
+<#@ import namespace="EnvDTE" #>
+<#@ import namespace="EnvDTE80" #>
+<#@ import namespace="Microsoft.VisualStudio.TextTemplating" #>
+<#@ import namespace="System.Runtime.InteropServices.CustomMarshalers" #>
+<#@ import namespace="System.Runtime.InteropServices" #>
+<#@ import namespace="System.Reflection" #>
+
+
+
+<#
+   // Get the DTE service from the host
+    EnvDTE.DTE Dte = null;
+	var serviceProvider = Host as IServiceProvider;
+    if (serviceProvider != null)
+        Dte = (EnvDTE.DTE)serviceProvider.GetService(typeof(EnvDTE.DTE));
+
+    // Fail if we couldn't get the DTE. This can happen when trying to run in TextTransform.exe
+    if (Dte == null)
+        throw new Exception("T4MVC can only execute through the Visual Studio host");
+
+	List<Permission> permissions = new List<Permission>();
+	List<Permission> groups = new List<Permission>();
+
+	var piRolePermission = Dte.Solution.FindProjectItem(Host.ResolvePath(@"Roles\RoleClaims.cs"));
+	var piGroups = FindClaimGroupProjectItems(piRolePermission.ContainingProject.ProjectItems.Item("Authorization").ProjectItems.Item("Roles").ProjectItems.Item("ClaimGroups")).ToList();
+
+	ParseProjectItem(piRolePermission, groups, permissions);
+    foreach (ProjectItem piItem in piGroups)
+		 ParseProjectItem(piItem, groups, permissions);
+
+	var permissionRoot = BuildHierarchy(groups, permissions);
+
+	
+
+	#>
+// <auto-generated />
+// This file was generated by a T4 template.
+// Don't change it directly as your change would get overwritten.  Instead, make changes
+// to the .tt file (i.e. the T4 template) and save it to regenerate this file.
+using Disco.Models.Authorization;
+using Disco.Models.Repository;
+using Disco.Services.Authorization.Roles;
+using System;
+using System.Collections.Generic;
+
+namespace Disco.Services.Authorization
+{
+	public static class Claims
+	{
+		private static Dictionary<string, Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>> _roleClaims;
+		private static ClaimNavigatorItem _claimNavigator;
+
+		static Claims()
+        {
+#region Role Claim Dictionary
+            _roleClaims = new Dictionary<string, Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>>()
+			{
+<#WriteAccessHashes(permissionRoot);#>
+			};
+#endregion
+
+#region Role Claim Navigator
+			_claimNavigator =
+<#WriteNavigator(permissionRoot);#>;
+#endregion
+        }
+
+		public static ClaimNavigatorItem RoleClaimNavigator
+		{
+			get { return _claimNavigator; }
+		}
+
+		public static Func<RoleClaims, bool> GetClaimAccessor(string ClaimKey) {
+			Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string> claimFunc;
+
+            if (!_roleClaims.TryGetValue(ClaimKey, out claimFunc))
+                throw new ArgumentException("Unknown Claim Key", "ClaimKey");
+
+            return claimFunc.Item1;
+		}
+
+		public static Action<RoleClaims, bool> GetClaimSetter(string ClaimKey) {
+			Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string> claimFunc;
+
+            if (!_roleClaims.TryGetValue(ClaimKey, out claimFunc))
+                throw new ArgumentException("Unknown Claim Key", "ClaimKey");
+
+            return claimFunc.Item2;
+		}
+
+		public static Tuple<string, string> GetClaimDetails(string ClaimKey) {
+			Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string> claimFunc;
+
+            if (!_roleClaims.TryGetValue(ClaimKey, out claimFunc))
+                throw new ArgumentException("Unknown Claim Key", "ClaimKey");
+
+            return new Tuple<string, string>(claimFunc.Item3, claimFunc.Item4);
+		}
+
+		public static RoleClaims BuildClaims(IEnumerable<string> ClaimKeys){
+			var c = new RoleClaims();
+			foreach (var claimKey in ClaimKeys)
+				c.Set(claimKey, true);
+
+			return c;
+		}
+
+		public static RoleClaims AdministratorClaims() {
+			var c = new RoleClaims();
+#region Set All Administrator Claims
+<#WriteAdministratorClaims(permissionRoot);#>
+#endregion
+			return c;
+		}
+
+		public static RoleClaims ComputerAccountClaims() {
+			return new RoleClaims() {
+				ComputerAccount = true
+			};
+		}
+
+#region Role Claim Constants
+<#WritePermissionConsts(permissionRoot);#>
+#endregion
+	}
+	public static class ClaimExtensions
+	{
+        public static bool Has(this RoleClaims c, string ClaimKey)
+        {
+            Func<RoleClaims, bool> claimFunc = Claims.GetClaimAccessor(ClaimKey);
+
+            return claimFunc(c);
+        }
+
+		public static void Set(this RoleClaims c, string ClaimKey, bool Value)
+        {
+            Action<RoleClaims, bool> claimSetter = Claims.GetClaimSetter(ClaimKey);
+
+            claimSetter(c, Value);
+        }
+
+		public static void SetClaims(this AuthorizationRole role, RoleClaims Claims)
+        {
+            role.ClaimsJson = Newtonsoft.Json.JsonConvert.SerializeObject(Claims);
+        }
+	}
+}
+<#+
+
+void DumpPermission(Permission p){
+	PushIndent("				");
+	WriteLine(p.Name);
+		foreach (Permission pChild in p.Children)
+		{
+			DumpPermission(pChild);
+		}
+	PopIndent();
+}
+
+void WriteNavigator(Permission root){
+	PushIndent("				");
+	WriteLine("new ClaimNavigatorItem(\"Claims\", \"Permissions\", \"Top-level node for all permissions\", false, new List<IClaimNavigatorItem>() {");
+	PushIndent("    ");	
+	for (int childIndex = 0; childIndex < root.Children.Count; childIndex++)
+    {
+		WriteNavigator_Recurse(root.Children[childIndex], string.Empty);
+		if (childIndex < root.Children.Count -1)
+			WriteLine(",");
+    }
+	WriteLine(string.Empty);
+	PopIndent();
+	Write("})");
+	PopIndent();
+}
+
+void WriteNavigator_Recurse(Permission p, string Prefix){
+	var key = string.Concat(Prefix, p.Name);
+
+	if (p.IsGroup){
+		var groupPrefix = string.Concat(key, ".");
+		WriteLine("new ClaimNavigatorItem(\"{0}{1}\", \"{2}\", \"{3}\", {4}, new List<IClaimNavigatorItem>() {{", Prefix, p.Name, p.FriendlyName, p.Description, p.Hidden ? "true" : "false");
+		PushIndent("    ");
+		for (int childIndex = 0; childIndex < p.Children.Count; childIndex++)
+		{
+			WriteNavigator_Recurse(p.Children[childIndex], groupPrefix);
+			if (childIndex < p.Children.Count -1)
+				WriteLine(",");
+			else
+				WriteLine(string.Empty);
+		}
+		PopIndent();
+		Write("})");
+    }else{
+		Write("new ClaimNavigatorItem(\"{0}{1}\", {2})", Prefix, p.Name, p.Hidden ? "true" : "false");
+    }
+}
+
+void WriteAdministratorClaims(Permission root){
+	PushIndent("			");
+	Stack<string> parents = new Stack<string>();
+	parents.Push("c");
+	foreach (var pChild in root.Children)
+			WriteAdministratorClaims_Recurse(pChild, parents);
+	PopIndent();
+}
+
+void WriteAdministratorClaims_Recurse(Permission p, Stack<string> parents){
+	if (p.IsGroup){
+		parents.Push(string.Format("{0}.{1}", parents.Peek(), p.Name));
+		foreach (var pChild in p.Children)
+			WriteAdministratorClaims_Recurse(pChild, parents);
+		parents.Pop();
+    }else{
+		if (p.Name != "ComputerAccount")
+			WriteLine("{0}.{1} = true;", parents.Peek(), p.Name);
+    }
+}
+
+
+void WriteAccessHashes(Permission root){
+	StringBuilder hashes = new StringBuilder();
+	Stack<string> parents = new Stack<string>();
+	parents.Push("c");
+	foreach (var pChild in root.Children)
+			WriteAccessHashes_Recurse(pChild, string.Empty, parents, hashes);
+	WriteLine(hashes.ToString().TrimEnd().TrimEnd(','));
+}
+
+void WriteAccessHashes_Recurse(Permission p, string Prefix, Stack<string> parents, StringBuilder hashes){
+	if (p.IsGroup){
+		parents.Push(string.Format("{0}.{1}", parents.Peek(), p.Name));
+		foreach (var pChild in p.Children)
+			WriteAccessHashes_Recurse(pChild, string.Concat(Prefix, p.Name, "."), parents, hashes);
+		parents.Pop();
+    }else{
+		var fqn = string.Concat(Prefix, p.Name);
+		hashes.AppendFormat("				{{ \"{0}\", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string>(c => {1}.{2}, (c, v) => {1}.{2} = v, \"{3}\", \"{4}\") }},", fqn, parents.Peek(), p.Name, p.FriendlyName, p.Description);
+		hashes.AppendLine();
+    }
+}
+
+void WritePermissionConsts(Permission root){
+	PushIndent("    ");
+	PushIndent("    ");
+	foreach (var pChild in root.Children)
+			WritePermissionConsts_Recurse(pChild, string.Empty);
+	PopIndent();
+	PopIndent();
+}
+void WritePermissionConsts_Recurse(Permission p, string Prefix){
+	if (p.IsGroup){
+		WriteLine("");
+		WriteLine("/// <summary>{0}", p.FriendlyName);
+		WriteLine("/// <para>{0}</para>", p.Description);
+		WriteLine("/// </summary>");
+		WriteLine("public static class {0}", p.Name);
+		WriteLine("{");
+		PushIndent("    ");
+        foreach (var pChild in p.Children)
+			WritePermissionConsts_Recurse(pChild, string.Concat(Prefix, p.Name, "."));
+		PopIndent();
+		WriteLine("}");
+	}else{
+		WriteLine("");
+		WriteLine("/// <summary>{0}", p.FriendlyName);
+		WriteLine("/// <para>{0}</para>", p.Description);
+		WriteLine("/// </summary>");
+		WriteLine("public const string {0} = \"{1}{0}\";", p.Name, Prefix);
+    }
+}
+
+Permission BuildHierarchy(List<Permission> groups, List<Permission> permissions){
+	var top = groups[0];
+
+	// Find Parents
+    var groupDict = groups.ToDictionary(p => p.FullName);
+
+	// Hierarchy
+    foreach (var p in permissions.Where(p => p.IsGroup))
+    {
+		var g = groupDict[p.Type];
+		p.Children = g.Children;
+		p.FriendlyName = g.FriendlyName;
+		p.Description = g.Description;
+    }
+
+	return top;
+}
+
+void ParseProjectItem(ProjectItem item, List<Permission> groups, List<Permission> permissions){
+	foreach (var ns in item.FileCodeModel.CodeElements.OfType<CodeNamespace>())
+    {
+        foreach (var cl in ns.Members.OfType<CodeClass2>())
+        {
+			var g = BuildPermission(cl);
+			groups.Add(g);
+            foreach (var pr in cl.Members.OfType<CodeProperty2>())
+            {
+				var p = BuildPermission(pr);
+				permissions.Add(p);
+				g.Children.Add(p);
+            }
+			g.Children = g.Children.OrderBy(p => p.IsGroup).OrderBy(p => p.FriendlyName).ToList();
+        }
+    }
+}
+
+IEnumerable<ProjectItem> FindClaimGroupProjectItems(ProjectItem item){
+	const string collectionGuid = "{6BB5F8EF-4483-11D3-8BCF-00C04F8EC28C}";
+
+	if (item.Kind == collectionGuid)
+        foreach (ProjectItem subItem in item.ProjectItems)
+            foreach (var returnItem in FindClaimGroupProjectItems(subItem))
+				yield return returnItem;
+	else
+		yield return item;
+}
+
+Permission BuildPermission(CodeClass2 item){
+	return new Permission(item.FullName, item.Name, item.FullName, item.Attributes);
+}  
+
+Permission BuildPermission(CodeProperty2 item){
+	return new Permission(item.FullName, item.Name, item.Type.AsFullName, item.Attributes);
+}
+
+[ComImport, Guid("00020400-0000-0000-C000-000000000046"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IDispatch
+{
+    void Reserved();
+    [PreserveSig]
+    int GetTypeInfo(uint nInfo, int lcid,
+        [MarshalAs(
+            UnmanagedType.CustomMarshaler,
+            MarshalTypeRef = typeof(TypeToTypeInfoMarshaler))]
+        out System.Type typeInfo);
+}
+
+class Permission {
+	public string FullName {get;set;}
+	public string Name {get;set;}
+	public string Type {get;set;}
+	public bool Hidden {get;set;}
+
+	public bool IsGroup {get { return Type != "System.Boolean"; } }
+
+	public List<Permission> Children {get;set;}
+	  
+	public string FriendlyName {get;set;}
+	public string Description {get;set;}
+
+    public Permission(string FullName, string Name, string Type, CodeElements Attributes)
+    {
+		this.FullName = FullName;
+		this.Name = Name;
+		this.Type = Type;
+		
+		Children = new List<Permission>();
+
+		if (Attributes.Count > 0){
+			CodeAttribute att = (CodeAttribute)Attributes.Item("ClaimDetails");
+			
+			if (att.Children != null){
+				
+				var attChildren = att.Children.OfType<CodeAttributeArgument>().ToArray();
+				this.FriendlyName = attChildren[0].Value.Trim('"');
+				this.Description = attChildren[1].Value.Trim('"');
+
+				if (attChildren.Length > 2) {
+					this.Hidden = bool.Parse(attChildren[2].Value);
+                }
+			}
+		}
+    }
+}
+#>
\ No newline at end of file
diff --git a/Disco.Services/Authorization/DiscoAuthorizeAllAttribute.cs b/Disco.Services/Authorization/DiscoAuthorizeAllAttribute.cs
new file mode 100644
index 00000000..557409ed
--- /dev/null
+++ b/Disco.Services/Authorization/DiscoAuthorizeAllAttribute.cs
@@ -0,0 +1,41 @@
+using Disco.Services.Users;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Mvc;
+
+namespace Disco.Services.Authorization
+{
+    public class DiscoAuthorizeAllAttribute : AuthorizeAttribute
+    {
+        string[] authorizedClaims;
+
+        public DiscoAuthorizeAllAttribute(params string[] AuthorisedClaims)
+        {
+            if (AuthorisedClaims == null || AuthorisedClaims.Length == 0)
+                throw new ArgumentNullException("AuthorisedClaims");
+
+            this.authorizedClaims = AuthorisedClaims;
+        }
+
+        protected override bool AuthorizeCore(System.Web.HttpContextBase httpContext)
+        {
+            if (httpContext == null)
+                throw new ArgumentNullException("httpContext");
+
+            var authToken = UserService.CurrentAuthorization;
+
+            if (authToken == null)
+                return false; // No Current User
+
+            return authToken.HasAll(authorizedClaims);
+        }
+
+        protected override void HandleUnauthorizedRequest(AuthorizationContext filterContext)
+        {
+            filterContext.Result = new HttpUnauthorizedResult(AuthorizationToken.BuildRequireAllMessage(authorizedClaims));
+        }
+    }
+}
diff --git a/Disco.Services/Authorization/DiscoAuthorizeAnyAttribute.cs b/Disco.Services/Authorization/DiscoAuthorizeAnyAttribute.cs
new file mode 100644
index 00000000..d04f9e9e
--- /dev/null
+++ b/Disco.Services/Authorization/DiscoAuthorizeAnyAttribute.cs
@@ -0,0 +1,41 @@
+using Disco.Services.Users;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Mvc;
+
+namespace Disco.Services.Authorization
+{
+    public class DiscoAuthorizeAnyAttribute : AuthorizeAttribute
+    {
+        string[] authorizedClaims;
+
+        public DiscoAuthorizeAnyAttribute(params string[] AuthorisedClaims)
+        {
+            if (AuthorisedClaims == null || AuthorisedClaims.Length == 0)
+                throw new ArgumentNullException("AuthorisedClaims");
+
+            this.authorizedClaims = AuthorisedClaims;
+        }
+
+        protected override bool AuthorizeCore(System.Web.HttpContextBase httpContext)
+        {
+            if (httpContext == null)
+                throw new ArgumentNullException("httpContext");
+
+            var authToken = UserService.CurrentAuthorization;
+
+            if (authToken == null)
+                return false; // No Current User
+
+            return authToken.HasAny(authorizedClaims);
+        }
+
+        protected override void HandleUnauthorizedRequest(AuthorizationContext filterContext)
+        {
+            filterContext.Result = new HttpUnauthorizedResult(AuthorizationToken.BuildRequireAnyMessage(authorizedClaims));
+        }
+    }
+}
diff --git a/Disco.Services/Authorization/DiscoAuthorizeAttribute.cs b/Disco.Services/Authorization/DiscoAuthorizeAttribute.cs
new file mode 100644
index 00000000..9d042417
--- /dev/null
+++ b/Disco.Services/Authorization/DiscoAuthorizeAttribute.cs
@@ -0,0 +1,53 @@
+using Disco.Services.Users;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Mvc;
+
+namespace Disco.Services.Authorization
+{
+    public class DiscoAuthorizeAttribute : AuthorizeAttribute
+    {
+        string authorizedClaim;
+
+        public DiscoAuthorizeAttribute() { }
+
+        public DiscoAuthorizeAttribute(string AuthorisedClaim)
+        {
+            this.authorizedClaim = AuthorisedClaim;
+        }
+
+        protected override bool AuthorizeCore(System.Web.HttpContextBase httpContext)
+        {
+            if (httpContext == null)
+                throw new ArgumentNullException("httpContext");
+
+            var authToken = UserService.CurrentAuthorization;
+
+            if (authToken == null)
+                return false; // No Current User
+
+            if (authorizedClaim == null)
+                return authToken.RoleTokens.Count > 0; // Just Authenticate - no Authorization (but require at least 1 role)
+            else
+                return authToken.Has(authorizedClaim);
+        }
+
+        protected override void HandleUnauthorizedRequest(AuthorizationContext filterContext)
+        {
+            string resultMessage;
+
+            if (UserService.CurrentAuthorization == null)
+                resultMessage = AuthorizationToken.RequireAuthenticationMessage;
+            else
+                if (string.IsNullOrEmpty(authorizedClaim))
+                    resultMessage = AuthorizationToken.RequireDiscoAuthorizationMessage;
+                else
+                    resultMessage = AuthorizationToken.BuildRequireMessage(authorizedClaim);
+
+            filterContext.Result = new HttpUnauthorizedResult(resultMessage);
+        }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/BaseRoleClaimGroup.cs b/Disco.Services/Authorization/Roles/BaseRoleClaimGroup.cs
new file mode 100644
index 00000000..c10a7e27
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/BaseRoleClaimGroup.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles
+{
+    public abstract class BaseRoleClaimGroup
+    {
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimDetailsAttribute.cs b/Disco.Services/Authorization/Roles/ClaimDetailsAttribute.cs
new file mode 100644
index 00000000..0021ae89
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimDetailsAttribute.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property)]
+    public class ClaimDetailsAttribute : Attribute
+    {
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public bool Hidden { get; set; }
+
+        public ClaimDetailsAttribute(string Name, string Description, bool Hidden = false)
+        {
+            this.Name = Name;
+            this.Description = Description;
+            this.Hidden = Hidden;
+        }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/ConfigClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/ConfigClaims.cs
new file mode 100644
index 00000000..64c63c67
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/ConfigClaims.cs
@@ -0,0 +1,59 @@
+using Disco.Services.Authorization.Roles.ClaimGroups.Configuration.DeviceBatch;
+using Disco.Services.Authorization.Roles.ClaimGroups.Configuration.DeviceCertificate;
+using Disco.Services.Authorization.Roles.ClaimGroups.Configuration.DeviceModel;
+using Disco.Services.Authorization.Roles.ClaimGroups.Configuration.DeviceProfile;
+using Disco.Services.Authorization.Roles.ClaimGroups.Configuration.DocumentTemplate;
+using Disco.Services.Authorization.Roles.ClaimGroups.Configuration.Enrolment;
+using Disco.Services.Authorization.Roles.ClaimGroups.Configuration.Logging;
+using Disco.Services.Authorization.Roles.ClaimGroups.Configuration.Origanisation;
+using Disco.Services.Authorization.Roles.ClaimGroups.Configuration.Plugin;
+using Disco.Services.Authorization.Roles.ClaimGroups.Configuration.System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Configuration
+{
+    [ClaimDetails("Configuration", "Permissions related to Disco Configuration")]
+    public class ConfigClaims : BaseRoleClaimGroup
+    {
+        public ConfigClaims()
+        {
+            this.DeviceCertificate = new DeviceCertificateClaims();
+            this.Enrolment = new EnrolmentClaims();
+            this.DeviceBatch = new DeviceBatchClaims();
+            this.DeviceModel = new DeviceModelClaims();
+            this.DeviceProfile = new DeviceProfileClaims();
+            this.DocumentTemplate = new DocumentTemplateClaims();
+            this.Logging = new LoggingClaims();
+            this.Plugin = new PluginClaims();
+            this.System = new SystemClaims();
+            this.Organisation = new OrganisationClaims();
+        }
+
+        [ClaimDetails("Show Configuration", "Can show the configuration menu")]
+        public bool Show { get; set; }
+
+        public DeviceCertificateClaims DeviceCertificate { get; set; }
+
+        public EnrolmentClaims Enrolment { get; set; }
+
+        public DeviceBatchClaims DeviceBatch { get; set; }
+
+        public DeviceModelClaims DeviceModel { get; set; }
+
+        public DeviceProfileClaims DeviceProfile { get; set; }
+
+        public DocumentTemplateClaims DocumentTemplate { get; set; }
+
+        public LoggingClaims Logging { get; set; }
+
+        public PluginClaims Plugin { get; set; }
+
+        public SystemClaims System { get; set; }
+
+        public OrganisationClaims Organisation { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DeviceBatch/DeviceBatchClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DeviceBatch/DeviceBatchClaims.cs
new file mode 100644
index 00000000..927a16d4
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DeviceBatch/DeviceBatchClaims.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Configuration.DeviceBatch
+{
+    [ClaimDetails("Device Batch", "Permissions related to Device Batches")]
+    public class DeviceBatchClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Configure Device Batches", "Can configure device batches")]
+        public bool Configure { get; set; }
+
+        [ClaimDetails("Create Device Batches", "Can create device batches")]
+        public bool Create { get; set; }
+
+        [ClaimDetails("Delete Device Batches", "Can delete device batches")]
+        public bool Delete { get; set; }
+
+        [ClaimDetails("Show Device Batches", "Can show device batches")]
+        public bool Show { get; set; }
+
+        [ClaimDetails("Show Timeline", "Can show device batch timeline")]
+        public bool ShowTimeline { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DeviceCertificate/DeviceCertificateClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DeviceCertificate/DeviceCertificateClaims.cs
new file mode 100644
index 00000000..a1c97058
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DeviceCertificate/DeviceCertificateClaims.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Configuration.DeviceCertificate
+{
+    [ClaimDetails("Device Certificate", "Permissions related to Device Certificates")]
+    public class DeviceCertificateClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Download Certificates", "Can download certificates")]
+        public bool DownloadCertificates { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DeviceModel/DeviceModelClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DeviceModel/DeviceModelClaims.cs
new file mode 100644
index 00000000..71f12188
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DeviceModel/DeviceModelClaims.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Configuration.DeviceModel
+{
+    [ClaimDetails("Device Model", "Permissions related to Device Models")]
+    public class DeviceModelClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Configure Device Models", "Can configure device models")]
+        public bool Configure { get; set; }
+
+        [ClaimDetails("Configure Device Model Components", "Can configure device model components")]
+        public bool ConfigureComponents { get; set; }
+
+        [ClaimDetails("Delete Device Models", "Can delete device models")]
+        public bool Delete { get; set; }
+
+        [ClaimDetails("Show Device Models", "Can show device models")]
+        public bool Show { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DeviceProfile/DeviceProfileClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DeviceProfile/DeviceProfileClaims.cs
new file mode 100644
index 00000000..709dd2fd
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DeviceProfile/DeviceProfileClaims.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Configuration.DeviceProfile
+{
+    [ClaimDetails("Device Profile", "Permissions related to Device Profiles")]
+    public class DeviceProfileClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Configure Device Profiles", "Can configure device profiles")]
+        public bool Configure { get; set; }
+
+        [ClaimDetails("Configure Computer Name Templates", "Can configure computer name templates for device profiles")]
+        public bool ConfigureComputerNameTemplate { get; set; }
+
+        [ClaimDetails("Configure Default Device Profiles", "Can configure default device profiles")]
+        public bool ConfigureDefaults { get; set; }
+
+        [ClaimDetails("Create Device Profiles", "Can create device profiles")]
+        public bool Create { get; set; }
+
+        [ClaimDetails("Delete Device Profiles", "Can delete device profiles")]
+        public bool Delete { get; set; }
+
+        [ClaimDetails("Show Device Profiles", "Can show device profiles")]
+        public bool Show { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DocumentTemplate/DocumentTemplateClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DocumentTemplate/DocumentTemplateClaims.cs
new file mode 100644
index 00000000..0d31d347
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/DocumentTemplate/DocumentTemplateClaims.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Configuration.DocumentTemplate
+{
+    [ClaimDetails("Document Template", "Permissions related to Document Templates")]
+    public class DocumentTemplateClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Configure Document Templates", "Can configure document templates")]
+        public bool Configure { get; set; }
+
+        [ClaimDetails("Configure Filter Expression", "Can configure filter expressions for document templates")]
+        public bool ConfigureFilterExpression { get; set; }
+
+        [ClaimDetails("Upload Document Templates", "Can upload document templates")]
+        public bool Upload { get; set; }
+
+        [ClaimDetails("Create Document Templates", "Can create document templates")]
+        public bool Create { get; set; }
+
+        [ClaimDetails("Delete Document Templates", "Can delete document templates")]
+        public bool Delete { get; set; }
+
+        [ClaimDetails("Show Document Templates", "Can show document templates")]
+        public bool Show { get; set; }
+
+        [ClaimDetails("Show Document Template Import Status", "Can show the document template import status")]
+        public bool ShowStatus { get; set; }
+
+        [ClaimDetails("Bulk Generate Document Templates", "Can bulk generate document templates")]
+        public bool BulkGenerate { get; set; }
+
+        [ClaimDetails("Undetected Pages", "Can show and assign imported documents which were not undetected")]
+        public bool UndetectedPages { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/Enrolment/EnrolmentClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/Enrolment/EnrolmentClaims.cs
new file mode 100644
index 00000000..8b478a07
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/Enrolment/EnrolmentClaims.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Configuration.Enrolment
+{
+    [ClaimDetails("Enrolment", "Permissions related to Device Enrolment")]
+    public class EnrolmentClaims
+    {
+        [ClaimDetails("Show Enrolment", "Can show device enrolment")]
+        public bool Show { get; set; }
+
+        [ClaimDetails("Configure Enrolment", "Can configure device enrolment")]
+        public bool Configure { get; set; }
+
+        [ClaimDetails("Show Enrolment Status", "Can show the enrolment status")]
+        public bool ShowStatus { get; set; }
+
+        [ClaimDetails("Download Bootstrapper", "Can download the Device Bootstrapper")]
+        public bool DownloadBootstrapper { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/Logging/LoggingClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/Logging/LoggingClaims.cs
new file mode 100644
index 00000000..44752b03
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/Logging/LoggingClaims.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Configuration.Logging
+{
+    [ClaimDetails("Logging", "Permissions related to Logging")]
+    public class LoggingClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Show Logging", "Can show logging")]
+        public bool Show { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/Origanisation/OrganisationClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/Origanisation/OrganisationClaims.cs
new file mode 100644
index 00000000..203a5d57
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/Origanisation/OrganisationClaims.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Configuration.Origanisation
+{
+    [ClaimDetails("Organisation Details", "Permissions related to the Organisation Details")]
+    public class OrganisationClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Show Organisation Details", "Can show the organisation details")]
+        public bool Show { get; set; }
+
+        [ClaimDetails("Configure Name", "Can configure the organisation name")]
+        public bool ConfigureName { get; set; }
+
+        [ClaimDetails("Configure Logo", "Can configure the organisation logo")]
+        public bool ConfigureLogo { get; set; }
+
+        [ClaimDetails("Configure Multi-Site Mode", "Can configure multi-site mode")]
+        public bool ConfigureMultiSiteMode { get; set; }
+
+        [ClaimDetails("Configure Addresses", "Can configure organisation addresses")]
+        public bool ConfigureAddresses { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/Plugin/PluginClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/Plugin/PluginClaims.cs
new file mode 100644
index 00000000..822b4fc9
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/Plugin/PluginClaims.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Configuration.Plugin
+{
+    [ClaimDetails("Plugin", "Permissions related to Plugins")]
+    public class PluginClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Show Plugins", "Can show plugins")]
+        public bool Show { get; set; }
+
+        [ClaimDetails("Install/Update Plugins", "Can install and update plugins")]
+        public bool Install { get; set; }
+
+        [ClaimDetails("Install/Update Local Plugins", "Can install and update locally uploaded plugins")]
+        public bool InstallLocal { get; set; }
+
+        [ClaimDetails("Uninstall Plugins", "Can uninstall plugins")]
+        public bool Uninstall { get; set; }
+
+        [ClaimDetails("Configure Plugins", "Can configure plugins")]
+        public bool Configure { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/System/SystemClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/System/SystemClaims.cs
new file mode 100644
index 00000000..c54f9de8
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Configuration/System/SystemClaims.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Configuration.System
+{
+    [ClaimDetails("System", "Permissions related to System Configuration")]
+    public class SystemClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Show System Configuration", "Can show the system configuration")]
+        public bool Show { get; set; }
+
+        [ClaimDetails("Configure Proxy Settings", "Can configure the proxy settings")]
+        public bool ConfigureProxy { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Device/DeviceActionsClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Device/DeviceActionsClaims.cs
new file mode 100644
index 00000000..02135c86
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Device/DeviceActionsClaims.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Device
+{
+    [ClaimDetails("Actions", "Permissions related to Device Actions")]
+    public class DeviceActionsClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Allow Unauthenticated Enrol", "Can allow devices to enrol without authentication")]
+        public bool AllowUnauthenticatedEnrol { get; set; }
+
+        [ClaimDetails("Assign User", "Can update the user assignment of devices")]
+        public bool AssignUser { get; set; }
+
+        [ClaimDetails("Decommission", "Can decommission devices")]
+        public bool Decommission { get; set; }
+        [ClaimDetails("Recommission", "Can recommission devices")]
+        public bool Recommission { get; set; }
+        [ClaimDetails("Delete", "Can delete devices")]
+        public bool Delete { get; set; }
+
+        [ClaimDetails("Add Attachments", "Can add attachments to devices")]
+        public bool AddAttachments { get; set; }
+        [ClaimDetails("Remove Any Attachments", "Can remove any attachments from devices")]
+        public bool RemoveAnyAttachments { get; set; }
+        [ClaimDetails("Remove Own Attachments", "Can remove own attachments from devices")]
+        public bool RemoveOwnAttachments { get; set; }
+
+        [ClaimDetails("Generate Documents", "Can generate documents for jobs")]
+        public bool GenerateDocuments { get; set; }
+
+        [ClaimDetails("Enrol Devices", "Can add devices offline and enrol devices with the Bootstrapper")]
+        public bool EnrolDevices { get; set; }
+        [ClaimDetails("Import Devices", "Can bulk import devices")]
+        public bool Import { get; set; }
+        [ClaimDetails("Export Devices", "Can export devices in a bulk format")]
+        public bool Export { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Device/DeviceClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Device/DeviceClaims.cs
new file mode 100644
index 00000000..d2e2372b
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Device/DeviceClaims.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Device
+{
+    [ClaimDetails("Device", "Permissions related to Devices")]
+    public class DeviceClaims : BaseRoleClaimGroup
+    {
+        public DeviceClaims()
+        {
+            this.Properties = new DevicePropertiesClaims();
+            this.Actions = new DeviceActionsClaims();
+        }
+
+        [ClaimDetails("Search Devices", "Can search devices")]
+        public bool Search { get; set; }
+
+        [ClaimDetails("Show Devices", "Can show devices")]
+        public bool Show { get; set; }
+
+        [ClaimDetails("Show Details", "Can show details associated with devices")]
+        public bool ShowDetails { get; set; }
+        [ClaimDetails("Show Attachments", "Can show device attachments")]
+        public bool ShowAttachments { get; set; }
+        [ClaimDetails("Show Certificates", "Can show certificates associated with devices")]
+        public bool ShowCertificates { get; set; }
+        [ClaimDetails("Show Devices Jobs", "Can show jobs associated with devices")]
+        public bool ShowJobs { get; set; }
+        [ClaimDetails("Show Assignment History", "Can show the assignment history for devices")]
+        public bool ShowAssignmentHistory { get; set; }
+
+
+        public DevicePropertiesClaims Properties { get; set; }
+
+        public DeviceActionsClaims Actions { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Device/DevicePropertiesClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Device/DevicePropertiesClaims.cs
new file mode 100644
index 00000000..7a5ce4e5
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Device/DevicePropertiesClaims.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Device
+{
+    [ClaimDetails("Device Properties", "Permissions related to Device Properties")]
+    public class DevicePropertiesClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Device Profile Property", "Can update property")]
+        public bool DeviceProfile { get; set; }
+
+        [ClaimDetails("Device Batch Property", "Can update property")]
+        public bool DeviceBatch { get; set; }
+
+        [ClaimDetails("Asset Number Property", "Can update property")]
+        public bool AssetNumber { get; set; }
+
+        [ClaimDetails("Location Property", "Can update property")]
+        public bool Location { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobActionsClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobActionsClaims.cs
new file mode 100644
index 00000000..779df4dd
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobActionsClaims.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Job
+{
+    [ClaimDetails("Actions", "Permissions related to Job Actions")]
+    public class JobActionsClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Create Jobs", "Can create jobs")]
+        public bool Create { get; set; }
+        [ClaimDetails("Close Jobs", "Can close jobs")]
+        public bool Close { get; set; }
+        [ClaimDetails("Force Close Jobs", "Can force close jobs")]
+        public bool ForceClose { get; set; }
+        [ClaimDetails("Reopen Jobs", "Can reopen jobs")]
+        public bool Reopen { get; set; }
+        [ClaimDetails("Delete Jobs", "Can delete jobs")]
+        public bool Delete { get; set; }
+
+        [ClaimDetails("Log Warranty", "Can log warranty for jobs")]
+        public bool LogWarranty { get; set; }
+        [ClaimDetails("Log Repair", "Can log repair for non-warranty jobs")]
+        public bool LogRepair { get; set; }
+
+        [ClaimDetails("Convert HWar Jobs To HNWar", "Can convert warranty jobs to non-warranty jobs")]
+        public bool ConvertHWarToHNWar { get; set; }
+
+        [ClaimDetails("Add Logs", "Can add job logs")]
+        public bool AddLogs { get; set; }
+        [ClaimDetails("Remove Any Logs", "Can remove any job logs")]
+        public bool RemoveAnyLogs { get; set; }
+        [ClaimDetails("Remove Own Logs", "Can remove own job logs")]
+        public bool RemoveOwnLogs { get; set; }
+
+        [ClaimDetails("Add Attachments", "Can add attachments to jobs")]
+        public bool AddAttachments { get; set; }
+        [ClaimDetails("Remove Any Attachments", "Can remove any attachments from jobs")]
+        public bool RemoveAnyAttachments { get; set; }
+        [ClaimDetails("Remove Own Attachments", "Can remove own attachments from jobs")]
+        public bool RemoveOwnAttachments { get; set; }
+
+        [ClaimDetails("Generate Documents", "Can generate documents for jobs")]
+        public bool GenerateDocuments { get; set; }
+
+        [ClaimDetails("Update Sub Types", "Can update sub types for jobs")]
+        public bool UpdateSubTypes { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobClaims.cs
new file mode 100644
index 00000000..78ba49f4
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobClaims.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Job
+{
+    [ClaimDetails("Job", "Permissions related to Jobs")]
+    public class JobClaims : BaseRoleClaimGroup
+    {
+        public JobClaims()
+        {
+            this.Lists = new JobListsClaims();
+            this.Actions = new JobActionsClaims();
+            this.Properties = new JobPropertiesClaims();
+            this.Types = new JobTypesClaims();
+        }
+
+        [ClaimDetails("Search Jobs", "Can search jobs")]
+        public bool Search { get; set; }
+
+        [ClaimDetails("Show Jobs", "Can show jobs")]
+        public bool Show { get; set; }
+
+        [ClaimDetails("Show Daily Opened & Closed", "Can show daily opened & closed chart")]
+        public bool ShowDailyChart { get; set; }
+
+        [ClaimDetails("Show Logs", "Can show job logs")]
+        public bool ShowLogs { get; set; }
+        [ClaimDetails("Show Attachments", "Can show job attachments")]
+        public bool ShowAttachments { get; set; }
+
+        [ClaimDetails("Show Non-Warranty Components", "Can show non-warranty job components")]
+        public bool ShowNonWarrantyComponents { get; set; }
+        [ClaimDetails("Show Non-Warranty Finance", "Can show non-warranty job finance")]
+        public bool ShowNonWarrantyFinance { get; set; }
+        [ClaimDetails("Show Non-Warranty Repairs", "Can show non-warranty job repairs")]
+        public bool ShowNonWarrantyRepairs { get; set; }
+        [ClaimDetails("Show Non-Warranty Insurance", "Can show non-warranty job insurance")]
+        public bool ShowNonWarrantyInsurance { get; set; }
+
+        [ClaimDetails("Show Warranty", "Can show job warranty")]
+        public bool ShowWarranty { get; set; }
+
+        [ClaimDetails("Show Flags", "Can show job flags")]
+        public bool ShowFlags { get; set; }
+
+        public JobListsClaims Lists { get; set; }
+
+        public JobActionsClaims Actions { get; set; }
+
+        public JobPropertiesClaims Properties { get; set; }
+
+        public JobTypesClaims Types { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobListsClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobListsClaims.cs
new file mode 100644
index 00000000..f89336e5
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobListsClaims.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Job
+{
+    [ClaimDetails("Lists", "Permissions related to Job Lists")]
+    public class JobListsClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Awaiting Technician Action List", "Can show list")]
+        public bool AwaitingTechnicianAction { get; set; }
+        [ClaimDetails("Long Running Jobs List", "Can show list")]
+        public bool LongRunningJobs { get; set; }
+
+        [ClaimDetails("All Open List", "Can show list")]
+        public bool AllOpen { get; set; }
+        [ClaimDetails("Devices Ready For Return List", "Can show list")]
+        public bool DevicesReadyForReturn { get; set; }
+        [ClaimDetails("Devices Awaiting Repair List", "Can show list")]
+        public bool DevicesAwaitingRepair { get; set; }
+        
+        [ClaimDetails("Awaiting Finance List", "Can show list")]
+        public bool AwaitingFinance { get; set; }
+
+        [ClaimDetails("Awaiting Finance Charge List", "Can show list (NOTE: Requires Awaiting Finance List)")]
+        public bool AwaitingFinanceCharge { get; set; }
+        [ClaimDetails("Awaiting Finance Payment List", "Can show list (NOTE: Requires Awaiting Finance List)")]
+        public bool AwaitingFinancePayment { get; set; }
+        [ClaimDetails("Awaiting Finance Insurance Processing List", "Can show list (NOTE: Requires Awaiting Finance List)")]
+        public bool AwaitingFinanceInsuranceProcessing { get; set; }
+        [ClaimDetails("Awaiting Finance Agreement Breach List", "Can show list (NOTE: Requires Awaiting Finance List)")]
+        public bool AwaitingFinanceAgreementBreach { get; set; }
+        
+        [ClaimDetails("Awaiting User Action List", "Can show list")]
+        public bool AwaitingUserAction { get; set; }
+        [ClaimDetails("Recently Closed List", "Can show list")]
+        public bool RecentlyClosed { get; set; }
+        [ClaimDetails("Locations List", "Can show list")]
+        public bool Locations { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobNonWarrantyPropertiesClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobNonWarrantyPropertiesClaims.cs
new file mode 100644
index 00000000..80026bc8
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobNonWarrantyPropertiesClaims.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Job
+{
+    [ClaimDetails("Non Warranty Properties", "Permissions related to Non-Warranty Job Properties")]
+    public class JobNonWarrantyPropertiesClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Add Components", "Can add job components (NOTE: Requires Edit Components)")]
+        public bool AddComponents { get; set; }
+        [ClaimDetails("Edit Components", "Can edit and remove job components")]
+        public bool EditComponents { get; set; }
+
+        [ClaimDetails("Is Insurance Claim  Property", "Can update property")]
+        public bool IsInsuranceClaim { get; set; }
+
+        [ClaimDetails("Insurance Claim Form Sent Property", "Can update property")]
+        public bool InsuranceClaimFormSent { get; set; }
+
+        [ClaimDetails("Accounting Charge Required Property", "Can update property")]
+        public bool AccountingChargeRequired { get; set; }
+        [ClaimDetails("Accounting Charge Added Property", "Can update property")]
+        public bool AccountingChargeAdded { get; set; }
+        [ClaimDetails("Accounting Charge Paid Property", "Can update property")]
+        public bool AccountingChargePaid { get; set; }
+        [ClaimDetails("Purchase Order Raised Property", "Can update property")]
+        public bool PurchaseOrderRaised { get; set; }
+        [ClaimDetails("Purchase Order Reference Property", "Can update property")]
+        public bool PurchaseOrderReference { get; set; }
+        [ClaimDetails("Purchase Order Sent Property", "Can update property")]
+        public bool PurchaseOrderSent { get; set; }
+        [ClaimDetails("Invoice Received Property", "Can update property")]
+        public bool InvoiceReceived { get; set; }
+
+        [ClaimDetails("Repairer Name Property", "Can update property")]
+        public bool RepairerName { get; set; }
+        [ClaimDetails("Repairer Completed Date Property", "Can update property")]
+        public bool RepairerCompletedDate { get; set; }
+        [ClaimDetails("Repairer Logged Date Property", "Can update property")]
+        public bool RepairerLoggedDate { get; set; }
+        [ClaimDetails("Repairer Reference Property", "Can update property")]
+        public bool RepairerReference { get; set; }
+
+        [ClaimDetails("Insurance Detail Properties", "Can update insurance detail properties")]
+        public bool InsuranceDetails { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobPropertiesClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobPropertiesClaims.cs
new file mode 100644
index 00000000..de2ecd5c
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobPropertiesClaims.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Job
+{
+    [ClaimDetails("Job Properties", "Permissions related to Job Properties")]
+    public class JobPropertiesClaims : BaseRoleClaimGroup
+    {
+        public JobPropertiesClaims()
+        {
+            this.WarrantyProperties = new JobWarrantyPropertiesClaims();
+            this.NonWarrantyProperties = new JobNonWarrantyPropertiesClaims();
+        }
+
+        public JobWarrantyPropertiesClaims WarrantyProperties { get; set; }
+        public JobNonWarrantyPropertiesClaims NonWarrantyProperties { get; set; }
+
+        [ClaimDetails("Device Held Property", "Can update property")]
+        public bool DeviceHeld { get; set; }
+        [ClaimDetails("Device Ready For Return Property", "Can update property")]
+        public bool DeviceReadyForReturn { get; set; }
+        [ClaimDetails("Device Returned Property", "Can update property")]
+        public bool DeviceReturned { get; set; }
+        [ClaimDetails("Waiting For User Action Property", "Can update property")]
+        public bool WaitingForUserAction { get; set; }
+        [ClaimDetails("Not Waiting For User Action Property", "Can update property")]
+        public bool NotWaitingForUserAction { get; set; }
+
+        [ClaimDetails("Flags Property", "Can update property")]
+        public bool Flags { get; set; }
+
+        [ClaimDetails("Expected Closed Date Property", "Can update property")]
+        public bool ExpectedClosedDate { get; set; }
+        [ClaimDetails("Device Held Location Property", "Can update property")]
+        public bool DeviceHeldLocation { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobTypesClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobTypesClaims.cs
new file mode 100644
index 00000000..1b54eada
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobTypesClaims.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Job
+{
+    [ClaimDetails("Types", "Permissions related to Job Types")]
+    public class JobTypesClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Show Hardware - Miscellaneous Jobs", "Can show jobs of this type")]
+        public bool ShowHMisc { get; set; }
+        [ClaimDetails("Show Hardware - Non-Warranty Jobs", "Can show jobs of this type")]
+        public bool ShowHNWar { get; set; }
+        [ClaimDetails("Show Hardware - Warranty Jobs", "Can show jobs of this type")]
+        public bool ShowHWar { get; set; }
+
+        [ClaimDetails("Show Software - Application Jobs", "Can show jobs of this type")]
+        public bool ShowSApp { get; set; }
+        [ClaimDetails("Show Software - Reimage Jobs", "Can show jobs of this type")]
+        public bool ShowSImg { get; set; }
+        [ClaimDetails("Show Software - Operating System Jobs", "Can show jobs of this type")]
+        public bool ShowSOS { get; set; }
+        
+        [ClaimDetails("Show User Management Jobs", "Can show jobs of this type")]
+        public bool ShowUMgmt { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobWarrantyPropertiesClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobWarrantyPropertiesClaims.cs
new file mode 100644
index 00000000..c2a7c491
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/Job/JobWarrantyPropertiesClaims.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.Job
+{
+    [ClaimDetails("Warranty Properties", "Permissions related to Warranty Job Properties")]
+    public class JobWarrantyPropertiesClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Warranty Completed Property", "Can update property")]
+        public bool WarrantyCompleted { get; set; }
+
+        [ClaimDetails("External Name Property", "Can update property")]
+        public bool ExternalName { get; set; }
+        [ClaimDetails("External Logged Date Property", "Can update property")]
+        public bool ExternalLoggedDate { get; set; }
+        [ClaimDetails("External Reference Property", "Can update property")]
+        public bool ExternalReference { get; set; }
+        [ClaimDetails("External Completed Date Property", "Can update property")]
+        public bool ExternalCompletedDate { get; set; }
+
+        [ClaimDetails("Provider Details", "Can access warranty provider details")]
+        public bool ProviderDetails { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/User/UserActionsClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/User/UserActionsClaims.cs
new file mode 100644
index 00000000..913fdf96
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/User/UserActionsClaims.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.User
+{
+    [ClaimDetails("Actions", "Permissions related to User Actions")]
+    public class UserActionsClaims : BaseRoleClaimGroup
+    {
+        [ClaimDetails("Add Attachments", "Can add attachments to users")]
+        public bool AddAttachments { get; set; }
+        [ClaimDetails("Remove Any Attachments", "Can remove any attachments from users")]
+        public bool RemoveAnyAttachments { get; set; }
+        [ClaimDetails("Remove Own Attachments", "Can remove own attachments from users")]
+        public bool RemoveOwnAttachments { get; set; }
+
+        [ClaimDetails("Generate Documents", "Can generate documents for users")]
+        public bool GenerateDocuments { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/ClaimGroups/User/UserClaims.cs b/Disco.Services/Authorization/Roles/ClaimGroups/User/UserClaims.cs
new file mode 100644
index 00000000..5437d4f0
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/ClaimGroups/User/UserClaims.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles.ClaimGroups.User
+{
+    [ClaimDetails("User", "Permissions related to Users")]
+    public class UserClaims : BaseRoleClaimGroup
+    {
+        public UserClaims()
+        {
+            this.Actions = new UserActionsClaims();
+        }
+
+        [ClaimDetails("Search Users", "Can search users")]
+        public bool Search { get; set; }
+
+        [ClaimDetails("Show Users", "Can show users")]
+        public bool Show { get; set; }
+
+        [ClaimDetails("Show Attachments", "Can show user attachments")]
+        public bool ShowAttachments { get; set; }
+
+        [ClaimDetails("Show Device Assignment History", "Can show the device assignment history for users")]
+        public bool ShowAssignmentHistory { get; set; }
+
+        [ClaimDetails("Show Users Jobs", "Can show jobs associated with users")]
+        public bool ShowJobs { get; set; }
+
+        [ClaimDetails("Show Users Authorization", "Can show authorization permissions associated with users")]
+        public bool ShowAuthorization { get; set; }
+
+        public UserActionsClaims Actions { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/RoleCache.cs b/Disco.Services/Authorization/Roles/RoleCache.cs
new file mode 100644
index 00000000..28497f99
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/RoleCache.cs
@@ -0,0 +1,106 @@
+using Disco.Data.Repository;
+using Disco.Models.Authorization;
+using Disco.Models.Repository;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles
+{
+    public static class RoleCache
+    {
+        internal const int AdministratorsTokenId = -1;
+        internal const int ComputerAccountTokenId = -200;
+        internal const string AdministratorsTokenSubjectIds = "Domain Admins,Disco Admins";
+        internal const string ClaimsJsonEmpty = "null";
+
+        private static List<RoleToken> _Cache;
+
+        internal static void Initialize(DiscoDataContext Database)
+        {
+            _Cache = Database.AuthorizationRoles.ToList().Select(ar => RoleToken.FromAuthorizationRole(ar)).ToList();
+
+            // Add System Roles
+            AddSystemRoles();
+        }
+
+        private static void AddSystemRoles()
+        {
+            // Disco Administrators
+            _Cache.Add(RoleToken.FromAuthorizationRole(new AuthorizationRole()
+            {
+                Id = AdministratorsTokenId,
+                Name = "Disco Administrators",
+                SubjectIds = AdministratorsTokenSubjectIds
+            }, Claims.AdministratorClaims()));
+
+            // Computer Accounts
+            _Cache.Add(RoleToken.FromAuthorizationRole(new AuthorizationRole()
+            {
+                Id = ComputerAccountTokenId,
+                Name = "Domain Computer Account"
+            }, Claims.ComputerAccountClaims()));
+        }
+
+        /// <summary>
+        /// Create a clone of an Authorization Role
+        /// <para>Creates immutable clones to avoid side-effects</para>
+        /// </summary>
+        /// <param name="TemplateRole">Authorization Role to Clone</param>
+        /// <returns>A copy of the Authorization Role</returns>
+        private static AuthorizationRole CloneAuthoriationRole(AuthorizationRole TemplateRole)
+        {
+            return new AuthorizationRole()
+            {
+                Id = TemplateRole.Id,
+                Name = TemplateRole.Name,
+                ClaimsJson = TemplateRole.ClaimsJson,
+                SubjectIds = TemplateRole.SubjectIds
+            };
+        }
+
+        internal static RoleToken AddRole(AuthorizationRole Role)
+        {
+            var token = RoleToken.FromAuthorizationRole(CloneAuthoriationRole(Role));
+            _Cache.Add(token);
+            return token;
+        }
+
+        internal static void RemoveRole(AuthorizationRole Role)
+        {
+            var token = GetRoleToken(Role.Id);
+            if (token != null)
+                _Cache.Remove(token);
+        }
+
+        internal static RoleToken UpdateRole(AuthorizationRole Role)
+        {
+            RemoveRole(Role);
+            return AddRole(Role);
+        }
+
+        internal static RoleToken GetRoleToken(int Id)
+        {
+            return _Cache.FirstOrDefault(t => t.Role.Id == Id);
+        }
+        internal static RoleToken GetRoleToken(string SecurityGroup)
+        {
+            return _Cache.FirstOrDefault(t => t.SubjectIdHashes.Contains(SecurityGroup.ToLower()));
+        }
+        internal static List<IRoleToken> GetRoleTokens(IEnumerable<string> SecurityGroup)
+        {
+            var securityGroups = SecurityGroup.Select(sg => sg.ToLower());
+
+            return _Cache.Where(t => securityGroups.Any(sg => t.SubjectIdHashes.Contains(sg))).Cast<IRoleToken>().ToList();
+        }
+        internal static List<IRoleToken> GetRoleTokens(IEnumerable<string> SecurityGroup, User User)
+        {
+            var subjectIds = (new string[] { User.Id }).Concat(SecurityGroup).Select(sg => sg.ToLower());
+
+            return _Cache.Where(t => subjectIds.Any(sg => t.SubjectIdHashes.Contains(sg))).Cast<IRoleToken>().ToList();
+        }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/RoleClaims.cs b/Disco.Services/Authorization/Roles/RoleClaims.cs
new file mode 100644
index 00000000..0add33a9
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/RoleClaims.cs
@@ -0,0 +1,39 @@
+using Disco.Services.Authorization.Roles.ClaimGroups;
+using Disco.Services.Authorization.Roles.ClaimGroups.Configuration;
+using Disco.Services.Authorization.Roles.ClaimGroups.Device;
+using Disco.Services.Authorization.Roles.ClaimGroups.Job;
+using Disco.Services.Authorization.Roles.ClaimGroups.User;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles
+{
+    public class RoleClaims : BaseRoleClaimGroup
+    {
+        public RoleClaims()
+        {
+            this.Config = new ConfigClaims();
+
+            this.Job = new JobClaims();
+            this.Device = new DeviceClaims();
+            this.User = new UserClaims();
+        }
+
+        [ClaimDetails("Computer Account", "Represents a computer account", true)]
+        public bool ComputerAccount { get; set; }
+
+        [ClaimDetails("Disco Administrator Account", "Represents a Disco Administrator account", true)]
+        public bool DiscoAdminAccount { get; set; }
+
+        public ConfigClaims Config { get; set; }
+
+        public JobClaims Job { get; set; }
+
+        public DeviceClaims Device { get; set; }
+
+        public UserClaims User { get; set; }
+    }
+}
diff --git a/Disco.Services/Authorization/Roles/RoleToken.cs b/Disco.Services/Authorization/Roles/RoleToken.cs
new file mode 100644
index 00000000..0c78e10b
--- /dev/null
+++ b/Disco.Services/Authorization/Roles/RoleToken.cs
@@ -0,0 +1,39 @@
+using Disco.Models.Authorization;
+using Disco.Models.Repository;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Authorization.Roles
+{
+    public class RoleToken : IRoleToken
+    {
+        public AuthorizationRole Role { get; set; }
+        internal HashSet<string> SubjectIdHashes { get; set; }
+        public List<string> SubjectIds { get; set; }
+        public RoleClaims Claims { get; set; }
+
+        public static RoleToken FromAuthorizationRole(AuthorizationRole Role)
+        {
+            var claims = JsonConvert.DeserializeObject<RoleClaims>(Role.ClaimsJson);
+
+            return FromAuthorizationRole(Role, claims);
+        }
+        
+        internal static RoleToken FromAuthorizationRole(AuthorizationRole Role, RoleClaims Claims)
+        {
+            string[] sg = (Role.SubjectIds == null ? new string[0] : Role.SubjectIds.Split(',').ToArray());
+
+            return new RoleToken()
+            {
+                Role = Role,
+                SubjectIdHashes = new HashSet<string>(sg.Select(i => i.ToLower())),
+                SubjectIds = sg.ToList(),
+                Claims = Claims
+            };
+        }
+    }
+}
diff --git a/Disco.Services/Disco.Services.csproj b/Disco.Services/Disco.Services.csproj
index 43aa97a8..21817985 100644
--- a/Disco.Services/Disco.Services.csproj
+++ b/Disco.Services/Disco.Services.csproj
@@ -73,6 +73,7 @@
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll</HintPath>
     </Reference>
+    <Reference Include="System.DirectoryServices" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
@@ -88,6 +89,45 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Authorization\AccessDeniedException.cs" />
+    <Compile Include="Authorization\AuthorizationToken.cs" />
+    <Compile Include="Authorization\ClaimNavigatorItem.cs" />
+    <Compile Include="Authorization\DiscoAuthorizeAllAttribute.cs" />
+    <Compile Include="Authorization\DiscoAuthorizeAnyAttribute.cs" />
+    <Compile Include="Authorization\DiscoAuthorizeAttribute.cs" />
+    <Compile Include="Authorization\Roles\BaseRoleClaimGroup.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Configuration\ConfigClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Configuration\DeviceBatch\DeviceBatchClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Configuration\DeviceCertificate\DeviceCertificateClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Configuration\DeviceModel\DeviceModelClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Configuration\DeviceProfile\DeviceProfileClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Configuration\DocumentTemplate\DocumentTemplateClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Configuration\Enrolment\EnrolmentClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Configuration\Logging\LoggingClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Configuration\Origanisation\OrganisationClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Configuration\Plugin\PluginClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Configuration\System\SystemClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Device\DeviceActionsClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Device\DeviceClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Device\DevicePropertiesClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Job\JobActionsClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Job\JobListsClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Job\JobNonWarrantyPropertiesClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Job\JobClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Job\JobPropertiesClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Job\JobTypesClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\Job\JobWarrantyPropertiesClaims.cs" />
+    <Compile Include="Authorization\Claims.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Claims.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Authorization\Roles\ClaimDetailsAttribute.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\User\UserActionsClaims.cs" />
+    <Compile Include="Authorization\Roles\ClaimGroups\User\UserClaims.cs" />
+    <Compile Include="Authorization\Roles\RoleCache.cs" />
+    <Compile Include="Authorization\Roles\RoleClaims.cs" />
+    <Compile Include="Authorization\Roles\RoleToken.cs" />
     <Compile Include="Logging\LogBase.cs" />
     <Compile Include="Logging\LogContext.cs" />
     <Compile Include="Logging\LogReInitalizeJob.cs" />
@@ -141,6 +181,19 @@
     <Compile Include="Tasks\ScheduledTaskStatus.cs" />
     <Compile Include="Tasks\ScheduledTaskStatusLive.cs" />
     <Compile Include="Plugins\Features\UIExtension\UIExtensions.cs" />
+    <Compile Include="Users\Cache.cs" />
+    <Compile Include="Users\CacheCleanTask.cs" />
+    <Compile Include="Users\Searching.cs" />
+    <Compile Include="Users\UserService.cs" />
+    <Compile Include="Web\AuthorizedController.cs" />
+    <Compile Include="Web\AuthorizedDatabaseController.cs" />
+    <Compile Include="Web\Bundles\Bundle.cs" />
+    <Compile Include="Web\Bundles\BundleExtensions.cs" />
+    <Compile Include="Web\Bundles\BundleHandler.cs" />
+    <Compile Include="Web\Bundles\BundleModule.cs" />
+    <Compile Include="Web\Bundles\BundleTable.cs" />
+    <Compile Include="Web\DatabaseController.cs" />
+    <Compile Include="Web\WebViewPage.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Disco.Data\Disco.Data.csproj">
@@ -154,8 +207,15 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="Authorization\Claims.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>Claims.cs</LastGenOutput>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
diff --git a/Disco.Services/Logging/LogContext.cs b/Disco.Services/Logging/LogContext.cs
index d1dfd317..d0e3733e 100644
--- a/Disco.Services/Logging/LogContext.cs
+++ b/Disco.Services/Logging/LogContext.cs
@@ -70,10 +70,10 @@ namespace Disco.Services.Logging
             }
         }
 
-        private static void InitalizeDatabase(Targets.LogPersistContext logDbContext)
+        private static void InitalizeDatabase(Targets.LogPersistContext LogDatabase)
         {
             // Add Modules
-            var existingModules = logDbContext.Modules.Include("EventTypes").ToDictionary(m => m.Id);
+            var existingModules = LogDatabase.Modules.Include("EventTypes").ToDictionary(m => m.Id);
             foreach (var module in LogModules)
             {
                 // Update/Insert Module
@@ -95,7 +95,7 @@ namespace Disco.Services.Logging
                         Name = module.Value.ModuleName,
                         Description = module.Value.ModuleDescription
                     };
-                    logDbContext.Modules.Add(dbModule);
+                    LogDatabase.Modules.Add(dbModule);
                 }
                 // Update/Insert Event Types
                 Dictionary<int, Models.LogEventType> existingEventTypes = (dbModule.EventTypes == null) ? new Dictionary<int, Models.LogEventType>() : dbModule.EventTypes.ToDictionary(et => et.Id);
@@ -123,17 +123,17 @@ namespace Disco.Services.Logging
                             Severity = eventType.Value.Severity,
                             Format = eventType.Value.Format
                         };
-                        logDbContext.EventTypes.Add(dbEventType);
+                        LogDatabase.EventTypes.Add(dbEventType);
                     }
                 }
             }
 
-            logDbContext.SaveChanges();
+            LogDatabase.SaveChanges();
         }
 
-        public static string LogFileBasePath(DiscoDataContext DiscoContext)
+        public static string LogFileBasePath(DiscoDataContext Database)
         {
-            var logDirectoryBase = Path.Combine(DiscoContext.DiscoConfiguration.DataStoreLocation, "Logs");
+            var logDirectoryBase = Path.Combine(Database.DiscoConfiguration.DataStoreLocation, "Logs");
             // Create Directory Structure
             if (!Directory.Exists(logDirectoryBase))
             {
@@ -155,9 +155,9 @@ namespace Disco.Services.Logging
             return logDirectoryBase;
         }
 
-        public static string LogFilePath(DiscoDataContext DiscoContext, DateTime Date, bool CreateDirectory = true)
+        public static string LogFilePath(DiscoDataContext Database, DateTime Date, bool CreateDirectory = true)
         {
-            var logDirectoryBase = LogFileBasePath(DiscoContext);
+            var logDirectoryBase = LogFileBasePath(Database);
             var logDirectory = Path.Combine(logDirectoryBase, Date.Year.ToString());
             if (CreateDirectory && !Directory.Exists(logDirectory))
             {
@@ -167,11 +167,11 @@ namespace Disco.Services.Logging
             return Path.Combine(logDirectory, logFileName);
         }
 
-        internal static void ReInitalize(DiscoDataContext DiscoContext)
+        internal static void ReInitalize(DiscoDataContext Database)
         {
             lock (_CurrentLock)
             {
-                var logPath = LogFilePath(DiscoContext, DateTime.Today);
+                var logPath = LogFilePath(Database, DateTime.Today);
 
                 //var connectionString = string.Format("Data Source=\"{0}\"", logPath);
 
@@ -204,7 +204,7 @@ namespace Disco.Services.Logging
             try
             {
                 // Get Yesterdays Log
-                var yesterdaysLogPath = LogFilePath(DiscoContext, DateTime.Today.AddDays(-1), false);
+                var yesterdaysLogPath = LogFilePath(Database, DateTime.Today.AddDays(-1), false);
                 if (File.Exists(yesterdaysLogPath))
                 {
                     SqlCeConnectionStringBuilder sqlCeCSB = new SqlCeConnectionStringBuilder();
@@ -229,9 +229,9 @@ namespace Disco.Services.Logging
         }
 
         private static IScheduler _ReInitializeScheduler;
-        public static void Initalize(DiscoDataContext DiscoContext, ISchedulerFactory SchedulerFactory)
+        public static void Initalize(DiscoDataContext Database, ISchedulerFactory SchedulerFactory)
         {
-            ReInitalize(DiscoContext);
+            ReInitalize(Database);
 
             _ReInitializeScheduler = SchedulerFactory.GetScheduler();
 
diff --git a/Disco.Services/Logging/LogReInitalizeJob.cs b/Disco.Services/Logging/LogReInitalizeJob.cs
index 064c1120..176a501a 100644
--- a/Disco.Services/Logging/LogReInitalizeJob.cs
+++ b/Disco.Services/Logging/LogReInitalizeJob.cs
@@ -11,9 +11,9 @@ namespace Disco.Services.Logging
     {
         public void Execute(IJobExecutionContext context)
         {
-            using (DiscoDataContext DiscoContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                LogContext.ReInitalize(DiscoContext);
+                LogContext.ReInitalize(database);
             }
         }
     }
diff --git a/Disco.Services/Logging/ReadLogContext.cs b/Disco.Services/Logging/ReadLogContext.cs
index e46a9108..5d8093b9 100644
--- a/Disco.Services/Logging/ReadLogContext.cs
+++ b/Disco.Services/Logging/ReadLogContext.cs
@@ -29,14 +29,14 @@ namespace Disco.Services.Logging
             return true;
         }
 
-        public List<Models.LogLiveEvent> Query(DiscoDataContext DiscoContext)
+        public List<Models.LogLiveEvent> Query(DiscoDataContext Database)
         {
             List<Models.LogLiveEvent> results = new List<LogLiveEvent>();
 
             // Validate Options
             this.Validate();
 
-            var relevantLogFiles = RelevantLogFiles(DiscoContext);
+            var relevantLogFiles = RelevantLogFiles(Database);
             relevantLogFiles.Reverse();
             foreach (var logFile in relevantLogFiles)
             {
@@ -73,10 +73,10 @@ namespace Disco.Services.Logging
             }
         }
 
-        private List<Tuple<string, DateTime>> RelevantLogFiles(DiscoDataContext DiscoContext)
+        private List<Tuple<string, DateTime>> RelevantLogFiles(DiscoDataContext Database)
         {
             List<Tuple<string, DateTime>> relevantFiles = new List<Tuple<string, DateTime>>();
-            var logDirectoryBase = LogContext.LogFileBasePath(DiscoContext);
+            var logDirectoryBase = LogContext.LogFileBasePath(Database);
             var logDirectoryBaseInfo = new DirectoryInfo(logDirectoryBase);
             var endDate = this.End.HasValue ? this.End.Value : DateTime.Now;
             var endDateYear = endDate.Year.ToString();
@@ -91,7 +91,7 @@ namespace Disco.Services.Logging
                     var queryDate = this.Start.Value.Date;
                     while (queryDate <= endDate)
                     {
-                        var fileName = LogContext.LogFilePath(DiscoContext, queryDate, false);
+                        var fileName = LogContext.LogFilePath(Database, queryDate, false);
                         if (File.Exists(fileName))
                             relevantFiles.Add(new Tuple<string, DateTime>(fileName, LogFileDate(fileName).Value));
 
diff --git a/Disco.Services/Plugins/CommunityInterop/PluginLibraryUpdateTask.cs b/Disco.Services/Plugins/CommunityInterop/PluginLibraryUpdateTask.cs
index e3531cea..756b69a9 100644
--- a/Disco.Services/Plugins/CommunityInterop/PluginLibraryUpdateTask.cs
+++ b/Disco.Services/Plugins/CommunityInterop/PluginLibraryUpdateTask.cs
@@ -48,13 +48,13 @@ namespace Disco.Services.Plugins.CommunityInterop
 
             Status.UpdateStatus(1, "Updating Plugin Library Catalogue", "Building Request");
 
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                catalogueFile = Plugins.CatalogueFile(dbContext);
+                catalogueFile = Plugins.CatalogueFile(database);
 
                 updateRequestBody = new PluginLibraryUpdateRequest()
                 {
-                    DeploymentId = dbContext.DiscoConfiguration.DeploymentId,
+                    DeploymentId = database.DiscoConfiguration.DeploymentId,
                     HostVersion = typeof(Plugins).Assembly.GetName().Version.ToString(4)
                 };
             }
@@ -111,13 +111,13 @@ namespace Disco.Services.Plugins.CommunityInterop
 
             Status.UpdateStatus(50, "Updating Plugin Library Compatibility", "Building Request");
 
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                compatibilityFile = Plugins.CompatibilityFile(dbContext);
+                compatibilityFile = Plugins.CompatibilityFile(database);
 
                 compatRequestBody = new PluginLibraryCompatibilityRequest()
                 {
-                    DeploymentId = dbContext.DiscoConfiguration.DeploymentId,
+                    DeploymentId = database.DiscoConfiguration.DeploymentId,
                     HostVersion = typeof(Plugins).Assembly.GetName().Version.ToString(4)
                 };
             }
@@ -200,7 +200,7 @@ namespace Disco.Services.Plugins.CommunityInterop
             }
         }
 
-        public override void InitalizeScheduledTask(DiscoDataContext dbContext)
+        public override void InitalizeScheduledTask(DiscoDataContext Database)
         {
             // Random time between midday and midnight.
             var rnd = new Random();
diff --git a/Disco.Services/Plugins/Features/CertificateProvider/CertificateProviderFeature.cs b/Disco.Services/Plugins/Features/CertificateProvider/CertificateProviderFeature.cs
index 2a5d58df..9badac55 100644
--- a/Disco.Services/Plugins/Features/CertificateProvider/CertificateProviderFeature.cs
+++ b/Disco.Services/Plugins/Features/CertificateProvider/CertificateProviderFeature.cs
@@ -13,6 +13,6 @@ namespace Disco.Services.Plugins.Features.CertificateProvider
     {
         // Certificate Plugin Requirements
         public abstract string CertificateProviderId { get; }
-        public abstract Tuple<DeviceCertificate, List<string>> AllocateCertificate(DiscoDataContext dbContext, Device Device);
+        public abstract Tuple<DeviceCertificate, List<string>> AllocateCertificate(DiscoDataContext Database, Device Device);
     }
 }
diff --git a/Disco.Services/Plugins/Features/WarrantyProvider/WarrantyProviderFeature.cs b/Disco.Services/Plugins/Features/WarrantyProvider/WarrantyProviderFeature.cs
index 1ec10e17..ec670b43 100644
--- a/Disco.Services/Plugins/Features/WarrantyProvider/WarrantyProviderFeature.cs
+++ b/Disco.Services/Plugins/Features/WarrantyProvider/WarrantyProviderFeature.cs
@@ -16,14 +16,14 @@ namespace Disco.Services.Plugins.Features.WarrantyProvider
         // Warranty Plugin Requirements
         public abstract string WarrantyProviderId { get; }
         public abstract Type SubmitJobViewType { get; }
-        public abstract dynamic SubmitJobViewModel(DiscoDataContext dbContext, Controller controller, Job Job, OrganisationAddress Address, User TechUser);
-        public abstract Dictionary<string, string> SubmitJobParseProperties(DiscoDataContext dbContext, FormCollection form, Controller controller, Job Job, OrganisationAddress Address, User TechUser, string FaultDescription);
-        public abstract Dictionary<string, string> SubmitJobDiscloseInfo(DiscoDataContext dbContext, Job Job, OrganisationAddress Address, User TechUser, string FaultDescription, Dictionary<string, string> WarrantyProviderProperties);
-        public abstract string SubmitJob(DiscoDataContext dbContext, Job Job, OrganisationAddress Address, User TechUser, string FaultDescription, Dictionary<string, string> WarrantyProviderProperties);
+        public abstract dynamic SubmitJobViewModel(DiscoDataContext Database, Controller controller, Job Job, OrganisationAddress Address, User TechUser);
+        public abstract Dictionary<string, string> SubmitJobParseProperties(DiscoDataContext Database, FormCollection form, Controller controller, Job Job, OrganisationAddress Address, User TechUser, string FaultDescription);
+        public abstract Dictionary<string, string> SubmitJobDiscloseInfo(DiscoDataContext Database, Job Job, OrganisationAddress Address, User TechUser, string FaultDescription, Dictionary<string, string> WarrantyProviderProperties);
+        public abstract string SubmitJob(DiscoDataContext Database, Job Job, OrganisationAddress Address, User TechUser, string FaultDescription, Dictionary<string, string> WarrantyProviderProperties);
 
         public abstract Type JobDetailsViewType { get; }
         public bool JobDetailsSupported { get { return this.JobDetailsViewType != null; } }
-        public abstract dynamic JobDetailsViewModel(DiscoDataContext dbContext, Controller controller, Job Job);
+        public abstract dynamic JobDetailsViewModel(DiscoDataContext Database, Controller controller, Job Job);
 
         public static PluginFeatureManifest FindPluginFeature(string PluginIdOrWarrantyProviderId)
         {
diff --git a/Disco.Services/Plugins/InstallPluginTask.cs b/Disco.Services/Plugins/InstallPluginTask.cs
index a0fdd8c6..afe36b8d 100644
--- a/Disco.Services/Plugins/InstallPluginTask.cs
+++ b/Disco.Services/Plugins/InstallPluginTask.cs
@@ -95,12 +95,12 @@ namespace Disco.Services.Plugins
                         if (Plugins.GetPlugins().FirstOrDefault(p => p.Id == packageManifest.Id) != null)
                             throw new InvalidOperationException(string.Format("The '{0} [{1}]' Plugin is already installed, please uninstall any existing versions before trying again", packageManifest.Name, packageManifest.Id));
 
-                        using (DiscoDataContext dbContext = new DiscoDataContext())
+                        using (DiscoDataContext database = new DiscoDataContext())
                         {
-                            string packagePath = Path.Combine(dbContext.DiscoConfiguration.PluginsLocation, packageManifest.Id);
+                            string packagePath = Path.Combine(database.DiscoConfiguration.PluginsLocation, packageManifest.Id);
 
                             // Check for Compatibility
-                            var compatibilityData = Plugins.LoadCompatibilityData(dbContext);
+                            var compatibilityData = Plugins.LoadCompatibilityData(database);
                             var pluginCompatibility = compatibilityData.Plugins.FirstOrDefault(i => i.Id.Equals(packageManifest.Id, StringComparison.InvariantCultureIgnoreCase) && packageManifest.Version == Version.Parse(i.Version));
                             if (pluginCompatibility != null && !pluginCompatibility.Compatible)
                                 throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] is not compatible: {2}", packageManifest.Id, packageManifest.VersionFormatted, pluginCompatibility.Reason));
@@ -144,11 +144,11 @@ namespace Disco.Services.Plugins
 
                             // Install Plugin
                             this.Status.UpdateStatus(80, "Initial Package Configuration");
-                            packageManifest.InstallPlugin(dbContext, this.Status);
+                            packageManifest.InstallPlugin(database, this.Status);
 
                             // Initialize Plugin
                             this.Status.UpdateStatus(98, "Initializing Plugin for Use");
-                            packageManifest.InitializePlugin(dbContext);
+                            packageManifest.InitializePlugin(database);
 
                             // Add Plugin Manifest to Host Environment
                             Plugins.AddPlugin(packageManifest);
diff --git a/Disco.Services/Plugins/Plugin.cs b/Disco.Services/Plugins/Plugin.cs
index 1296467b..68ad7ac3 100644
--- a/Disco.Services/Plugins/Plugin.cs
+++ b/Disco.Services/Plugins/Plugin.cs
@@ -14,10 +14,10 @@ namespace Disco.Services.Plugins
 
         #region Lifecycle
         // Events/Triggers for Custom Plugin Initialization (Optional)
-        public virtual void Install(DiscoDataContext dbContext, ScheduledTaskStatus Status) { return; }
-        public virtual void Initialize(DiscoDataContext dbContext) { return; }
-        public virtual void Uninstall(DiscoDataContext dbContext, bool UninstallData, ScheduledTaskStatus Status) { return; }
-        public virtual void AfterUpdate(DiscoDataContext dbContext, PluginManifest PreviousManifest) { return; }
+        public virtual void Install(DiscoDataContext Database, ScheduledTaskStatus Status) { return; }
+        public virtual void Initialize(DiscoDataContext Database) { return; }
+        public virtual void Uninstall(DiscoDataContext Database, bool UninstallData, ScheduledTaskStatus Status) { return; }
+        public virtual void AfterUpdate(DiscoDataContext Database, PluginManifest PreviousManifest) { return; }
         #endregion
 
         public virtual void Dispose()
diff --git a/Disco.Services/Plugins/PluginConfigurationHandler.cs b/Disco.Services/Plugins/PluginConfigurationHandler.cs
index 25964f7a..39fd7aab 100644
--- a/Disco.Services/Plugins/PluginConfigurationHandler.cs
+++ b/Disco.Services/Plugins/PluginConfigurationHandler.cs
@@ -12,8 +12,8 @@ namespace Disco.Services.Plugins
     {
         public PluginManifest Manifest { get; set; }
 
-        public abstract PluginConfigurationHandlerGetResponse Get(DiscoDataContext dbContext, Controller controller);
-        public abstract bool Post(DiscoDataContext dbContext, FormCollection form, Controller controller);
+        public abstract PluginConfigurationHandlerGetResponse Get(DiscoDataContext Database, Controller controller);
+        public abstract bool Post(DiscoDataContext Database, FormCollection form, Controller controller);
 
         public virtual void Dispose()
         {
diff --git a/Disco.Services/Plugins/PluginFeature.cs b/Disco.Services/Plugins/PluginFeature.cs
index 58bfc5cf..35cc8508 100644
--- a/Disco.Services/Plugins/PluginFeature.cs
+++ b/Disco.Services/Plugins/PluginFeature.cs
@@ -12,7 +12,7 @@ namespace Disco.Services.Plugins
         public PluginFeatureManifest Manifest {get; internal set;}
 
         // Allow Custom Initialization (Optional)
-        public virtual void Initialize(DiscoDataContext dbContext) { return; }
+        public virtual void Initialize(DiscoDataContext Database) { return; }
 
         public virtual void Dispose()
         {
diff --git a/Disco.Services/Plugins/PluginFeatureManifest.cs b/Disco.Services/Plugins/PluginFeatureManifest.cs
index c9f47b25..1f6c7b0d 100644
--- a/Disco.Services/Plugins/PluginFeatureManifest.cs
+++ b/Disco.Services/Plugins/PluginFeatureManifest.cs
@@ -26,7 +26,7 @@ namespace Disco.Services.Plugins
         [JsonIgnore]
         public Type CategoryType { get; private set; }
 
-        internal bool Initialize(DiscoDataContext dbContext, PluginManifest pluginManifest)
+        internal bool Initialize(DiscoDataContext Database, PluginManifest pluginManifest)
         {
             this.PluginManifest = pluginManifest;
 
@@ -38,7 +38,7 @@ namespace Disco.Services.Plugins
 
             using (var instance = this.CreateInstance())
             {
-                instance.Initialize(dbContext);
+                instance.Initialize(Database);
             }
 
             PluginsLog.LogInitializedPluginFeature(this.PluginManifest, this);
diff --git a/Disco.Services/Plugins/PluginManifest.cs b/Disco.Services/Plugins/PluginManifest.cs
index d6f16ade..8488a1ee 100644
--- a/Disco.Services/Plugins/PluginManifest.cs
+++ b/Disco.Services/Plugins/PluginManifest.cs
@@ -284,7 +284,7 @@ namespace Disco.Services.Plugins
         {
             return JsonConvert.SerializeObject(this, Formatting.Indented, new VersionConverter());
         }
-        private bool InitializePluginEnvironment(DiscoDataContext dbContext)
+        private bool InitializePluginEnvironment(DiscoDataContext Database)
         {
             if (!environmentInitalized)
             {
@@ -316,58 +316,58 @@ namespace Disco.Services.Plugins
                     this.WebHandlerType = this.PluginAssembly.GetType(this.WebHandlerTypeName, true, true);
 
                 // Update non-static values
-                this.StorageLocation = Path.Combine(dbContext.DiscoConfiguration.PluginStorageLocation, this.Id);
+                this.StorageLocation = Path.Combine(Database.DiscoConfiguration.PluginStorageLocation, this.Id);
 
                 environmentInitalized = true;
             }
 
             return true;
         }
-        internal bool AfterPluginUpdate(DiscoDataContext dbContext, PluginManifest PreviousManifest)
+        internal bool AfterPluginUpdate(DiscoDataContext Database, PluginManifest PreviousManifest)
         {
             // Initialize Plugin
-            InitializePluginEnvironment(dbContext);
+            InitializePluginEnvironment(Database);
 
             using (var pluginInstance = this.CreateInstance())
             {
-                pluginInstance.AfterUpdate(dbContext, PreviousManifest);
+                pluginInstance.AfterUpdate(Database, PreviousManifest);
             }
 
             return true;
         }
-        internal bool UninstallPlugin(DiscoDataContext dbContext, bool UninstallData, ScheduledTaskStatus Status)
+        internal bool UninstallPlugin(DiscoDataContext Database, bool UninstallData, ScheduledTaskStatus Status)
         {
             // Initialize Plugin
-            InitializePluginEnvironment(dbContext);
+            InitializePluginEnvironment(Database);
 
             using (var pluginInstance = this.CreateInstance())
             {
-                pluginInstance.Uninstall(dbContext, UninstallData, Status);
+                pluginInstance.Uninstall(Database, UninstallData, Status);
             }
 
             return true;
         }
-        internal bool InstallPlugin(DiscoDataContext dbContext, ScheduledTaskStatus Status)
+        internal bool InstallPlugin(DiscoDataContext Database, ScheduledTaskStatus Status)
         {
             // Initialize Plugin
-            InitializePluginEnvironment(dbContext);
+            InitializePluginEnvironment(Database);
 
             using (var pluginInstance = this.CreateInstance())
             {
-                pluginInstance.Install(dbContext, Status);
+                pluginInstance.Install(Database, Status);
             }
 
             return true;
         }
-        internal bool InitializePlugin(DiscoDataContext dbContext)
+        internal bool InitializePlugin(DiscoDataContext Database)
         {
             // Initialize Plugin
-            InitializePluginEnvironment(dbContext);
+            InitializePluginEnvironment(Database);
 
             // Initialize Plugin
             using (var pluginInstance = this.CreateInstance())
             {
-                pluginInstance.Initialize(dbContext);
+                pluginInstance.Initialize(Database);
             }
             PluginsLog.LogInitializedPlugin(this);
 
@@ -376,7 +376,7 @@ namespace Disco.Services.Plugins
             {
                 foreach (var feature in Features)
                 {
-                    feature.Initialize(dbContext, this);
+                    feature.Initialize(Database, this);
                 }
             }
             else
diff --git a/Disco.Services/Plugins/Plugins.cs b/Disco.Services/Plugins/Plugins.cs
index 55aec941..b1e1d3be 100644
--- a/Disco.Services/Plugins/Plugins.cs
+++ b/Disco.Services/Plugins/Plugins.cs
@@ -250,18 +250,18 @@ namespace Disco.Services.Plugins
                 throw new InvalidOperationException(string.Format("Unknown Plugin Feature Category Type: [{0}]", FeatureCategoryType.Name));
         }
 
-        public static string CatalogueFile(DiscoDataContext dbContext)
+        public static string CatalogueFile(DiscoDataContext Database)
         {
-            return Path.Combine(dbContext.DiscoConfiguration.PluginPackagesLocation, "Catalogue.json");
+            return Path.Combine(Database.DiscoConfiguration.PluginPackagesLocation, "Catalogue.json");
         }
-        public static string CompatibilityFile(DiscoDataContext dbContext)
+        public static string CompatibilityFile(DiscoDataContext Database)
         {
-            return Path.Combine(dbContext.DiscoConfiguration.PluginPackagesLocation, "Compatibility.json");
+            return Path.Combine(Database.DiscoConfiguration.PluginPackagesLocation, "Compatibility.json");
         }
 
-        public static PluginLibraryUpdateResponse LoadCatalogue(DiscoDataContext dbContext)
+        public static PluginLibraryUpdateResponse LoadCatalogue(DiscoDataContext Database)
         {
-            var catalogueFile = CatalogueFile(dbContext);
+            var catalogueFile = CatalogueFile(Database);
 
             if (!File.Exists(catalogueFile))
                 return null;
@@ -269,13 +269,13 @@ namespace Disco.Services.Plugins
             return JsonConvert.DeserializeObject<PluginLibraryUpdateResponse>(File.ReadAllText(catalogueFile));
         }
 
-        public static PluginLibraryCompatibilityResponse LoadCompatibilityData(DiscoDataContext dbContext)
+        public static PluginLibraryCompatibilityResponse LoadCompatibilityData(DiscoDataContext Database)
         {
             var pluginAssembly = typeof(Plugins).Assembly;
             Version hostVersion = pluginAssembly.GetName().Version;
             PluginLibraryCompatibilityResponse Data = null;
             var localCompatFile = Path.Combine(Path.GetDirectoryName(pluginAssembly.Location), "ReleasePluginCompatibility.json");
-            var serverCompatFile = CompatibilityFile(dbContext);
+            var serverCompatFile = CompatibilityFile(Database);
 
             if (File.Exists(localCompatFile))
             {
@@ -325,7 +325,7 @@ namespace Disco.Services.Plugins
             return Data;
         }
 
-        public static void InitalizePlugins(DiscoDataContext dbContext)
+        public static void InitalizePlugins(DiscoDataContext Database)
         {
             if (_PluginManifests == null)
             {
@@ -334,10 +334,10 @@ namespace Disco.Services.Plugins
                     if (_PluginManifests == null)
                     {
                         Version hostVersion = typeof(Plugins).Assembly.GetName().Version;
-                        var compatibilityData = new Lazy<PluginLibraryCompatibilityResponse>(() => LoadCompatibilityData(dbContext));
+                        var compatibilityData = new Lazy<PluginLibraryCompatibilityResponse>(() => LoadCompatibilityData(Database));
                         Dictionary<string, PluginManifest> loadedPlugins = new Dictionary<string, PluginManifest>();
 
-                        PluginPath = dbContext.DiscoConfiguration.PluginsLocation;
+                        PluginPath = Database.DiscoConfiguration.PluginsLocation;
 
                         AppDomain appDomain = AppDomain.CurrentDomain;
 
@@ -367,7 +367,7 @@ namespace Disco.Services.Plugins
                                             if (File.Exists(updatePackagePath))
                                             {
                                                 // Update Plugin
-                                                pluginManifest = UpdatePlugin(dbContext, pluginManifest, updatePackagePath, compatibilityData.Value);
+                                                pluginManifest = UpdatePlugin(Database, pluginManifest, updatePackagePath, compatibilityData.Value);
                                             }
 
                                             if (pluginManifest != null)
@@ -382,7 +382,7 @@ namespace Disco.Services.Plugins
                                                 if (pluginManifest.HostVersionMax != null && pluginManifest.HostVersionMax < hostVersion)
                                                     throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] does not support this version of Disco (Support expired as of v{2})", pluginManifest.Id, pluginManifest.VersionFormatted, pluginManifest.HostVersionMax.ToString()));
 
-                                                pluginManifest.InitializePlugin(dbContext);
+                                                pluginManifest.InitializePlugin(Database);
                                                 loadedPlugins[pluginManifest.Id] = pluginManifest;
                                             }
                                         }
@@ -414,7 +414,7 @@ namespace Disco.Services.Plugins
 
                                         // Check for Data Removal
                                         bool DataUninstalled = false;
-                                        string pluginStorageLocation = Path.Combine(dbContext.DiscoConfiguration.PluginStorageLocation, uninstallManifest.Id);
+                                        string pluginStorageLocation = Path.Combine(Database.DiscoConfiguration.PluginStorageLocation, uninstallManifest.Id);
 
                                         string pluginManifestUninstallDataFilename = Path.Combine(pluginStorageLocation, "manifest.uninstall.json");
                                         if (File.Exists(pluginManifestUninstallDataFilename))
@@ -443,13 +443,13 @@ namespace Disco.Services.Plugins
             _PluginAssemblyManifests = _PluginManifests.Values.ToDictionary(p => p.PluginAssembly, p => p);
         }
 
-        public static PluginManifest UpdatePlugin(DiscoDataContext dbContext, PluginManifest ExistingManifest, String UpdatePluginPackageFilePath, PluginLibraryCompatibilityResponse CompatibilityData = null)
+        public static PluginManifest UpdatePlugin(DiscoDataContext Database, PluginManifest ExistingManifest, String UpdatePluginPackageFilePath, PluginLibraryCompatibilityResponse CompatibilityData = null)
         {
             PluginManifest updatedManifest;
 
             using (var packageStream = File.OpenRead(UpdatePluginPackageFilePath))
             {
-                updatedManifest = UpdatePlugin(dbContext, ExistingManifest, packageStream, CompatibilityData);
+                updatedManifest = UpdatePlugin(Database, ExistingManifest, packageStream, CompatibilityData);
             }
 
             // Remove Update after processing
@@ -458,7 +458,7 @@ namespace Disco.Services.Plugins
             return updatedManifest;
         }
 
-        public static PluginManifest UpdatePlugin(DiscoDataContext dbContext, PluginManifest ExistingManifest, Stream UpdatePluginPackage, PluginLibraryCompatibilityResponse CompatibilityData = null)
+        public static PluginManifest UpdatePlugin(DiscoDataContext Database, PluginManifest ExistingManifest, Stream UpdatePluginPackage, PluginLibraryCompatibilityResponse CompatibilityData = null)
         {
             using (MemoryStream packageStream = new MemoryStream())
             {
@@ -495,12 +495,12 @@ namespace Disco.Services.Plugins
 
                     // Check Compatibility
                     if (CompatibilityData == null)
-                        CompatibilityData = LoadCompatibilityData(dbContext);
+                        CompatibilityData = LoadCompatibilityData(Database);
                     var pluginCompatibility = CompatibilityData.Plugins.FirstOrDefault(i => i.Id.Equals(packageManifest.Id, StringComparison.InvariantCultureIgnoreCase) && packageManifest.Version == Version.Parse(i.Version));
                     if (pluginCompatibility != null && !pluginCompatibility.Compatible)
                         throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] is not compatible: {2}", packageManifest.Id, packageManifest.VersionFormatted, pluginCompatibility.Reason));
 
-                    string packagePath = Path.Combine(dbContext.DiscoConfiguration.PluginsLocation, packageManifest.Id);
+                    string packagePath = Path.Combine(Database.DiscoConfiguration.PluginsLocation, packageManifest.Id);
 
                     // Force Delete of Existing Folder
                     if (Directory.Exists(packagePath))
@@ -530,7 +530,7 @@ namespace Disco.Services.Plugins
                     packageManifest = PluginManifest.FromPluginManifestFile(Path.Combine(packagePath, "manifest.json"));
 
                     // Trigger AfterPluginUpdate
-                    packageManifest.AfterPluginUpdate(dbContext, ExistingManifest);
+                    packageManifest.AfterPluginUpdate(Database, ExistingManifest);
 
                     PluginsLog.LogAfterUpdate(ExistingManifest, packageManifest);
 
diff --git a/Disco.Services/Plugins/UninstallPluginTask.cs b/Disco.Services/Plugins/UninstallPluginTask.cs
index 3d4f8628..c3fd1e1c 100644
--- a/Disco.Services/Plugins/UninstallPluginTask.cs
+++ b/Disco.Services/Plugins/UninstallPluginTask.cs
@@ -29,9 +29,9 @@ namespace Disco.Services.Plugins
             if (!File.Exists(manifestFileLocation))
                 throw new FileNotFoundException("Plugin Manifest File Not Found", manifestFileLocation);
 
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                manifest.UninstallPlugin(dbContext, UninstallData, this.Status);
+                manifest.UninstallPlugin(database, UninstallData, this.Status);
             }
 
             string manifestUninstallFileLocation = Path.Combine(manifest.PluginLocation, "manifest.uninstall.json");
diff --git a/Disco.Services/Plugins/UpdatePluginTask.cs b/Disco.Services/Plugins/UpdatePluginTask.cs
index d64a3e4a..1b2320d8 100644
--- a/Disco.Services/Plugins/UpdatePluginTask.cs
+++ b/Disco.Services/Plugins/UpdatePluginTask.cs
@@ -32,10 +32,10 @@ namespace Disco.Services.Plugins
 
             List<Tuple<PluginManifest, string, PluginLibraryItem>> updatePlugins;
 
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                catalogue = Plugins.LoadCatalogue(dbContext);
-                pluginPackagesLocation = dbContext.DiscoConfiguration.PluginPackagesLocation;
+                catalogue = Plugins.LoadCatalogue(database);
+                pluginPackagesLocation = database.DiscoConfiguration.PluginPackagesLocation;
             }
 
             if (!string.IsNullOrEmpty(pluginId))
@@ -82,10 +82,10 @@ namespace Disco.Services.Plugins
             Plugins.RestartApp(1500);
         }
 
-        public static List<PluginManifest> OfflineInstalledPlugins(DiscoDataContext dbContext)
+        public static List<PluginManifest> OfflineInstalledPlugins(DiscoDataContext Database)
         {
-            string pluginsLocation = dbContext.DiscoConfiguration.PluginsLocation;
-            string pluginsStorageLocation = dbContext.DiscoConfiguration.PluginStorageLocation;
+            string pluginsLocation = Database.DiscoConfiguration.PluginsLocation;
+            string pluginsStorageLocation = Database.DiscoConfiguration.PluginStorageLocation;
 
             List<PluginManifest> installedPluginManifests = new List<PluginManifest>();
 
@@ -121,13 +121,13 @@ namespace Disco.Services.Plugins
             List<Tuple<PluginManifest, string, PluginLibraryItem>> updatePlugins = new List<Tuple<PluginManifest, string, PluginLibraryItem>>();
 
             
-            using (DiscoDataContext dbContext = new DiscoDataContext())
+            using (DiscoDataContext database = new DiscoDataContext())
             {
-                pluginPackagesLocation = dbContext.DiscoConfiguration.PluginPackagesLocation;
-                installedPluginManifests = OfflineInstalledPlugins(dbContext);
+                pluginPackagesLocation = database.DiscoConfiguration.PluginPackagesLocation;
+                installedPluginManifests = OfflineInstalledPlugins(database);
 
                 if (installedPluginManifests.Count > 0)
-                    pluginCatalogue = Plugins.LoadCatalogue(dbContext);
+                    pluginCatalogue = Plugins.LoadCatalogue(database);
             }
 
             if (pluginCatalogue != null && installedPluginManifests.Count > 0)
@@ -231,15 +231,15 @@ namespace Disco.Services.Plugins
 
                 Status.UpdateStatus(20, string.Format("{0} [{1} v{2}] by {3}", updateManifest.Name, updateManifest.Id, updateManifest.Version.ToString(4), updateManifest.Author), "Initializing Update Environment");
 
-                using (DiscoDataContext dbContext = new DiscoDataContext())
+                using (DiscoDataContext database = new DiscoDataContext())
                 {
                     // Check for Compatibility
-                    var compatibilityData = Plugins.LoadCompatibilityData(dbContext);
+                    var compatibilityData = Plugins.LoadCompatibilityData(database);
                     var pluginCompatibility = compatibilityData.Plugins.FirstOrDefault(i => i.Id.Equals(updateManifest.Id, StringComparison.InvariantCultureIgnoreCase) && updateManifest.Version == Version.Parse(i.Version));
                     if (pluginCompatibility != null && !pluginCompatibility.Compatible)
                         throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] is not compatible: {2}", updateManifest.Id, updateManifest.VersionFormatted, pluginCompatibility.Reason));
 
-                    var updatePluginPath = Path.Combine(dbContext.DiscoConfiguration.PluginsLocation, string.Format("{0}.discoPlugin", updateManifest.Id));
+                    var updatePluginPath = Path.Combine(database.DiscoConfiguration.PluginsLocation, string.Format("{0}.discoPlugin", updateManifest.Id));
                     File.Move(packageTempFilePath, updatePluginPath);
 
                     if (existingManifest != null)
diff --git a/Disco.Services/Properties/AssemblyInfo.cs b/Disco.Services/Properties/AssemblyInfo.cs
index 55da51f6..640e3cfa 100644
--- a/Disco.Services/Properties/AssemblyInfo.cs
+++ b/Disco.Services/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.2249")]
-[assembly: AssemblyFileVersion("1.2.0725.2249")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.1001.1541")]
+[assembly: AssemblyFileVersion("1.2.1001.1541")]
\ No newline at end of file
diff --git a/Disco.Services/Tasks/ScheduledTask.cs b/Disco.Services/Tasks/ScheduledTask.cs
index dc4dc4e4..f5856a09 100644
--- a/Disco.Services/Tasks/ScheduledTask.cs
+++ b/Disco.Services/Tasks/ScheduledTask.cs
@@ -9,7 +9,7 @@ namespace Disco.Services.Tasks
 {
     public abstract class ScheduledTask : IJob
     {
-        public virtual void InitalizeScheduledTask(DiscoDataContext dbContext) { return; }
+        public virtual void InitalizeScheduledTask(DiscoDataContext Database) { return; }
 
         internal protected ScheduledTaskStatus Status { get; private set; }
         internal protected IJobExecutionContext ExecutionContext { get; private set; }
diff --git a/Disco.Services/Tasks/ScheduledTasks.cs b/Disco.Services/Tasks/ScheduledTasks.cs
index c654d4dd..293b2211 100644
--- a/Disco.Services/Tasks/ScheduledTasks.cs
+++ b/Disco.Services/Tasks/ScheduledTasks.cs
@@ -16,7 +16,7 @@ namespace Disco.Services.Tasks
         private static object _RunningTasksLock = new object();
         private static List<ScheduledTaskStatus> _RunningTasks = new List<ScheduledTaskStatus>();
 
-        public static void InitalizeScheduledTasks(DiscoDataContext dbContext, ISchedulerFactory SchedulerFactory, bool InitiallySchedule)
+        public static void InitalizeScheduledTasks(DiscoDataContext database, ISchedulerFactory SchedulerFactory, bool InitiallySchedule)
         {
             ScheduledTasksLog.LogInitializingScheduledTasks();
 
@@ -43,7 +43,7 @@ namespace Disco.Services.Tasks
                         ScheduledTask instance = (ScheduledTask)Activator.CreateInstance(scheduledTaskType);
                         try
                         {
-                            instance.InitalizeScheduledTask(dbContext);
+                            instance.InitalizeScheduledTask(database);
                         }
                         catch (Exception ex)
                         {
diff --git a/Disco.Services/Users/Cache.cs b/Disco.Services/Users/Cache.cs
new file mode 100644
index 00000000..7523b23f
--- /dev/null
+++ b/Disco.Services/Users/Cache.cs
@@ -0,0 +1,176 @@
+using Disco.Data.Repository;
+using Disco.Models.Repository;
+using Disco.Services.Authorization;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Users
+{
+    internal static class Cache
+    {
+        private static ConcurrentDictionary<string, Tuple<User, AuthorizationToken, DateTime>> _Cache = new ConcurrentDictionary<string, Tuple<User, AuthorizationToken, DateTime>>();
+        private const long CacheTimeoutTicks = 6000000000; // 10 Minutes
+
+        internal static AuthorizationToken GetAuthorization(string UserId, DiscoDataContext Database, bool ForceRefresh)
+        {
+            Tuple<User, AuthorizationToken, DateTime> record = Get(UserId, Database, ForceRefresh);
+
+            if (record == null)
+                return null;
+            else
+                return record.Item2;
+        }
+        internal static AuthorizationToken GetAuthorization(string UserId, bool ForceRefresh)
+        {
+            Tuple<User, AuthorizationToken, DateTime> record = Get(UserId, ForceRefresh);
+
+            if (record == null)
+                return null;
+            else
+                return record.Item2;
+        }
+        internal static AuthorizationToken GetAuthorization(string UserId, DiscoDataContext Database)
+        {
+            return GetAuthorization(UserId, Database, false);
+        }
+        internal static AuthorizationToken GetAuthorization(string UserId)
+        {
+            return GetAuthorization(UserId, false);
+        }
+
+        internal static User GetUser(string UserId, DiscoDataContext Database, bool ForceRefresh)
+        {
+            Tuple<User, AuthorizationToken, DateTime> record = Get(UserId, Database, ForceRefresh);
+
+            if (record == null)
+                return null;
+            else
+                return record.Item1;
+        }
+        internal static User GetUser(string UserId, bool ForceRefresh)
+        {
+            Tuple<User, AuthorizationToken, DateTime> record = Get(UserId, ForceRefresh);
+
+            if (record == null)
+                return null;
+            else
+                return record.Item1;
+        }
+        internal static User GetUser(string UserId, DiscoDataContext Database)
+        {
+            return GetUser(UserId, Database, false);
+        }
+        internal static User GetUser(string UserId)
+        {
+            return GetUser(UserId, false);
+        }
+
+        internal static Tuple<User, AuthorizationToken, DateTime> Get(string UserId, DiscoDataContext Database, bool ForceRefresh)
+        {
+            Tuple<User, AuthorizationToken, DateTime> record = null;
+
+            // Check Cache
+            if (!ForceRefresh)
+                record = TryUserCache(UserId);
+
+            if (record == null)
+            {
+                var importedUser = UserService.ImportUser(Database, UserId);
+                record = SetValue(UserId, importedUser);
+            }
+
+            return record;
+        }
+        internal static Tuple<User, AuthorizationToken, DateTime> Get(string UserId, DiscoDataContext Database)
+        {
+            return Get(UserId, Database, false);
+        }
+        internal static Tuple<User, AuthorizationToken, DateTime> Get(string UserId, bool ForceRefresh)
+        {
+            // Check Cache
+            Tuple<User, AuthorizationToken, DateTime> record = null;
+
+            if (!ForceRefresh)
+                record = TryUserCache(UserId);
+
+            if (record == null)
+            {
+                // Load from Repository
+                using (DiscoDataContext database = new DiscoDataContext())
+                {
+                    record = Get(UserId, database, true);
+                }
+            }
+            return record;
+        }
+        internal static Tuple<User, AuthorizationToken, DateTime> Get(string UserId)
+        {
+            return Get(UserId, false);
+        }
+
+        internal static Tuple<User, AuthorizationToken, DateTime> TryUserCache(string UserId)
+        {
+            var cache = _Cache;
+
+            string userId = UserId.ToLower();
+            Tuple<User, AuthorizationToken, DateTime> record;
+            if (cache.TryGetValue(userId, out record))
+            {
+                if (record.Item3 > DateTime.Now)
+                    return record;
+                else
+                    cache.TryRemove(userId, out record);
+            }
+            return null;
+        }
+
+        internal static Tuple<User, AuthorizationToken, DateTime> SetValue(string UserId, Tuple<User, AuthorizationToken> Record)
+        {
+            var cache = _Cache;
+
+            string userId = UserId.ToLower();
+            Tuple<User, AuthorizationToken, DateTime> record = new Tuple<User, AuthorizationToken, DateTime>(Record.Item1, Record.Item2, DateTime.Now.AddTicks(CacheTimeoutTicks));
+            if (cache.ContainsKey(userId))
+            {
+                Tuple<User, AuthorizationToken, DateTime> oldRecord;
+                if (cache.TryGetValue(userId, out oldRecord))
+                {
+                    cache.TryUpdate(userId, record, oldRecord);
+                    return record;
+                }
+            }
+            cache.TryAdd(userId, record);
+            return record;
+        }
+
+        internal static bool InvalidateRecord(string UserId)
+        {
+            Tuple<User, AuthorizationToken, DateTime> userRecord;
+            return _Cache.TryRemove(UserId, out userRecord);
+        }
+
+        internal static void CleanStaleCache()
+        {
+            var cache = _Cache;
+
+            var userIds = cache.Keys.ToArray();
+            foreach (string userId in userIds)
+            {
+                Tuple<User, AuthorizationToken, DateTime> record;
+                if (cache.TryGetValue(userId, out record))
+                {
+                    if (record.Item3 <= DateTime.Now)
+                        cache.TryRemove(userId, out record);
+                }
+            }
+        }
+        internal static void FlushCache()
+        {
+            _Cache = new ConcurrentDictionary<string, Tuple<User, AuthorizationToken, DateTime>>();
+        }
+    }
+}
diff --git a/Disco.BI/BI/UserBI/UserCachePruneTask.cs b/Disco.Services/Users/CacheCleanTask.cs
similarity index 90%
rename from Disco.BI/BI/UserBI/UserCachePruneTask.cs
rename to Disco.Services/Users/CacheCleanTask.cs
index a758d26a..6c7bfd08 100644
--- a/Disco.BI/BI/UserBI/UserCachePruneTask.cs
+++ b/Disco.Services/Users/CacheCleanTask.cs
@@ -7,9 +7,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Disco.BI.UserBI
+namespace Disco.Services.Users
 {
-    public class UserCachePruneTask : ScheduledTask
+    public class CacheCleanTask : ScheduledTask
     {
         public override string TaskName { get { return "User Cache - Clean Stale Cache"; } }
 
@@ -17,7 +17,7 @@ namespace Disco.BI.UserBI
         public override bool CancelInitiallySupported { get { return false; } }
         public override bool LogExceptionsOnly { get { return true; } }
 
-        public override void InitalizeScheduledTask(DiscoDataContext dbContext)
+        public override void InitalizeScheduledTask(DiscoDataContext Database)
         {
             // Run @ every 15mins
 
@@ -36,7 +36,7 @@ namespace Disco.BI.UserBI
 
         protected override void ExecuteTask()
         {
-            UserCache.CleanStaleCache();
+            Cache.CleanStaleCache();
         }
     }
 }
diff --git a/Disco.Services/Users/Searching.cs b/Disco.Services/Users/Searching.cs
new file mode 100644
index 00000000..bef5adbd
--- /dev/null
+++ b/Disco.Services/Users/Searching.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Users
+{
+    public static class Searching
+    {
+
+    }
+}
diff --git a/Disco.Services/Users/UserService.cs b/Disco.Services/Users/UserService.cs
new file mode 100644
index 00000000..ae69628e
--- /dev/null
+++ b/Disco.Services/Users/UserService.cs
@@ -0,0 +1,257 @@
+using Disco.Data.Repository;
+using Disco.Models.Interop.ActiveDirectory;
+using Disco.Models.Repository;
+using Disco.Services.Authorization;
+using Disco.Services.Authorization.Roles;
+using Disco.Services.Logging;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data.Entity.Infrastructure;
+using System.DirectoryServices.ActiveDirectory;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+
+namespace Disco.Services.Users
+{
+    public static class UserService
+    {
+        private const string _cacheHttpRequestKey = "Disco_CurrentUserToken";
+        private static Func<string, string[], ActiveDirectoryUserAccount> _GetActiveDirectoryUserAccount;
+        private static Func<string, string[], ActiveDirectoryMachineAccount> _GetActiveDirectoryMachineAccount;
+
+        public static void Initialize(DiscoDataContext Database,
+            Func<string, string[], ActiveDirectoryUserAccount> GetActiveDirectoryUserAccount,
+            Func<string, string[], ActiveDirectoryMachineAccount> GetActiveDirectoryMachineAccount)
+        {
+            _GetActiveDirectoryUserAccount = GetActiveDirectoryUserAccount;
+            _GetActiveDirectoryMachineAccount = GetActiveDirectoryMachineAccount;
+
+            Authorization.Roles.RoleCache.Initialize(Database);
+        }
+
+        public static string CurrentUserId
+        {
+            get
+            {
+                // Check for ASP.NET
+                if (HttpContext.Current != null)
+                {
+                    if (HttpContext.Current.Request.IsAuthenticated)
+                        return HttpContext.Current.User.Identity.Name;
+                    else
+                        return null;
+                }
+
+                // User default User
+                return System.Security.Principal.WindowsIdentity.GetCurrent().Name;
+            }
+        }
+
+        private static Tuple<User, AuthorizationToken, DateTime> CurrentUserToken
+        {
+            get
+            {
+                Tuple<User, AuthorizationToken, DateTime> token = null;
+
+                if (HttpContext.Current != null)
+                {
+                    if (HttpContext.Current.Request.IsAuthenticated)
+                        token = (Tuple<User, AuthorizationToken, DateTime>)HttpContext.Current.Items[_cacheHttpRequestKey];
+                    else
+                        return null; // Not Authenticated
+                }
+
+                if (token == null)
+                {
+                    var userId = CurrentUserId;
+
+                    if (userId != null)
+                    {
+                        token = Cache.Get(userId);
+
+                        if (HttpContext.Current != null && HttpContext.Current.Request.IsAuthenticated)
+                            HttpContext.Current.Items[_cacheHttpRequestKey] = token;
+                    }
+                }
+
+                return token;
+            }
+        }
+        public static User CurrentUser
+        {
+            get
+            {
+                var token = CurrentUserToken;
+
+                if (token == null)
+                    return null;
+                else
+                    return token.Item1;
+            }
+        }
+        public static AuthorizationToken CurrentAuthorization
+        {
+            get
+            {
+                var token = CurrentUserToken;
+
+                if (token == null)
+                    return null;
+                else
+                    return token.Item2;
+            }
+        }
+
+        public static User GetUser(string UserId)
+        {
+            return Cache.GetUser(UserId);
+        }
+        public static User GetUser(string UserId, DiscoDataContext Database)
+        {
+            return Cache.GetUser(UserId, Database);
+        }
+        public static User GetUser(string UserId, DiscoDataContext Database, bool ForceRefresh)
+        {
+            return Cache.GetUser(UserId, Database, ForceRefresh);
+        }
+
+        public static AuthorizationToken GetAuthorization(string UserId)
+        {
+            return Cache.GetAuthorization(UserId);
+        }
+        public static AuthorizationToken GetAuthorization(string UserId, DiscoDataContext Database)
+        {
+            return Cache.GetAuthorization(UserId, Database);
+        }
+        public static AuthorizationToken GetAuthorization(string UserId, DiscoDataContext Database, bool ForceRefresh)
+        {
+            return Cache.GetAuthorization(UserId, Database, ForceRefresh);
+        }
+
+        public static bool InvalidateCachedUser(string UserId)
+        {
+            return Cache.InvalidateRecord(UserId);
+        }
+
+
+
+        public static int CreateAuthorizationRole(DiscoDataContext Database, AuthorizationRole Role)
+        {
+            if (Role == null)
+                throw new ArgumentNullException("Role");
+
+            if (string.IsNullOrWhiteSpace(Role.ClaimsJson))
+                Role.ClaimsJson = JsonConvert.SerializeObject(new RoleClaims());
+
+            Database.AuthorizationRoles.Add(Role);
+            Database.SaveChanges();
+
+            // Add to Cache
+            RoleCache.AddRole(Role);
+
+            // Flush User Cache
+            Cache.FlushCache();
+
+            return Role.Id;
+        }
+        public static void DeleteAuthorizationRole(DiscoDataContext Database, AuthorizationRole Role)
+        {
+            if (Role == null)
+                throw new ArgumentNullException("Role");
+
+            Database.AuthorizationRoles.Remove(Role);
+            Database.SaveChanges();
+
+            // Remove from Role Cache
+            RoleCache.RemoveRole(Role);
+
+            // Flush User Cache
+            Cache.FlushCache();
+        }
+        public static void UpdateAuthorizationRole(DiscoDataContext Database, AuthorizationRole Role)
+        {
+            if (Role == null)
+                throw new ArgumentNullException("Role");
+            if (Database == null)
+                throw new ArgumentNullException("Database");
+
+            Database.SaveChanges();
+
+            // Update Role Cache
+            RoleCache.UpdateRole(Role);
+
+            // Flush User Cache
+            Cache.FlushCache();
+        }
+
+        internal static Tuple<User, AuthorizationToken> ImportUser(DiscoDataContext Database, string UserId)
+        {
+            if (_GetActiveDirectoryUserAccount == null)
+                throw new InvalidOperationException("UserServer has not been Initialized");
+            if (string.IsNullOrEmpty(UserId))
+                throw new ArgumentNullException("UserId is required", "UserId");
+
+            if (UserId.EndsWith("$"))
+            {
+                // Machine Account
+                var adAccount = _GetActiveDirectoryMachineAccount(UserId, null);
+
+                if (adAccount == null)
+                    return null;
+
+                var user = adAccount.ToRepositoryUser();
+                var token = AuthorizationToken.BuildComputerAccountToken(user);
+
+                return new Tuple<User, AuthorizationToken>(user, token);
+            }
+            else
+            {
+                // User Account
+
+                ActiveDirectoryUserAccount adAccount;
+                try
+                {
+                    adAccount = _GetActiveDirectoryUserAccount(UserId, null);
+
+                    if (adAccount == null)
+                        throw new ArgumentException(string.Format("Invalid Username: '{0}'; User doesn't in AD", UserId), "Username");
+                }
+                catch (COMException ex)
+                {
+                    // If "Server is not operational" then Try Cache
+                    if (ex.ErrorCode == -2147016646)
+                        SystemLog.LogException("Server is not operational; Primary Domain Controller Down?", ex);
+
+                    throw ex;
+                }
+                catch (ActiveDirectoryOperationException ex)
+                {
+                    // Try From Cache...
+                    SystemLog.LogException("Primary Domain Controller Down?", ex);
+                    throw ex;
+                }
+
+                var user = adAccount.ToRepositoryUser();
+
+                // Update Repository
+                User existingUser = Database.Users.Find(user.Id);
+                if (existingUser == null)
+                    Database.Users.Add(user);
+                else
+                {
+                    existingUser.UpdateSelf(user);
+                    user = existingUser;
+                }
+                Database.SaveChanges();
+
+                var token = AuthorizationToken.BuildToken(user, adAccount.Groups);
+
+                return new Tuple<User, AuthorizationToken>(user, token);
+            }
+        }
+    }
+}
diff --git a/Disco.Services/Web/AuthorizedController.cs b/Disco.Services/Web/AuthorizedController.cs
new file mode 100644
index 00000000..a04b83f2
--- /dev/null
+++ b/Disco.Services/Web/AuthorizedController.cs
@@ -0,0 +1,32 @@
+using Disco.Models.Repository;
+using Disco.Services.Authorization;
+using Disco.Services.Users;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Mvc;
+
+namespace Disco.Services.Web
+{
+    [DiscoAuthorize]
+    public abstract class AuthorizedController : Controller
+    {
+        public AuthorizationToken Authorization
+        {
+            get
+            {
+                return UserService.CurrentAuthorization;
+            }
+        }
+
+        public User CurrentUser
+        {
+            get
+            {
+                return UserService.CurrentUser;
+            }
+        }
+    }
+}
diff --git a/Disco.Services/Web/AuthorizedDatabaseController.cs b/Disco.Services/Web/AuthorizedDatabaseController.cs
new file mode 100644
index 00000000..3133912c
--- /dev/null
+++ b/Disco.Services/Web/AuthorizedDatabaseController.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Disco.Services.Authorization;
+using Disco.Models.Repository;
+using Disco.Services.Users;
+
+namespace Disco.Services.Web
+{
+    [DiscoAuthorize]
+    public abstract class AuthorizedDatabaseController : DatabaseController
+    {
+        public AuthorizationToken Authorization
+        {
+            get
+            {
+                return UserService.CurrentAuthorization;
+            }
+        }
+
+        public User CurrentUser
+        {
+            get
+            {
+                return UserService.CurrentUser;
+            }
+        }
+    }
+}
diff --git a/Disco.Web.Extensions/MvcExtensions/Bundles/Bundle.cs b/Disco.Services/Web/Bundles/Bundle.cs
similarity index 98%
rename from Disco.Web.Extensions/MvcExtensions/Bundles/Bundle.cs
rename to Disco.Services/Web/Bundles/Bundle.cs
index 2f206b55..f9f1738a 100644
--- a/Disco.Web.Extensions/MvcExtensions/Bundles/Bundle.cs
+++ b/Disco.Services/Web/Bundles/Bundle.cs
@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 
-namespace Disco.Web.Extensions.MvcExtensions.Bundles
+namespace Disco.Services.Web.Bundles
 {
     public class Bundle
     {
diff --git a/Disco.Web.Extensions/MvcExtensions/Bundles/BundleExtensions.cs b/Disco.Services/Web/Bundles/BundleExtensions.cs
similarity index 96%
rename from Disco.Web.Extensions/MvcExtensions/Bundles/BundleExtensions.cs
rename to Disco.Services/Web/Bundles/BundleExtensions.cs
index 14a1aa61..8f16d940 100644
--- a/Disco.Web.Extensions/MvcExtensions/Bundles/BundleExtensions.cs
+++ b/Disco.Services/Web/Bundles/BundleExtensions.cs
@@ -1,12 +1,13 @@
-using System;
+using Disco.Services.Web.Bundles;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
-using Disco.Web.Extensions.MvcExtensions.Bundles;
 
-namespace Disco.Web.Extensions
+namespace Disco.Services.Web
 {
     public static class BundleExtensions
     {
diff --git a/Disco.Web.Extensions/MvcExtensions/Bundles/BundleHandler.cs b/Disco.Services/Web/Bundles/BundleHandler.cs
similarity index 95%
rename from Disco.Web.Extensions/MvcExtensions/Bundles/BundleHandler.cs
rename to Disco.Services/Web/Bundles/BundleHandler.cs
index 7b30da64..f4b6af82 100644
--- a/Disco.Web.Extensions/MvcExtensions/Bundles/BundleHandler.cs
+++ b/Disco.Services/Web/Bundles/BundleHandler.cs
@@ -5,13 +5,13 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 
-namespace Disco.Web.Extensions.MvcExtensions.Bundles
+namespace Disco.Services.Web.Bundles
 {
     internal sealed class BundleHandler : IHttpHandler
     {
         public Bundle RequestBundle { get; private set; }
         public string BundleVirtualPath { get; private set; }
-        
+
         public BundleHandler(Bundle requestBundle, string bundleVirtualPath)
         {
             this.RequestBundle = requestBundle;
diff --git a/Disco.Web.Extensions/MvcExtensions/Bundles/BundleModule.cs b/Disco.Services/Web/Bundles/BundleModule.cs
similarity index 81%
rename from Disco.Web.Extensions/MvcExtensions/Bundles/BundleModule.cs
rename to Disco.Services/Web/Bundles/BundleModule.cs
index 5707c09d..0bfcf4be 100644
--- a/Disco.Web.Extensions/MvcExtensions/Bundles/BundleModule.cs
+++ b/Disco.Services/Web/Bundles/BundleModule.cs
@@ -1,16 +1,16 @@
-using System;
+using Microsoft.Web.Infrastructure.DynamicModuleHelper;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Web;
-using Microsoft.Web.Infrastructure.DynamicModuleHelper;
 
-[assembly: WebActivatorEx.PreApplicationStartMethod(typeof(Disco.Web.Extensions.MvcExtensions.Bundles.BundleModule), "PreApplicationStart")]
+[assembly: WebActivatorEx.PreApplicationStartMethod(typeof(Disco.Services.Web.Bundles.BundleModule), "PreApplicationStart")]
 
-namespace Disco.Web.Extensions.MvcExtensions.Bundles
+namespace Disco.Services.Web.Bundles
 {
-    public class BundleModule :IHttpModule
+    public class BundleModule : IHttpModule
     {
         public void Init(HttpApplication context)
         {
diff --git a/Disco.Web.Extensions/MvcExtensions/Bundles/BundleTable.cs b/Disco.Services/Web/Bundles/BundleTable.cs
similarity index 96%
rename from Disco.Web.Extensions/MvcExtensions/Bundles/BundleTable.cs
rename to Disco.Services/Web/Bundles/BundleTable.cs
index b6cc9e58..bee13e15 100644
--- a/Disco.Web.Extensions/MvcExtensions/Bundles/BundleTable.cs
+++ b/Disco.Services/Web/Bundles/BundleTable.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 
-namespace Disco.Web.Extensions.MvcExtensions.Bundles
+namespace Disco.Services.Web.Bundles
 {
     public static class BundleTable
     {
@@ -41,7 +41,7 @@ namespace Disco.Web.Extensions.MvcExtensions.Bundles
         public static string ResolveBundleUrl(string BundleUrl)
         {
             var bundle = GetBundleFor(BundleUrl);
-            
+
             if (bundle == null)
                 throw new ArgumentException(string.Format("Unknown Bundle Url: {0}", BundleUrl), "BundleUrl");
 
diff --git a/Disco.Web.Extensions/MvcExtensions/dbController.cs b/Disco.Services/Web/DatabaseController.cs
similarity index 50%
rename from Disco.Web.Extensions/MvcExtensions/dbController.cs
rename to Disco.Services/Web/DatabaseController.cs
index 33481613..9380034d 100644
--- a/Disco.Web.Extensions/MvcExtensions/dbController.cs
+++ b/Disco.Services/Web/DatabaseController.cs
@@ -1,34 +1,35 @@
-using System;
+using Disco.Data.Repository;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
+using System.Text;
+using System.Threading.Tasks;
 using System.Web.Mvc;
-using Disco.Data.Repository;
 
-namespace Disco.Web
+namespace Disco.Services.Web
 {
     [OutputCache(Duration = 0, Location = System.Web.UI.OutputCacheLocation.None)]
-    public class dbController : Controller
+    public abstract class DatabaseController : Controller
     {
-        protected DiscoDataContext dbContext;
+        protected DiscoDataContext Database;
 
         protected override void OnActionExecuting(ActionExecutingContext filterContext)
         {
-            this.dbContext = new DiscoDataContext();
-            this.dbContext.Configuration.LazyLoadingEnabled = false;
+            this.Database = new DiscoDataContext();
+            this.Database.Configuration.LazyLoadingEnabled = false;
 
             base.OnActionExecuting(filterContext);
         }
 
         protected override void Dispose(bool disposing)
         {
-            if (this.dbContext != null)
+            if (this.Database != null)
             {
-                this.dbContext.Dispose();
-                this.dbContext = null;
+                this.Database.Dispose();
+                this.Database = null;
             }
 
             base.Dispose(disposing);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Disco.Services/Web/WebViewPage.cs b/Disco.Services/Web/WebViewPage.cs
new file mode 100644
index 00000000..2fbada25
--- /dev/null
+++ b/Disco.Services/Web/WebViewPage.cs
@@ -0,0 +1,32 @@
+using Disco.Models.Repository;
+using Disco.Services.Authorization;
+using Disco.Services.Users;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Services.Web
+{
+    public abstract class WebViewPage<T> : System.Web.Mvc.WebViewPage<T>
+    {
+
+        public AuthorizationToken Authorization
+        {
+            get
+            {
+                return UserService.CurrentAuthorization;
+            }
+        }
+
+        public User CurrentUser
+        {
+            get
+            {
+                return UserService.CurrentUser;
+            }
+        }
+
+    }
+}
diff --git a/Disco.Web.Extensions/DataModelExtension/DeviceModelExtensions.cs b/Disco.Web.Extensions/DataModelExtension/DeviceModelExtensions.cs
index ff4c1259..ea38546c 100644
--- a/Disco.Web.Extensions/DataModelExtension/DeviceModelExtensions.cs
+++ b/Disco.Web.Extensions/DataModelExtension/DeviceModelExtensions.cs
@@ -23,7 +23,7 @@ namespace Disco.Web.Extensions
             }
 
             if (IncludeNoModelItem)
-                items.Insert(0, new SelectListItem() { Value = string.Empty, Text = "Unknown", Selected = !SelectedId.HasValue });
+                items.Insert(0, new SelectListItem() { Value = string.Empty, Text = "<None Selected>", Selected = !SelectedId.HasValue });
 
             return items;
         }
diff --git a/Disco.Web.Extensions/Disco.Web.Extensions.csproj b/Disco.Web.Extensions/Disco.Web.Extensions.csproj
index 98714a3c..df36a390 100644
--- a/Disco.Web.Extensions/Disco.Web.Extensions.csproj
+++ b/Disco.Web.Extensions/Disco.Web.Extensions.csproj
@@ -95,14 +95,6 @@
     <Compile Include="DataModelExtension\DocumentTemplateExtensions.cs" />
     <Compile Include="DataModelExtension\JobSubTypeExtensions.cs" />
     <Compile Include="DataModelExtension\JobTypeExtensions.cs" />
-    <Compile Include="MvcExtensions\AuthorizeDiscoUsersAttribute.cs" />
-    <Compile Include="MvcExtensions\Bundles\Bundle.cs" />
-    <Compile Include="MvcExtensions\Bundles\BundleExtensions.cs" />
-    <Compile Include="MvcExtensions\Bundles\BundleHandler.cs" />
-    <Compile Include="MvcExtensions\Bundles\BundleModule.cs" />
-    <Compile Include="MvcExtensions\Bundles\BundleTable.cs" />
-    <Compile Include="MvcExtensions\dbAdminController.cs" />
-    <Compile Include="MvcExtensions\dbController.cs" />
     <Compile Include="MvcExtensions\JsonNet\JsonNetResult.cs" />
     <Compile Include="MvcExtensions\PartialCompiled\PartialCompiledHtmlExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -134,7 +126,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_BuildAction="Both" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2011/7/1" />
+      <UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
diff --git a/Disco.Web.Extensions/MvcExtensions/AuthorizeDiscoUsersAttribute.cs b/Disco.Web.Extensions/MvcExtensions/AuthorizeDiscoUsersAttribute.cs
deleted file mode 100644
index eab47f3b..00000000
--- a/Disco.Web.Extensions/MvcExtensions/AuthorizeDiscoUsersAttribute.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Disco.BI.UserBI;
-using Disco.Models.Repository;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-
-namespace Disco.Web
-{
-    public class AuthorizeDiscoUsersAttribute : AuthorizeAttribute
-    {
-        string[] authorizedTypes;
-
-        public AuthorizeDiscoUsersAttribute(params string[] AuthorizedUserTypes)
-        {
-            if (AuthorizedUserTypes == null)
-                throw new ArgumentNullException("AuthorizedUserTypes");
-            if (AuthorizedUserTypes.Length == 0)
-                throw new ArgumentOutOfRangeException("AuthorizedUserTypes", "At least one Authorized User Type must be specified");
-            
-            authorizedTypes = AuthorizedUserTypes;
-        }
-
-        protected override bool AuthorizeCore(System.Web.HttpContextBase httpContext)
-        {
-            if (httpContext == null)
-            {
-                throw new ArgumentNullException("httpContext");
-            }
-
-            var DiscoUser = UserCache.CurrentUser;
-
-            if (DiscoUser != null && authorizedTypes.Contains(DiscoUser.Type))
-                return true;
-
-            return false;
-        }
-    }
-}
diff --git a/Disco.Web.Extensions/MvcExtensions/Bundles/BundleUnordered.cs b/Disco.Web.Extensions/MvcExtensions/Bundles/BundleUnordered.cs
deleted file mode 100644
index ddd34314..00000000
--- a/Disco.Web.Extensions/MvcExtensions/Bundles/BundleUnordered.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web.Optimization;
-
-namespace Disco.Web.Extensions.MvcExtensions.Bundles
-{
-    public class BundleUnordered : IBundleOrderer
-    {
-        public IEnumerable<System.IO.FileInfo> OrderFiles(BundleContext context, IEnumerable<System.IO.FileInfo> files)
-        {
-            return files;
-        }
-    }
-}
diff --git a/Disco.Web.Extensions/MvcExtensions/Bundles/JsJoin.cs b/Disco.Web.Extensions/MvcExtensions/Bundles/JsJoin.cs
deleted file mode 100644
index 1676752f..00000000
--- a/Disco.Web.Extensions/MvcExtensions/Bundles/JsJoin.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Web.Optimization;
-using System.IO;
-
-namespace Disco.Web.Extensions.MvcExtensions.Bundles
-{
-    public class JsJoin : IBundleTransform
-    {
-        internal static string JsContentType;
-        static JsJoin()
-        {
-            JsContentType = "text/javascript";
-        }
-
-        public void Process(BundleContext context, BundleResponse response)
-        {
-            if (context == null)
-                throw new ArgumentNullException("context");
-            if (response == null)
-                throw new ArgumentNullException("response");
-
-            // Not Needed - the new Transforms pipeline has already loaded the content
-            //if (!context.EnableInstrumentation && string.IsNullOrEmpty(response.Content))
-            //{
-            //    try
-            //    {
-            //        StringBuilder bundleContent = new StringBuilder();
-            //        foreach (FileInfo file in response.Files)
-            //        {
-            //            string fileContent = File.ReadAllText(file.FullName);
-
-            //            bundleContent.AppendLine(fileContent);
-            //        }
-
-            //        response.Content = bundleContent.ToString();
-            //    }
-            //    catch (Exception ex)
-            //    {
-            //        GenerateErrorResponse(response, new string[] { ex.GetType().Name, ex.Message, ex.StackTrace });
-            //    }
-            //}
-
-            response.ContentType = JsContentType;
-        }
-
-        internal static void GenerateErrorResponse(BundleResponse bundle, ICollection<string> errors)
-        {
-            StringBuilder builder = new StringBuilder();
-            builder.Append("/* ");
-            builder.Append("Bundle creation failed [JsJoin].").Append("\r\n");
-            foreach (string str in errors)
-            {
-                builder.Append(str).Append("\r\n");
-            }
-            builder.Append(" */\r\n");
-            bundle.Content = builder.ToString();
-        }
-
-    }
-}
diff --git a/Disco.Web.Extensions/MvcExtensions/Bundles/LessCompile.cs b/Disco.Web.Extensions/MvcExtensions/Bundles/LessCompile.cs
deleted file mode 100644
index 19c9778d..00000000
--- a/Disco.Web.Extensions/MvcExtensions/Bundles/LessCompile.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.IO;
-using System.Web;
-using dotless.Core;
-using dotless.Core.configuration;
-using System.Web.Optimization;
-
-namespace Disco.Web.Extensions.MvcExtensions.Bundles
-{
-    public class LessCompile : IBundleTransform
-    {
-        internal static string CssContentType;
-        internal static readonly ILessEngine Instance;
-
-        static LessCompile()
-        {
-            CssContentType = "text/css";
-            Instance = new EngineFactory(new DotlessConfiguration()
-            {
-                CacheEnabled = false,
-                MinifyOutput = true
-            }).GetEngine();
-        }
-
-        public void Process(BundleContext context, BundleResponse response)
-        {
-            if (context == null)
-                throw new ArgumentNullException("context");
-            if (response == null)
-                throw new ArgumentNullException("response");
-
-            if (!context.EnableInstrumentation)
-            {
-
-                try
-                {
-                    StringBuilder bundleContent = new StringBuilder();
-                    Uri appRootPath = new Uri(HttpContext.Current.Request.PhysicalApplicationPath);
-
-                    var restoreEnvironmentCurrentDirectory = Environment.CurrentDirectory;
-
-                    foreach (FileInfo file in response.Files)
-                    {
-                        string fileContent = File.ReadAllText(file.FullName);
-                        Uri fileRootPath = new Uri(file.DirectoryName + "/");
-
-                        // Less Compile
-
-                        Environment.CurrentDirectory = file.DirectoryName;
-                        fileContent = Instance.TransformToCss(fileContent, file.FullName);
-
-                        // Embed Images
-                        fileContent = EmbedCssImages(fileContent, fileRootPath, appRootPath);
-                        bundleContent.Append(fileContent);
-                    }
-
-                    if (!Environment.CurrentDirectory.Equals(restoreEnvironmentCurrentDirectory))
-                        Environment.CurrentDirectory = restoreEnvironmentCurrentDirectory;
-
-                    response.Content = bundleContent.ToString();
-                }
-                catch (Exception ex)
-                {
-                    GenerateErrorResponse(response, new string[] { ex.GetType().Name, ex.Message, ex.StackTrace });
-                }
-            }
-            response.ContentType = CssContentType;
-        }
-
-        private static string EmbedCssImages(string cssContent, Uri fileRootPath, Uri appRootPath)
-        {
-            return Regex.Replace(cssContent, "url\\((.*?)\\)", m =>
-            {
-                var cssFilename = m.Groups[1].Value.Trim(new char[] { '\'', '"' });
-                Uri fileUri;
-                if (cssFilename.StartsWith("/"))
-                    fileUri = new Uri(appRootPath, cssFilename);
-                else
-                    fileUri = new Uri(fileRootPath, cssFilename);
-                if (File.Exists(fileUri.LocalPath))
-                {
-                    var fileInfo = new FileInfo(fileUri.LocalPath);
-                    // Ensure File is < 250kb
-                    if (fileInfo.Length < 256000)
-                    {
-                        string contentType = null;
-                        switch (fileInfo.Extension)
-                        {
-                            case ".png":
-                                contentType = "image/png";
-                                break;
-                            case ".gif":
-                                contentType = "image/gif";
-                                break;
-                            case ".jpg":
-                            case ".jpeg":
-                                contentType = "image/jpeg";
-                                break;
-                            default:
-                                return m.Value;
-                        }
-                        StringBuilder sb = new StringBuilder();
-                        sb.Append("url(data:");
-                        sb.Append(contentType);
-                        sb.Append(";base64,");
-                        sb.Append(Convert.ToBase64String(File.ReadAllBytes(fileInfo.FullName)));
-                        sb.Append(")");
-                        return sb.ToString();
-                    }
-                    else
-                    {
-                        return string.Format("url(/{0})", appRootPath.MakeRelativeUri(fileUri).ToString());
-                    }
-                }
-                else
-                {
-                    throw new FileNotFoundException(string.Format("Unable to embed css image, file not found: '{0}' at '{1}'", cssFilename, fileUri.AbsolutePath), cssFilename);
-                }
-            });
-        }
-
-        internal static void GenerateErrorResponse(BundleResponse bundle, ICollection<string> errors)
-        {
-            StringBuilder builder = new StringBuilder();
-            builder.Append("/* ");
-            builder.Append("Bundle creation failed [LessCompile].").Append("\r\n");
-            foreach (string str in errors)
-            {
-                builder.Append(str).Append("\r\n");
-            }
-            builder.Append(" */\r\n");
-            bundle.Content = builder.ToString();
-        }
-
-    }
-}
diff --git a/Disco.Web.Extensions/MvcExtensions/dbAdminController.cs b/Disco.Web.Extensions/MvcExtensions/dbAdminController.cs
deleted file mode 100644
index 3cd49070..00000000
--- a/Disco.Web.Extensions/MvcExtensions/dbAdminController.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-
-namespace Disco.Web
-{
-    [AuthorizeDiscoUsersAttribute(Disco.Models.Repository.User.Types.Admin)]
-    public class dbAdminController : dbController
-    {
-    }
-}
\ No newline at end of file
diff --git a/Disco.Web.Extensions/Properties/AssemblyInfo.cs b/Disco.Web.Extensions/Properties/AssemblyInfo.cs
index 540c11f4..c4dc0895 100644
--- a/Disco.Web.Extensions/Properties/AssemblyInfo.cs
+++ b/Disco.Web.Extensions/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.2249")]
-[assembly: AssemblyFileVersion("1.2.0725.2249")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.1001.1541")]
+[assembly: AssemblyFileVersion("1.2.1001.1541")]
\ No newline at end of file
diff --git a/Disco.Web/App_Code/AjaxHelpers.cshtml b/Disco.Web/App_Code/AjaxHelpers.cshtml
index d14f1fc1..2f49ec43 100644
--- a/Disco.Web/App_Code/AjaxHelpers.cshtml
+++ b/Disco.Web/App_Code/AjaxHelpers.cshtml
@@ -1,7 +1,7 @@
 @* Generator: WebPagesHelper *@
 @using Disco.BI.Extensions;
 @using Disco.Web;
-@using Disco.Web.Extensions;
+@using Disco.Services.Web;
 @helper AjaxLoader(string id = null)
     {
         Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
diff --git a/Disco.Web/App_Code/AjaxHelpers.generated.cs b/Disco.Web/App_Code/AjaxHelpers.generated.cs
index b08b4731..280d7a4b 100644
--- a/Disco.Web/App_Code/AjaxHelpers.generated.cs
+++ b/Disco.Web/App_Code/AjaxHelpers.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -30,14 +30,14 @@ namespace Disco.Web
     #line default
     #line hidden
     
-    #line 3 "..\..\App_Code\AjaxHelpers.cshtml"
-    using Disco.Web;
+    #line 4 "..\..\App_Code\AjaxHelpers.cshtml"
+    using Disco.Services.Web;
     
     #line default
     #line hidden
     
-    #line 4 "..\..\App_Code\AjaxHelpers.cshtml"
-    using Disco.Web.Extensions;
+    #line 3 "..\..\App_Code\AjaxHelpers.cshtml"
+    using Disco.Web;
     
     #line default
     #line hidden
diff --git a/Disco.Web/App_Code/CommonHelpers.cshtml b/Disco.Web/App_Code/CommonHelpers.cshtml
index 1e0e196a..8ecdcf5b 100644
--- a/Disco.Web/App_Code/CommonHelpers.cshtml
+++ b/Disco.Web/App_Code/CommonHelpers.cshtml
@@ -4,7 +4,7 @@
 @using Disco.Web;
 @using System.Web.Mvc
 @using System.Web.Mvc.Html;
-@using Disco.Web.Extensions;
+@using Disco.Services.Web;
 @helper FriendlyDate(DateTime d, string ElementId = null)
 {
     <span @(ElementId == null ? null : new HtmlString(string.Format("id=\"{0}\" ", ElementId)))title="@d.ToFullDateTime()" data-discodatetime="@d.ToSortableDateTime()" data-datetimeformatted="@d.ToJavascriptDateTime()" class="date nowrap">@d.ToFuzzy()</span>
diff --git a/Disco.Web/App_Code/CommonHelpers.generated.cs b/Disco.Web/App_Code/CommonHelpers.generated.cs
index e480b8a2..d52f57ee 100644
--- a/Disco.Web/App_Code/CommonHelpers.generated.cs
+++ b/Disco.Web/App_Code/CommonHelpers.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -48,14 +48,14 @@ namespace Disco.Web
     #line default
     #line hidden
     
-    #line 4 "..\..\App_Code\CommonHelpers.cshtml"
-    using Disco.Web;
+    #line 7 "..\..\App_Code\CommonHelpers.cshtml"
+    using Disco.Services.Web;
     
     #line default
     #line hidden
     
-    #line 7 "..\..\App_Code\CommonHelpers.cshtml"
-    using Disco.Web.Extensions;
+    #line 4 "..\..\App_Code\CommonHelpers.cshtml"
+    using Disco.Web;
     
     #line default
     #line hidden
diff --git a/Disco.Web/App_Start/AppConfig.cs b/Disco.Web/App_Start/AppConfig.cs
index 87c6d4c8..3b6a6620 100644
--- a/Disco.Web/App_Start/AppConfig.cs
+++ b/Disco.Web/App_Start/AppConfig.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using Disco.Data.Repository;
+using System.Threading;
+using System.Reflection;
 
 namespace Disco.Web
 {
@@ -25,39 +27,50 @@ namespace Disco.Web
             return true;
         }
 
-        public static void InitalizeEnvironment(DiscoDataContext dbContext)
+        private static void InitalizeEnvironment(DiscoDataContext Database)
         {
             // Initialize Logging
-            Disco.Services.Logging.LogContext.Initalize(dbContext, DiscoApplication.SchedulerFactory);
+            Disco.Services.Logging.LogContext.Initalize(Database, DiscoApplication.SchedulerFactory);
 
             // Load Organisation Name
-            DiscoApplication.OrganisationName = dbContext.DiscoConfiguration.OrganisationName;
-            DiscoApplication.MultiSiteMode = dbContext.DiscoConfiguration.MultiSiteMode;
+            DiscoApplication.OrganisationName = Database.DiscoConfiguration.OrganisationName;
+            DiscoApplication.MultiSiteMode = Database.DiscoConfiguration.MultiSiteMode;
 
             // Setup Global Proxy
-            DiscoApplication.SetGlobalProxy(dbContext.DiscoConfiguration.ProxyAddress,
-                dbContext.DiscoConfiguration.ProxyPort,
-                dbContext.DiscoConfiguration.ProxyUsername,
-                dbContext.DiscoConfiguration.ProxyPassword);
+            DiscoApplication.SetGlobalProxy(Database.DiscoConfiguration.ProxyAddress,
+                Database.DiscoConfiguration.ProxyPort,
+                Database.DiscoConfiguration.ProxyUsername,
+                Database.DiscoConfiguration.ProxyPassword);
+
+            // Initialize User Service Interop
+            Disco.Services.Users.UserService.Initialize(Database,
+                (UserId, AdditionalProperties) => Disco.BI.Interop.ActiveDirectory.ActiveDirectory.GetUserAccount(UserId, AdditionalProperties),
+                (UserId, AdditionalProperties) => Disco.BI.Interop.ActiveDirectory.ActiveDirectory.GetMachineAccount(UserId, null, null, AdditionalProperties));
+
+        }
+
+        public static void InitalizeNormalEnvironment(DiscoDataContext Database)
+        {
+            InitalizeEnvironment(Database);
 
             // Initialize Expressions
             BI.Expressions.Expression.InitializeExpressions();
 
             // Initialize Warranty Providers Plugins
-            Disco.Services.Plugins.Plugins.InitalizePlugins(dbContext);
+            Disco.Services.Plugins.Plugins.InitalizePlugins(Database);
 
             // Initialize Scheduled Tasks
-            Disco.Services.Tasks.ScheduledTasks.InitalizeScheduledTasks(dbContext, DiscoApplication.SchedulerFactory, true);
+            Disco.Services.Tasks.ScheduledTasks.InitalizeScheduledTasks(Database, DiscoApplication.SchedulerFactory, true);
 
             // Schedule Immediate Check for Update (if never updated, or last updated over 2 days ago)
-            if (dbContext.DiscoConfiguration.UpdateLastCheck == null ||
-                dbContext.DiscoConfiguration.UpdateLastCheck.ResponseTimestamp < DateTime.Now.AddDays(-2))
+            if (Database.DiscoConfiguration.UpdateLastCheck == null ||
+                Database.DiscoConfiguration.UpdateLastCheck.ResponseTimestamp < DateTime.Now.AddDays(-2))
             {
                 Disco.BI.Interop.Community.UpdateCheckTask.ScheduleNow();
             }
 
             // Setup Attachment Monitor
-            DiscoApplication.DocumentDropBoxMonitor = new BI.DocumentTemplateBI.Importer.DocumentDropBoxMonitor(dbContext, DiscoApplication.SchedulerFactory, HttpContext.Current.Cache);
+            DiscoApplication.DocumentDropBoxMonitor = new BI.DocumentTemplateBI.Importer.DocumentDropBoxMonitor(Database, DiscoApplication.SchedulerFactory, HttpContext.Current.Cache);
 
             DiscoApplication.DocumentDropBoxMonitor.StartWatching();
             DiscoApplication.DocumentDropBoxMonitor.ScheduleCurrentFiles(10);
@@ -66,27 +79,16 @@ namespace Disco.Web
             Disco.BI.Interop.SignalRHandlers.RepositoryMonitorNotifications.Initialize();
         }
 
-        public static void InitializeUpdateEnvironment(DiscoDataContext dbContext, Version PreviousVersion)
+        public static void InitializeUpdateEnvironment(DiscoDataContext Database, Version PreviousVersion)
         {
-            // Initialize Logging
-            Disco.Services.Logging.LogContext.Initalize(dbContext, DiscoApplication.SchedulerFactory);
-
-            // Load Organisation Name
-            DiscoApplication.OrganisationName = dbContext.DiscoConfiguration.OrganisationName;
-            DiscoApplication.MultiSiteMode = dbContext.DiscoConfiguration.MultiSiteMode;
-
-            // Setup Global Proxy
-            DiscoApplication.SetGlobalProxy(dbContext.DiscoConfiguration.ProxyAddress,
-                dbContext.DiscoConfiguration.ProxyPort,
-                dbContext.DiscoConfiguration.ProxyUsername,
-                dbContext.DiscoConfiguration.ProxyPassword);
+            InitalizeEnvironment(Database);
 
             // Initialize Scheduled Tasks
-            Disco.Services.Tasks.ScheduledTasks.InitalizeScheduledTasks(dbContext, DiscoApplication.SchedulerFactory, true);
+            Disco.Services.Tasks.ScheduledTasks.InitalizeScheduledTasks(Database, DiscoApplication.SchedulerFactory, true);
 
             // Import MAC Address Migration
             if (PreviousVersion != null && PreviousVersion < new Version(1, 2, 910, 0))
-                Disco.BI.DeviceBI.Migration.LogMacAddressImporting.SetRequired(dbContext);
+                Disco.BI.DeviceBI.Migration.LogMacAddressImporting.SetRequired(Database);
         }
 
         public static void DisposeEnvironment()
diff --git a/Disco.Web/App_Start/BundleConfig.cs b/Disco.Web/App_Start/BundleConfig.cs
index 3ac682ea..c742dcf3 100644
--- a/Disco.Web/App_Start/BundleConfig.cs
+++ b/Disco.Web/App_Start/BundleConfig.cs
@@ -1,9 +1,6 @@
-using System.IO;
+using Disco.Services.Web.Bundles;
+using System.IO;
 using System.Web;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Disco.Web.Extensions.MvcExtensions.Bundles;
 
 namespace Disco.Web
 {
@@ -23,6 +20,7 @@ namespace Disco.Web
             BundleTable.Add(new Bundle("~/Style/Credits", Links.ClientSource.Style.Credits_min_css));
             BundleTable.Add(new Bundle("~/Style/InitialConfig", Links.ClientSource.Style.InitialConfig_min_css));
             BundleTable.Add(new Bundle("~/Style/jQueryUI/dynatree", Links.ClientSource.Style.jQueryUI.dynatree.ui_dynatree_min_css));
+            BundleTable.Add(new Bundle("~/Style/Fancytree", Links.ClientSource.Style.Fancytree.ui_fancytree_min_css));
             BundleTable.Add(new Bundle("~/Style/Shadowbox", Links.ClientSource.Style.Shadowbox_min_css));
             BundleTable.Add(new Bundle("~/Style/Timeline", Links.ClientSource.Style.Timeline_min_css));
 
diff --git a/Disco.Web/Areas/API/Controllers/AuthorizationRoleController.cs b/Disco.Web/Areas/API/Controllers/AuthorizationRoleController.cs
new file mode 100644
index 00000000..d7079acd
--- /dev/null
+++ b/Disco.Web/Areas/API/Controllers/AuthorizationRoleController.cs
@@ -0,0 +1,233 @@
+using Disco.BI.Extensions;
+using Disco.BI.Interop.ActiveDirectory;
+using Disco.Models.Interop.ActiveDirectory;
+using Disco.Models.Repository;
+using Disco.Services.Authorization;
+using Disco.Services.Users;
+using Disco.Services.Web;
+using System;
+using System.Linq;
+using System.Web.Mvc;
+
+namespace Disco.Web.Areas.API.Controllers
+{
+    [DiscoAuthorize(Claims.DiscoAdminAccount)]
+    public partial class AuthorizationRoleController : AuthorizedDatabaseController
+    {
+
+        #region Properties
+
+        const string pName = "name";
+
+        public virtual ActionResult Update(int id, string key, string value = null, bool redirect = false)
+        {
+            try
+            {
+                if (id < 0)
+                    throw new ArgumentOutOfRangeException("id");
+                if (string.IsNullOrEmpty(key))
+                    throw new ArgumentNullException("key");
+                var authorizationRole = Database.AuthorizationRoles.Find(id);
+                if (authorizationRole != null)
+                {
+                    switch (key.ToLower())
+                    {
+                        case pName:
+                            UpdateName(authorizationRole, value);
+                            break;
+                        default:
+                            throw new Exception("Invalid Update Key");
+                    }
+                }
+                else
+                {
+                    return Json("Invalid Authorization Role Id", JsonRequestBehavior.AllowGet);
+                }
+                if (redirect)
+                    return RedirectToAction(MVC.Config.AuthorizationRole.Index(authorizationRole.Id));
+                else
+                    return Json("OK", JsonRequestBehavior.AllowGet);
+            }
+            catch (Exception ex)
+            {
+                if (redirect)
+                    throw;
+                else
+                    return Json(string.Format("Error: {0}", ex.Message), JsonRequestBehavior.AllowGet);
+            }
+        }
+
+        private void UpdateName(AuthorizationRole AuthorizationRole, string Name)
+        {
+            if (string.IsNullOrWhiteSpace(Name))
+                throw new ArgumentNullException("Name", "Authorization Role Name is required");
+            else
+            {
+                if (AuthorizationRole.Name != Name)
+                {
+                    // Check for Duplicates
+                    var d = Database.AuthorizationRoles.Where(db => db.Id != AuthorizationRole.Id && db.Name == Name).Count();
+                    if (d > 0)
+                    {
+                        throw new Exception("An Authorization Role with that name already exists");
+                    }
+
+                    AuthorizationRole.Name = Name;
+                    UserService.UpdateAuthorizationRole(Database, AuthorizationRole);
+                }
+            }
+        }
+
+        private void UpdateClaims(AuthorizationRole AuthorizationRole, string[] ClaimKeys)
+        {
+            var claims = Claims.BuildClaims(ClaimKeys);
+            AuthorizationRole.SetClaims(claims);
+
+            UserService.UpdateAuthorizationRole(Database, AuthorizationRole);
+        }
+
+        private void UpdateSubjects(AuthorizationRole AuthorizationRole, string[] Subjects)
+        {
+            string subjectIds = null;
+
+            // Validate Subjects
+            if (Subjects != null && Subjects.Length > 0)
+            {
+                var subjects = Subjects.Where(s => !string.IsNullOrWhiteSpace(s)).Select(s => s.Trim()).Select(s => new Tuple<string, IActiveDirectoryObject>(s, ActiveDirectory.GetObject(s))).ToList();
+                var invalidSubjects = subjects.Where(s => s.Item2 == null).ToList();
+
+                if (invalidSubjects.Count > 0)
+                    throw new ArgumentException(string.Format("Subjects not found: {0}", string.Join(", ", invalidSubjects)), "Subjects");
+
+                subjectIds = string.Join(",", subjects.Select(s => s.Item2.SamAccountName).OrderBy(s => s));
+
+                if (string.IsNullOrEmpty(subjectIds))
+                    subjectIds = null;
+            }
+
+            if (AuthorizationRole.SubjectIds != subjectIds)
+            {
+                AuthorizationRole.SubjectIds = subjectIds;
+                UserService.UpdateAuthorizationRole(Database, AuthorizationRole);
+            }
+        }
+
+        public virtual ActionResult UpdateName(int id, string RoleName = null, bool redirect = false)
+        {
+            return Update(id, pName, RoleName, redirect);
+        }
+
+        public virtual ActionResult UpdateClaims(int id, string[] ClaimKeys = null, bool redirect = false)
+        {
+            try
+            {
+                if (id < 0)
+                    throw new ArgumentOutOfRangeException("id");
+
+                var authorizationRole = Database.AuthorizationRoles.Find(id);
+                if (authorizationRole != null)
+                {
+                    UpdateClaims(authorizationRole, ClaimKeys);
+                }
+                else
+                {
+                    return Json("Invalid Authorization Role Id", JsonRequestBehavior.AllowGet);
+                }
+                if (redirect)
+                    return RedirectToAction(MVC.Config.AuthorizationRole.Index(authorizationRole.Id));
+                else
+                    return Json("OK", JsonRequestBehavior.AllowGet);
+            }
+            catch (Exception ex)
+            {
+                if (redirect)
+                    throw;
+                else
+                    return Json(string.Format("Error: {0}", ex.Message), JsonRequestBehavior.AllowGet);
+            }
+        }
+
+        public virtual ActionResult UpdateSubjects(int id, string[] Subjects = null, bool redirect = false)
+        {
+            try
+            {
+                if (id < 0)
+                    throw new ArgumentOutOfRangeException("id");
+
+                var authorizationRole = Database.AuthorizationRoles.Find(id);
+                if (authorizationRole != null)
+                {
+                    UpdateSubjects(authorizationRole, Subjects);
+                }
+                else
+                {
+                    return Json("Invalid Authorization Role Id", JsonRequestBehavior.AllowGet);
+                }
+                if (redirect)
+                    return RedirectToAction(MVC.Config.AuthorizationRole.Index(authorizationRole.Id));
+                else
+                    return Json("OK", JsonRequestBehavior.AllowGet);
+            }
+            catch (Exception ex)
+            {
+                if (redirect)
+                    throw;
+                else
+                    return Json(string.Format("Error: {0}", ex.Message), JsonRequestBehavior.AllowGet);
+            }
+        }
+
+        #endregion
+
+        #region Actions
+
+        public virtual ActionResult Delete(int id, Nullable<bool> redirect = false)
+        {
+            try
+            {
+                var ar = Database.AuthorizationRoles.Find(id);
+                if (ar != null)
+                {
+                    ar.Delete(Database);
+                    Database.SaveChanges();
+
+                    if (redirect.HasValue && redirect.Value)
+                        return RedirectToAction(MVC.Config.AuthorizationRole.Index(null));
+                    else
+                        return Json("OK", JsonRequestBehavior.AllowGet);
+                }
+                throw new Exception("Invalid Authorization Role Id");
+            }
+            catch (Exception ex)
+            {
+                if (redirect.HasValue && redirect.Value)
+                    throw;
+                else
+                    return Json(string.Format("Error: {0}", ex.Message), JsonRequestBehavior.AllowGet);
+            }
+        }
+
+        #endregion
+
+        public virtual ActionResult SearchSubjects(string term)
+        {
+            var groupResults = BI.Interop.ActiveDirectory.ActiveDirectory.SearchGroups(term).Cast<IActiveDirectoryObject>();
+            var userResults = BI.Interop.ActiveDirectory.ActiveDirectory.SearchUsers(term).Cast<IActiveDirectoryObject>();
+
+            var results = groupResults.Concat(userResults).OrderBy(r => r.SamAccountName)
+                .Select(r => Models.AuthorizationRole.SubjectItem.FromActiveDirectoryObject(r)).ToList();
+
+            return Json(results, JsonRequestBehavior.AllowGet);
+        }
+
+        public virtual ActionResult Subject(string Id)
+        {
+            var subject = ActiveDirectory.GetObject(Id);
+            
+            if (subject == null || !(subject is ActiveDirectoryUserAccount || subject is ActiveDirectoryGroup))
+                return Json(null, JsonRequestBehavior.AllowGet);
+            else
+                return Json(Models.AuthorizationRole.SubjectItem.FromActiveDirectoryObject(subject), JsonRequestBehavior.AllowGet);
+        }
+    }
+}
diff --git a/Disco.Web/Areas/API/Controllers/BootstrapperController.cs b/Disco.Web/Areas/API/Controllers/BootstrapperController.cs
index 838aa11c..3b004b38 100644
--- a/Disco.Web/Areas/API/Controllers/BootstrapperController.cs
+++ b/Disco.Web/Areas/API/Controllers/BootstrapperController.cs
@@ -1,23 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using Disco.Services.Authorization;
+using Disco.Services.Web;
+using System;
 using System.Web.Mvc;
-using Disco.BI.Extensions;
 
 namespace Disco.Web.Areas.API.Controllers
 {
-    public partial class BootstrapperController : dbAdminController
+    [DiscoAuthorize(Claims.Config.Enrolment.Configure)]
+    public partial class BootstrapperController : AuthorizedDatabaseController
     {
-
         public virtual ActionResult MacSshUsername(string MacSshUsername)
         {
             try
             {
                 if (!string.IsNullOrWhiteSpace(MacSshUsername))
                 {
-                    dbContext.DiscoConfiguration.Bootstrapper.MacSshUsername = MacSshUsername;
-                    dbContext.SaveChanges();
+                    Database.DiscoConfiguration.Bootstrapper.MacSshUsername = MacSshUsername;
+                    Database.SaveChanges();
                     return Json("OK", JsonRequestBehavior.AllowGet);
                 }
                 else
@@ -36,8 +34,8 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 if (!string.IsNullOrWhiteSpace(MacSshPassword))
                 {
-                    dbContext.DiscoConfiguration.Bootstrapper.MacSshPassword = MacSshPassword;
-                    dbContext.SaveChanges();
+                    Database.DiscoConfiguration.Bootstrapper.MacSshPassword = MacSshPassword;
+                    Database.SaveChanges();
                     return Json("OK", JsonRequestBehavior.AllowGet);
                 }
                 else
diff --git a/Disco.Web/Areas/API/Controllers/DeviceBatchController.cs b/Disco.Web/Areas/API/Controllers/DeviceBatchController.cs
index 4f10fc83..6d164f88 100644
--- a/Disco.Web/Areas/API/Controllers/DeviceBatchController.cs
+++ b/Disco.Web/Areas/API/Controllers/DeviceBatchController.cs
@@ -1,19 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using Disco.BI;
-using Disco.BI.Extensions;
+using Disco.BI.Extensions;
 using Disco.Models.Repository;
+using Disco.Services.Authorization;
+using Disco.Services.Web;
 using Disco.Web.Extensions;
+using System;
+using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
+using System.Web.Mvc;
 
 namespace Disco.Web.Areas.API.Controllers
 {
-    public partial class DeviceBatchController : dbAdminController
+    public partial class DeviceBatchController : AuthorizedDatabaseController
     {
-
         const string pName = "name";
         const string pPurchaseDate = "purchasedate";
         const string pSupplier = "supplier";
@@ -29,15 +28,18 @@ namespace Disco.Web.Areas.API.Controllers
         const string pInsuranceDetails = "insurancedetails";
         const string pComments = "comments";
 
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure)]
         public virtual ActionResult Update(int id, string key, string value = null, bool redirect = false)
         {
+            Authorization.Require(Claims.Config.DeviceBatch.Configure);
+
             try
             {
                 if (id < 0)
                     throw new ArgumentOutOfRangeException("id");
                 if (string.IsNullOrEmpty(key))
                     throw new ArgumentNullException("key");
-                var deviceBatch = dbContext.DeviceBatches.Find(id);
+                var deviceBatch = Database.DeviceBatches.Find(id);
                 if (deviceBatch != null)
                 {
                     switch (key.ToLower())
@@ -107,62 +109,86 @@ namespace Disco.Web.Areas.API.Controllers
         }
 
         #region Update Shortcut Methods
+        
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure)]
         public virtual ActionResult UpdateName(int id, string BatchName = null, bool redirect = false)
         {
             return Update(id, pName, BatchName, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure)]
         public virtual ActionResult UpdatePurchaseDate(int id, string PurchaseDate = null, bool redirect = false)
         {
             return Update(id, pPurchaseDate, PurchaseDate, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure)]
         public virtual ActionResult UpdateSupplier(int id, string Supplier = null, bool redirect = false)
         {
             return Update(id, pSupplier, Supplier, redirect);
         }
-        [ValidateInput(false)]
+        
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure), ValidateInput(false)]
         public virtual ActionResult UpdatePurchaseDetails(int id, string PurchaseDetails = null, bool redirect = false)
         {
             return Update(id, pPurchaseDetails, PurchaseDetails, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure)]
         public virtual ActionResult UpdateUnitCost(int id, string UnitCost = null, bool redirect = false)
         {
             return Update(id, pUnitCost, UnitCost, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure)]
         public virtual ActionResult UpdateUnitQuantity(int id, string UnitQuantity = null, bool redirect = false)
         {
             return Update(id, pUnitQuantity, UnitQuantity, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure)]
         public virtual ActionResult UpdateDefaultDeviceModelId(int id, string DefaultDeviceModelId = null, bool redirect = false)
         {
             return Update(id, pDefaultDeviceModelId, DefaultDeviceModelId, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure)]
         public virtual ActionResult UpdateWarrantyValidUntil(int id, string WarrantyValidUntil = null, bool redirect = false)
         {
             return Update(id, pWarrantyValidUntil, WarrantyValidUntil, redirect);
         }
-        [ValidateInput(false)]
+        
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure), ValidateInput(false)]
         public virtual ActionResult UpdateWarrantyDetails(int id, string WarrantyDetails = null, bool redirect = false)
         {
             return Update(id, pWarrantyDetails, WarrantyDetails, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure)]
         public virtual ActionResult UpdateInsuredDate(int id, string InsuredDate = null, bool redirect = false)
         {
             return Update(id, pInsuredDate, InsuredDate, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure)]
         public virtual ActionResult UpdateInsuranceSupplier(int id, string InsuranceSupplier = null, bool redirect = false)
         {
             return Update(id, pInsuranceSupplier, InsuranceSupplier, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure)]
         public virtual ActionResult UpdateInsuredUntil(int id, string InsuredUntil = null, bool redirect = false)
         {
             return Update(id, pInsuredUntil, InsuredUntil, redirect);
         }
-        [ValidateInput(false)]
+        
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure), ValidateInput(false)]
         public virtual ActionResult UpdateInsuranceDetails(int id, string InsuranceDetails = null, bool redirect = false)
         {
             return Update(id, pInsuranceDetails, InsuranceDetails, redirect);
         }
-        [ValidateInput(false)]
+
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Configure), ValidateInput(false)]
         public virtual ActionResult UpdateComments(int id, string Comments = null, bool redirect = false)
         {
             return Update(id, pComments, Comments, redirect);
@@ -177,14 +203,14 @@ namespace Disco.Web.Areas.API.Controllers
             else
             {
                 // Check for Duplicates
-                var d = dbContext.DeviceBatches.Where(db => db.Id != deviceBatch.Id && db.Name == Name).Count();
+                var d = Database.DeviceBatches.Where(db => db.Id != deviceBatch.Id && db.Name == Name).Count();
                 if (d > 0)
                 {
                     throw new Exception("A Device Batch with that name already exists");
                 }
                 deviceBatch.Name = Name;
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdatePurchaseDate(DeviceBatch deviceBatch, string PurchaseDate)
         {
@@ -202,7 +228,7 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateSupplier(DeviceBatch deviceBatch, string Supplier)
         {
@@ -210,7 +236,7 @@ namespace Disco.Web.Areas.API.Controllers
                 deviceBatch.Supplier = null;
             else
                 deviceBatch.Supplier = Supplier;
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdatePurchaseDetails(DeviceBatch deviceBatch, string PurchaseDetails)
         {
@@ -218,7 +244,7 @@ namespace Disco.Web.Areas.API.Controllers
                 deviceBatch.PurchaseDetails = null;
             else
                 deviceBatch.PurchaseDetails = PurchaseDetails;
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateUnitCost(DeviceBatch deviceBatch, string UnitCost)
         {
@@ -236,7 +262,7 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Currency Format");
                 }
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateUnitQuantity(DeviceBatch deviceBatch, string UnitQuantity)
         {
@@ -254,7 +280,7 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Number");
                 }
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateDefaultDeviceModelId(DeviceBatch deviceBatch, string DefaultDeviceModelId)
         {
@@ -263,13 +289,13 @@ namespace Disco.Web.Areas.API.Controllers
                 int bId;
                 if (int.TryParse(DefaultDeviceModelId, out bId))
                 {
-                    var dm = dbContext.DeviceModels.Find(bId);
+                    var dm = Database.DeviceModels.Find(bId);
                     if (dm != null)
                     {
                         deviceBatch.DefaultDeviceModelId = dm.Id;
                         deviceBatch.DefaultDeviceModel = dm;
 
-                        dbContext.SaveChanges();
+                        Database.SaveChanges();
                         return;
                     }
                 }
@@ -280,7 +306,7 @@ namespace Disco.Web.Areas.API.Controllers
                 deviceBatch.DefaultDeviceModelId = null;
                 deviceBatch.DefaultDeviceModel = null;
 
-                dbContext.SaveChanges();
+                Database.SaveChanges();
                 return;
             }
             throw new Exception("Invalid Device Model Id");
@@ -301,7 +327,7 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateWarrantyDetails(DeviceBatch deviceBatch, string WarrantyDetails)
         {
@@ -309,7 +335,7 @@ namespace Disco.Web.Areas.API.Controllers
                 deviceBatch.WarrantyDetails = null;
             else
                 deviceBatch.WarrantyDetails = WarrantyDetails;
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateInsuredDate(DeviceBatch deviceBatch, string InsuredDate)
         {
@@ -327,7 +353,7 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateInsuranceSupplier(DeviceBatch deviceBatch, string InsuranceSupplier)
         {
@@ -335,7 +361,7 @@ namespace Disco.Web.Areas.API.Controllers
                 deviceBatch.InsuranceSupplier = null;
             else
                 deviceBatch.InsuranceSupplier = InsuranceSupplier;
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateInsuredUntil(DeviceBatch deviceBatch, string InsuredUntil)
         {
@@ -353,7 +379,7 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateInsuranceDetails(DeviceBatch deviceBatch, string InsuranceDetails)
         {
@@ -361,7 +387,7 @@ namespace Disco.Web.Areas.API.Controllers
                 deviceBatch.InsuranceDetails = null;
             else
                 deviceBatch.InsuranceDetails = InsuranceDetails;
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateComments(DeviceBatch deviceBatch, string Comments)
         {
@@ -369,21 +395,22 @@ namespace Disco.Web.Areas.API.Controllers
                 deviceBatch.Comments = null;
             else
                 deviceBatch.Comments = Comments;
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         #endregion
 
         #region Actions
 
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Delete)]
         public virtual ActionResult Delete(int id, Nullable<bool> redirect = false)
         {
             try
             {
-                var db = dbContext.DeviceBatches.Find(id);
+                var db = Database.DeviceBatches.Find(id);
                 if (db != null)
                 {
-                    db.Delete(dbContext);
-                    dbContext.SaveChanges();
+                    db.Delete(Database);
+                    Database.SaveChanges();
                     if (redirect.HasValue && redirect.Value)
                         return RedirectToAction(MVC.Config.DeviceBatch.Index(null));
                     else
@@ -403,27 +430,32 @@ namespace Disco.Web.Areas.API.Controllers
         #endregion
 
         #region Index
+
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Show)]
         public virtual ActionResult Index(int? id)
         {
             if (id.HasValue)
             {
-                dbContext.Configuration.ProxyCreationEnabled = false;
-                DeviceBatch deviceBatch = dbContext.DeviceBatches.FirstOrDefault(db => db.Id == id);
+                Database.Configuration.ProxyCreationEnabled = false;
+                DeviceBatch deviceBatch = Database.DeviceBatches.FirstOrDefault(db => db.Id == id);
                 return Json(deviceBatch, JsonRequestBehavior.AllowGet);
             }
             else
             {
-                var deviceBatches = dbContext.DeviceBatches.ToArray();
+                var deviceBatches = Database.DeviceBatches.ToArray();
                 return Json(deviceBatches, JsonRequestBehavior.AllowGet);
             }
         }
+
         #endregion
 
         #region Timeline
+
+        [DiscoAuthorizeAll(Claims.Config.DeviceBatch.Show, Claims.Config.DeviceBatch.ShowTimeline)]
         public virtual ActionResult Timeline()
         {
 
-            var batchesInformation = dbContext.DeviceBatches.Select(db => new
+            var batchesInformation = Database.DeviceBatches.Select(db => new
             {
                 Name = db.Name,
                 Comments = db.Comments,
@@ -466,13 +498,15 @@ namespace Disco.Web.Areas.API.Controllers
         #endregion
 
         #region Exporting
+        
+        [DiscoAuthorizeAll(Claims.Config.DeviceBatch.Show, Claims.Device.Actions.Export)]
         public virtual ActionResult ExportDevices(int id)
         {
-            DeviceBatch db = dbContext.DeviceBatches.Find(id);
+            DeviceBatch db = Database.DeviceBatches.Find(id);
             if (db == null)
                 throw new ArgumentNullException("id", "Invalid Device Batch Id");
 
-            var devices = dbContext.Devices.Where(d => !d.DecommissionedDate.HasValue && d.DeviceBatchId == db.Id);
+            var devices = Database.Devices.Where(d => !d.DecommissionedDate.HasValue && d.DeviceBatchId == db.Id);
 
             var export = BI.DeviceBI.Importing.Export.GenerateExport(devices);
 
@@ -480,6 +514,7 @@ namespace Disco.Web.Areas.API.Controllers
 
             return File(export, "text/csv", filename);
         }
+
         #endregion
 
     }
diff --git a/Disco.Web/Areas/API/Controllers/DeviceCertificateController.cs b/Disco.Web/Areas/API/Controllers/DeviceCertificateController.cs
index dd0bbc5a..678d0606 100644
--- a/Disco.Web/Areas/API/Controllers/DeviceCertificateController.cs
+++ b/Disco.Web/Areas/API/Controllers/DeviceCertificateController.cs
@@ -1,17 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using Disco.Services.Authorization;
+using Disco.Services.Web;
+using System;
 using System.Web.Mvc;
 
 namespace Disco.Web.Areas.API.Controllers
 {
-    public partial class DeviceCertificateController : dbAdminController
+    public partial class DeviceCertificateController : AuthorizedDatabaseController
     {
 
+        [DiscoAuthorize(Claims.Config.DeviceCertificate.DownloadCertificates)]
         public virtual ActionResult Download(int id)
         {
-            var wc = dbContext.DeviceCertificates.Find(id);
+            var wc = Database.DeviceCertificates.Find(id);
             if (wc == null)
             {
                 throw new Exception("Invalid Device Certificate Id");
diff --git a/Disco.Web/Areas/API/Controllers/DeviceController.cs b/Disco.Web/Areas/API/Controllers/DeviceController.cs
index 06de2472..843c1dea 100644
--- a/Disco.Web/Areas/API/Controllers/DeviceController.cs
+++ b/Disco.Web/Areas/API/Controllers/DeviceController.cs
@@ -1,16 +1,17 @@
-using System;
-using System.Collections.Generic;
+using Disco.BI.Extensions;
+using Disco.BI.Interop.ActiveDirectory;
+using Disco.Services.Authorization;
+using Disco.Services.Users;
+using Disco.Services.Web;
+using System;
+using System.IO;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
-using Disco.BI.Extensions;
-using Disco.BI;
-using Disco.BI.Interop.ActiveDirectory;
-using System.IO;
 
 namespace Disco.Web.Areas.API.Controllers
 {
-    public partial class DeviceController : dbAdminController
+    public partial class DeviceController : AuthorizedDatabaseController
     {
 
         const string pDeviceProfileId = "deviceprofileid";
@@ -22,7 +23,7 @@ namespace Disco.Web.Areas.API.Controllers
 
         public virtual ActionResult Update(string id, string key, string value = null, bool redirect = false)
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
 
             try
             {
@@ -30,27 +31,33 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new ArgumentNullException("id");
                 if (string.IsNullOrEmpty(key))
                     throw new ArgumentNullException("key");
-                var device = dbContext.Devices.Find(id);
+                var device = Database.Devices.Find(id);
                 if (device != null)
                 {
                     switch (key.ToLower())
                     {
                         case pDeviceProfileId:
+                            Authorization.Require(Claims.Device.Properties.DeviceProfile);
                             UpdateDeviceProfileId(device, value);
                             break;
                         case pDeviceBatchId:
+                            Authorization.Require(Claims.Device.Properties.DeviceBatch);
                             UpdateDeviceBatchId(device, value);
                             break;
                         case pAssetNumber:
+                            Authorization.Require(Claims.Device.Properties.AssetNumber);
                             UpdateAssetNumber(device, value);
                             break;
                         case pAssignedUserId:
+                            Authorization.Require(Claims.Device.Actions.AssignUser);
                             UpdateAssignedUserId(device, value);
                             break;
                         case pLocation:
+                            Authorization.Require(Claims.Device.Properties.Location);
                             UpdateLocation(device, value);
                             break;
                         case pAllowUnauthenticatedEnrol:
+                            Authorization.Require(Claims.Device.Actions.AllowUnauthenticatedEnrol);
                             UpdateAllowUnauthenticatedEnrol(device, value);
                             break;
                         default:
@@ -76,30 +83,43 @@ namespace Disco.Web.Areas.API.Controllers
         }
 
         #region Update Shortcut Methods
+
+        [DiscoAuthorize(Claims.Device.Properties.DeviceProfile)]
         public virtual ActionResult UpdateDeviceProfileId(string id, string DeviceProfileId = null, bool redirect = false)
         {
             return Update(id, pDeviceProfileId, DeviceProfileId, redirect);
         }
+
+        [DiscoAuthorize(Claims.Device.Properties.DeviceBatch)]
         public virtual ActionResult UpdateDeviceBatchId(string id, string DeviceBatchId = null, bool redirect = false)
         {
             return Update(id, pDeviceBatchId, DeviceBatchId, redirect);
         }
+
+        [DiscoAuthorize(Claims.Device.Properties.AssetNumber)]
         public virtual ActionResult UpdateAssetNumber(string id, string AssetNumber = null, bool redirect = false)
         {
             return Update(id, pAssetNumber, AssetNumber, redirect);
         }
+
+        [DiscoAuthorize(Claims.Device.Properties.Location)]
         public virtual ActionResult UpdateLocation(string id, string Location = null, bool redirect = false)
         {
             return Update(id, pLocation, Location, redirect);
         }
+
+        [DiscoAuthorize(Claims.Device.Actions.AssignUser)]
         public virtual ActionResult UpdateAssignedUserId(string id, string AssignedUserId = null, bool redirect = false)
         {
             return Update(id, pAssignedUserId, AssignedUserId, redirect);
         }
+
+        [DiscoAuthorize(Claims.Device.Actions.AllowUnauthenticatedEnrol)]
         public virtual ActionResult UpdateAllowUnauthenticatedEnrol(string id, string AllowUnauthenticatedEnrol = null, bool redirect = false)
         {
             return Update(id, pAllowUnauthenticatedEnrol, AllowUnauthenticatedEnrol, redirect);
         }
+
         #endregion
 
         #region Update Properties
@@ -110,7 +130,7 @@ namespace Disco.Web.Areas.API.Controllers
                 int pId;
                 if (int.TryParse(DeviceProfileId, out pId))
                 {
-                    var p = dbContext.DeviceProfiles.Find(pId);
+                    var p = Database.DeviceProfiles.Find(pId);
                     if (p != null)
                     {
                         device.DeviceProfileId = p.Id;
@@ -124,7 +144,7 @@ namespace Disco.Web.Areas.API.Controllers
                                 adMachineAccount.SetDescription(device);
                         }
 
-                        dbContext.SaveChanges();
+                        Database.SaveChanges();
                         return;
                     }
                 }
@@ -138,13 +158,13 @@ namespace Disco.Web.Areas.API.Controllers
                 int bId;
                 if (int.TryParse(DeviceBatchId, out bId))
                 {
-                    var b = dbContext.DeviceBatches.Find(bId);
+                    var b = Database.DeviceBatches.Find(bId);
                     if (b != null)
                     {
                         device.DeviceBatchId = b.Id;
                         device.DeviceBatch = b;
 
-                        dbContext.SaveChanges();
+                        Database.SaveChanges();
                         return;
                     }
                 }
@@ -155,7 +175,7 @@ namespace Disco.Web.Areas.API.Controllers
                 device.DeviceBatchId = null;
                 device.DeviceBatch = null;
 
-                dbContext.SaveChanges();
+                Database.SaveChanges();
                 return;
             }
             throw new Exception("Invalid Device Batch Id");
@@ -166,7 +186,7 @@ namespace Disco.Web.Areas.API.Controllers
                 device.AssetNumber = null;
             else
                 device.AssetNumber = AssetNumber.Trim();
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateLocation(Disco.Models.Repository.Device device, string Location)
         {
@@ -174,27 +194,24 @@ namespace Disco.Web.Areas.API.Controllers
                 device.Location = null;
             else
                 device.Location = Location.Trim();
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateAssignedUserId(Disco.Models.Repository.Device device, string UserId)
         {
-            var daus = dbContext.DeviceUserAssignments.Where(m => m.DeviceSerialNumber == device.SerialNumber && m.UnassignedDate == null);
+            var daus = Database.DeviceUserAssignments.Where(m => m.DeviceSerialNumber == device.SerialNumber && m.UnassignedDate == null);
             Disco.Models.Repository.User u = null;
             if (!string.IsNullOrEmpty(UserId))
             {
-                // Changed 2012-12-13 G# - Stop error when assigning user - Force Refresh
-                // http://www.discoict.com.au/forum/support/2012/11/error-when-assigning-multiple-devices-to-single-user.aspx
-                //u = BI.UserBI.UserCache.GetUser(UserId, dbContext);
-                u = BI.UserBI.UserCache.GetUser(UserId, dbContext, true);
-                // End Changed 2012-12-13 G#
+                UserService.GetUser(UserId, Database, true);
+                
                 if (u == null)
                 {
                     throw new Exception("Invalid Username");
                 }
             }
 
-            device.AssignDevice(dbContext, u);
-            dbContext.SaveChanges();
+            device.AssignDevice(Database, u);
+            Database.SaveChanges();
         }
         private void UpdateAllowUnauthenticatedEnrol(Disco.Models.Repository.Device device, string AllowUnauthenticatedEnrol)
         {
@@ -207,23 +224,25 @@ namespace Disco.Web.Areas.API.Controllers
             if (device.AllowUnauthenticatedEnrol != bAllowUnauthenticatedEnrol)
             {
                 device.AllowUnauthenticatedEnrol = bAllowUnauthenticatedEnrol;
-                dbContext.SaveChanges();
+                Database.SaveChanges();
             }
         }
         #endregion
 
         #region Device Actions
+
+        [DiscoAuthorize(Claims.Device.Actions.Decommission)]
         public virtual ActionResult Decommission(string id, int Reason, bool redirect)
         {
-            var d = dbContext.Devices.Find(id);
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            var d = Database.Devices.Find(id);
+            Database.Configuration.LazyLoadingEnabled = true;
             if (d != null)
             {
                 if (d.CanDecommission())
                 {
                     d.OnDecommission((Disco.Models.Repository.Device.DecommissionReasons)Reason);
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     if (redirect)
                         return RedirectToAction(MVC.Device.Show(id));
                     else
@@ -236,17 +255,19 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json("Invalid Device Serial Number", JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Device.Actions.Recommission)]
         public virtual ActionResult Recommission(string id, bool redirect)
         {
-            var d = dbContext.Devices.Find(id);
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            var d = Database.Devices.Find(id);
+            Database.Configuration.LazyLoadingEnabled = true;
             if (d != null)
             {
                 if (d.CanRecommission())
                 {
                     d.OnRecommission();
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     if (redirect)
                         return RedirectToAction(MVC.Device.Show(id));
                     else
@@ -259,17 +280,19 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json("Invalid Device Serial Number", JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Device.Actions.Delete)]
         public virtual ActionResult Delete(string id, bool redirect)
         {
-            var j = dbContext.Devices.Find(id);
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            var j = Database.Devices.Find(id);
+            Database.Configuration.LazyLoadingEnabled = true;
             if (j != null)
             {
                 if (j.CanDelete())
                 {
-                    j.OnDelete(dbContext);
+                    j.OnDelete(Database);
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     if (redirect)
                         return RedirectToAction(MVC.Device.Index());
                     else
@@ -282,26 +305,28 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json("Invalid Device Serial Number", JsonRequestBehavior.AllowGet);
         }
+
         #endregion
 
+        [DiscoAuthorize(Claims.Device.Actions.GenerateDocuments)]
         public virtual ActionResult GeneratePdf(string id, string DocumentTemplateId)
         {
             if (string.IsNullOrEmpty(id))
                 throw new ArgumentNullException("id");
             if (string.IsNullOrEmpty(DocumentTemplateId))
                 throw new ArgumentNullException("AttachmentTypeId");
-            var device = dbContext.Devices.Find(id);
+            var device = Database.Devices.Find(id);
             if (device != null)
             {
-                var documentTemplate = dbContext.DocumentTemplates.Find(DocumentTemplateId);
+                var documentTemplate = Database.DocumentTemplates.Find(DocumentTemplateId);
                 if (documentTemplate != null)
                 {
                     var timeStamp = DateTime.Now;
                     Stream pdf;
                     using (var generationState = Disco.Models.BI.DocumentTemplates.DocumentState.DefaultState()){
-                        pdf = documentTemplate.GeneratePdf(dbContext, device, DiscoApplication.CurrentUser, timeStamp, generationState);
+                        pdf = documentTemplate.GeneratePdf(Database, device, UserService.CurrentUser, timeStamp, generationState);
                     }
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     return File(pdf, "application/pdf", string.Format("{0}_{1}_{2:yyyyMMdd-HHmmss}.pdf", documentTemplate.Id, device.SerialNumber, timeStamp));
                 }
                 else
@@ -315,16 +340,17 @@ namespace Disco.Web.Areas.API.Controllers
             }
         }
 
+        [DiscoAuthorize(Claims.Device.Show)]
         public virtual ActionResult LastNetworkLogonDate(string id)
         {
-            var device = dbContext.Devices.Find(id);
+            var device = Database.Devices.Find(id);
             if (device == null)
             {
                 return HttpNotFound("Invalid Device Serial Number");
             }
 
             if (device.UpdateLastNetworkLogonDate())
-                dbContext.SaveChanges();
+                Database.SaveChanges();
 
             var result = new
             {
@@ -337,13 +363,14 @@ namespace Disco.Web.Areas.API.Controllers
         }
 
         #region Device Attachements
-        [OutputCache(Location = System.Web.UI.OutputCacheLocation.Client, Duration = 172800)]
+
+        [DiscoAuthorize(Claims.Device.ShowAttachments), OutputCache(Location = System.Web.UI.OutputCacheLocation.Client, Duration = 172800)]
         public virtual ActionResult AttachmentDownload(int id)
         {
-            var da = dbContext.DeviceAttachments.Find(id);
+            var da = Database.DeviceAttachments.Find(id);
             if (da != null)
             {
-                var filePath = da.RepositoryFilename(dbContext);
+                var filePath = da.RepositoryFilename(Database);
                 if (System.IO.File.Exists(filePath))
                 {
                     return File(filePath, da.MimeType, da.Filename);
@@ -355,13 +382,14 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return HttpNotFound("Invalid Attachment Number");
         }
-        [OutputCache(Location = System.Web.UI.OutputCacheLocation.Client, Duration = 172800)]
+
+        [DiscoAuthorize(Claims.Device.ShowAttachments), OutputCache(Location = System.Web.UI.OutputCacheLocation.Client, Duration = 172800)]
         public virtual ActionResult AttachmentThumbnail(int id)
         {
-            var da = dbContext.DeviceAttachments.Find(id);
+            var da = Database.DeviceAttachments.Find(id);
             if (da != null)
             {
-                var thumbPath = da.RepositoryThumbnailFilename(dbContext);
+                var thumbPath = da.RepositoryThumbnailFilename(Database);
                 if (System.IO.File.Exists(thumbPath))
                 {
                     if (thumbPath.EndsWith(".png", StringComparison.InvariantCultureIgnoreCase))
@@ -374,9 +402,11 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return HttpNotFound("Invalid Attachment Number");
         }
+
+        [DiscoAuthorize(Claims.Device.Actions.AddAttachments)]
         public virtual ActionResult AttachmentUpload(string id, string Comments)
         {
-            var d = dbContext.Devices.Find(id);
+            var d = Database.Devices.Find(id);
             if (d != null)
             {
                 if (Request.Files.Count > 0)
@@ -391,18 +421,18 @@ namespace Disco.Web.Areas.API.Controllers
                         var da = new Disco.Models.Repository.DeviceAttachment()
                         {
                             DeviceSerialNumber = d.SerialNumber,
-                            TechUserId = DiscoApplication.CurrentUser.Id,
+                            TechUserId = UserService.CurrentUserId,
                             Filename = file.FileName,
                             MimeType = contentType,
                             Timestamp = DateTime.Now,
                             Comments = Comments
                         };
-                        dbContext.DeviceAttachments.Add(da);
-                        dbContext.SaveChanges();
+                        Database.DeviceAttachments.Add(da);
+                        Database.SaveChanges();
 
-                        da.SaveAttachment(dbContext, file.InputStream);
+                        da.SaveAttachment(Database, file.InputStream);
 
-                        da.GenerateThumbnail(dbContext);
+                        da.GenerateThumbnail(Database);
 
                         return Json(da.Id, JsonRequestBehavior.AllowGet);
                     }
@@ -411,9 +441,11 @@ namespace Disco.Web.Areas.API.Controllers
             }
             throw new Exception("Invalid Device Serial Number");
         }
+
+        [DiscoAuthorize(Claims.Device.ShowAttachments)]
         public virtual ActionResult Attachment(int id)
         {
-            var da = dbContext.DeviceAttachments.Include("TechUser").Where(m => m.Id == id).FirstOrDefault();
+            var da = Database.DeviceAttachments.Include("TechUser").Where(m => m.Id == id).FirstOrDefault();
             if (da != null)
             {
 
@@ -427,9 +459,11 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json(new Models.Attachment.AttachmentModel() { Result = "Invalid Attachment Number" }, JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Device.ShowAttachments)]
         public virtual ActionResult Attachments(string id)
         {
-            var d = dbContext.Devices.Include("DeviceAttachments.TechUser").Where(m => m.SerialNumber == id).FirstOrDefault();
+            var d = Database.Devices.Include("DeviceAttachments.TechUser").Where(m => m.SerialNumber == id).FirstOrDefault();
             if (d != null)
             {
                 var m = new Models.Attachment.AttachmentsModel()
@@ -442,22 +476,21 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json(new Models.Attachment.AttachmentsModel() { Result = "Invalid Device Serial Number" }, JsonRequestBehavior.AllowGet);
         }
+        
+        [DiscoAuthorizeAny(Claims.Job.Actions.RemoveAnyAttachments, Claims.Job.Actions.RemoveOwnAttachments)]
         public virtual ActionResult AttachmentRemove(int id)
         {
-            var da = dbContext.DeviceAttachments.Include("TechUser").Where(m => m.Id == id).FirstOrDefault();
+            var da = Database.DeviceAttachments.Include("TechUser").Where(m => m.Id == id).FirstOrDefault();
             if (da != null)
             {
-                // 2012-02-17 G# Remove - 'Delete Own Comments' policy
-                //if (da.TechUserId == DiscoApplication.CurrentUser.Id)
-                //{
-                da.OnDelete(dbContext);
-                dbContext.SaveChanges();
+                if (da.TechUserId.Equals(CurrentUser.Id, StringComparison.InvariantCultureIgnoreCase))
+                    Authorization.RequireAny(Claims.Device.Actions.RemoveAnyAttachments, Claims.Device.Actions.RemoveOwnAttachments);
+                else
+                    Authorization.Require(Claims.Device.Actions.RemoveAnyAttachments);
+
+                da.OnDelete(Database);
+                Database.SaveChanges();
                 return Json("OK", JsonRequestBehavior.AllowGet);
-                //}
-                //else
-                //{
-                //    return Json("You can only delete your own attachments.", JsonRequestBehavior.AllowGet);
-                //}
             }
             return Json("Invalid Attachment Number", JsonRequestBehavior.AllowGet);
         }
@@ -465,6 +498,8 @@ namespace Disco.Web.Areas.API.Controllers
         #endregion
 
         #region Importing / Exporting
+
+        [DiscoAuthorize(Claims.Device.Actions.Import)]
         public virtual ActionResult ImportParse(HttpPostedFileBase ImportFile)
         {
             if (ImportFile == null || ImportFile.ContentLength == 0)
@@ -481,6 +516,7 @@ namespace Disco.Web.Areas.API.Controllers
             return RedirectToAction(MVC.Config.Logging.TaskStatus(status.SessionId));
         }
 
+        [DiscoAuthorize(Claims.Device.Actions.Import)]
         public virtual ActionResult ImportProcess(string ParseTaskSessionKey)
         {
             if (string.IsNullOrWhiteSpace(ParseTaskSessionKey))
@@ -493,10 +529,11 @@ namespace Disco.Web.Areas.API.Controllers
             return RedirectToAction(MVC.Config.Logging.TaskStatus(status.SessionId));
         }
 
+        [DiscoAuthorize(Claims.Device.Actions.Export)]
         public virtual ActionResult ExportAllDevices()
         {
             // Non-Decommissioned Devices
-            var devices = dbContext.Devices.Where(d => !d.DecommissionedDate.HasValue);
+            var devices = Database.Devices.Where(d => !d.DecommissionedDate.HasValue);
 
             var export = BI.DeviceBI.Importing.Export.GenerateExport(devices);
 
@@ -504,13 +541,14 @@ namespace Disco.Web.Areas.API.Controllers
 
             return File(export, "text/csv", filename);
         } 
+
         #endregion
 
+        [DiscoAuthorize(Claims.DiscoAdminAccount)]
         public virtual ActionResult MigrateDeviceMacAddressesFromLog()
         {
             var taskStatus = Disco.BI.DeviceBI.Migration.LogMacAddressImporting.ScheduleImmediately();
             return RedirectToAction(MVC.Config.Logging.TaskStatus(taskStatus.SessionId));
         }
-
     }
 }
diff --git a/Disco.Web/Areas/API/Controllers/DeviceModelController.cs b/Disco.Web/Areas/API/Controllers/DeviceModelController.cs
index 0dd59bb1..e24f2dd1 100644
--- a/Disco.Web/Areas/API/Controllers/DeviceModelController.cs
+++ b/Disco.Web/Areas/API/Controllers/DeviceModelController.cs
@@ -1,32 +1,36 @@
-using System;
+using Disco.BI.Extensions;
+using Disco.Models.Repository;
+using Disco.Services.Authorization;
+using Disco.Services.Plugins;
+using Disco.Services.Plugins.Features.WarrantyProvider;
+using Disco.Services.Web;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
-using Disco.BI;
-using Disco.BI.Extensions;
-using Disco.Models.Repository;
-using Disco.Services.Plugins;
-using Disco.Services.Plugins.Features.WarrantyProvider;
 
 namespace Disco.Web.Areas.API.Controllers
 {
-    public partial class DeviceModelController : dbAdminController
+    public partial class DeviceModelController : AuthorizedDatabaseController
     {
 
         const string pDescription = "description";
         const string pDefaultPurchaseDate = "defaultpurchasedate";
         const string pDefaultWarrantyProvider = "defaultwarrantyprovider";
 
+        [DiscoAuthorize(Claims.Config.DeviceModel.Configure)]
         public virtual ActionResult Update(int id, string key, string value = null, bool redirect = false)
         {
+            Authorization.Require(Claims.Config.DeviceModel.Configure);
+
             try
             {
                 if (id < 0)
                     throw new ArgumentOutOfRangeException("id");
                 if (string.IsNullOrEmpty(key))
                     throw new ArgumentNullException("key");
-                var deviceModel = dbContext.DeviceModels.Find(id);
+                var deviceModel = Database.DeviceModels.Find(id);
                 if (deviceModel != null)
                 {
                     switch (key.ToLower())
@@ -63,18 +67,25 @@ namespace Disco.Web.Areas.API.Controllers
         }
 
         #region Update Shortcut Methods
+        
+        [DiscoAuthorize(Claims.Config.DeviceModel.Configure)]
         public virtual ActionResult UpdateDescription(int id, string Description = null, bool redirect = false)
         {
             return Update(id, pDescription, Description, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceModel.Configure)]
         public virtual ActionResult UpdateDefaultPurchaseDate(int id, string DefaultPurchaseDate = null, bool redirect = false)
         {
             return Update(id, pDefaultPurchaseDate, DefaultPurchaseDate, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceModel.Configure)]
         public virtual ActionResult UpdateDefaultWarrantyProvider(int id, string DefaultWarrantyProvider = null, bool redirect = false)
         {
             return Update(id, pDefaultWarrantyProvider, DefaultWarrantyProvider, redirect);
         }
+
         #endregion
 
         #region Update Properties
@@ -84,7 +95,7 @@ namespace Disco.Web.Areas.API.Controllers
                 deviceModel.Description = null;
             else
                 deviceModel.Description = Description;
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateDefaultPurchaseDate(Disco.Models.Repository.DeviceModel deviceModel, string DefaultPurchaseDate)
         {
@@ -104,7 +115,7 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateDefaultWarrantyProvider(Disco.Models.Repository.DeviceModel deviceModel, string DefaultWarrantyProvider)
         {
@@ -118,7 +129,7 @@ namespace Disco.Web.Areas.API.Controllers
                 var WarrantyProvider = Plugins.GetPluginFeature(DefaultWarrantyProvider, typeof(WarrantyProviderFeature));
                 deviceModel.DefaultWarrantyProvider = WarrantyProvider.Id;
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         #endregion
 
@@ -128,7 +139,7 @@ namespace Disco.Web.Areas.API.Controllers
         {
             if (id.HasValue)
             {
-                var m = dbContext.DeviceModels.Find(id.Value);
+                var m = Database.DeviceModels.Find(id.Value);
                 if (m != null)
                 {
                     // Try From DataStore
@@ -156,17 +167,18 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return File(Links.ClientSource.Style.Images.DeviceTypes.Unknown_png, "image/png");
         }
-        [HttpPost]
+        
+        [DiscoAuthorize(Claims.Config.DeviceModel.Configure), HttpPost]
         public virtual ActionResult Image(int id, bool redirect, HttpPostedFileBase Image)
         {
             if (Image != null && Image.ContentLength > 0)
             {
-                var dm = dbContext.DeviceModels.Find(id);
+                var dm = Database.DeviceModels.Find(id);
                 if (dm != null)
                 {
                     if (dm.ImageImport(Image.InputStream))
                     {
-                        dbContext.SaveChanges();
+                        Database.SaveChanges();
                         if (redirect)
                             return RedirectToAction(MVC.Config.DeviceModel.Index(dm.Id));
                         else
@@ -194,15 +206,16 @@ namespace Disco.Web.Areas.API.Controllers
 
         #region Actions
 
+        [DiscoAuthorize(Claims.Config.DeviceModel.Delete)]
         public virtual ActionResult Delete(int id, Nullable<bool> redirect = false)
         {
             try
             {
-                var dm = dbContext.DeviceModels.Find(id);
+                var dm = Database.DeviceModels.Find(id);
                 if (dm != null)
                 {
-                    dm.Delete(dbContext);
-                    dbContext.SaveChanges();
+                    dm.Delete(Database);
+                    Database.SaveChanges();
                     if (redirect.HasValue && redirect.Value)
                         return RedirectToAction(MVC.Config.DeviceModel.Index(null));
                     else
@@ -223,9 +236,10 @@ namespace Disco.Web.Areas.API.Controllers
 
         #region Device Model Components
 
+        [DiscoAuthorize(Claims.Config.DeviceModel.Show)]
         public virtual ActionResult Component(int id)
         {
-            var dc = dbContext.DeviceComponents.Include("JobSubTypes").Where(i => i.Id == id).FirstOrDefault();
+            var dc = Database.DeviceComponents.Include("JobSubTypes").Where(i => i.Id == id).FirstOrDefault();
             if (dc != null)
             {
                 return Json(new Models.DeviceModel.ComponentModel { Result = "OK", Component = Models.DeviceModel._ComponentModel.FromDeviceComponent(dc) }, JsonRequestBehavior.AllowGet);
@@ -233,12 +247,13 @@ namespace Disco.Web.Areas.API.Controllers
             return Json(new Models.DeviceModel.ComponentModel { Result = "Invalid Device Component Id" }, JsonRequestBehavior.AllowGet);
         }
 
+        [DiscoAuthorize(Claims.Config.DeviceModel.ConfigureComponents)]
         public virtual ActionResult ComponentAdd(int? id, string Description, string Cost)
         {
             DeviceModel dm = null;
             if (id.HasValue)
             {
-                dm = dbContext.DeviceModels.Find(id.Value);
+                dm = Database.DeviceModels.Find(id.Value);
                 if (dm == null)
                 {
                     return Json(new Models.DeviceModel.ComponentModel { Result = "Invalid Device Model Id" }, JsonRequestBehavior.AllowGet);
@@ -263,36 +278,40 @@ namespace Disco.Web.Areas.API.Controllers
             }
             dc.JobSubTypes = new List<JobSubType>();
 
-            dbContext.DeviceComponents.Add(dc);
-            dbContext.SaveChanges();
+            Database.DeviceComponents.Add(dc);
+            Database.SaveChanges();
 
             return Json(new Models.DeviceModel.ComponentModel { Result = "OK", Component = Models.DeviceModel._ComponentModel.FromDeviceComponent(dc) }, JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceModel.ConfigureComponents)]
         public virtual ActionResult ComponentUpdateJobSubTypes(int id, List<string> JobSubTypes)
         {
-            var dc = dbContext.DeviceComponents.Include("JobSubTypes").Where(i => i.Id == id).FirstOrDefault();
+            var dc = Database.DeviceComponents.Include("JobSubTypes").Where(i => i.Id == id).FirstOrDefault();
             if (dc != null)
             {
                 dc.JobSubTypes.Clear();
 
                 if (JobSubTypes != null)
                 {
-                    var jsts = dbContext.JobSubTypes.Where(jst => JobSubTypes.Contains(jst.JobTypeId + "_" + jst.Id));
+                    var jsts = Database.JobSubTypes.Where(jst => JobSubTypes.Contains(jst.JobTypeId + "_" + jst.Id));
                     foreach (var jst in jsts)
                     {
                         dc.JobSubTypes.Add(jst);
                     }
                 }
 
-                dbContext.SaveChanges();
+                Database.SaveChanges();
 
                 return Json(new Models.DeviceModel.ComponentModel { Result = "OK", Component = Models.DeviceModel._ComponentModel.FromDeviceComponent(dc) }, JsonRequestBehavior.AllowGet);
             }
             return Json(new Models.DeviceModel.ComponentModel { Result = "Invalid Device Component Id" }, JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceModel.ConfigureComponents)]
         public virtual ActionResult ComponentUpdate(int id, string Description, string Cost)
         {
-            var dc = dbContext.DeviceComponents.Include("JobSubTypes").Where(i => i.Id == id).FirstOrDefault();
+            var dc = Database.DeviceComponents.Include("JobSubTypes").Where(i => i.Id == id).FirstOrDefault();
             if (dc != null)
             {
                 decimal cost = 0;
@@ -306,20 +325,22 @@ namespace Disco.Web.Areas.API.Controllers
                 dc.Description = Description;
                 dc.Cost = cost;
 
-                dbContext.SaveChanges();
+                Database.SaveChanges();
 
                 return Json(new Models.DeviceModel.ComponentModel { Result = "OK", Component = Models.DeviceModel._ComponentModel.FromDeviceComponent(dc) }, JsonRequestBehavior.AllowGet);
             }
             return Json(new Models.DeviceModel.ComponentModel { Result = "Invalid Device Component Id" }, JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceModel.ConfigureComponents)]
         public virtual ActionResult ComponentRemove(int id)
         {
-            var dc = dbContext.DeviceComponents.Include("JobSubTypes").Where(c => c.Id == id).FirstOrDefault();
+            var dc = Database.DeviceComponents.Include("JobSubTypes").Where(c => c.Id == id).FirstOrDefault();
             if (dc != null)
             {
                 dc.JobSubTypes.Clear();
-                dbContext.DeviceComponents.Remove(dc);
-                dbContext.SaveChanges();
+                Database.DeviceComponents.Remove(dc);
+                Database.SaveChanges();
                 return Json("OK", JsonRequestBehavior.AllowGet);
             }
             return Json("Invalid Device Component Id", JsonRequestBehavior.AllowGet);
@@ -327,21 +348,23 @@ namespace Disco.Web.Areas.API.Controllers
         #endregion
 
         #region Index
+        [DiscoAuthorize(Claims.Config.DeviceModel.Show)]
         public virtual ActionResult Index()
         {
-            var deviceModels = dbContext.DeviceModels.ToArray().Select(dm => Models.DeviceModel._DeviceModel.FromDeviceModel(dm)).ToArray();
+            var deviceModels = Database.DeviceModels.ToArray().Select(dm => Models.DeviceModel._DeviceModel.FromDeviceModel(dm)).ToArray();
             return Json(deviceModels, JsonRequestBehavior.AllowGet);
         }
         #endregion
 
         #region Exporting
+        [DiscoAuthorizeAll(Claims.Config.DeviceModel.Show, Claims.Device.Actions.Export)]
         public virtual ActionResult ExportDevices(int id)
         {
-            DeviceModel dm = dbContext.DeviceModels.Find(id);
+            DeviceModel dm = Database.DeviceModels.Find(id);
             if (dm == null)
                 throw new ArgumentNullException("id", "Invalid Device Model Id");
 
-            var devices = dbContext.Devices.Where(d => !d.DecommissionedDate.HasValue && d.DeviceModelId == dm.Id);
+            var devices = Database.Devices.Where(d => !d.DecommissionedDate.HasValue && d.DeviceModelId == dm.Id);
 
             var export = BI.DeviceBI.Importing.Export.GenerateExport(devices);
 
diff --git a/Disco.Web/Areas/API/Controllers/DeviceProfileController.cs b/Disco.Web/Areas/API/Controllers/DeviceProfileController.cs
index 9fb5250a..afb42372 100644
--- a/Disco.Web/Areas/API/Controllers/DeviceProfileController.cs
+++ b/Disco.Web/Areas/API/Controllers/DeviceProfileController.cs
@@ -1,16 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using Disco.BI;
-using Disco.BI.Extensions;
-using Disco.Data.Configuration.Modules;
+using Disco.BI.Extensions;
 using Disco.Models.Repository;
+using Disco.Services.Authorization;
+using Disco.Services.Web;
+using System;
+using System.Linq;
+using System.Web.Mvc;
 
 namespace Disco.Web.Areas.API.Controllers
 {
-    public partial class DeviceProfileController : dbAdminController
+    public partial class DeviceProfileController : AuthorizedDatabaseController
     {
 
         const string pDescription = "description";
@@ -25,15 +23,18 @@ namespace Disco.Web.Areas.API.Controllers
         const string pEnforceOrganisationalUnit = "enforceorganisationalunit";
         const string pProvisionADAccount = "provisionadaccount";
 
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult Update(int id, string key, string value = null, Nullable<bool> redirect = null)
         {
+            Authorization.Require(Claims.Config.DeviceProfile.Configure);
+
             try
             {
                 if (id < 0)
                     throw new ArgumentOutOfRangeException("id");
                 if (string.IsNullOrEmpty(key))
                     throw new ArgumentNullException("key");
-                var deviceProfile = dbContext.DeviceProfiles.Find(id);
+                var deviceProfile = Database.DeviceProfiles.Find(id);
                 if (deviceProfile != null)
                 {
                     switch (key.ToLower())
@@ -60,6 +61,7 @@ namespace Disco.Web.Areas.API.Controllers
                             UpdateDefaultOrganisationAddress(deviceProfile, value);
                             break;
                         case pComputerNameTemplate:
+                            Authorization.Require(Claims.Config.DeviceProfile.ConfigureComputerNameTemplate);
                             UpdateComputerNameTemplate(deviceProfile, value);
                             break;
                         case pEnforceComputerNameConvention:
@@ -92,54 +94,75 @@ namespace Disco.Web.Areas.API.Controllers
                     return Json(string.Format("Error: {0}", ex.Message), JsonRequestBehavior.AllowGet);
             }
         }
+
         #region Update Shortcut Methods
+
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult UpdateDescription(int id, string Description = null, Nullable<bool> redirect = null)
         {
             return Update(id, pDescription, Description, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult UpdateName(int id, string ProfileName = null, Nullable<bool> redirect = null)
         {
             return Update(id, pName, ProfileName, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult UpdateShortName(int id, string ShortName = null, Nullable<bool> redirect = null)
         {
             return Update(id, pShortName, ShortName, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult UpdateDistributionType(int id, string DistributionType = null, Nullable<bool> redirect = null)
         {
             return Update(id, pDistributionType, DistributionType, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult UpdateCertificateProviderId(int id, string CertificateProviderId = null, Nullable<bool> redirect = null)
         {
             return Update(id, pCertificateProviderId, CertificateProviderId, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult UpdateOrganisationalUnit(int id, string OrganisationalUnit = null, Nullable<bool> redirect = null)
         {
             return Update(id, pOrganisationalUnit, OrganisationalUnit, redirect);
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult UpdateDefaultOrganisationAddress(int id, string DefaultOrganisationAddress = null, Nullable<bool> redirect = null)
         {
             return Update(id, pDefaultOrganisationAddress, DefaultOrganisationAddress, redirect);
         }
+
+        [DiscoAuthorizeAll(Claims.Config.DeviceProfile.Configure, Claims.Config.DeviceProfile.ConfigureComputerNameTemplate)]
         public virtual ActionResult UpdateComputerNameTemplate(int id, string ComputerNameTemplate = null, Nullable<bool> redirect = null)
         {
             return Update(id, pComputerNameTemplate, ComputerNameTemplate, redirect);
         }
-        // Added 2012-06-14 G#
+
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult UpdateEnforceComputerNameConvention(int id, string EnforceComputerNameConvention = null, Nullable<bool> redirect = null)
         {
             return Update(id, pEnforceComputerNameConvention, EnforceComputerNameConvention, redirect);
         }
-        // Added 2012-06-14 G#
+
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult UpdateEnforceOrganisationalUnit(int id, string EnforceOrganisationalUnit = null, Nullable<bool> redirect = null)
         {
             return Update(id, pEnforceOrganisationalUnit, EnforceOrganisationalUnit, redirect);
         }
-        // Added 2012-06-28 G#
+
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult UpdateProvisionADAccount(int id, string ProvisionADAccount = null, Nullable<bool> redirect = null)
         {
             return Update(id, pProvisionADAccount, ProvisionADAccount, redirect);
         }
+
         #endregion
 
         #region Update Properties
@@ -149,7 +172,7 @@ namespace Disco.Web.Areas.API.Controllers
                 deviceProfile.Description = null;
             else
                 deviceProfile.Description = Description;
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateName(Disco.Models.Repository.DeviceProfile deviceProfile, string Name)
@@ -158,7 +181,7 @@ namespace Disco.Web.Areas.API.Controllers
                 throw new Exception("Profile name cannot be empty");
             else
                 deviceProfile.Name = Name;
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateShortName(Disco.Models.Repository.DeviceProfile deviceProfile, string ShortName)
@@ -167,7 +190,7 @@ namespace Disco.Web.Areas.API.Controllers
                 throw new Exception("Profile short name cannot be empty");
             else
                 deviceProfile.ShortName = ShortName;
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateDistributionType(Disco.Models.Repository.DeviceProfile deviceProfile, string DistributionType)
@@ -175,10 +198,8 @@ namespace Disco.Web.Areas.API.Controllers
             int iDt;
             if (int.TryParse(DistributionType, out iDt))
             {
-                // Removed 2012-06-14 G# - Properties moved to DeviceProfile model & DB Migrated in DBv3.
-                //deviceProfile.Configuration(dbContext).DistributionType = (DeviceProfileConfiguration.DeviceProfileDistributionTypes)iDt;
                 deviceProfile.DistributionType = (Disco.Models.Repository.DeviceProfile.DistributionTypes)iDt;
-                dbContext.SaveChanges();
+                Database.SaveChanges();
                 return;
             }
             throw new Exception("Invalid Distribution Type Number");
@@ -199,28 +220,29 @@ namespace Disco.Web.Areas.API.Controllers
                 else
                     deviceProfile.CertificateProviderId = featureManifest.Id;
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateOrganisationalUnit(Disco.Models.Repository.DeviceProfile deviceProfile, string OrganisationalUnit)
         {
             if (string.IsNullOrWhiteSpace(OrganisationalUnit))
                 OrganisationalUnit = null;
-            // Removed 2012-06-14 G# - Properties moved to DeviceProfile model & DB Migrated in DBv3.
-            //deviceProfile.Configuration(dbContext).OrganisationalUnit = OrganisationalUnit;
+
             deviceProfile.OrganisationalUnit = OrganisationalUnit;
 
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
+
         private void UpdateComputerNameTemplate(Disco.Models.Repository.DeviceProfile deviceProfile, string ComputerNameTemplate)
         {
+            Authorization.Require(Claims.Config.DeviceProfile.ConfigureComputerNameTemplate);
+
             if (string.IsNullOrWhiteSpace(ComputerNameTemplate))
                 throw new Exception("ComputerNameTemplate is Required");
-            // Removed 2012-06-14 G# - Properties moved to DeviceProfile model & DB Migrated in DBv3.
-            //deviceProfile.Configuration(dbContext).ComputerNameTemplate = ComputerNameTemplate;
+
             deviceProfile.ComputerNameTemplate = ComputerNameTemplate;
 
-            dbContext.SaveChanges();
+            Database.SaveChanges();
 
             deviceProfile.ComputerNameInvalidateCache();
         }
@@ -237,7 +259,7 @@ namespace Disco.Web.Areas.API.Controllers
                 int daoId;
                 if (int.TryParse(DefaultOrganisationAddress, out daoId))
                 {
-                    var oa = dbContext.DiscoConfiguration.OrganisationAddresses.GetAddress(daoId);
+                    var oa = Database.DiscoConfiguration.OrganisationAddresses.GetAddress(daoId);
                     if (oa != null)
                     {
                         deviceProfile.DefaultOrganisationAddress = oa.Id;
@@ -254,10 +276,9 @@ namespace Disco.Web.Areas.API.Controllers
             }
 
 
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
-        // Added 2012-06-14 G#
         private void UpdateEnforceComputerNameConvention(Disco.Models.Repository.DeviceProfile deviceProfile, string EnforceComputerNameConvention)
         {
             bool bValue;
@@ -265,12 +286,12 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 deviceProfile.EnforceComputerNameConvention = bValue;
 
-                dbContext.SaveChanges();
+                Database.SaveChanges();
                 return;
             }
             throw new Exception("Invalid Boolean Value");
         }
-        // Added 2012-06-14 G#
+        
         private void UpdateEnforceOrganisationalUnit(Disco.Models.Repository.DeviceProfile deviceProfile, string EnforceOrganisationalUnit)
         {
             bool bValue;
@@ -278,12 +299,12 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 deviceProfile.EnforceOrganisationalUnit = bValue;
 
-                dbContext.SaveChanges();
+                Database.SaveChanges();
                 return;
             }
             throw new Exception("Invalid Boolean Value");
         }
-        // Added 2012-06-28 G#
+        
         private void UpdateProvisionADAccount(Disco.Models.Repository.DeviceProfile deviceProfile, string ProvisionADAccount)
         {
             bool bValue;
@@ -291,13 +312,14 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 deviceProfile.ProvisionADAccount = bValue;
 
-                dbContext.SaveChanges();
+                Database.SaveChanges();
                 return;
             }
             throw new Exception("Invalid Boolean Value");
         }
         #endregion
 
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult OrganisationalUnits()
         {
             var OUs = BI.Interop.ActiveDirectory.ActiveDirectory.GetOrganisationalUnitStructure();
@@ -306,15 +328,16 @@ namespace Disco.Web.Areas.API.Controllers
 
         #region Actions
 
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Delete)]
         public virtual ActionResult Delete(int id, Nullable<bool> redirect = false)
         {
             try
             {
-                var dp = dbContext.DeviceProfiles.Find(id);
+                var dp = Database.DeviceProfiles.Find(id);
                 if (dp != null)
                 {
-                    dp.Delete(dbContext);
-                    dbContext.SaveChanges();
+                    dp.Delete(Database);
+                    Database.SaveChanges();
                     if (redirect.HasValue && redirect.Value)
                         return RedirectToAction(MVC.Config.DeviceProfile.Index(null));
                     else
@@ -334,15 +357,17 @@ namespace Disco.Web.Areas.API.Controllers
         #endregion
 
         #region Defaults
+
+        [DiscoAuthorize(Claims.Config.DeviceProfile.ConfigureDefaults)]
         public virtual ActionResult Default(int id, Nullable<bool> redirect = null)
         {
             try
             {
-                var dp = dbContext.DeviceProfiles.Find(id);
+                var dp = Database.DeviceProfiles.Find(id);
                 if (dp != null)
                 {
-                    dbContext.DiscoConfiguration.DeviceProfiles.DefaultDeviceProfileId = dp.Id;
-                    dbContext.SaveChanges();
+                    Database.DiscoConfiguration.DeviceProfiles.DefaultDeviceProfileId = dp.Id;
+                    Database.SaveChanges();
                     if (redirect.HasValue && redirect.Value)
                         return RedirectToAction(MVC.Config.DeviceProfile.Index(id));
                     else
@@ -358,6 +383,8 @@ namespace Disco.Web.Areas.API.Controllers
                     return Json(string.Format("Error: {0}", ex.Message), JsonRequestBehavior.AllowGet);
             }
         }
+
+        [DiscoAuthorize(Claims.Config.DeviceProfile.ConfigureDefaults)]
         public virtual ActionResult DefaultAddDeviceOffline(int id, Nullable<bool> redirect = false)
         {
             try
@@ -365,7 +392,7 @@ namespace Disco.Web.Areas.API.Controllers
                 int defaultValue = 0;
                 if (id > 0)
                 {
-                    var dp = dbContext.DeviceProfiles.Find(id);
+                    var dp = Database.DeviceProfiles.Find(id);
                     if (dp != null)
                     {
                         defaultValue = dp.Id;
@@ -375,8 +402,8 @@ namespace Disco.Web.Areas.API.Controllers
                         throw new Exception("Invalid Device Profile Number");
                     }
                 }
-                dbContext.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId = defaultValue;
-                dbContext.SaveChanges();
+                Database.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId = defaultValue;
+                Database.SaveChanges();
                 if (redirect.HasValue && redirect.Value)
                     return RedirectToAction(MVC.Config.DeviceProfile.Index(id));
                 else
@@ -390,16 +417,18 @@ namespace Disco.Web.Areas.API.Controllers
                     return Json(string.Format("Error: {0}", ex.Message), JsonRequestBehavior.AllowGet);
             }
         }
+
         #endregion
 
         #region Exporting
+        [DiscoAuthorizeAll(Claims.Config.DeviceProfile.Show, Claims.Device.Actions.Export)]
         public virtual ActionResult ExportDevices(int id)
         {
-            DeviceProfile dp = dbContext.DeviceProfiles.Find(id);
+            DeviceProfile dp = Database.DeviceProfiles.Find(id);
             if (dp == null)
                 throw new ArgumentNullException("id", "Invalid Device Profile Id");
 
-            var devices = dbContext.Devices.Where(d => !d.DecommissionedDate.HasValue && d.DeviceProfileId == dp.Id);
+            var devices = Database.Devices.Where(d => !d.DecommissionedDate.HasValue && d.DeviceProfileId == dp.Id);
 
             var export = BI.DeviceBI.Importing.Export.GenerateExport(devices);
 
diff --git a/Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs b/Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs
index e01e5229..e58ad762 100644
--- a/Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs
+++ b/Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs
@@ -1,15 +1,18 @@
-using System;
+using Disco.BI;
+using Disco.BI.Extensions;
+using Disco.Models.Repository;
+using Disco.Services.Authorization;
+using Disco.Services.Users;
+using Disco.Services.Web;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
-using Disco.BI;
-using Disco.BI.Extensions;
-using Disco.Models.Repository;
 
 namespace Disco.Web.Areas.API.Controllers
 {
-    public partial class DocumentTemplateController : dbAdminController
+    public partial class DocumentTemplateController : AuthorizedDatabaseController
     {
 
         const string pDescription = "description";
@@ -17,6 +20,7 @@ namespace Disco.Web.Areas.API.Controllers
         const string pFilterExpression = "filterexpression";
         const string pFlattenForm = "flattenform";
 
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.Configure)]
         public virtual ActionResult Update(string id, string key, string value = null, bool redirect = false)
         {
             try
@@ -25,7 +29,7 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new ArgumentNullException("id");
                 if (string.IsNullOrEmpty(key))
                     throw new ArgumentNullException("key");
-                var documentTemplate = dbContext.DocumentTemplates.Find(id);
+                var documentTemplate = Database.DocumentTemplates.Find(id);
                 if (documentTemplate != null)
                 {
                     switch (key.ToLower())
@@ -37,6 +41,7 @@ namespace Disco.Web.Areas.API.Controllers
                             UpdateScope(documentTemplate, value);
                             break;
                         case pFilterExpression:
+                            Authorization.Require(Claims.Config.DocumentTemplate.ConfigureFilterExpression);
                             UpdateFilterExpression(documentTemplate, value);
                             break;
                         case pFlattenForm:
@@ -64,16 +69,16 @@ namespace Disco.Web.Areas.API.Controllers
             }
         }
 
-        [HttpGet]
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.Upload), HttpGet]
         public virtual ActionResult Template(string id)
         {
             if (string.IsNullOrEmpty(id))
                 throw new ArgumentNullException("id");
-            var documentTemplate = dbContext.DocumentTemplates.Find(id);
+            var documentTemplate = Database.DocumentTemplates.Find(id);
             if (documentTemplate == null)
                 throw new ArgumentException("Invalid Document Template Id", "id");
 
-            var filename = documentTemplate.RepositoryFilename(dbContext);
+            var filename = documentTemplate.RepositoryFilename(Database);
             if (System.IO.File.Exists(filename))
             {
                 return File(filename, DocumentTemplate.PdfMimeType, string.Format("{0}.pdf", documentTemplate.Id));
@@ -83,18 +88,19 @@ namespace Disco.Web.Areas.API.Controllers
                 throw new InvalidOperationException("Template not found");
             }
         }
-        [HttpPost]
+
+        [DiscoAuthorizeAll(Claims.Config.DocumentTemplate.Upload, Claims.Config.DocumentTemplate.Configure), HttpPost]
         public virtual ActionResult Template(string id, bool redirect, HttpPostedFileBase Template)
         {
             try
             {
                 if (string.IsNullOrEmpty(id))
                     throw new ArgumentNullException("id");
-                var documentTemplate = dbContext.DocumentTemplates.Find(id);
+                var documentTemplate = Database.DocumentTemplates.Find(id);
                 if (documentTemplate == null)
                     throw new ArgumentException("Invalid Document Template Id", "id");
 
-                documentTemplate.SavePdfTemplate(dbContext, Template.InputStream);
+                documentTemplate.SavePdfTemplate(Database, Template.InputStream);
 
                 if (redirect)
                     return RedirectToAction(MVC.Config.DocumentTemplate.Index(documentTemplate.Id));
@@ -111,29 +117,34 @@ namespace Disco.Web.Areas.API.Controllers
         }
 
         #region Update Shortcut Methods
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.Configure)]
         public virtual ActionResult UpdateDescription(string id, string Description = null, bool redirect = false)
         {
             return Update(id, pDescription, Description, redirect);
         }
+        [DiscoAuthorizeAll(Claims.Config.DocumentTemplate.Configure, Claims.Config.DocumentTemplate.ConfigureFilterExpression)]
         public virtual ActionResult UpdateFilterExpression(string id, string FilterExpression = null, bool redirect = false)
         {
             return Update(id, pFilterExpression, FilterExpression, redirect);
         }
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.Configure)]
         public virtual ActionResult UpdateFlattenForm(string id, string FlattenForm = null, bool redirect = false)
         {
             return Update(id, pFlattenForm, FlattenForm, redirect);
         }
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.Configure)]
         public virtual ActionResult UpdateScope(string id, string Scope = null, bool redirect = false)
         {
             return Update(id, pScope, Scope, redirect);
         }
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.Configure)]
         public virtual ActionResult UpdateSubTypes(string id, List<string> SubTypes = null)
         {
             try
             {
                 if (string.IsNullOrEmpty(id))
                     throw new ArgumentNullException("id");
-                var documentTemplate = dbContext.DocumentTemplates.Find(id);
+                var documentTemplate = Database.DocumentTemplates.Find(id);
 
                 UpdateSubTypes(documentTemplate, SubTypes);
 
@@ -153,7 +164,7 @@ namespace Disco.Web.Areas.API.Controllers
             if (!string.IsNullOrWhiteSpace(Description))
             {
                 documentTemplate.Description = Description.Trim();
-                dbContext.SaveChanges();
+                Database.SaveChanges();
                 return;
             }
             throw new Exception("Invalid Description");
@@ -164,7 +175,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 if (Disco.Models.Repository.DocumentTemplate.DocumentTemplateScopes.ToList().Contains(Scope))
                 {
-                    dbContext.Configuration.LazyLoadingEnabled = true;
+                    Database.Configuration.LazyLoadingEnabled = true;
 
                     documentTemplate.Scope = Scope;
 
@@ -175,7 +186,7 @@ namespace Disco.Web.Areas.API.Controllers
                             documentTemplate.JobSubTypes.Remove(st);
                     }
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     return;
                 }
             }
@@ -194,7 +205,7 @@ namespace Disco.Web.Areas.API.Controllers
             // Invalidate Cache
             documentTemplate.FilterExpressionInvalidateCache();
 
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateFlattenForm(Disco.Models.Repository.DocumentTemplate documentTemplate, string FlattenForm)
         {
@@ -211,11 +222,11 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Boolean Format");
             }
 
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateSubTypes(Disco.Models.Repository.DocumentTemplate documentTemplate, List<string> SubTypes)
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
 
             // Remove All Existing
             if (documentTemplate.JobSubTypes != null)
@@ -232,35 +243,21 @@ namespace Disco.Web.Areas.API.Controllers
                 {
                     var typeId = stId.Substring(0, stId.IndexOf("_"));
                     var subTypeId = stId.Substring(stId.IndexOf("_") + 1);
-                    var subType = dbContext.JobSubTypes.FirstOrDefault(jst => jst.JobTypeId == typeId && jst.Id == subTypeId);
+                    var subType = Database.JobSubTypes.FirstOrDefault(jst => jst.JobTypeId == typeId && jst.Id == subTypeId);
                     subTypes.Add(subType);
                 }
                 documentTemplate.JobSubTypes = subTypes;
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         #endregion
 
-
-
         #region Actions
 
-        [OutputCache(NoStore = true, Duration = 0)]
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.UndetectedPages), OutputCache(NoStore = true, Duration = 0)]
         public virtual ActionResult ImporterThumbnail(string SessionId, int PageNumber)
         {
-            // Load from Cache
-            //var cacheKey = string.Format("Disco.BI.DocumentImporter-{0}-{1}", SessionId, PageNumber);
-            //var cacheValue = HttpContext.Cache.Get(cacheKey);
-            //if (cacheValue != null)
-            //{
-            //    var cacheFile = cacheValue as byte[];
-            //    if (cacheFile != null)
-            //    {
-            //        return File(cacheFile, "image/png");
-            //    }
-            //}
-
-            var dataStoreSessionPagesCacheLocation = DataStore.CreateLocation(dbContext, "Cache\\DocumentDropBox_SessionPages");
+            var dataStoreSessionPagesCacheLocation = DataStore.CreateLocation(Database, "Cache\\DocumentDropBox_SessionPages");
             var filename = System.IO.Path.Combine(dataStoreSessionPagesCacheLocation, string.Format("{0}-{1}", SessionId, PageNumber));
             if (System.IO.File.Exists(filename))
                 return File(filename, "image/png");
@@ -268,9 +265,10 @@ namespace Disco.Web.Areas.API.Controllers
                 return File("~/ClientSource/Style/Images/Status/fileBroken256.png", "image/png");
         }
 
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.UndetectedPages)]
         public virtual ActionResult ImporterUndetectedFiles()
         {
-            var undetectedLocation = DataStore.CreateLocation(dbContext, "DocumentDropBox_Unassigned");
+            var undetectedLocation = DataStore.CreateLocation(Database, "DocumentDropBox_Unassigned");
             var undetectedDirectory = new System.IO.DirectoryInfo(undetectedLocation);
             var m = undetectedDirectory.GetFiles("*.pdf").Select(f => new Models.DocumentTemplate.ImporterUndetectedFilesModel()
             {
@@ -281,6 +279,8 @@ namespace Disco.Web.Areas.API.Controllers
 
             return Json(m);
         }
+
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.UndetectedPages)]
         public virtual ActionResult ImporterUndetectedDataIdLookup(string id, string term, int limitCount = 20)
         {
             if (!string.IsNullOrEmpty(id) && !string.IsNullOrWhiteSpace(term))
@@ -306,7 +306,7 @@ namespace Disco.Web.Areas.API.Controllers
                 }
                 else
                 {
-                    var documentTemplate = dbContext.DocumentTemplates.Find(id);
+                    var documentTemplate = Database.DocumentTemplates.Find(id);
                     if (documentTemplate != null)
                         searchScope = documentTemplate.Scope;
                     else
@@ -318,13 +318,13 @@ namespace Disco.Web.Areas.API.Controllers
                     switch (searchScope)
                     {
                         case DocumentTemplate.DocumentTemplateScopes.Device:
-                            results = BI.DeviceBI.Searching.Search(dbContext, term, limitCount).Select(sr => Models.DocumentTemplate.ImporterUndetectedDataIdLookupModel.FromSearchResultItem(sr)).ToArray();
+                            results = BI.DeviceBI.Searching.Search(Database, term, limitCount).Select(sr => Models.DocumentTemplate.ImporterUndetectedDataIdLookupModel.FromSearchResultItem(sr)).ToArray();
                             break;
                         case DocumentTemplate.DocumentTemplateScopes.Job:
-                            results = BI.JobBI.Searching.Search(dbContext, term, limitCount, false).Items.Select(sr => Models.DocumentTemplate.ImporterUndetectedDataIdLookupModel.FromSearchResultItem(sr)).ToArray();
+                            results = BI.JobBI.Searching.Search(Database, term, limitCount, false).Items.Select(sr => Models.DocumentTemplate.ImporterUndetectedDataIdLookupModel.FromSearchResultItem(sr)).ToArray();
                             break;
                         case DocumentTemplate.DocumentTemplateScopes.User:
-                            results = BI.UserBI.Searching.Search(dbContext, term, limitCount).Select(sr => Models.DocumentTemplate.ImporterUndetectedDataIdLookupModel.FromSearchResultItem(sr)).ToArray();
+                            results = BI.UserBI.Searching.Search(Database, term, limitCount).Select(sr => Models.DocumentTemplate.ImporterUndetectedDataIdLookupModel.FromSearchResultItem(sr)).ToArray();
                             break;
                         default:
                             results = null;
@@ -337,11 +337,13 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json(null, JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.UndetectedPages)]
         public virtual ActionResult ImporterUndetectedFile(string id, Nullable<bool> Source, Nullable<bool> Thumbnail)
         {
             if (!string.IsNullOrEmpty(id))
             {
-                var undetectedLocation = DataStore.CreateLocation(dbContext, "DocumentDropBox_Unassigned");
+                var undetectedLocation = DataStore.CreateLocation(Database, "DocumentDropBox_Unassigned");
                 if (Source.HasValue && Source.Value)
                 {
                     var filename = System.IO.Path.Combine(undetectedLocation, string.Concat(id, ".pdf"));
@@ -372,11 +374,13 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return HttpNotFound();
         }
+
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.UndetectedPages)]
         public virtual ActionResult ImporterUndetectedAssign(string id, string DocumentTemplateId, string DataId)
         {
-            var undetectedLocation = DataStore.CreateLocation(dbContext, "DocumentDropBox_Unassigned");
+            var undetectedLocation = DataStore.CreateLocation(Database, "DocumentDropBox_Unassigned");
             var filename = System.IO.Path.Combine(undetectedLocation, string.Concat(id, ".pdf"));
-            if (BI.Interop.Pdf.PdfImporter.ProcessPdfAttachment(filename, dbContext, DocumentTemplateId, DataId, DiscoApplication.CurrentUser.Id, DateTime.Now))
+            if (BI.Interop.Pdf.PdfImporter.ProcessPdfAttachment(filename, Database, DocumentTemplateId, DataId, UserService.CurrentUserId, DateTime.Now))
             {
                 // Delete File
                 System.IO.File.Delete(filename);
@@ -396,9 +400,11 @@ namespace Disco.Web.Areas.API.Controllers
                 return Json("Unable to Import File with the supplied parameters");
             }
         }
+
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.UndetectedPages)]
         public virtual ActionResult ImporterUndetectedDelete(string id)
         {
-            var undetectedLocation = DataStore.CreateLocation(dbContext, "DocumentDropBox_Unassigned");
+            var undetectedLocation = DataStore.CreateLocation(Database, "DocumentDropBox_Unassigned");
             var filename = System.IO.Path.Combine(undetectedLocation, string.Concat(id, ".pdf"));
             if (System.IO.File.Exists(filename))
             {
@@ -421,32 +427,49 @@ namespace Disco.Web.Areas.API.Controllers
             }
         }
 
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.BulkGenerate)]
         public virtual ActionResult BulkGenerate(string id, string DataIds = null)
         {
             if (string.IsNullOrEmpty(id))
                 throw new ArgumentNullException("id");
             if (string.IsNullOrEmpty(DataIds))
                 throw new ArgumentNullException("DataIds");
-            var documentTemplate = dbContext.DocumentTemplates.Find(id);
+            var documentTemplate = Database.DocumentTemplates.Find(id);
             if (documentTemplate == null)
                 throw new ArgumentException("Invalid Document Template Id", "id");
 
+            switch (documentTemplate.Scope)
+            {
+                case DocumentTemplate.DocumentTemplateScopes.Device:
+                    Authorization.Require(Claims.Device.Actions.GenerateDocuments);
+                    break;
+                case DocumentTemplate.DocumentTemplateScopes.Job:
+                    Authorization.Require(Claims.Job.Actions.GenerateDocuments);
+                    break;
+                case DocumentTemplate.DocumentTemplateScopes.User:
+                    Authorization.Require(Claims.User.Actions.GenerateDocuments);
+                    break;
+                default:
+                    throw new InvalidOperationException("Unknown DocumentType Scope");
+            }
+
             var dataIds = DataIds.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
             var timeStamp = DateTime.Now;
-            var pdf = documentTemplate.GeneratePdfBulk(dbContext, DiscoApplication.CurrentUser, timeStamp, dataIds);
+            var pdf = documentTemplate.GeneratePdfBulk(Database, UserService.CurrentUser, timeStamp, dataIds);
 
             return File(pdf, "application/pdf", string.Format("{0}_Bulk_{1:yyyyMMdd-HHmmss}.pdf", documentTemplate.Id, timeStamp));
         }
 
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.Delete)]
         public virtual ActionResult Delete(string id, Nullable<bool> redirect = false)
         {
             try
             {
-                var at = dbContext.DocumentTemplates.Include("JobSubTypes").FirstOrDefault(a => a.Id == id);
+                var at = Database.DocumentTemplates.Include("JobSubTypes").FirstOrDefault(a => a.Id == id);
                 if (at != null)
                 {
-                    at.Delete(dbContext);
-                    dbContext.SaveChanges();
+                    at.Delete(Database);
+                    Database.SaveChanges();
                     if (redirect.HasValue && redirect.Value)
                         return RedirectToAction(MVC.Config.DocumentTemplate.Index(null));
                     else
diff --git a/Disco.Web/Areas/API/Controllers/ExpressionsController.cs b/Disco.Web/Areas/API/Controllers/ExpressionsController.cs
index 8db63327..975250da 100644
--- a/Disco.Web/Areas/API/Controllers/ExpressionsController.cs
+++ b/Disco.Web/Areas/API/Controllers/ExpressionsController.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using Disco.Services.Authorization;
+using Disco.Services.Web;
 using System.Web.Mvc;
 
 namespace Disco.Web.Areas.API.Controllers
 {
-    public partial class ExpressionsController : dbAdminController
+    [DiscoAuthorize(Claims.DiscoAdminAccount)]
+    public partial class ExpressionsController : AuthorizedDatabaseController
     {
         public virtual ActionResult ValidateExpression(string Expression)
         {
diff --git a/Disco.Web/Areas/API/Controllers/JobController.cs b/Disco.Web/Areas/API/Controllers/JobController.cs
index 1dcc2129..92eb85e3 100644
--- a/Disco.Web/Areas/API/Controllers/JobController.cs
+++ b/Disco.Web/Areas/API/Controllers/JobController.cs
@@ -1,17 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using Disco.BI.Extensions;
-using Disco.Web.Extensions;
+using Disco.BI.Extensions;
 using Disco.Models.Repository;
-using Disco.Data.Configuration;
+using Disco.Services.Authorization;
+using Disco.Services.Users;
+using Disco.Services.Web;
+using Disco.Web.Extensions;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Web.Mvc;
 
 namespace Disco.Web.Areas.API.Controllers
 {
-    public partial class JobController : dbAdminController
+    public partial class JobController : AuthorizedDatabaseController
     {
 
         #region Property Constants
@@ -75,8 +76,10 @@ namespace Disco.Web.Areas.API.Controllers
                 if (string.IsNullOrEmpty(key))
                     throw new ArgumentNullException("key");
 
-                dbContext.Configuration.LazyLoadingEnabled = true;
-                var job = dbContext.Jobs.Find(id);
+                var authToken = UserService.CurrentAuthorization;
+
+                Database.Configuration.LazyLoadingEnabled = true;
+                var job = Database.Jobs.Find(id);
 
                 object resultData = null;
                 string resultUrlFragment = null;
@@ -86,144 +89,180 @@ namespace Disco.Web.Areas.API.Controllers
                     switch (key.ToLower())
                     {
                         case pExpectedClosedDate:
+                            Authorization.Require(Claims.Job.Properties.ExpectedClosedDate);
                             UpdateExpectedClosedDate(job, value);
                             break;
                         case pDeviceHeldLocation:
+                            Authorization.Require(Claims.Job.Properties.DeviceHeldLocation);
                             UpdateDeviceHeldLocation(job, value);
                             break;
                         case pFlags:
+                            Authorization.Require(Claims.Job.Properties.Flags);
                             UpdateFlags(job, value);
                             resultUrlFragment = pJobDetailsTabFlags;
                             break;
                         case pNonWarrantyAccountingChargeRequired:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.AccountingChargeRequired);
                             resultData = UpdateNonWarrantyAccountingChargeRequired(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyFinance;
                             break;
                         case pNonWarrantyAccountingChargeAdded:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.AccountingChargeAdded);
                             resultData = UpdateNonWarrantyAccountingChargeAdded(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyFinance;
                             break;
                         case pNonWarrantyAccountingChargePaid:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.AccountingChargePaid);
                             resultData = UpdateNonWarrantyAccountingChargePaid(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyFinance;
                             break;
                         case pNonWarrantyPurchaseOrderRaised:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.PurchaseOrderRaised);
                             resultData = UpdateNonWarrantyPurchaseOrderRaised(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyFinance;
                             break;
                         case pNonWarrantyPurchaseOrderReference:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.PurchaseOrderReference);
                             UpdateNonWarrantyPurchaseOrderReference(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyFinance;
                             break;
                         case pNonWarrantyPurchaseOrderSent:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.PurchaseOrderSent);
                             resultData = UpdateNonWarrantyPurchaseOrderSent(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyFinance;
                             break;
                         case pNonWarrantyInvoiceReceived:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InvoiceReceived);
                             resultData = UpdateNonWarrantyInvoiceReceived(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyFinance;
                             break;
                         case pNonWarrantyRepairerName:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.RepairerName);
                             UpdateNonWarrantyRepairerName(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyRepairs;
                             break;
                         case pNonWarrantyRepairerLoggedDate:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.RepairerLoggedDate);
                             UpdateNonWarrantyRepairerLoggedDate(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyRepairs;
                             break;
                         case pNonWarrantyRepairerReference:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.RepairerReference);
                             UpdateNonWarrantyRepairerReference(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyRepairs;
                             break;
                         case pNonWarrantyRepairerCompletedDate:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.RepairerCompletedDate);
                             UpdateNonWarrantyRepairerCompletedDate(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyRepairs;
                             break;
                         case pNonWarrantyIsInsuranceClaim:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.IsInsuranceClaim);
                             UpdateNonWarrantyIsInsuranceClaim(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsuranceLossOrDamageDate:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsuranceLossOrDamageDate(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsuranceEventLocation:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsuranceEventLocation(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsuranceDescription:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsuranceDescription(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsuranceThirdPartyCaused:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsuranceThirdPartyCaused(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsuranceThirdPartyCausedName:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsuranceThirdPartyCausedName(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsuranceThirdPartyCausedWhy:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsuranceThirdPartyCausedWhy(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsuranceWitnessesNamesAddresses:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsuranceWitnessesNamesAddresses(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsuranceBurglaryTheftMethodOfEntry:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsuranceBurglaryTheftMethodOfEntry(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsurancePropertyLastSeenDate:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsurancePropertyLastSeenDate(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsurancePoliceNotified:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsurancePoliceNotified(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsurancePoliceNotifiedStation:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsurancePoliceNotifiedStation(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsurancePoliceNotifiedDate:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsurancePoliceNotifiedDate(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsurancePoliceNotifiedCrimeReportNo:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsurancePoliceNotifiedCrimeReportNo(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsuranceRecoverReduceAction:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsuranceRecoverReduceAction(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsuranceOtherInterestedParties:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsuranceOtherInterestedParties(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsuranceDateOfPurchase:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails);
                             UpdateInsuranceDateOfPurchase(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pInsuranceClaimFormSentDate:
+                            Authorization.Require(Claims.Job.Properties.NonWarrantyProperties.InsuranceClaimFormSent);
                             resultData = UpdateInsuranceClaimFormSentDate(job, value);
                             resultUrlFragment = pJobDetailsTabNonWarrantyInsurance;
                             break;
                         case pWarrantyExternalName:
+                            Authorization.Require(Claims.Job.Properties.WarrantyProperties.ExternalName);
                             UpdateWarrantyExternalName(job, value);
                             resultUrlFragment = pJobDetailsTabWarranty;
                             break;
                         case pWarrantyExternalLoggedDate:
+                            Authorization.Require(Claims.Job.Properties.WarrantyProperties.ExternalLoggedDate);
                             UpdateWarrantyExternalLoggedDate(job, value);
                             resultUrlFragment = pJobDetailsTabWarranty;
                             break;
                         case pWarrantyExternalReference:
+                            Authorization.Require(Claims.Job.Properties.WarrantyProperties.ExternalReference);
                             UpdateWarrantyExternalReference(job, value);
                             resultUrlFragment = pJobDetailsTabWarranty;
                             break;
                         case pWarrantyExternalCompletedDate:
+                            Authorization.Require(Claims.Job.Properties.WarrantyProperties.ExternalCompletedDate);
                             UpdateWarrantyExternalCompletedDate(job, value);
                             resultUrlFragment = pJobDetailsTabWarranty;
                             break;
@@ -237,7 +276,7 @@ namespace Disco.Web.Areas.API.Controllers
                 }
                 if (redirect.HasValue && redirect.Value)
                     return this.RedirectToAction(MVC.Job.Show(job.Id), resultUrlFragment);
-                    //return RedirectToAction(MVC.Job.Show(job.Id));
+                //return RedirectToAction(MVC.Job.Show(job.Id));
                 else
                 {
                     if (resultData != null)
@@ -260,64 +299,79 @@ namespace Disco.Web.Areas.API.Controllers
         }
 
         #region Update Shortcut Methods
+        [DiscoAuthorize(Claims.Job.Properties.ExpectedClosedDate)]
         public virtual ActionResult UpdateExpectedClosedDate(int id, string ExpectedClosedDate, Nullable<bool> redirect = null)
         {
             return Update(id, pExpectedClosedDate, ExpectedClosedDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.DeviceHeldLocation)]
         public virtual ActionResult UpdateDeviceHeldLocation(int id, string DeviceHeldLocation, Nullable<bool> redirect = null)
         {
             return Update(id, pDeviceHeldLocation, DeviceHeldLocation, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.Flags)]
         public virtual ActionResult UpdateFlags(int id, string Flags, Nullable<bool> redirect = null)
         {
             return Update(id, pFlags, Flags, redirect);
         }
 
         #region NonWarranty
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.AccountingChargeRequired)]
         public virtual ActionResult UpdateNonWarrantyAccountingChargeRequired(int id, string AccountingChargeRequiredDate, Nullable<bool> redirect = null)
         {
             return Update(id, pNonWarrantyAccountingChargeRequired, AccountingChargeRequiredDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.AccountingChargeAdded)]
         public virtual ActionResult UpdateNonWarrantyAccountingChargeAdded(int id, string AccountingChargeAddedDate, Nullable<bool> redirect = null)
         {
             return Update(id, pNonWarrantyAccountingChargeAdded, AccountingChargeAddedDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.AccountingChargePaid)]
         public virtual ActionResult UpdateNonWarrantyAccountingChargePaid(int id, string AccountingChargePaidDate, Nullable<bool> redirect = null)
         {
             return Update(id, pNonWarrantyAccountingChargePaid, AccountingChargePaidDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.PurchaseOrderRaised)]
         public virtual ActionResult UpdateNonWarrantyPurchaseOrderRaised(int id, string PurchaseOrderRaisedDate, Nullable<bool> redirect = null)
         {
             return Update(id, pNonWarrantyPurchaseOrderRaised, PurchaseOrderRaisedDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.PurchaseOrderReference)]
         public virtual ActionResult UpdateNonWarrantyPurchaseOrderReference(int id, string PurchaseOrderReference, Nullable<bool> redirect = null)
         {
             return Update(id, pNonWarrantyPurchaseOrderReference, PurchaseOrderReference, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.PurchaseOrderSent)]
         public virtual ActionResult UpdateNonWarrantyPurchaseOrderSent(int id, string PurchaseOrderSentDate, Nullable<bool> redirect = null)
         {
             return Update(id, pNonWarrantyPurchaseOrderSent, PurchaseOrderSentDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InvoiceReceived)]
         public virtual ActionResult UpdateNonWarrantyInvoiceReceived(int id, string InvoiceReceivedDate, Nullable<bool> redirect = null)
         {
             return Update(id, pNonWarrantyInvoiceReceived, InvoiceReceivedDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.RepairerName)]
         public virtual ActionResult UpdateNonWarrantyRepairerName(int id, string RepairerName, Nullable<bool> redirect = null)
         {
             return Update(id, pNonWarrantyRepairerName, RepairerName, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.RepairerLoggedDate)]
         public virtual ActionResult UpdateNonWarrantyRepairerLoggedDate(int id, string RepairerLoggedDate, Nullable<bool> redirect = null)
         {
             return Update(id, pNonWarrantyRepairerLoggedDate, RepairerLoggedDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.RepairerReference)]
         public virtual ActionResult UpdateNonWarrantyRepairerReference(int id, string RepairerReference, Nullable<bool> redirect = null)
         {
             return Update(id, pNonWarrantyRepairerReference, RepairerReference, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.RepairerCompletedDate)]
         public virtual ActionResult UpdateNonWarrantyRepairerCompletedDate(int id, string RepairerCompletedDate, Nullable<bool> redirect = null)
         {
             return Update(id, pNonWarrantyRepairerCompletedDate, RepairerCompletedDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.IsInsuranceClaim)]
         public virtual ActionResult UpdateNonWarrantyIsInsuranceClaim(int id, bool IsInsuranceClaim, Nullable<bool> redirect = null)
         {
             return Update(id, pNonWarrantyIsInsuranceClaim, IsInsuranceClaim.ToString(), redirect);
@@ -326,74 +380,92 @@ namespace Disco.Web.Areas.API.Controllers
 
         #region Insurance
 
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsuranceLossOrDamageDate(int id, string LossOrDamageDate, Nullable<bool> redirect = null)
         {
             return Update(id, pInsuranceLossOrDamageDate, LossOrDamageDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsuranceEventLocation(int id, string EventLocation, Nullable<bool> redirect = null)
         {
             return Update(id, pInsuranceEventLocation, EventLocation, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsuranceDescription(int id, string Description, Nullable<bool> redirect = null)
         {
             return Update(id, pInsuranceDescription, Description, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsuranceThirdPartyCaused(int id, string ThirdPartyCaused, Nullable<bool> redirect = null)
         {
             return Update(id, pInsuranceThirdPartyCaused, ThirdPartyCaused, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsuranceThirdPartyCausedName(int id, string ThirdPartyCausedName, Nullable<bool> redirect = null)
         {
             return Update(id, pInsuranceThirdPartyCausedName, ThirdPartyCausedName, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsuranceThirdPartyCausedWhy(int id, string ThirdPartyCausedWhy, Nullable<bool> redirect = null)
         {
             return Update(id, pInsuranceThirdPartyCausedWhy, ThirdPartyCausedWhy, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsuranceWitnessesNamesAddresses(int id, string WitnessesNamesAddresses, Nullable<bool> redirect = null)
         {
             return Update(id, pInsuranceWitnessesNamesAddresses, WitnessesNamesAddresses, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsuranceBurglaryTheftMethodOfEntry(int id, string BurglaryTheftMethodOfEntry, Nullable<bool> redirect = null)
         {
             return Update(id, pInsuranceBurglaryTheftMethodOfEntry, BurglaryTheftMethodOfEntry, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsurancePropertyLastSeenDate(int id, string PropertyLastSeenDate, Nullable<bool> redirect = null)
         {
             return Update(id, pInsurancePropertyLastSeenDate, PropertyLastSeenDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsurancePoliceNotified(int id, string PoliceNotified, Nullable<bool> redirect = null)
         {
             return Update(id, pInsurancePoliceNotified, PoliceNotified, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsurancePoliceNotifiedStation(int id, string PoliceNotifiedStation, Nullable<bool> redirect = null)
         {
             return Update(id, pInsurancePoliceNotifiedStation, PoliceNotifiedStation, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsurancePoliceNotifiedDate(int id, string PoliceNotifiedDate, Nullable<bool> redirect = null)
         {
             return Update(id, pInsurancePoliceNotifiedDate, PoliceNotifiedDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsurancePoliceNotifiedCrimeReportNo(int id, string PoliceNotifiedCrimeReportNo, Nullable<bool> redirect = null)
         {
             return Update(id, pInsurancePoliceNotifiedCrimeReportNo, PoliceNotifiedCrimeReportNo, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsuranceRecoverReduceAction(int id, string RecoverReduceAction, Nullable<bool> redirect = null)
         {
             return Update(id, pInsuranceRecoverReduceAction, RecoverReduceAction, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsuranceOtherInterestedParties(int id, string OtherInterestedParties, Nullable<bool> redirect = null)
         {
             return Update(id, pInsuranceOtherInterestedParties, OtherInterestedParties, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails)]
         public virtual ActionResult UpdateInsuranceDateOfPurchase(int id, string DateOfPurchase, Nullable<bool> redirect = null)
         {
             return Update(id, pInsuranceDateOfPurchase, DateOfPurchase, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceClaimFormSent)]
         public virtual ActionResult UpdateInsuranceClaimFormSentDate(int id, string ClaimFormSentDate, Nullable<bool> redirect = null)
         {
             return Update(id, pInsuranceClaimFormSentDate, ClaimFormSentDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.InsuranceClaimFormSent)]
         public virtual ActionResult UpdateInsuranceClaimFormSentUserId(int id, string ClaimFormSentUserId, Nullable<bool> redirect = null)
         {
             return Update(id, pInsuranceClaimFormSentUserId, ClaimFormSentUserId, redirect);
@@ -402,18 +474,22 @@ namespace Disco.Web.Areas.API.Controllers
         #endregion
 
         #region Warranty
+        [DiscoAuthorize(Claims.Job.Properties.WarrantyProperties.ExternalName)]
         public virtual ActionResult UpdateWarrantyExternalName(int id, string ExternalName, Nullable<bool> redirect = null)
         {
             return Update(id, pWarrantyExternalName, ExternalName, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.WarrantyProperties.ExternalLoggedDate)]
         public virtual ActionResult UpdateWarrantyExternalLoggedDate(int id, string ExternalLoggedDate, Nullable<bool> redirect = null)
         {
             return Update(id, pWarrantyExternalLoggedDate, ExternalLoggedDate, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.WarrantyProperties.ExternalReference)]
         public virtual ActionResult UpdateWarrantyExternalReference(int id, string ExternalReference, Nullable<bool> redirect = null)
         {
             return Update(id, pWarrantyExternalReference, ExternalReference, redirect);
         }
+        [DiscoAuthorize(Claims.Job.Properties.WarrantyProperties.ExternalCompletedDate)]
         public virtual ActionResult UpdateWarrantyExternalCompletedDate(int id, string ExternalCompletedDate, Nullable<bool> redirect = null)
         {
             return Update(id, pWarrantyExternalCompletedDate, ExternalCompletedDate, redirect);
@@ -442,7 +518,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.ExpectedClosedDate = null;
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateDeviceHeldLocation(Job job, string DeviceHeldLocation)
         {
@@ -451,7 +527,7 @@ namespace Disco.Web.Areas.API.Controllers
             else
                 job.DeviceHeldLocation = DeviceHeldLocation;
 
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateFlags(Job job, string Flags)
         {
@@ -466,7 +542,7 @@ namespace Disco.Web.Areas.API.Controllers
                 if (!job.Flags.HasValue)
                 {
                     job.Flags = null;
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                 }
             }
             else
@@ -494,7 +570,7 @@ namespace Disco.Web.Areas.API.Controllers
                     if (job.Flags.HasValue)
                     {
                         job.Flags = null;
-                        dbContext.SaveChanges();
+                        Database.SaveChanges();
                     }
                 }
                 else
@@ -502,7 +578,7 @@ namespace Disco.Web.Areas.API.Controllers
                     if (!job.Flags.HasValue || (long)job.Flags.Value != flags)
                     {
                         job.Flags = (Disco.Models.Repository.Job.UserManagementFlags)flags;
-                        dbContext.SaveChanges();
+                        Database.SaveChanges();
                     }
                 }
             }
@@ -544,9 +620,9 @@ namespace Disco.Web.Areas.API.Controllers
                     jmi.OtherInterestedParties = job.User.DisplayName;
 
                 job.JobMetaInsurance = jmi;
-                dbContext.JobMetaInsurances.Add(jmi);
+                Database.JobMetaInsurances.Add(jmi);
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private Models.Job._DateChangeModel UpdateNonWarrantyAccountingChargeRequired(Job job, string AccountingChargeRequiredDate)
@@ -574,13 +650,13 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            job.JobMetaNonWarranty.AccountingChargeRequiredUserId = DiscoApplication.CurrentUser.Id;
-            dbContext.SaveChanges();
+            job.JobMetaNonWarranty.AccountingChargeRequiredUserId = CurrentUser.Id;
+            Database.SaveChanges();
             return new Models.Job._DateChangeModel()
             {
                 Id = job.Id,
                 Result = "OK",
-                UserDescription = DiscoApplication.CurrentUser.ToString()
+                UserDescription = CurrentUser.ToString()
             }.SetDateTime(job.JobMetaNonWarranty.AccountingChargeRequiredDate);
         }
         private Models.Job._DateChangeModel UpdateNonWarrantyAccountingChargeAdded(Job job, string AccountingChargeAddedDate)
@@ -608,13 +684,13 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            job.JobMetaNonWarranty.AccountingChargeAddedUserId = DiscoApplication.CurrentUser.Id;
-            dbContext.SaveChanges();
+            job.JobMetaNonWarranty.AccountingChargeAddedUserId = CurrentUser.Id;
+            Database.SaveChanges();
             return new Models.Job._DateChangeModel()
             {
                 Id = job.Id,
                 Result = "OK",
-                UserDescription = DiscoApplication.CurrentUser.ToString()
+                UserDescription = CurrentUser.ToString()
             }.SetDateTime(job.JobMetaNonWarranty.AccountingChargeAddedDate);
         }
         private Models.Job._DateChangeModel UpdateNonWarrantyAccountingChargePaid(Job job, string AccountingChargePaidDate)
@@ -642,13 +718,13 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            job.JobMetaNonWarranty.AccountingChargePaidUserId = DiscoApplication.CurrentUser.Id;
-            dbContext.SaveChanges();
+            job.JobMetaNonWarranty.AccountingChargePaidUserId = CurrentUser.Id;
+            Database.SaveChanges();
             return new Models.Job._DateChangeModel()
             {
                 Id = job.Id,
                 Result = "OK",
-                UserDescription = DiscoApplication.CurrentUser.ToString()
+                UserDescription = CurrentUser.ToString()
             }.SetDateTime(job.JobMetaNonWarranty.AccountingChargePaidDate);
         }
         private Models.Job._DateChangeModel UpdateNonWarrantyPurchaseOrderRaised(Job job, string PurchaseOrderRaisedDate)
@@ -676,13 +752,13 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            job.JobMetaNonWarranty.PurchaseOrderRaisedUserId = DiscoApplication.CurrentUser.Id;
-            dbContext.SaveChanges();
+            job.JobMetaNonWarranty.PurchaseOrderRaisedUserId = CurrentUser.Id;
+            Database.SaveChanges();
             return new Models.Job._DateChangeModel()
             {
                 Id = job.Id,
                 Result = "OK",
-                UserDescription = DiscoApplication.CurrentUser.ToString()
+                UserDescription = CurrentUser.ToString()
             }.SetDateTime(job.JobMetaNonWarranty.PurchaseOrderRaisedDate);
         }
         private void UpdateNonWarrantyPurchaseOrderReference(Job job, string PurchaseOrderReference)
@@ -692,7 +768,7 @@ namespace Disco.Web.Areas.API.Controllers
             else
                 job.JobMetaNonWarranty.PurchaseOrderReference = PurchaseOrderReference;
 
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private Models.Job._DateChangeModel UpdateNonWarrantyPurchaseOrderSent(Job job, string PurchaseOrderSentDate)
         {
@@ -719,13 +795,13 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            job.JobMetaNonWarranty.PurchaseOrderSentUserId = DiscoApplication.CurrentUser.Id;
-            dbContext.SaveChanges();
+            job.JobMetaNonWarranty.PurchaseOrderSentUserId = CurrentUser.Id;
+            Database.SaveChanges();
             return new Models.Job._DateChangeModel()
             {
                 Id = job.Id,
                 Result = "OK",
-                UserDescription = DiscoApplication.CurrentUser.ToString()
+                UserDescription = CurrentUser.ToString()
             }.SetDateTime(job.JobMetaNonWarranty.PurchaseOrderSentDate);
         }
         private Models.Job._DateChangeModel UpdateNonWarrantyInvoiceReceived(Job job, string InvoiceReceivedDate)
@@ -753,13 +829,13 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            job.JobMetaNonWarranty.InvoiceReceivedUserId = DiscoApplication.CurrentUser.Id;
-            dbContext.SaveChanges();
+            job.JobMetaNonWarranty.InvoiceReceivedUserId = CurrentUser.Id;
+            Database.SaveChanges();
             return new Models.Job._DateChangeModel()
             {
                 Id = job.Id,
                 Result = "OK",
-                UserDescription = DiscoApplication.CurrentUser.ToString()
+                UserDescription = CurrentUser.ToString()
             }.SetDateTime(job.JobMetaNonWarranty.InvoiceReceivedDate);
         }
 
@@ -779,7 +855,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaNonWarranty.RepairerName = RepairerName.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateNonWarrantyRepairerLoggedDate(Job job, string RepairerLoggedDate)
         {
@@ -812,7 +888,7 @@ namespace Disco.Web.Areas.API.Controllers
                     }
                 }
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateNonWarrantyRepairerReference(Job job, string RepairerReference)
         {
@@ -830,7 +906,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaNonWarranty.RepairerReference = RepairerReference.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         private void UpdateNonWarrantyRepairerCompletedDate(Job job, string RepairerCompletedDate)
         {
@@ -863,7 +939,7 @@ namespace Disco.Web.Areas.API.Controllers
                     }
                 }
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         #endregion
@@ -902,13 +978,13 @@ namespace Disco.Web.Areas.API.Controllers
                     }
                 }
             }
-            job.JobMetaInsurance.ClaimFormSentUserId = DiscoApplication.CurrentUser.Id;
-            dbContext.SaveChanges();
+            job.JobMetaInsurance.ClaimFormSentUserId = CurrentUser.Id;
+            Database.SaveChanges();
             return new Models.Job._DateChangeModel()
             {
                 Id = job.Id,
                 Result = "OK",
-                UserDescription = DiscoApplication.CurrentUser.ToString()
+                UserDescription = CurrentUser.ToString()
             }.SetDateTime(job.JobMetaInsurance.ClaimFormSentDate);
         }
 
@@ -933,7 +1009,7 @@ namespace Disco.Web.Areas.API.Controllers
                 }
                 job.JobMetaInsurance.DateOfPurchase = dt;
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsuranceOtherInterestedParties(Job job, string OtherInterestedParties)
@@ -952,7 +1028,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaInsurance.OtherInterestedParties = OtherInterestedParties.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsuranceRecoverReduceAction(Job job, string RecoverReduceAction)
@@ -971,7 +1047,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaInsurance.RecoverReduceAction = RecoverReduceAction.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsurancePoliceNotifiedCrimeReportNo(Job job, string PoliceNotifiedCrimeReportNo)
@@ -990,7 +1066,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaInsurance.PoliceNotifiedCrimeReportNo = PoliceNotifiedCrimeReportNo.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsurancePoliceNotifiedDate(Job job, string PoliceNotifiedDate)
@@ -1014,7 +1090,7 @@ namespace Disco.Web.Areas.API.Controllers
                 }
                 job.JobMetaInsurance.PoliceNotifiedDate = dt;
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsurancePoliceNotifiedStation(Job job, string PoliceNotifiedStation)
@@ -1033,7 +1109,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaInsurance.PoliceNotifiedStation = PoliceNotifiedStation.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsurancePoliceNotified(Job job, string PoliceNotified)
@@ -1051,7 +1127,7 @@ namespace Disco.Web.Areas.API.Controllers
             }
 
             job.JobMetaInsurance.PoliceNotified = b;
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsurancePropertyLastSeenDate(Job job, string PropertyLastSeenDate)
@@ -1078,7 +1154,7 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsuranceBurglaryTheftMethodOfEntry(Job job, string BurglaryTheftMethodOfEntry)
@@ -1097,7 +1173,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaInsurance.BurglaryTheftMethodOfEntry = BurglaryTheftMethodOfEntry.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsuranceWitnessesNamesAddresses(Job job, string WitnessesNamesAddresses)
@@ -1116,7 +1192,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaInsurance.WitnessesNamesAddresses = WitnessesNamesAddresses.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsuranceThirdPartyCausedWhy(Job job, string ThirdPartyCausedWhy)
@@ -1135,7 +1211,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaInsurance.ThirdPartyCausedWhy = ThirdPartyCausedWhy.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsuranceThirdPartyCausedName(Job job, string ThirdPartyCausedName)
@@ -1154,7 +1230,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaInsurance.ThirdPartyCausedName = ThirdPartyCausedName.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsuranceThirdPartyCaused(Job job, string ThirdPartyCaused)
@@ -1172,7 +1248,7 @@ namespace Disco.Web.Areas.API.Controllers
             }
 
             job.JobMetaInsurance.ThirdPartyCaused = b;
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsuranceDescription(Job job, string Description)
@@ -1191,7 +1267,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaInsurance.Description = Description.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsuranceEventLocation(Job job, string EventLocation)
@@ -1210,7 +1286,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaInsurance.EventLocation = EventLocation.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateInsuranceLossOrDamageDate(Job job, string LossOrDamageDate)
@@ -1237,7 +1313,7 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         #endregion
 
@@ -1258,7 +1334,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaWarranty.ExternalName = ExternalName.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateWarrantyExternalLoggedDate(Job job, string ExternalLoggedDate)
@@ -1285,7 +1361,7 @@ namespace Disco.Web.Areas.API.Controllers
                     throw new Exception("Invalid Date Format");
                 }
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
 
         private void UpdateWarrantyExternalReference(Job job, string ExternalReference)
@@ -1304,8 +1380,9 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 job.JobMetaWarranty.ExternalReference = ExternalReference.Trim();
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
+        
         private void UpdateWarrantyExternalCompletedDate(Job job, string ExternalCompletedDate)
         {
             // Validate Is Warranty Job
@@ -1337,13 +1414,15 @@ namespace Disco.Web.Areas.API.Controllers
                     }
                 }
             }
-            dbContext.SaveChanges();
+            Database.SaveChanges();
         }
         #endregion
 
         #endregion
 
         #region Job Actions
+
+        [DiscoAuthorize(Claims.Job.Actions.UpdateSubTypes)]
         public virtual ActionResult UpdateSubTypes(int id, List<string> SubTypes = null, Nullable<bool> AddComponents = null, Nullable<bool> redirect = null)
         {
             try
@@ -1357,14 +1436,14 @@ namespace Disco.Web.Areas.API.Controllers
                 if (AddComponents == null)
                     AddComponents = false;
 
-                dbContext.Configuration.LazyLoadingEnabled = true;
-                var job = dbContext.Jobs.Include("JobSubTypes").Where(j => j.Id == id).FirstOrDefault();
+                Database.Configuration.LazyLoadingEnabled = true;
+                var job = Database.Jobs.Include("JobSubTypes").Where(j => j.Id == id).FirstOrDefault();
                 if (job == null)
                     throw new Exception("Invalid Job Id");
 
-                var subTypes = dbContext.JobSubTypes.Where(jst => SubTypes.Contains(jst.JobTypeId + "_" + jst.Id)).ToList();
-                job.UpdateSubTypes(dbContext, subTypes, AddComponents.Value, DiscoApplication.CurrentUser);
-                dbContext.SaveChanges();
+                var subTypes = Database.JobSubTypes.Where(jst => SubTypes.Contains(jst.JobTypeId + "_" + jst.Id)).ToList();
+                job.UpdateSubTypes(Database, subTypes, AddComponents.Value, CurrentUser);
+                Database.SaveChanges();
                 if (redirect.HasValue && redirect.Value)
                     return RedirectToAction(MVC.Job.Show(job.Id));
                 else
@@ -1378,6 +1457,8 @@ namespace Disco.Web.Areas.API.Controllers
                     return Json(string.Format("Error: {0}", ex.Message), JsonRequestBehavior.AllowGet);
             }
         }
+
+        [DiscoAuthorize(Claims.Job.Properties.Flags)]
         public virtual ActionResult UpdateFlag(int id, long? Flag, string Reason, Nullable<bool> redirect = null)
         {
             try
@@ -1387,7 +1468,7 @@ namespace Disco.Web.Areas.API.Controllers
                 if (!Flag.HasValue || Flag.Value == 0)
                     throw new ArgumentNullException("Flag");
 
-                var job = dbContext.Jobs.Include("JobSubTypes").Where(j => j.Id == id).FirstOrDefault();
+                var job = Database.Jobs.Include("JobSubTypes").Where(j => j.Id == id).FirstOrDefault();
                 if (job == null)
                     throw new Exception("Invalid Job Id");
 
@@ -1401,7 +1482,7 @@ namespace Disco.Web.Areas.API.Controllers
                         if (flagStatus.Item2)
                         {
                             job.Flags = (Disco.Models.Repository.Job.UserManagementFlags)((long)(job.Flags ?? 0) ^ (flag * -1));
-                            dbContext.SaveChanges();
+                            Database.SaveChanges();
                         }
                     }
                     else
@@ -1414,13 +1495,13 @@ namespace Disco.Web.Areas.API.Controllers
                         JobLog jobLog = new JobLog()
                         {
                             JobId = job.Id,
-                            TechUserId = DiscoApplication.CurrentUser.Id,
+                            TechUserId = CurrentUser.Id,
                             Timestamp = DateTime.Now,
                             Comments = string.Format("Added Flag: {0}{1}Reason: {2}", flagStatus.Item1, Environment.NewLine, Reason)
                         };
-                        dbContext.JobLogs.Add(jobLog);
+                        Database.JobLogs.Add(jobLog);
 
-                        dbContext.SaveChanges();
+                        Database.SaveChanges();
                     }
 
 
@@ -1442,6 +1523,8 @@ namespace Disco.Web.Areas.API.Controllers
                     return Json(string.Format("Error: {0}", ex.Message), JsonRequestBehavior.AllowGet);
             }
         }
+
+        [DiscoAuthorize(Claims.Job.Properties.WaitingForUserAction)]
         public virtual ActionResult WaitingForUserAction(int id, string Reason, Nullable<bool> redirect = null)
         {
             try
@@ -1449,15 +1532,15 @@ namespace Disco.Web.Areas.API.Controllers
                 if (id < 0)
                     throw new ArgumentOutOfRangeException("id");
 
-                dbContext.Configuration.LazyLoadingEnabled = true;
-                var job = dbContext.Jobs.Where(j => j.Id == id).FirstOrDefault();
+                Database.Configuration.LazyLoadingEnabled = true;
+                var job = Database.Jobs.Where(j => j.Id == id).FirstOrDefault();
                 if (job == null)
                     throw new Exception("Invalid Job Id");
                 if (!job.CanWaitingForUserAction())
                     throw new InvalidOperationException("Unable to set Waiting For User Action");
 
-                job.OnWaitingForUserAction(dbContext, DiscoApplication.CurrentUser, Reason);
-                dbContext.SaveChanges();
+                job.OnWaitingForUserAction(Database, CurrentUser, Reason);
+                Database.SaveChanges();
                 if (redirect.HasValue && redirect.Value)
                     return RedirectToAction(MVC.Job.Show(job.Id));
                 else
@@ -1471,6 +1554,8 @@ namespace Disco.Web.Areas.API.Controllers
                     return Json(string.Format("Error: {0}", ex.Message), JsonRequestBehavior.AllowGet);
             }
         }
+
+        [DiscoAuthorize(Claims.Job.Properties.NotWaitingForUserAction)]
         public virtual ActionResult NotWaitingForUserAction(int id, string Resolution, Nullable<bool> redirect = null)
         {
             try
@@ -1478,15 +1563,15 @@ namespace Disco.Web.Areas.API.Controllers
                 if (id < 0)
                     throw new ArgumentOutOfRangeException("id");
 
-                dbContext.Configuration.LazyLoadingEnabled = true;
-                var job = dbContext.Jobs.Where(j => j.Id == id).FirstOrDefault();
+                Database.Configuration.LazyLoadingEnabled = true;
+                var job = Database.Jobs.Where(j => j.Id == id).FirstOrDefault();
                 if (job == null)
                     throw new Exception("Invalid Job Id");
                 if (!job.CanNotWaitingForUserAction())
                     throw new InvalidOperationException("Unable to set Waiting For User Action");
 
-                job.OnNotWaitingForUserAction(dbContext, DiscoApplication.CurrentUser, Resolution);
-                dbContext.SaveChanges();
+                job.OnNotWaitingForUserAction(Database, CurrentUser, Resolution);
+                Database.SaveChanges();
                 if (redirect.HasValue && redirect.Value)
                     return RedirectToAction(MVC.Job.Show(job.Id));
                 else
@@ -1501,16 +1586,17 @@ namespace Disco.Web.Areas.API.Controllers
             }
         }
 
+        [DiscoAuthorize(Claims.Job.Actions.LogRepair)]
         public virtual ActionResult LogRepair(int id, string RepairerName, string RepairerReference, bool? redirect = null)
         {
-            var j = dbContext.Jobs.Include("JobMetaNonWarranty").Where(job => job.Id == id).FirstOrDefault();
+            var j = Database.Jobs.Include("JobMetaNonWarranty").Where(job => job.Id == id).FirstOrDefault();
             if (j != null)
             {
                 if (j.CanLogRepair())
                 {
                     j.OnLogRepair(RepairerName, RepairerReference);
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
 
                     if (redirect.HasValue && redirect.Value)
                         return RedirectToAction(MVC.Job.Show(id));
@@ -1524,16 +1610,18 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json("Invalid Job Number", JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Job.Properties.DeviceReadyForReturn)]
         public virtual ActionResult DeviceReadyForReturn(int id, bool redirect)
         {
-            var j = dbContext.Jobs.Find(id);
+            var j = Database.Jobs.Find(id);
             if (j != null)
             {
                 if (j.CanDeviceReadyForReturn())
                 {
-                    j.OnDeviceReadyForReturn(DiscoApplication.CurrentUser);
+                    j.OnDeviceReadyForReturn(CurrentUser);
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     if (redirect)
                         return RedirectToAction(MVC.Job.Show(id));
                     else
@@ -1546,16 +1634,18 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json("Invalid Job Number", JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Job.Properties.DeviceHeld)]
         public virtual ActionResult DeviceHeld(int id, bool redirect)
         {
-            var j = dbContext.Jobs.Find(id);
+            var j = Database.Jobs.Find(id);
             if (j != null)
             {
                 if (j.CanDeviceHeld())
                 {
-                    j.OnDeviceHeld(DiscoApplication.CurrentUser);
+                    j.OnDeviceHeld(CurrentUser);
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     if (redirect)
                         return RedirectToAction(MVC.Job.Show(id));
                     else
@@ -1568,16 +1658,18 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json("Invalid Job Number", JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Job.Properties.DeviceReturned)]
         public virtual ActionResult DeviceReturned(int id, bool redirect)
         {
-            var j = dbContext.Jobs.Find(id);
+            var j = Database.Jobs.Find(id);
             if (j != null)
             {
                 if (j.CanDeviceReturned())
                 {
-                    j.OnDeviceReturned(DiscoApplication.CurrentUser);
+                    j.OnDeviceReturned(CurrentUser);
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     if (redirect)
                         return RedirectToAction(MVC.Job.Show(id));
                     else
@@ -1590,17 +1682,19 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json("Invalid Job Number", JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Job.Actions.ForceClose)]
         public virtual ActionResult ForceClose(int id, string Reason, Nullable<bool> redirect = null)
         {
-            var j = dbContext.Jobs.Find(id);
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            var j = Database.Jobs.Find(id);
+            Database.Configuration.LazyLoadingEnabled = true;
             if (j != null)
             {
                 if (j.CanForceClose())
                 {
-                    j.OnForceClose(dbContext, DiscoApplication.CurrentUser, Reason);
+                    j.OnForceClose(Database, CurrentUser, Reason);
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     if (redirect.HasValue && redirect.Value)
                         return RedirectToAction(MVC.Job.Show(id));
                     else
@@ -1613,17 +1707,19 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json("Invalid Job Number", JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Job.Actions.Close)]
         public virtual ActionResult Close(int id, bool redirect)
         {
-            var j = dbContext.Jobs.Find(id);
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            var j = Database.Jobs.Find(id);
+            Database.Configuration.LazyLoadingEnabled = true;
             if (j != null)
             {
                 if (j.CanClose())
                 {
-                    j.OnClose(DiscoApplication.CurrentUser);
+                    j.OnClose(CurrentUser);
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     if (redirect)
                         return RedirectToAction(MVC.Job.Show(id));
                     else
@@ -1636,16 +1732,18 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json("Invalid Job Number", JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Job.Actions.Reopen)]
         public virtual ActionResult Reopen(int id, bool redirect)
         {
-            var j = dbContext.Jobs.Find(id);
+            var j = Database.Jobs.Find(id);
             if (j != null)
             {
                 if (j.CanReopen())
                 {
                     j.OnReopen();
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     if (redirect)
                         return RedirectToAction(MVC.Job.Show(id));
                     else
@@ -1658,17 +1756,19 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json("Invalid Job Number", JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Job.Actions.Delete)]
         public virtual ActionResult Delete(int id, bool redirect)
         {
-            var j = dbContext.Jobs.Find(id);
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            var j = Database.Jobs.Find(id);
+            Database.Configuration.LazyLoadingEnabled = true;
             if (j != null)
             {
                 if (j.CanDelete())
                 {
-                    j.OnDelete(dbContext);
+                    j.OnDelete(Database);
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     if (redirect)
                         return RedirectToAction(MVC.Job.Index());
                     else
@@ -1682,17 +1782,18 @@ namespace Disco.Web.Areas.API.Controllers
             return Json("Invalid Job Number", JsonRequestBehavior.AllowGet);
         }
 
+        [DiscoAuthorize(Claims.Job.Actions.ConvertHWarToHNWar)]
         public virtual ActionResult ConvertHWarToHNWar(int id, bool redirect)
         {
-            var j = dbContext.Jobs.Find(id);
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            var j = Database.Jobs.Find(id);
+            Database.Configuration.LazyLoadingEnabled = true;
             if (j != null)
             {
                 if (j.CanConvertHWarToHNWar())
                 {
-                    j.OnConvertHWarToHNWar(dbContext);
+                    j.OnConvertHWarToHNWar(Database);
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     if (redirect)
                         return RedirectToAction(MVC.Job.Show(j.Id));
                     else
@@ -1709,9 +1810,10 @@ namespace Disco.Web.Areas.API.Controllers
         #endregion
 
         #region Job Comments
+        [DiscoAuthorize(Claims.Job.ShowLogs)]
         public virtual ActionResult Comments(int id)
         {
-            var j = dbContext.Jobs.Include("JobLogs.TechUser").Where(m => m.Id == id).FirstOrDefault();
+            var j = Database.Jobs.Include("JobLogs.TechUser").Where(m => m.Id == id).FirstOrDefault();
             if (j != null)
             {
                 var c = new Models.Job.CommentsModel() { Result = "OK" };
@@ -1721,9 +1823,10 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json(new Models.Job.CommentsModel() { Result = "Invalid Job Number" }, JsonRequestBehavior.AllowGet);
         }
+        [DiscoAuthorize(Claims.Job.ShowLogs)]
         public virtual ActionResult Comment(int id)
         {
-            var jl = dbContext.JobLogs.Include("TechUser").FirstOrDefault(l => l.Id == id);
+            var jl = Database.JobLogs.Include("TechUser").FirstOrDefault(l => l.Id == id);
             if (jl != null)
             {
                 var c = Models.Job._CommentModel.FromJobLog(jl);
@@ -1732,43 +1835,42 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json(new Models.Job.CommentsModel() { Result = "Invalid Comment Id" }, JsonRequestBehavior.AllowGet);
         }
+        [DiscoAuthorize(Claims.Job.Actions.AddLogs)]
         public virtual ActionResult CommentPost(int id, string comment)
         {
-            var j = dbContext.Jobs.Find(id);
+            var j = Database.Jobs.Find(id);
             if (j != null)
             {
                 var jl = new Disco.Models.Repository.JobLog()
                 {
                     JobId = j.Id,
-                    TechUserId = DiscoApplication.CurrentUser.Id,
+                    TechUserId = CurrentUser.Id,
                     Timestamp = DateTime.Now,
                     Comments = comment
                 };
-                dbContext.JobLogs.Add(jl);
-                dbContext.SaveChanges();
+                Database.JobLogs.Add(jl);
+                Database.SaveChanges();
 
-                jl = dbContext.JobLogs.Include("TechUser").Where(m => m.Id == jl.Id).FirstOrDefault();
+                jl = Database.JobLogs.Include("TechUser").Where(m => m.Id == jl.Id).FirstOrDefault();
                 return Json(new Models.Job.CommentPostModel() { Result = "OK", Comment = Models.Job._CommentModel.FromJobLog(jl) }, JsonRequestBehavior.AllowGet);
             }
             return Json(new Models.Job.CommentPostModel() { Result = "Invalid Job Number" }, JsonRequestBehavior.AllowGet);
         }
+        
+        [DiscoAuthorizeAny(Claims.Job.Actions.RemoveAnyLogs, Claims.Job.Actions.RemoveOwnLogs)]
         public virtual ActionResult CommentRemove(int id)
         {
-            var jl = dbContext.JobLogs.Find(id);
+            var jl = Database.JobLogs.Find(id);
             if (jl != null)
             {
-                // 2012-02-17 G# Remove - 'Delete Own Comments' policy
-                // Only Delete Own Comments
-                //if (jl.TechUserId == DiscoApplication.CurrentUser.Id)
-                //{
-                dbContext.JobLogs.Remove(jl);
-                dbContext.SaveChanges();
+                if (jl.TechUserId.Equals(CurrentUser.Id, StringComparison.InvariantCultureIgnoreCase))
+                    Authorization.RequireAny(Claims.Job.Actions.RemoveAnyLogs, Claims.Job.Actions.RemoveOwnLogs);
+                else
+                    Authorization.Require(Claims.Job.Actions.RemoveAnyLogs);
+
+                Database.JobLogs.Remove(jl);
+                Database.SaveChanges();
                 return Json("OK", JsonRequestBehavior.AllowGet);
-                //}
-                //else
-                //{
-                //    return Json("You can only delete your own comments.", JsonRequestBehavior.AllowGet);
-                //}
             }
             // Doesn't Exist/Already Deleted - OK
             return Json("OK", JsonRequestBehavior.AllowGet);
@@ -1777,13 +1879,13 @@ namespace Disco.Web.Areas.API.Controllers
 
         #region Job Attachements
 
-        [OutputCache(Location = System.Web.UI.OutputCacheLocation.Client, Duration = 172800)]
+        [DiscoAuthorize(Claims.Job.ShowAttachments), OutputCache(Location = System.Web.UI.OutputCacheLocation.Client, Duration = 172800)]
         public virtual ActionResult AttachmentDownload(int id)
         {
-            var ja = dbContext.JobAttachments.Find(id);
+            var ja = Database.JobAttachments.Find(id);
             if (ja != null)
             {
-                var filePath = ja.RepositoryFilename(dbContext);
+                var filePath = ja.RepositoryFilename(Database);
                 if (System.IO.File.Exists(filePath))
                 {
                     return File(filePath, ja.MimeType, ja.Filename);
@@ -1795,13 +1897,14 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return HttpNotFound("Invalid Attachment Number");
         }
-        [OutputCache(Location = System.Web.UI.OutputCacheLocation.Client, Duration = 172800)]
+        
+        [DiscoAuthorize(Claims.Job.ShowAttachments), OutputCache(Location = System.Web.UI.OutputCacheLocation.Client, Duration = 172800)]
         public virtual ActionResult AttachmentThumbnail(int id)
         {
-            var ja = dbContext.JobAttachments.Find(id);
+            var ja = Database.JobAttachments.Find(id);
             if (ja != null)
             {
-                var thumbPath = ja.RepositoryThumbnailFilename(dbContext);
+                var thumbPath = ja.RepositoryThumbnailFilename(Database);
                 var thumbFileInfo = new FileInfo(thumbPath);
                 if (thumbFileInfo.Exists && thumbFileInfo.Length > 0)
                 {
@@ -1815,9 +1918,11 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return HttpNotFound("Invalid Attachment Number");
         }
+
+        [DiscoAuthorize(Claims.Job.Actions.AddAttachments)]
         public virtual ActionResult AttachmentUpload(int id, string Comments)
         {
-            var j = dbContext.Jobs.Find(id);
+            var j = Database.Jobs.Find(id);
             if (j != null)
             {
                 if (Request.Files.Count > 0)
@@ -1832,18 +1937,18 @@ namespace Disco.Web.Areas.API.Controllers
                         var ja = new Disco.Models.Repository.JobAttachment()
                         {
                             JobId = j.Id,
-                            TechUserId = DiscoApplication.CurrentUser.Id,
+                            TechUserId = CurrentUser.Id,
                             Filename = file.FileName,
                             MimeType = contentType,
                             Timestamp = DateTime.Now,
                             Comments = Comments
                         };
-                        dbContext.JobAttachments.Add(ja);
-                        dbContext.SaveChanges();
+                        Database.JobAttachments.Add(ja);
+                        Database.SaveChanges();
 
-                        ja.SaveAttachment(dbContext, file.InputStream);
+                        ja.SaveAttachment(Database, file.InputStream);
 
-                        ja.GenerateThumbnail(dbContext);
+                        ja.GenerateThumbnail(Database);
 
                         return Json(ja.Id, JsonRequestBehavior.AllowGet);
                     }
@@ -1852,9 +1957,11 @@ namespace Disco.Web.Areas.API.Controllers
             }
             throw new Exception("Invalid Job Number");
         }
+
+        [DiscoAuthorize(Claims.Job.ShowAttachments)]
         public virtual ActionResult Attachment(int id)
         {
-            var ja = dbContext.JobAttachments.Include("TechUser").Where(m => m.Id == id).FirstOrDefault();
+            var ja = Database.JobAttachments.Include("TechUser").Where(m => m.Id == id).FirstOrDefault();
             if (ja != null)
             {
 
@@ -1868,9 +1975,11 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json(new Models.Attachment.AttachmentModel() { Result = "Invalid Attachment Number" }, JsonRequestBehavior.AllowGet);
         }
+        
+        [DiscoAuthorize(Claims.Job.ShowAttachments)]
         public virtual ActionResult Attachments(int id)
         {
-            var j = dbContext.Jobs.Include("JobAttachments.TechUser").Where(m => m.Id == id).FirstOrDefault();
+            var j = Database.Jobs.Include("JobAttachments.TechUser").Where(m => m.Id == id).FirstOrDefault();
             if (j != null)
             {
                 var m = new Models.Attachment.AttachmentsModel()
@@ -1883,22 +1992,21 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json(new Models.Attachment.AttachmentsModel() { Result = "Invalid Attachment Number" }, JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorizeAny(Claims.Job.Actions.RemoveAnyAttachments, Claims.Job.Actions.RemoveOwnAttachments)]
         public virtual ActionResult AttachmentRemove(int id)
         {
-            var ja = dbContext.JobAttachments.Include("TechUser").Where(m => m.Id == id).FirstOrDefault();
+            var ja = Database.JobAttachments.Include("TechUser").Where(m => m.Id == id).FirstOrDefault();
             if (ja != null)
             {
-                // 2012-02-17 G# Remove - 'Delete Own Comments' policy
-                //if (ja.TechUserId == DiscoApplication.CurrentUser.Id)
-                //{
-                ja.OnDelete(dbContext);
-                dbContext.SaveChanges();
+                if (ja.TechUserId.Equals(CurrentUser.Id, StringComparison.InvariantCultureIgnoreCase))
+                    Authorization.RequireAny(Claims.Job.Actions.RemoveAnyAttachments, Claims.Job.Actions.RemoveOwnAttachments);
+                else
+                    Authorization.Require(Claims.Job.Actions.RemoveAnyAttachments);
+                
+                ja.OnDelete(Database);
+                Database.SaveChanges();
                 return Json("OK", JsonRequestBehavior.AllowGet);
-                //}
-                //else
-                //{
-                //    return Json("You can only delete your own attachments.", JsonRequestBehavior.AllowGet);
-                //}
             }
             return Json("Invalid Attachment Number", JsonRequestBehavior.AllowGet);
         }
@@ -1906,9 +2014,11 @@ namespace Disco.Web.Areas.API.Controllers
         #endregion
 
         #region Job Components
+
+        [DiscoAuthorizeAll(Claims.Job.Properties.NonWarrantyProperties.AddComponents, Claims.Job.Properties.NonWarrantyProperties.EditComponents)]
         public virtual ActionResult ComponentAdd(int id, string Description, string Cost)
         {
-            var j = dbContext.Jobs.Find(id);
+            var j = Database.Jobs.Find(id);
             if (j != null)
             {
                 decimal cost = 0;
@@ -1923,18 +2033,20 @@ namespace Disco.Web.Areas.API.Controllers
                     JobId = j.Id,
                     Description = Description,
                     Cost = cost,
-                    TechUserId = DiscoApplication.CurrentUser.Id
+                    TechUserId = CurrentUser.Id
                 };
-                dbContext.JobComponents.Add(jc);
-                dbContext.SaveChanges();
+                Database.JobComponents.Add(jc);
+                Database.SaveChanges();
 
                 return Json(new Models.Job.ComponentModel { Result = "OK", Component = Models.Job._ComponentModel.FromJobComponent(jc) }, JsonRequestBehavior.AllowGet);
             }
             return Json(new Models.Job.ComponentModel { Result = "Invalid Job Number" }, JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.EditComponents)]
         public virtual ActionResult ComponentUpdate(int id, string Description, string Cost)
         {
-            var jc = dbContext.JobComponents.Find(id);
+            var jc = Database.JobComponents.Find(id);
             if (jc != null)
             {
                 decimal cost = 0;
@@ -1947,55 +2059,60 @@ namespace Disco.Web.Areas.API.Controllers
 
                 jc.Description = Description;
                 jc.Cost = cost;
-                dbContext.SaveChanges();
+                Database.SaveChanges();
 
                 return Json(new Models.Job.ComponentModel { Result = "OK", Component = Models.Job._ComponentModel.FromJobComponent(jc) }, JsonRequestBehavior.AllowGet);
             }
             return Json(new Models.Job.ComponentModel { Result = "Invalid Job Component Number" }, JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Job.Properties.NonWarrantyProperties.EditComponents)]
         public virtual ActionResult ComponentRemove(int id)
         {
-            var jc = dbContext.JobComponents.Find(id);
+            var jc = Database.JobComponents.Find(id);
             if (jc != null)
             {
-                dbContext.JobComponents.Remove(jc);
-                dbContext.SaveChanges();
+                Database.JobComponents.Remove(jc);
+                Database.SaveChanges();
                 return Json("OK", JsonRequestBehavior.AllowGet);
             }
             return Json("Invalid Job Component Number", JsonRequestBehavior.AllowGet);
         }
+
         #endregion
 
         #region Job Statistics
 
+        [DiscoAuthorize(Claims.Job.Show)]
         public virtual ActionResult StatisticsDailyOpenedClosed()
         {
-            var result = BI.JobBI.Statistics.DailyOpenedClosed.Data(dbContext, true);
+            var result = BI.JobBI.Statistics.DailyOpenedClosed.Data(Database, true);
 
             return Json(result, JsonRequestBehavior.AllowGet);
         }
 
         #endregion
 
+        [DiscoAuthorize(Claims.Job.Actions.GenerateDocuments)]
         public virtual ActionResult GeneratePdf(string id, string DocumentTemplateId)
         {
             if (string.IsNullOrEmpty(id))
                 throw new ArgumentNullException("id");
             if (string.IsNullOrEmpty(DocumentTemplateId))
                 throw new ArgumentNullException("AttachmentTypeId");
-            var job = dbContext.Jobs.Find(int.Parse(id));
+            var job = Database.Jobs.Find(int.Parse(id));
             if (job != null)
             {
-                var documentTemplate = dbContext.DocumentTemplates.Find(DocumentTemplateId);
+                var documentTemplate = Database.DocumentTemplates.Find(DocumentTemplateId);
                 if (documentTemplate != null)
                 {
                     var timeStamp = DateTime.Now;
                     Stream pdf;
                     using (var generationState = Disco.Models.BI.DocumentTemplates.DocumentState.DefaultState())
                     {
-                        pdf = documentTemplate.GeneratePdf(dbContext, job, DiscoApplication.CurrentUser, timeStamp, generationState);
+                        pdf = documentTemplate.GeneratePdf(Database, job, CurrentUser, timeStamp, generationState);
                     }
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     return File(pdf, "application/pdf", string.Format("{0}_{1}_{2:yyyyMMdd-HHmmss}.pdf", documentTemplate.Id, job.Id, timeStamp));
                 }
                 else
@@ -2008,11 +2125,5 @@ namespace Disco.Web.Areas.API.Controllers
                 throw new ArgumentException("Invalid Job Id", "id");
             }
         }
-
-        public virtual ActionResult OrganisationAddress(int id)
-        {
-            var address = dbContext.DiscoConfiguration.OrganisationAddresses.GetAddress(id);
-            return Json(address, JsonRequestBehavior.AllowGet);
-        }
     }
 }
diff --git a/Disco.Web/Areas/API/Controllers/LoggingController.cs b/Disco.Web/Areas/API/Controllers/LoggingController.cs
index 302107c9..01d825cc 100644
--- a/Disco.Web/Areas/API/Controllers/LoggingController.cs
+++ b/Disco.Web/Areas/API/Controllers/LoggingController.cs
@@ -1,22 +1,25 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using Disco.BI.Extensions;
+using Disco.Services.Authorization;
 using Disco.Services.Logging;
 using Disco.Services.Tasks;
+using Disco.Services.Web;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Mvc;
 
 namespace Disco.Web.Areas.API.Controllers
 {
-    public partial class LoggingController : dbAdminController
+    public partial class LoggingController : AuthorizedDatabaseController
     {
+        [DiscoAuthorize(Claims.Config.Logging.Show)]
         public virtual ActionResult Modules()
         {
             var m = LogContext.LogModules.Values.Select(lm => Models.Logs.LogModuleModel.FromLogModule(lm)).ToList();
 
             return Json(m, JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.Config.Logging.Show)]
         public virtual ActionResult RetrieveEvents(string Format, DateTime? Start = null, DateTime? End = null, int? ModuleId = null, List<int> EventTypeIds = null, int? Take = null)
         {
              var logRetriever = new ReadLogContext()
@@ -27,7 +30,7 @@ namespace Disco.Web.Areas.API.Controllers
                 EventTypes = EventTypeIds,
                 Take = Take
             };
-            var results = logRetriever.Query(dbContext);
+            var results = logRetriever.Query(Database);
 
             switch (Format.ToLower())
             {
@@ -46,6 +49,7 @@ namespace Disco.Web.Areas.API.Controllers
             }
 
         }
+
         public virtual ActionResult ScheduledTaskStatus(string id)
         {
             if (string.IsNullOrEmpty(id))
diff --git a/Disco.Web/Areas/API/Controllers/PluginController.cs b/Disco.Web/Areas/API/Controllers/PluginController.cs
index 858c50df..14c530b8 100644
--- a/Disco.Web/Areas/API/Controllers/PluginController.cs
+++ b/Disco.Web/Areas/API/Controllers/PluginController.cs
@@ -1,16 +1,18 @@
-using System;
-using System.Collections.Generic;
+using Disco.Services.Authorization;
+using Disco.Services.Plugins;
+using Disco.Services.Plugins.CommunityInterop;
+using Disco.Services.Web;
+using System;
 using System.IO;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
-using Disco.Services.Plugins;
-using Disco.Services.Plugins.CommunityInterop;
 
 namespace Disco.Web.Areas.API.Controllers
 {
-    public partial class PluginController : dbAdminController
+    public partial class PluginController : AuthorizedDatabaseController
     {
+        [DiscoAuthorize(Claims.Config.Plugin.Install)]
         public virtual ActionResult UpdateLibraryCatalogue()
         {
             var status = PluginLibraryUpdateTask.ScheduleNow();
@@ -20,6 +22,7 @@ namespace Disco.Web.Areas.API.Controllers
             return RedirectToAction(MVC.Config.Logging.TaskStatus(status.SessionId));
         }
 
+        [DiscoAuthorize(Claims.Config.Plugin.Install)]
         public virtual ActionResult UpdateAll()
         {
             var status = UpdatePluginTask.UpdateAllPlugins();
@@ -27,6 +30,7 @@ namespace Disco.Web.Areas.API.Controllers
             return RedirectToAction(MVC.Config.Logging.TaskStatus(status.SessionId));
         }
 
+        [DiscoAuthorize(Claims.Config.Plugin.Install)]
         public virtual ActionResult Update(string PluginId)
         {
             if (string.IsNullOrEmpty(PluginId))
@@ -37,6 +41,7 @@ namespace Disco.Web.Areas.API.Controllers
             return RedirectToAction(MVC.Config.Logging.TaskStatus(status.SessionId));
         }
 
+        [DiscoAuthorizeAll(Claims.Config.Plugin.Install, Claims.Config.Plugin.InstallLocal)]
         public virtual ActionResult UpdateLocal(string PluginId, HttpPostedFileBase Plugin)
         {
             if (string.IsNullOrEmpty(PluginId))
@@ -45,10 +50,10 @@ namespace Disco.Web.Areas.API.Controllers
             if (Plugin == null || Plugin.ContentLength <= 0 || string.IsNullOrWhiteSpace(Plugin.FileName))
                 throw new ArgumentException("A discoPlugin file must be uploaded", "Plugin");
 
-            var tempPluginLocation = Path.Combine(dbContext.DiscoConfiguration.PluginPackagesLocation, Path.GetFileName(Plugin.FileName));
+            var tempPluginLocation = Path.Combine(Database.DiscoConfiguration.PluginPackagesLocation, Path.GetFileName(Plugin.FileName));
 
-            if (!Directory.Exists(dbContext.DiscoConfiguration.PluginPackagesLocation))
-                Directory.CreateDirectory(dbContext.DiscoConfiguration.PluginPackagesLocation);
+            if (!Directory.Exists(Database.DiscoConfiguration.PluginPackagesLocation))
+                Directory.CreateDirectory(Database.DiscoConfiguration.PluginPackagesLocation);
 
             if (System.IO.File.Exists(tempPluginLocation))
                 System.IO.File.Delete(tempPluginLocation);
@@ -60,6 +65,7 @@ namespace Disco.Web.Areas.API.Controllers
             return RedirectToAction(MVC.Config.Logging.TaskStatus(status.SessionId));
         }
 
+        [DiscoAuthorize(Claims.Config.Plugin.Uninstall)]
         public virtual ActionResult Uninstall(string id, bool UninstallData)
         {
             if (string.IsNullOrEmpty(id))
@@ -72,12 +78,13 @@ namespace Disco.Web.Areas.API.Controllers
             return RedirectToAction(MVC.Config.Logging.TaskStatus(status.SessionId));
         }
 
+        [DiscoAuthorize(Claims.Config.Plugin.Install)]
         public virtual ActionResult Install(string PluginId)
         {
             if (string.IsNullOrEmpty(PluginId))
                 throw new ArgumentNullException("PluginId", "A PluginId must be supplied");
 
-            var catalogue = Plugins.LoadCatalogue(dbContext);
+            var catalogue = Plugins.LoadCatalogue(Database);
             var plugin = catalogue.Plugins.FirstOrDefault(p => p.Id.Equals(PluginId));
 
             if (plugin == null)
@@ -87,22 +94,23 @@ namespace Disco.Web.Areas.API.Controllers
             if (Plugins.PluginInstalled(plugin.Id))
                 throw new InvalidOperationException("This plugin is already installed");
 
-            var tempPluginLocation = Path.Combine(dbContext.DiscoConfiguration.PluginPackagesLocation, string.Format("{0}.discoPlugin", plugin.Id));
+            var tempPluginLocation = Path.Combine(Database.DiscoConfiguration.PluginPackagesLocation, string.Format("{0}.discoPlugin", plugin.Id));
 
             var status = InstallPluginTask.InstallPlugin(plugin.LatestDownloadUrl, tempPluginLocation, true);
 
             return RedirectToAction(MVC.Config.Logging.TaskStatus(status.SessionId));
         }
 
+        [DiscoAuthorizeAll(Claims.Config.Plugin.Install, Claims.Config.Plugin.InstallLocal)]
         public virtual ActionResult InstallLocal(HttpPostedFileBase Plugin)
         {
             if (Plugin == null || Plugin.ContentLength <= 0 || string.IsNullOrWhiteSpace(Plugin.FileName))
                 throw new ArgumentException("A discoPlugin file must be uploaded", "Plugin");
 
-            var tempPluginLocation = Path.Combine(dbContext.DiscoConfiguration.PluginPackagesLocation, Path.GetFileName(Plugin.FileName));
+            var tempPluginLocation = Path.Combine(Database.DiscoConfiguration.PluginPackagesLocation, Path.GetFileName(Plugin.FileName));
 
-            if (!Directory.Exists(dbContext.DiscoConfiguration.PluginPackagesLocation))
-                Directory.CreateDirectory(dbContext.DiscoConfiguration.PluginPackagesLocation);
+            if (!Directory.Exists(Database.DiscoConfiguration.PluginPackagesLocation))
+                Directory.CreateDirectory(Database.DiscoConfiguration.PluginPackagesLocation);
 
             if (System.IO.File.Exists(tempPluginLocation))
                 System.IO.File.Delete(tempPluginLocation);
diff --git a/Disco.Web/Areas/API/Controllers/SystemController.cs b/Disco.Web/Areas/API/Controllers/SystemController.cs
index e8409d45..adf40523 100644
--- a/Disco.Web/Areas/API/Controllers/SystemController.cs
+++ b/Disco.Web/Areas/API/Controllers/SystemController.cs
@@ -1,22 +1,20 @@
-using System;
-using System.Collections.Generic;
+using Disco.BI.Extensions;
+using Disco.BI.Interop.ActiveDirectory;
+using Disco.Services.Authorization;
+using Disco.Services.Web;
+using System;
+using System.Drawing;
+using System.IO;
 using System.Linq;
+using System.Text;
 using System.Web;
 using System.Web.Mvc;
-using Disco.BI;
-using Disco.BI.Extensions;
-using System.IO;
-using System.Drawing;
-using System.Text;
-using Disco.Services.Tasks;
-using Disco.BI.Interop.ActiveDirectory;
-using Disco.Models.Repository;
 
 namespace Disco.Web.Areas.API.Controllers
 {
-    public partial class SystemController : dbAdminController
+    public partial class SystemController : AuthorizedDatabaseController
     {
-
+        [DiscoAuthorize(Claims.Config.System.Show)]
         public virtual ActionResult UpdateLastNetworkLogonDates()
         {
             var taskStatus = ActiveDirectoryUpdateLastNetworkLogonDateJob.ScheduleImmediately();
@@ -24,44 +22,46 @@ namespace Disco.Web.Areas.API.Controllers
             return RedirectToAction(MVC.Config.Logging.TaskStatus(taskStatus.SessionId));
         }
 
+        [DiscoAuthorize(Claims.DiscoAdminAccount)]
         public virtual ActionResult UpdateAttachmentThumbnails()
         {
             // Device Attachments
-            var das = dbContext.DeviceAttachments.Where(da => da.MimeType == "application/pdf");
+            var das = Database.DeviceAttachments.Where(da => da.MimeType == "application/pdf");
             foreach (var da in das)
             {
-                var fileName = da.RepositoryThumbnailFilename(dbContext);
+                var fileName = da.RepositoryThumbnailFilename(Database);
                 if (!System.IO.File.Exists(fileName))
                 {
-                    da.GenerateThumbnail(dbContext);
+                    da.GenerateThumbnail(Database);
                 }
             }
 
             // User Attachments
-            var uas = dbContext.UserAttachments.Where(ua => ua.MimeType == "application/pdf");
+            var uas = Database.UserAttachments.Where(ua => ua.MimeType == "application/pdf");
             foreach (var ua in uas)
             {
-                var fileName = ua.RepositoryThumbnailFilename(dbContext);
+                var fileName = ua.RepositoryThumbnailFilename(Database);
                 if (!System.IO.File.Exists(fileName))
                 {
-                    ua.GenerateThumbnail(dbContext);
+                    ua.GenerateThumbnail(Database);
                 }
             }
 
             // Job Attachments
-            var jas = dbContext.JobAttachments.Where(ja => ja.MimeType == "application/pdf");
+            var jas = Database.JobAttachments.Where(ja => ja.MimeType == "application/pdf");
             foreach (var ja in jas)
             {
-                var fileName = ja.RepositoryThumbnailFilename(dbContext);
+                var fileName = ja.RepositoryThumbnailFilename(Database);
                 if (!System.IO.File.Exists(fileName))
                 {
-                    ja.GenerateThumbnail(dbContext);
+                    ja.GenerateThumbnail(Database);
                 }
             }
 
             return Content("Done", "text/text");
         }
 
+        [DiscoAuthorize(Claims.Config.System.Show)]
         public virtual ActionResult UpdateCheck()
         {
             var ts = Disco.BI.Interop.Community.UpdateCheckTask.ScheduleNow();
@@ -72,16 +72,17 @@ namespace Disco.Web.Areas.API.Controllers
         #region Organisation
 
         #region Organisation Name
+        [DiscoAuthorize(Claims.Config.Organisation.ConfigureName)]
         public virtual ActionResult UpdateOrganisationName(string OrganisationName, bool redirect = false)
         {
             if (string.IsNullOrWhiteSpace(OrganisationName))
-                dbContext.DiscoConfiguration.OrganisationName = null;
+                Database.DiscoConfiguration.OrganisationName = null;
             else
-                dbContext.DiscoConfiguration.OrganisationName = OrganisationName;
+                Database.DiscoConfiguration.OrganisationName = OrganisationName;
 
-            dbContext.SaveChanges();
+            Database.SaveChanges();
 
-            DiscoApplication.OrganisationName = dbContext.DiscoConfiguration.OrganisationName;
+            DiscoApplication.OrganisationName = Database.DiscoConfiguration.OrganisationName;
 
             if (redirect)
                 return RedirectToAction(MVC.Config.Organisation.Index());
@@ -99,7 +100,7 @@ namespace Disco.Web.Areas.API.Controllers
             if (Height < 1)
                 throw new ArgumentOutOfRangeException("Height");
 
-            using (Stream logoStream = dbContext.DiscoConfiguration.OrganisationLogo)
+            using (Stream logoStream = Database.DiscoConfiguration.OrganisationLogo)
             {
                 using (Image logoBitmap = Bitmap.FromStream(logoStream))
                 {
@@ -107,12 +108,12 @@ namespace Disco.Web.Areas.API.Controllers
                 }
             }
         }
-        [HttpPost]
+        [DiscoAuthorize(Claims.Config.Organisation.ConfigureLogo), HttpPost]
         public virtual ActionResult OrganisationLogo(bool redirect, HttpPostedFileBase Image, bool? ResetLogo = null)
         {
             if (ResetLogo.HasValue && ResetLogo.Value)
             {
-                dbContext.DiscoConfiguration.OrganisationLogo = null;
+                Database.DiscoConfiguration.OrganisationLogo = null;
 
                 if (redirect)
                     return RedirectToAction(MVC.Config.Organisation.Index());
@@ -124,7 +125,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 if (Image.ContentType.StartsWith("image/", StringComparison.InvariantCultureIgnoreCase))
                 {
-                    dbContext.DiscoConfiguration.OrganisationLogo = Image.InputStream;
+                    Database.DiscoConfiguration.OrganisationLogo = Image.InputStream;
 
                     if (redirect)
                         return RedirectToAction(MVC.Config.Organisation.Index());
@@ -147,7 +148,7 @@ namespace Disco.Web.Areas.API.Controllers
         #endregion
 
         #region Organisation Addresses
-
+        [DiscoAuthorize(Claims.Config.Organisation.ConfigureAddresses)]
         public virtual ActionResult UpdateOrganisationAddress(Disco.Models.BI.Config.OrganisationAddress organisationAddress, bool redirect = false)
         {
             if (organisationAddress == null)
@@ -156,8 +157,8 @@ namespace Disco.Web.Areas.API.Controllers
             }
             if (ModelState.IsValid)
             {
-                dbContext.DiscoConfiguration.OrganisationAddresses.SetAddress(organisationAddress);
-                dbContext.SaveChanges();
+                Database.DiscoConfiguration.OrganisationAddresses.SetAddress(organisationAddress);
+                Database.SaveChanges();
                 if (redirect)
                     return RedirectToAction(MVC.Config.Organisation.Index());
                 else
@@ -183,10 +184,11 @@ namespace Disco.Web.Areas.API.Controllers
                     return Json(em.ToString(), JsonRequestBehavior.AllowGet);
             }
         }
+        [DiscoAuthorize(Claims.Config.Organisation.ConfigureAddresses)]
         public virtual ActionResult DeleteOrganisationAddress(int Id, bool redirect = false)
         {
-            dbContext.DiscoConfiguration.OrganisationAddresses.RemoveAddress(Id);
-            dbContext.SaveChanges();
+            Database.DiscoConfiguration.OrganisationAddresses.RemoveAddress(Id);
+            Database.SaveChanges();
 
             if (redirect)
                 return RedirectToAction(MVC.Config.Organisation.Index());
@@ -198,13 +200,14 @@ namespace Disco.Web.Areas.API.Controllers
 
         #region MultiSiteMode
 
+        [DiscoAuthorize(Claims.Config.Organisation.ConfigureMultiSiteMode)]
         public virtual ActionResult UpdateMultiSiteMode(bool MultiSiteMode, bool redirect = false)
         {
-            dbContext.DiscoConfiguration.MultiSiteMode = MultiSiteMode;
+            Database.DiscoConfiguration.MultiSiteMode = MultiSiteMode;
 
-            dbContext.SaveChanges();
+            Database.SaveChanges();
 
-            DiscoApplication.MultiSiteMode = dbContext.DiscoConfiguration.MultiSiteMode;
+            DiscoApplication.MultiSiteMode = Database.DiscoConfiguration.MultiSiteMode;
 
             if (redirect)
                 return RedirectToAction(MVC.Config.Organisation.Index());
diff --git a/Disco.Web/Areas/API/Controllers/UserController.cs b/Disco.Web/Areas/API/Controllers/UserController.cs
index 53ab3f14..7f14beb2 100644
--- a/Disco.Web/Areas/API/Controllers/UserController.cs
+++ b/Disco.Web/Areas/API/Controllers/UserController.cs
@@ -1,29 +1,32 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using Disco.BI;
-using Disco.BI.Extensions;
+using Disco.BI.Extensions;
+using Disco.Services.Authorization;
+using Disco.Services.Users;
+using Disco.Services.Web;
+using System;
 using System.IO;
+using System.Linq;
+using System.Web.Mvc;
 
 namespace Disco.Web.Areas.API.Controllers
 {
-    public partial class UserController : dbAdminController
+    public partial class UserController : AuthorizedDatabaseController
     {
+        [DiscoAuthorize(Claims.User.Search)]
         public virtual ActionResult UpstreamUsers(string term)
         {
             return Json(BI.UserBI.Searching.SearchUpstream(term), JsonRequestBehavior.AllowGet);
         }
 
         #region User Attachements
+
+        [DiscoAuthorize(Claims.User.ShowAttachments)]
         [OutputCache(Location = System.Web.UI.OutputCacheLocation.Client, Duration = 172800)]
         public virtual ActionResult AttachmentDownload(int id)
         {
-            var ua = dbContext.UserAttachments.Find(id);
+            var ua = Database.UserAttachments.Find(id);
             if (ua != null)
             {
-                var filePath = ua.RepositoryFilename(dbContext);
+                var filePath = ua.RepositoryFilename(Database);
                 if (System.IO.File.Exists(filePath))
                 {
                     return File(filePath, ua.MimeType, ua.Filename);
@@ -35,13 +38,15 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return HttpNotFound("Invalid Attachment Number");
         }
+
+        [DiscoAuthorize(Claims.User.ShowAttachments)]
         [OutputCache(Location = System.Web.UI.OutputCacheLocation.Client, Duration = 172800)]
         public virtual ActionResult AttachmentThumbnail(int id)
         {
-            var ua = dbContext.UserAttachments.Find(id);
+            var ua = Database.UserAttachments.Find(id);
             if (ua != null)
             {
-                var thumbPath = ua.RepositoryThumbnailFilename(dbContext);
+                var thumbPath = ua.RepositoryThumbnailFilename(Database);
                 if (System.IO.File.Exists(thumbPath))
                 {
                     if (thumbPath.EndsWith(".png", StringComparison.InvariantCultureIgnoreCase))
@@ -54,9 +59,11 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return HttpNotFound("Invalid Attachment Number");
         }
+
+        [DiscoAuthorize(Claims.User.Actions.AddAttachments)]
         public virtual ActionResult AttachmentUpload(string id, string Comments)
         {
-            var u = dbContext.Users.Find(id);
+            var u = Database.Users.Find(id);
             if (u != null)
             {
                 if (Request.Files.Count > 0)
@@ -71,18 +78,18 @@ namespace Disco.Web.Areas.API.Controllers
                         var ua = new Disco.Models.Repository.UserAttachment()
                         {
                             UserId = u.Id,
-                            TechUserId = DiscoApplication.CurrentUser.Id,
+                            TechUserId = UserService.CurrentUserId,
                             Filename = file.FileName,
                             MimeType = contentType,
                             Timestamp = DateTime.Now,
                             Comments = Comments
                         };
-                        dbContext.UserAttachments.Add(ua);
-                        dbContext.SaveChanges();
+                        Database.UserAttachments.Add(ua);
+                        Database.SaveChanges();
 
-                        ua.SaveAttachment(dbContext, file.InputStream);
+                        ua.SaveAttachment(Database, file.InputStream);
 
-                        ua.GenerateThumbnail(dbContext);
+                        ua.GenerateThumbnail(Database);
 
                         return Json(ua.Id, JsonRequestBehavior.AllowGet);
                     }
@@ -91,9 +98,11 @@ namespace Disco.Web.Areas.API.Controllers
             }
             throw new Exception("Invalid User Id");
         }
+
+        [DiscoAuthorize(Claims.User.ShowAttachments)]
         public virtual ActionResult Attachment(int id)
         {
-            var ua = dbContext.UserAttachments.Include("TechUser").Where(m => m.Id == id).FirstOrDefault();
+            var ua = Database.UserAttachments.Include("TechUser").Where(m => m.Id == id).FirstOrDefault();
             if (ua != null)
             {
 
@@ -107,9 +116,11 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json(new Models.Attachment.AttachmentModel() { Result = "Invalid Attachment Number" }, JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorize(Claims.User.ShowAttachments)]
         public virtual ActionResult Attachments(string id)
         {
-            var u = dbContext.Users.Include("UserAttachments.TechUser").Where(m => m.Id == id).FirstOrDefault();
+            var u = Database.Users.Include("UserAttachments.TechUser").Where(m => m.Id == id).FirstOrDefault();
             if (u != null)
             {
                 var m = new Models.Attachment.AttachmentsModel()
@@ -122,47 +133,47 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json(new Models.Attachment.AttachmentsModel() { Result = "Invalid User Id" }, JsonRequestBehavior.AllowGet);
         }
+
+        [DiscoAuthorizeAny(Claims.User.Actions.RemoveAnyAttachments, Claims.User.Actions.RemoveOwnAttachments)]
         public virtual ActionResult AttachmentRemove(int id)
         {
-            var ua = dbContext.UserAttachments.Include("TechUser").Where(m => m.Id == id).FirstOrDefault();
+            var ua = Database.UserAttachments.Include("TechUser").Where(m => m.Id == id).FirstOrDefault();
             if (ua != null)
             {
-                // 2012-02-17 G# Remove - 'Delete Own Comments' policy
-                //if (ua.TechUserId == DiscoApplication.CurrentUser.Id)
-                //{
-                ua.OnDelete(dbContext);
-                dbContext.SaveChanges();
+                if (ua.TechUserId.Equals(CurrentUser.Id, StringComparison.InvariantCultureIgnoreCase))
+                    Authorization.RequireAny(Claims.User.Actions.RemoveAnyAttachments, Claims.User.Actions.RemoveOwnAttachments);
+                else
+                    Authorization.Require(Claims.User.Actions.RemoveAnyAttachments);
+
+                ua.OnDelete(Database);
+                Database.SaveChanges();
                 return Json("OK", JsonRequestBehavior.AllowGet);
-                //}
-                //else
-                //{
-                //    return Json("You can only delete your own attachments.", JsonRequestBehavior.AllowGet);
-                //}
             }
             return Json("Invalid Attachment Number", JsonRequestBehavior.AllowGet);
         }
 
         #endregion
 
+        [DiscoAuthorize(Claims.User.Actions.GenerateDocuments)]
         public virtual ActionResult GeneratePdf(string id, string DocumentTemplateId)
         {
             if (string.IsNullOrEmpty(id))
                 throw new ArgumentNullException("id");
             if (string.IsNullOrEmpty(DocumentTemplateId))
                 throw new ArgumentNullException("AttachmentTypeId");
-            var user = dbContext.Users.Find(id);
+            var user = Database.Users.Find(id);
             if (user != null)
             {
-                var documentTemplate = dbContext.DocumentTemplates.Find(DocumentTemplateId);
+                var documentTemplate = Database.DocumentTemplates.Find(DocumentTemplateId);
                 if (documentTemplate != null)
                 {
                     var timeStamp = DateTime.Now;
                     Stream pdf;
                     using (var generationState = Disco.Models.BI.DocumentTemplates.DocumentState.DefaultState())
                     {
-                        pdf = documentTemplate.GeneratePdf(dbContext, user, DiscoApplication.CurrentUser, timeStamp, generationState);
+                        pdf = documentTemplate.GeneratePdf(Database, user, UserService.CurrentUser, timeStamp, generationState);
                     }
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
                     return File(pdf, "application/pdf", string.Format("{0}_{1}_{2:yyyyMMdd-HHmmss}.pdf", documentTemplate.Id, user.Id, timeStamp));
                 }
                 else
diff --git a/Disco.Web/Areas/API/Models/Attachment/_AttachmentModel.cs b/Disco.Web/Areas/API/Models/Attachment/_AttachmentModel.cs
index 00991741..8f315faf 100644
--- a/Disco.Web/Areas/API/Models/Attachment/_AttachmentModel.cs
+++ b/Disco.Web/Areas/API/Models/Attachment/_AttachmentModel.cs
@@ -12,6 +12,7 @@ namespace Disco.Web.Areas.API.Models.Attachment
         public string ParentId { get; set; }
         public int Id { get; set; }
         public string Author { get; set; }
+        public string AuthorId { get; set; }
         public DateTime Timestamp { get; set; }
         public string Comments { get; set; }
         public string Filename { get; set; }
@@ -45,6 +46,7 @@ namespace Disco.Web.Areas.API.Models.Attachment
             {
                 ParentId = ua.UserId,
                 Id = ua.Id,
+                AuthorId = ua.TechUserId,
                 Author = ua.TechUser.ToString(),
                 Timestamp = ua.Timestamp,
                 Comments = ua.Comments,
@@ -58,6 +60,7 @@ namespace Disco.Web.Areas.API.Models.Attachment
             {
                 ParentId = ja.JobId.ToString(),
                 Id = ja.Id,
+                AuthorId = ja.TechUserId,
                 Author = ja.TechUser.ToString(),
                 Timestamp = ja.Timestamp,
                 Comments = ja.Comments,
@@ -71,6 +74,7 @@ namespace Disco.Web.Areas.API.Models.Attachment
             {
                 ParentId = da.DeviceSerialNumber,
                 Id = da.Id,
+                AuthorId = da.TechUserId,
                 Author = da.TechUser.ToString(),
                 Timestamp = da.Timestamp,
                 Comments = da.Comments,
diff --git a/Disco.Web/Areas/API/Models/AuthorizationRole/SubjectItem.cs b/Disco.Web/Areas/API/Models/AuthorizationRole/SubjectItem.cs
new file mode 100644
index 00000000..f22f5728
--- /dev/null
+++ b/Disco.Web/Areas/API/Models/AuthorizationRole/SubjectItem.cs
@@ -0,0 +1,25 @@
+using Disco.Models.Interop.ActiveDirectory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Disco.Web.Areas.API.Models.AuthorizationRole
+{
+    public class SubjectItem
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public string Type { get; set; }
+
+        public static SubjectItem FromActiveDirectoryObject(IActiveDirectoryObject ADObject)
+        {
+            return new Models.AuthorizationRole.SubjectItem()
+            {
+                Id = ADObject.SamAccountName,
+                Name = ADObject.Name,
+                Type = ADObject is ActiveDirectoryGroup ? "group" : "user"
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/Disco.Web/Areas/API/Models/Job/_CommentModel.cs b/Disco.Web/Areas/API/Models/Job/_CommentModel.cs
index 25fb3590..880f8c0c 100644
--- a/Disco.Web/Areas/API/Models/Job/_CommentModel.cs
+++ b/Disco.Web/Areas/API/Models/Job/_CommentModel.cs
@@ -11,6 +11,7 @@ namespace Disco.Web.Areas.API.Models.Job
     {
         public int Id { get; set; }
         public int JobId { get; set; }
+        public string AuthorId { get; set; }
         public string Author { get; set; }
         public DateTime Timestamp { get; set; }
         public string Comments { get; set; }
@@ -43,6 +44,7 @@ namespace Disco.Web.Areas.API.Models.Job
             {
                 Id = jl.Id,
                 JobId = jl.JobId,
+                AuthorId = jl.TechUserId,
                 Author = jl.TechUser.ToString(),
                 Timestamp = jl.Timestamp,
                 Comments = jl.Comments
diff --git a/Disco.Web/Areas/Config/ConfigAreaRegistration.cs b/Disco.Web/Areas/Config/ConfigAreaRegistration.cs
index e9d0537a..c5a4ddd9 100644
--- a/Disco.Web/Areas/Config/ConfigAreaRegistration.cs
+++ b/Disco.Web/Areas/Config/ConfigAreaRegistration.cs
@@ -94,11 +94,15 @@ namespace Disco.Web.Areas.Config
                 "Config/DocumentTemplate/{id}",
                 new { controller = "DocumentTemplate", action = "Index", id = UrlParameter.Optional }
             );
-
             context.MapRoute(
-                "Config_Warranty",
-                "Config/Warranty/{id}",
-                new { controller = "Warranty", action = "Index", id = UrlParameter.Optional }
+                "Config_AuthorizationRole_Create",
+                "Config/AuthorizationRole/Create",
+                new { controller = "AuthorizationRole", action = "Create", id = UrlParameter.Optional }
+            );
+            context.MapRoute(
+                "Config_AuthorizationRole",
+                "Config/AuthorizationRole/{id}",
+                new { controller = "AuthorizationRole", action = "Index", id = UrlParameter.Optional }
             );
 
             context.MapRoute(
diff --git a/Disco.Web/Areas/Config/Controllers/AuthorizationRoleController.cs b/Disco.Web/Areas/Config/Controllers/AuthorizationRoleController.cs
new file mode 100644
index 00000000..a02d0580
--- /dev/null
+++ b/Disco.Web/Areas/Config/Controllers/AuthorizationRoleController.cs
@@ -0,0 +1,105 @@
+using Disco.Models.Authorization;
+using Disco.Models.UI.Config.AuthorizationRole;
+using Disco.Services.Authorization;
+using Disco.Services.Authorization.Roles;
+using Disco.Services.Plugins.Features.UIExtension;
+using Disco.Services.Users;
+using Disco.Services.Web;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Mvc;
+
+namespace Disco.Web.Areas.Config.Controllers
+{
+    [DiscoAuthorize(Claims.DiscoAdminAccount)]
+    public partial class AuthorizationRoleController : AuthorizedDatabaseController
+    {
+        public virtual ActionResult Index(int? id)
+        {
+            if (id.HasValue)
+            {
+                // Show
+                var ar = Database.AuthorizationRoles.Find(id.Value);
+
+                if (ar == null)
+                    throw new ArgumentException("Invalid Authorization Role Id");
+
+                var token = RoleToken.FromAuthorizationRole(ar);
+                var subjects = token.SubjectIds == null ? new List<Models.AuthorizationRole.ShowModel.SubjectDescriptor>() :
+                    token.SubjectIds.Select(subjectId => Disco.BI.Interop.ActiveDirectory.ActiveDirectory.GetObject(subjectId))
+                    .Where(item => item != null)
+                    .Select(item => Models.AuthorizationRole.ShowModel.SubjectDescriptor.FromActiveDirectoryObject(item))
+                    .OrderBy(item => item.Name).ToList();
+
+                var m = new Models.AuthorizationRole.ShowModel()
+                {
+                    Token = token,
+                    Subjects = subjects,
+                    ClaimNavigator = Claims.RoleClaimNavigator.BuildClaimTree(token.Claims)
+                };
+
+
+                // UI Extensions
+                UIExtensions.ExecuteExtensions<ConfigAuthorizationRoleShowModel>(this.ControllerContext, m);
+
+                return View(MVC.Config.AuthorizationRole.Views.Show, m);
+            }
+            else
+            {
+                // List Index
+                var ars = Database.AuthorizationRoles.ToList()
+                    .Select(ar => RoleToken.FromAuthorizationRole(ar)).Cast<IRoleToken>().ToList();
+
+                var m = new Models.AuthorizationRole.IndexModel()
+                {
+                    Tokens = ars
+                };
+
+                // UI Extensions
+                UIExtensions.ExecuteExtensions<ConfigAuthorizationRoleIndexModel>(this.ControllerContext, m);
+
+                return View(m);
+            }
+        }
+
+        public virtual ActionResult Create()
+        {
+            // Default Role
+            var m = new Models.AuthorizationRole.CreateModel()
+            {
+                AuthorizationRole = new Disco.Models.Repository.AuthorizationRole()
+            };
+
+            // UI Extensions
+            UIExtensions.ExecuteExtensions<ConfigAuthorizationRoleCreateModel>(this.ControllerContext, m);
+
+            return View(m);
+        }
+
+        [HttpPost]
+        public virtual ActionResult Create(Models.AuthorizationRole.CreateModel model)
+        {
+            if (ModelState.IsValid)
+            {
+                // Check for Existing
+                var existing = Database.AuthorizationRoles.Where(m => m.Name == model.AuthorizationRole.Name).FirstOrDefault();
+                if (existing == null)
+                {
+                    var roleId = UserService.CreateAuthorizationRole(Database, model.AuthorizationRole);
+
+                    return RedirectToAction(MVC.Config.AuthorizationRole.Index(roleId));
+                }
+                else
+                {
+                    ModelState.AddModelError("Name", "Am Authorization Role with this name already exists.");
+                }
+            }
+
+            // UI Extensions
+            UIExtensions.ExecuteExtensions<ConfigAuthorizationRoleCreateModel>(this.ControllerContext, model);
+
+            return View(model);
+        }
+    }
+}
diff --git a/Disco.Web/Areas/Config/Controllers/ConfigController.cs b/Disco.Web/Areas/Config/Controllers/ConfigController.cs
index 5a92c4db..48d9493c 100644
--- a/Disco.Web/Areas/Config/Controllers/ConfigController.cs
+++ b/Disco.Web/Areas/Config/Controllers/ConfigController.cs
@@ -1,22 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using Disco.Services.Authorization;
+using Disco.Services.Web;
 using System.Web.Mvc;
 
 namespace Disco.Web.Areas.Config.Controllers
 {
-    public partial class ConfigController : dbAdminController
+    public partial class ConfigController : AuthorizedDatabaseController
     {
         //
         // GET: /Config/Config/
 
+        [DiscoAuthorize(Claims.Config.Show)]
         public virtual ActionResult Index()
         {
 
             var m = new Models.Config.IndexModel()
             {
-                UpdateResponse = dbContext.DiscoConfiguration.UpdateLastCheck
+                UpdateResponse = Database.DiscoConfiguration.UpdateLastCheck
             };
 
             return View(m);
diff --git a/Disco.Web/Areas/Config/Controllers/DeviceBatchController.cs b/Disco.Web/Areas/Config/Controllers/DeviceBatchController.cs
index dfbf0ad5..be765620 100644
--- a/Disco.Web/Areas/Config/Controllers/DeviceBatchController.cs
+++ b/Disco.Web/Areas/Config/Controllers/DeviceBatchController.cs
@@ -1,26 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using Disco.BI;
-using Disco.BI.Extensions;
-using Disco.Web.Extensions;
-using Disco.Services.Plugins.Features.UIExtension;
+using Disco.BI.Extensions;
 using Disco.Models.UI.Config.DeviceBatch;
+using Disco.Services.Authorization;
+using Disco.Services.Plugins.Features.UIExtension;
+using Disco.Services.Web;
+using System;
+using System.Linq;
+using System.Web.Mvc;
 
 namespace Disco.Web.Areas.Config.Controllers
 {
-    public partial class DeviceBatchController : dbAdminController
+    public partial class DeviceBatchController : AuthorizedDatabaseController
     {
-
+        [DiscoAuthorize(Claims.Config.DeviceBatch.Show)]
         public virtual ActionResult Index(int? id)
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
 
             if (id.HasValue)
             {
-                var m = dbContext.DeviceBatches.Where(db => db.Id == id.Value)
+                var m = Database.DeviceBatches.Where(db => db.Id == id.Value)
                     .Select(db => new Models.DeviceBatch.ShowModel()
                     {
                         DeviceBatch = db,
@@ -38,9 +36,18 @@ namespace Disco.Web.Areas.Config.Controllers
                     DeviceDecommissionedCount = dG.Count(d => d.DecommissionedDate.HasValue)
                 }).ToArray().Cast<ConfigDeviceBatchShowModelMembership>().ToList();
 
-                m.CanDelete = m.DeviceBatch.CanDelete(dbContext);
+                if (Authorization.Has(Claims.Config.DeviceBatch.Delete))
+                    m.CanDelete = m.DeviceBatch.CanDelete(Database);
 
-                m.DeviceModels = dbContext.DeviceModels.ToList();
+                if (Authorization.Has(Claims.Config.DeviceBatch.Configure))
+                {
+                    m.DeviceModels = Database.DeviceModels.ToList();
+                    m.DefaultDeviceModel = m.DeviceBatch.DefaultDeviceModelId.HasValue ? m.DeviceModels.FirstOrDefault(dm => dm.Id == m.DeviceBatch.DefaultDeviceModelId.Value) : null;
+                }
+                else
+                {
+                    m.DefaultDeviceModel = m.DeviceBatch.DefaultDeviceModelId.HasValue ? Database.DeviceModels.Find(m.DeviceBatch.DefaultDeviceModelId.Value) : null;
+                }
 
                 // UI Extensions
                 UIExtensions.ExecuteExtensions<ConfigDeviceBatchShowModel>(this.ControllerContext, m);
@@ -49,7 +56,7 @@ namespace Disco.Web.Areas.Config.Controllers
             }
             else
             {
-                var m = Models.DeviceBatch.IndexModel.Build(dbContext);
+                var m = Models.DeviceBatch.IndexModel.Build(Database);
 
                 // UI Extensions
                 UIExtensions.ExecuteExtensions<ConfigDeviceBatchIndexModel>(this.ControllerContext, m);
@@ -58,12 +65,13 @@ namespace Disco.Web.Areas.Config.Controllers
             }
         }
 
+        [DiscoAuthorizeAll(Claims.Config.DeviceBatch.Create, Claims.Config.DeviceBatch.Configure)]
         public virtual ActionResult Create()
         {
             // Default Batch
             var m = new Models.DeviceBatch.CreateModel()
             {
-                DeviceBatch = BI.DeviceBI.BatchUtilities.DefaultNewDeviceBatch(dbContext)
+                DeviceBatch = BI.DeviceBI.BatchUtilities.DefaultNewDeviceBatch(Database)
             };
 
             // UI Extensions
@@ -72,17 +80,17 @@ namespace Disco.Web.Areas.Config.Controllers
             return View(m);
         }
 
-        [HttpPost]
+        [DiscoAuthorizeAll(Claims.Config.DeviceBatch.Create, Claims.Config.DeviceBatch.Configure), HttpPost]
         public virtual ActionResult Create(Models.DeviceBatch.CreateModel model)
         {
             if (ModelState.IsValid)
             {
                 // Check for Existing
-                var existing = dbContext.DeviceBatches.Where(m => m.Name == model.DeviceBatch.Name).FirstOrDefault();
+                var existing = Database.DeviceBatches.Where(m => m.Name == model.DeviceBatch.Name).FirstOrDefault();
                 if (existing == null)
                 {
-                    dbContext.DeviceBatches.Add(model.DeviceBatch);
-                    dbContext.SaveChanges();
+                    Database.DeviceBatches.Add(model.DeviceBatch);
+                    Database.SaveChanges();
                     return RedirectToAction(MVC.Config.DeviceBatch.Index(model.DeviceBatch.Id));
                 }
                 else
@@ -97,6 +105,7 @@ namespace Disco.Web.Areas.Config.Controllers
             return View(model);
         }
 
+        [DiscoAuthorize(Claims.Config.DeviceBatch.ShowTimeline)]
         public virtual ActionResult Timeline()
         {
             var m = new Models.DeviceBatch.TimelineModel();
diff --git a/Disco.Web/Areas/Config/Controllers/DeviceModelController.cs b/Disco.Web/Areas/Config/Controllers/DeviceModelController.cs
index 35755da4..c113d315 100644
--- a/Disco.Web/Areas/Config/Controllers/DeviceModelController.cs
+++ b/Disco.Web/Areas/Config/Controllers/DeviceModelController.cs
@@ -1,23 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using Disco.Services.Plugins.Features.WarrantyProvider;
-using Disco.Services.Plugins;
-using Disco.BI.Extensions;
-using Disco.Services.Plugins.Features.UIExtension;
+using Disco.BI.Extensions;
 using Disco.Models.UI.Config.DeviceModel;
+using Disco.Services.Authorization;
+using Disco.Services.Plugins;
+using Disco.Services.Plugins.Features.UIExtension;
+using Disco.Services.Plugins.Features.WarrantyProvider;
+using Disco.Services.Web;
+using System;
+using System.Linq;
+using System.Web.Mvc;
 
 namespace Disco.Web.Areas.Config.Controllers
 {
-    public partial class DeviceModelController : dbAdminController
+    public partial class DeviceModelController : AuthorizedDatabaseController
     {
+        [DiscoAuthorize(Claims.Config.DeviceModel.Show)]
         public virtual ActionResult Index(int? id)
         {
             if (id.HasValue)
             {
-                var m = dbContext.DeviceModels.Include("DeviceComponents").Where(dm => dm.Id == id.Value).Select(dm => new Models.DeviceModel.ShowModel()
+                var m = Database.DeviceModels.Include("DeviceComponents").Where(dm => dm.Id == id.Value).Select(dm => new Models.DeviceModel.ShowModel()
                 {
                     DeviceModel = dm,
                     DeviceCount = dm.Devices.Count(),
@@ -32,16 +33,11 @@ namespace Disco.Web.Areas.Config.Controllers
                 m.DeviceComponentsModel = new Models.DeviceModel.ComponentsModel()
                 {
                     DeviceModelId = m.DeviceModel.Id,
-                    DeviceComponents = dbContext.DeviceComponents.Include("JobSubTypes").Where(dc => dc.DeviceModelId == m.DeviceModel.Id).ToList(),
-                    JobSubTypes = dbContext.JobSubTypes.Where(jst => jst.JobTypeId == Disco.Models.Repository.JobType.JobTypeIds.HNWar).ToList()
+                    DeviceComponents = Database.DeviceComponents.Include("JobSubTypes").Where(dc => dc.DeviceModelId == m.DeviceModel.Id).ToList(),
+                    JobSubTypes = Database.JobSubTypes.Where(jst => jst.JobTypeId == Disco.Models.Repository.JobType.JobTypeIds.HNWar).ToList()
                 };
 
-                m.CanDelete = m.DeviceModel.CanDelete(dbContext);
-
-                //m.Devices = BI.DeviceBI.SelectDeviceSearchResultItem(dbContext.Devices.Where(d => d.DeviceModelId == m.DeviceModel.Id));
-
-                //m.Devices = dbContext.Devices.Include("DeviceModel").Include("DeviceProfile").Include("AssignedUser")
-                //    .Where(d => d.DeviceModelId == m.DeviceModel.Id).ToList();
+                m.CanDelete = m.DeviceModel.CanDelete(Database);
 
                 // UI Extensions
                 UIExtensions.ExecuteExtensions<ConfigDeviceModelShowModel>(this.ControllerContext, m);
@@ -50,7 +46,7 @@ namespace Disco.Web.Areas.Config.Controllers
             }
             else
             {
-                var m = Models.DeviceModel.IndexModel.Build(dbContext);
+                var m = Models.DeviceModel.IndexModel.Build(Database);
 
                 // UI Extensions
                 UIExtensions.ExecuteExtensions<ConfigDeviceModelIndexModel>(this.ControllerContext, m);
@@ -59,12 +55,13 @@ namespace Disco.Web.Areas.Config.Controllers
             }
         }
 
+        [DiscoAuthorize(Claims.Config.DeviceModel.Show)]
         public virtual ActionResult GenericComponents()
         {
             var m = new Models.DeviceModel.ComponentsModel()
             {
-                DeviceComponents = dbContext.DeviceComponents.Include("JobSubTypes").Where(dc => !dc.DeviceModelId.HasValue).ToList(),
-                JobSubTypes = dbContext.JobSubTypes.Where(jst => jst.JobTypeId == Disco.Models.Repository.JobType.JobTypeIds.HNWar).ToList()
+                DeviceComponents = Database.DeviceComponents.Include("JobSubTypes").Where(dc => !dc.DeviceModelId.HasValue).ToList(),
+                JobSubTypes = Database.JobSubTypes.Where(jst => jst.JobTypeId == Disco.Models.Repository.JobType.JobTypeIds.HNWar).ToList()
             };
 
             // UI Extensions
diff --git a/Disco.Web/Areas/Config/Controllers/DeviceProfileController.cs b/Disco.Web/Areas/Config/Controllers/DeviceProfileController.cs
index d856f5ce..cd5dda61 100644
--- a/Disco.Web/Areas/Config/Controllers/DeviceProfileController.cs
+++ b/Disco.Web/Areas/Config/Controllers/DeviceProfileController.cs
@@ -1,26 +1,26 @@
-using System;
+using Disco.BI.Extensions;
+using Disco.Models.Repository;
+using Disco.Models.UI.Config.DeviceProfile;
+using Disco.Services.Authorization;
+using Disco.Services.Plugins;
+using Disco.Services.Plugins.Features.CertificateProvider;
+using Disco.Services.Plugins.Features.UIExtension;
+using Disco.Services.Web;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
 using System.Web.Mvc;
-using Disco.Data.Configuration;
-using Disco.BI;
-using Disco.BI.Extensions;
-using Disco.Services.Plugins.Features.CertificateProvider;
-using Disco.Services.Plugins;
-using Disco.Services.Plugins.Features.UIExtension;
-using Disco.Models.UI.Config.DeviceProfile;
-using Disco.Models.Repository;
 
 namespace Disco.Web.Areas.Config.Controllers
 {
-    public partial class DeviceProfileController : dbAdminController
+    public partial class DeviceProfileController : AuthorizedDatabaseController
     {
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Show)]
         public virtual ActionResult Index(int? id)
         {
             if (id.HasValue)
             {
-                var m = dbContext.DeviceProfiles.Where(dp => dp.Id == id.Value).Select(dp => new Models.DeviceProfile.ShowModel()
+                var m = Database.DeviceProfiles.Where(dp => dp.Id == id.Value).Select(dp => new Models.DeviceProfile.ShowModel()
                 {
                     DeviceProfile = dp,
                     DeviceCount = dp.Devices.Count(),
@@ -30,7 +30,11 @@ namespace Disco.Web.Areas.Config.Controllers
                 if (m == null || m.DeviceProfile == null)
                     throw new ArgumentException("Invalid Device Profile Id", "id");
 
-                m.OrganisationAddresses = dbContext.DiscoConfiguration.OrganisationAddresses.Addresses;
+                m.OrganisationAddresses = Database.DiscoConfiguration.OrganisationAddresses.Addresses;
+
+                if (m.DeviceProfile.DefaultOrganisationAddress.HasValue)
+                    m.DefaultOrganisationAddress = Database.DiscoConfiguration.OrganisationAddresses.GetAddress(m.DeviceProfile.DefaultOrganisationAddress.Value);
+
                 m.CertificateProviders = Plugins.GetPluginFeatures(typeof(CertificateProviderFeature));
 
                 var DistributionValues = Enum.GetValues(typeof(Disco.Models.Repository.DeviceProfile.DistributionTypes));
@@ -44,13 +48,7 @@ namespace Disco.Web.Areas.Config.Controllers
                         Selected = ((int)m.DeviceProfile.DistributionType == value)
                     });
                 }
-                m.CanDelete = m.DeviceProfile.CanDelete(dbContext);
-
-                // Removed 2012-06-14 G# - Properties moved to DeviceProfile model & DB Migrated in DBv3.
-                //var config = m.DeviceProfile.Configuration(dbContext);
-                //m.AllocateWirelessCertificate = m.DeviceProfile.AllocateWirelessCertificate;
-                //m.OrganisationalUnit = m.DeviceProfile.OrganisationalUnit;
-                //m.ComputerNameTemplate = m.DeviceProfile.ComputerNameTemplate;
+                m.CanDelete = m.DeviceProfile.CanDelete(Database);
 
                 // UI Extensions
                 UIExtensions.ExecuteExtensions<ConfigDeviceProfileShowModel>(this.ControllerContext, m);
@@ -59,7 +57,7 @@ namespace Disco.Web.Areas.Config.Controllers
             }
             else
             {
-                var m = Models.DeviceProfile.IndexModel.Build(dbContext);
+                var m = Models.DeviceProfile.IndexModel.Build(Database);
 
                 // UI Extensions
                 UIExtensions.ExecuteExtensions<ConfigDeviceProfileIndexModel>(this.ControllerContext, m);
@@ -68,6 +66,7 @@ namespace Disco.Web.Areas.Config.Controllers
             }
         }
 
+        [DiscoAuthorizeAll(Claims.Config.DeviceProfile.Create, Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult Create()
         {
             var m = new Models.DeviceProfile.CreateModel()
@@ -86,19 +85,19 @@ namespace Disco.Web.Areas.Config.Controllers
             return View(m);
         }
 
-        [HttpPost]
+        [DiscoAuthorizeAll(Claims.Config.DeviceProfile.Create, Claims.Config.DeviceProfile.Configure), HttpPost]
         public virtual ActionResult Create(Models.DeviceProfile.CreateModel model)
         {
             if (ModelState.IsValid)
             {
                 // Check for Existing
-                var existing = dbContext.DeviceProfiles.Where(m => m.Name == model.DeviceProfile.Name).FirstOrDefault();
+                var existing = Database.DeviceProfiles.Where(m => m.Name == model.DeviceProfile.Name).FirstOrDefault();
                 if (existing == null)
                 {
                     model.DeviceProfile.ProvisionADAccount = true;
 
-                    dbContext.DeviceProfiles.Add(model.DeviceProfile);
-                    dbContext.SaveChanges();
+                    Database.DeviceProfiles.Add(model.DeviceProfile);
+                    Database.SaveChanges();
                     return RedirectToAction(MVC.Config.DeviceProfile.Index(model.DeviceProfile.Id));
                 }
                 else
@@ -113,13 +112,14 @@ namespace Disco.Web.Areas.Config.Controllers
             return View(model);
         }
 
+        [DiscoAuthorize(Claims.Config.DeviceProfile.ConfigureDefaults)]
         public virtual ActionResult Defaults()
         {
             var m = new Models.DeviceProfile.DefaultsModel()
             {
-                DeviceProfiles = dbContext.DeviceProfiles.ToList(),
-                Default = dbContext.DiscoConfiguration.DeviceProfiles.DefaultDeviceProfileId,
-                DefaultAddDeviceOffline = dbContext.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId
+                DeviceProfiles = Database.DeviceProfiles.ToList(),
+                Default = Database.DiscoConfiguration.DeviceProfiles.DefaultDeviceProfileId,
+                DefaultAddDeviceOffline = Database.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId
             };
             m.DeviceProfilesAndNone = m.DeviceProfiles.ToList();
             m.DeviceProfilesAndNone.Insert(0, new Disco.Models.Repository.DeviceProfile() { Id = 0, Name = "<No Default>" });
diff --git a/Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs b/Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs
index 7a48194b..d408ff4c 100644
--- a/Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs
+++ b/Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs
@@ -1,23 +1,23 @@
-using System;
+using Disco.BI.Extensions;
+using Disco.Models.UI.Config.DocumentTemplate;
+using Disco.Services.Authorization;
+using Disco.Services.Plugins.Features.UIExtension;
+using Disco.Services.Web;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
 using System.Web.Mvc;
-using Disco.BI;
-using Disco.BI.Extensions;
-using Disco.Services.Plugins.Features.UIExtension;
-using Disco.Models.UI.Config.DocumentTemplate;
 
 namespace Disco.Web.Areas.Config.Controllers
 {
-    public partial class DocumentTemplateController : dbAdminController
+    public partial class DocumentTemplateController : AuthorizedDatabaseController
     {
-
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.Show)]
         public virtual ActionResult Index(string id)
         {
             if (string.IsNullOrEmpty(id))
             {
-                var m = new Models.DocumentTemplate.IndexModel() { DocumentTemplates = dbContext.DocumentTemplates.ToList() };
+                var m = new Models.DocumentTemplate.IndexModel() { DocumentTemplates = Database.DocumentTemplates.ToList() };
 
                 // UI Extensions
                 UIExtensions.ExecuteExtensions<ConfigDocumentTemplateIndexModel>(this.ControllerContext, m);
@@ -28,10 +28,10 @@ namespace Disco.Web.Areas.Config.Controllers
             {
                 var m = new Models.DocumentTemplate.ShowModel()
                 {
-                    DocumentTemplate = dbContext.DocumentTemplates.Include("JobSubTypes").Where(at => at.Id == id).FirstOrDefault()
+                    DocumentTemplate = Database.DocumentTemplates.Include("JobSubTypes").Where(at => at.Id == id).FirstOrDefault()
                 };
-                m.TemplateExpressions = m.DocumentTemplate.ExtractPdfExpressions(dbContext);
-                m.UpdateModel(dbContext);
+                m.TemplateExpressions = m.DocumentTemplate.ExtractPdfExpressions(Database);
+                m.UpdateModel(Database);
 
                 // UI Extensions
                 UIExtensions.ExecuteExtensions<ConfigDocumentTemplateShowModel>(this.ControllerContext, m);
@@ -40,6 +40,7 @@ namespace Disco.Web.Areas.Config.Controllers
             }
         }
 
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.ShowStatus)]
         public virtual ActionResult ImportStatus()
         {
             var m = new Models.DocumentTemplate.ImportStatusModel();
@@ -49,11 +50,13 @@ namespace Disco.Web.Areas.Config.Controllers
 
             return View();
         }
+
+        [DiscoAuthorize(Claims.Config.DocumentTemplate.UndetectedPages)]
         public virtual ActionResult UndetectedPages()
         {
             var m = new Models.DocumentTemplate.UndetectedPagesModel()
             {
-                DocumentTemplates = dbContext.DocumentTemplates.ToList()
+                DocumentTemplates = Database.DocumentTemplates.ToList()
             };
 
             // UI Extensions
@@ -62,10 +65,11 @@ namespace Disco.Web.Areas.Config.Controllers
             return View(m);
         }
 
+        [DiscoAuthorizeAll(Claims.Config.DocumentTemplate.Create, Claims.Config.DocumentTemplate.Configure)]
         public virtual ActionResult Create()
         {
             var m = new Models.DocumentTemplate.CreateModel();
-            m.UpdateModel(dbContext);
+            m.UpdateModel(Database);
 
             // UI Extensions
             UIExtensions.ExecuteExtensions<ConfigDocumentTemplateCreateModel>(this.ControllerContext, m);
@@ -73,19 +77,19 @@ namespace Disco.Web.Areas.Config.Controllers
             return View(m);
         }
 
-        [HttpPost]
+        [DiscoAuthorizeAll(Claims.Config.DocumentTemplate.Create, Claims.Config.DocumentTemplate.Configure), HttpPost]
         public virtual ActionResult Create(Models.DocumentTemplate.CreateModel model)
         {
-            model.UpdateModel(dbContext);
+            model.UpdateModel(Database);
 
             if (ModelState.IsValid)
             {
                 // Check for Existing
-                var existing = dbContext.DocumentTemplates.Where(m => m.Id == model.DocumentTemplate.Id).FirstOrDefault();
+                var existing = Database.DocumentTemplates.Where(m => m.Id == model.DocumentTemplate.Id).FirstOrDefault();
                 if (existing == null)
                 {
 
-                    dbContext.DocumentTemplates.Add(model.DocumentTemplate);
+                    Database.DocumentTemplates.Add(model.DocumentTemplate);
 
                     if (model.DocumentTemplate.Scope == Disco.Models.Repository.DocumentTemplate.DocumentTemplateScopes.Job)
                     {
@@ -96,10 +100,10 @@ namespace Disco.Web.Areas.Config.Controllers
                         //    model.AttachmentType.JobSubTypes.Add(jobSubType);
                     }
 
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
 
                     // Save Template
-                    model.DocumentTemplate.SavePdfTemplate(dbContext, model.Template.InputStream);
+                    model.DocumentTemplate.SavePdfTemplate(Database, model.Template.InputStream);
 
                     return RedirectToAction(MVC.Config.DocumentTemplate.Index(model.DocumentTemplate.Id));
                 }
@@ -115,6 +119,7 @@ namespace Disco.Web.Areas.Config.Controllers
             return View(model);
         }
 
+        [DiscoAuthorize(Claims.Config.Show)]
         public virtual ActionResult ExpressionBrowser(string type, bool StaticDeclaredMembersOnly = false)
         {
             if (string.IsNullOrWhiteSpace(type))
diff --git a/Disco.Web/Areas/Config/Controllers/EnrolmentController.cs b/Disco.Web/Areas/Config/Controllers/EnrolmentController.cs
index 84ebffe1..e9607d1b 100644
--- a/Disco.Web/Areas/Config/Controllers/EnrolmentController.cs
+++ b/Disco.Web/Areas/Config/Controllers/EnrolmentController.cs
@@ -1,23 +1,19 @@
 using Disco.Models.UI.Config.Enrolment;
+using Disco.Services.Authorization;
 using Disco.Services.Plugins.Features.UIExtension;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using Disco.Services.Web;
 using System.Web.Mvc;
 
 namespace Disco.Web.Areas.Config.Controllers
 {
-    public partial class EnrolmentController : dbAdminController
+    public partial class EnrolmentController : AuthorizedDatabaseController
     {
-        //
-        // GET: /Config/Bootstrapper/
-
+        [DiscoAuthorize(Claims.Config.Enrolment.Show)]
         public virtual ActionResult Index()
         {
             var m = new Models.Enrolment.IndexModel()
             {
-                MacSshUsername = dbContext.DiscoConfiguration.Bootstrapper.MacSshUsername
+                MacSshUsername = Database.DiscoConfiguration.Bootstrapper.MacSshUsername
             };
 
             // UI Extensions
@@ -25,6 +21,8 @@ namespace Disco.Web.Areas.Config.Controllers
 
             return View(m);
         }
+
+        [DiscoAuthorize(Claims.Config.Enrolment.ShowStatus)]
         public virtual ActionResult Status()
         {
             var m = new Models.Enrolment.StatusModel();
diff --git a/Disco.Web/Areas/Config/Controllers/ExpressionsController.cs b/Disco.Web/Areas/Config/Controllers/ExpressionsController.cs
index 75d7e40e..5fb3cd13 100644
--- a/Disco.Web/Areas/Config/Controllers/ExpressionsController.cs
+++ b/Disco.Web/Areas/Config/Controllers/ExpressionsController.cs
@@ -1,22 +1,23 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using Disco.Services.Authorization;
+using Disco.Services.Web;
+using System;
 using System.Web.Mvc;
 
 namespace Disco.Web.Areas.Config.Controllers
 {
-    public partial class ExpressionsController : Controller
+    [DiscoAuthorize(Claims.DiscoAdminAccount)]
+    public partial class ExpressionsController : AuthorizedDatabaseController
     {
-        //
-        // GET: /Config/Expressions/
+        // Under Construction - Not In Production
 
         public virtual ActionResult Index()
         {
-            return View(Views.Editor, new Models.Expressions.EditorModel()
-            {
-                Expression = @"JobComponentsTotalCost() < 100 ? JobComponentsTotalCost().ToString('c') : '$100.00'"
-            });
+            throw new NotImplementedException();
+
+            //return View(Views.Editor, new Models.Expressions.EditorModel()
+            //{
+            //    Expression = @"JobComponentsTotalCost() < 100 ? JobComponentsTotalCost().ToString('c') : '$100.00'"
+            //});
         }
 
     }
diff --git a/Disco.Web/Areas/Config/Controllers/LoggingController.cs b/Disco.Web/Areas/Config/Controllers/LoggingController.cs
index 4f17a52b..d0887e31 100644
--- a/Disco.Web/Areas/Config/Controllers/LoggingController.cs
+++ b/Disco.Web/Areas/Config/Controllers/LoggingController.cs
@@ -1,20 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Disco.Models.UI.Config.Logging;
+using Disco.Services.Authorization;
 using Disco.Services.Logging;
 using Disco.Services.Logging.Models;
 using Disco.Services.Plugins.Features.UIExtension;
-using Disco.Models.UI.Config.Logging;
+using Disco.Services.Web;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Mvc;
 
 namespace Disco.Web.Areas.Config.Controllers
 {
-    public partial class LoggingController : dbAdminController
+    public partial class LoggingController : AuthorizedDatabaseController
     {
         //
         // GET: /Config/Logs/
-
+        [DiscoAuthorize(Claims.Config.Logging.Show)]
         public virtual ActionResult Index()
         {
             var m = new Models.Logging.IndexModel()
diff --git a/Disco.Web/Areas/Config/Controllers/OrganisationController.cs b/Disco.Web/Areas/Config/Controllers/OrganisationController.cs
index ee758b1b..e109ce47 100644
--- a/Disco.Web/Areas/Config/Controllers/OrganisationController.cs
+++ b/Disco.Web/Areas/Config/Controllers/OrganisationController.cs
@@ -1,25 +1,24 @@
 using Disco.Models.UI.Config.Organisation;
+using Disco.Services.Authorization;
 using Disco.Services.Plugins.Features.UIExtension;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using Disco.Services.Web;
 using System.Web.Mvc;
 
 namespace Disco.Web.Areas.Config.Controllers
 {
-    public partial class OrganisationController : dbAdminController
+    public partial class OrganisationController : AuthorizedDatabaseController
     {
         //
         // GET: /Config/Organisation/
 
+        [DiscoAuthorize(Claims.Config.Organisation.Show)]
         public virtual ActionResult Index()
         {
             var viewModel = new Models.Organisation.IndexModel();
 
-            viewModel.OrganisationName = dbContext.DiscoConfiguration.OrganisationName;
-            viewModel.MultiSiteMode = dbContext.DiscoConfiguration.MultiSiteMode;
-            viewModel.OrganisationAddresses = dbContext.DiscoConfiguration.OrganisationAddresses.Addresses;
+            viewModel.OrganisationName = Database.DiscoConfiguration.OrganisationName;
+            viewModel.MultiSiteMode = Database.DiscoConfiguration.MultiSiteMode;
+            viewModel.OrganisationAddresses = Database.DiscoConfiguration.OrganisationAddresses.Addresses;
 
             // UI Extensions
             UIExtensions.ExecuteExtensions<ConfigOrganisationIndexModel>(this.ControllerContext, viewModel);
diff --git a/Disco.Web/Areas/Config/Controllers/PluginsController.cs b/Disco.Web/Areas/Config/Controllers/PluginsController.cs
index bb8bab4e..ace52205 100644
--- a/Disco.Web/Areas/Config/Controllers/PluginsController.cs
+++ b/Disco.Web/Areas/Config/Controllers/PluginsController.cs
@@ -1,30 +1,28 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using Disco.Models.BI.Interop.Community;
+using Disco.Services.Authorization;
 using Disco.Services.Plugins;
-using Disco.Services.Tasks;
+using Disco.Services.Users;
+using Disco.Services.Web;
 using Disco.Web.Areas.Config.Models.Plugins;
+using System;
+using System.Web.Mvc;
 
 namespace Disco.Web.Areas.Config.Controllers
 {
-    public partial class PluginsController : dbAdminController
+    public partial class PluginsController : AuthorizedDatabaseController
     {
-        [HttpGet]
+        [DiscoAuthorize(Claims.Config.Plugin.Show), HttpGet]
         public virtual ActionResult Index()
         {
             Models.Plugins.IndexViewModel vm = new Models.Plugins.IndexViewModel()
                 {
                     PluginManifests = Plugins.GetPlugins(),
-                    Catalogue = Plugins.LoadCatalogue(dbContext)
+                    Catalogue = Plugins.LoadCatalogue(Database)
                 };
             return View(vm);
         }
 
         #region Plugin Configuration
-        [HttpPost]
+        [DiscoAuthorize(Claims.Config.Plugin.Configure), HttpPost]
         public virtual ActionResult Configure(string PluginId, FormCollection form)
         {
             if (string.IsNullOrEmpty(PluginId))
@@ -34,24 +32,24 @@ namespace Disco.Web.Areas.Config.Controllers
 
             using (PluginConfigurationHandler configHandler = manifest.CreateConfigurationHandler())
             {
-                if (configHandler.Post(dbContext, form, this))
+                if (configHandler.Post(Database, form, this))
                 {
-                    dbContext.SaveChanges();
+                    Database.SaveChanges();
 
-                    PluginsLog.LogPluginConfigurationSaved(manifest.Id, DiscoApplication.CurrentUser.Id);
+                    PluginsLog.LogPluginConfigurationSaved(manifest.Id, UserService.CurrentUserId);
 
                     return RedirectToAction(MVC.Config.Plugins.Index());
                 }
                 else
                 {
                     // Config Errors
-                    PluginConfigurationViewModel vm = new PluginConfigurationViewModel(configHandler.Get(dbContext, this));
+                    PluginConfigurationViewModel vm = new PluginConfigurationViewModel(configHandler.Get(Database, this));
                     return View(Views.Configure, vm);
                 }
             }
         }
 
-        [HttpGet]
+        [DiscoAuthorize(Claims.Config.Plugin.Configure), HttpGet]
         public virtual ActionResult Configure(string PluginId)
         {
             if (string.IsNullOrEmpty(PluginId))
@@ -61,18 +59,18 @@ namespace Disco.Web.Areas.Config.Controllers
 
             using (PluginConfigurationHandler configHandler = manifest.CreateConfigurationHandler())
             {
-                PluginConfigurationViewModel vm = new PluginConfigurationViewModel(configHandler.Get(dbContext, this));
-                PluginsLog.LogPluginConfigurationLoaded(manifest.Id, DiscoApplication.CurrentUser.Id);
+                PluginConfigurationViewModel vm = new PluginConfigurationViewModel(configHandler.Get(Database, this));
+                PluginsLog.LogPluginConfigurationLoaded(manifest.Id, UserService.CurrentUserId);
                 return View(Views.Configure, vm);
             }
         }
         #endregion
 
+        [DiscoAuthorize(Claims.Config.Plugin.Install)]
         public virtual ActionResult Install()
         {
             // Check for recent catalogue
-
-            var catalogue = Plugins.LoadCatalogue(dbContext);
+            var catalogue = Plugins.LoadCatalogue(Database);
 
             if (catalogue == null || catalogue.ResponseTimestamp < DateTime.Now.AddHours(-1))
             {
diff --git a/Disco.Web/Areas/Config/Controllers/SystemConfigController.cs b/Disco.Web/Areas/Config/Controllers/SystemConfigController.cs
index fa4f908f..d245fb63 100644
--- a/Disco.Web/Areas/Config/Controllers/SystemConfigController.cs
+++ b/Disco.Web/Areas/Config/Controllers/SystemConfigController.cs
@@ -1,25 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using Disco.Services.Authorization;
+using Disco.Services.Web;
 using System.Web.Mvc;
 
 namespace Disco.Web.Areas.Config.Controllers
 {
-    public partial class SystemConfigController : dbAdminController
+    public partial class SystemConfigController : AuthorizedDatabaseController
     {
-        [HttpGet]
+        [DiscoAuthorize(Claims.Config.System.Show), HttpGet]
         public virtual ActionResult Index()
         {
-            var m = Models.SystemConfig.IndexModel.FromConfiguration(dbContext.DiscoConfiguration);
+            var m = Models.SystemConfig.IndexModel.FromConfiguration(Database.DiscoConfiguration);
             return View(m);
         }
-        [HttpPost]
+
+        [DiscoAuthorizeAll(Claims.Config.System.Show, Claims.Config.System.ConfigureProxy), HttpPost]
         public virtual ActionResult Index(Models.SystemConfig.IndexModel config)
         {
             if (ModelState.IsValid)
             {
-                config.ToConfiguration(dbContext);
+                config.ToConfiguration(Database);
                 return RedirectToAction(MVC.Config.Config.Index());
             }
             else
diff --git a/Disco.Web/Areas/Config/Models/AuthorizationRole/CreateModel.cs b/Disco.Web/Areas/Config/Models/AuthorizationRole/CreateModel.cs
new file mode 100644
index 00000000..b42d645a
--- /dev/null
+++ b/Disco.Web/Areas/Config/Models/AuthorizationRole/CreateModel.cs
@@ -0,0 +1,13 @@
+using Disco.Models.UI.Config.AuthorizationRole;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Disco.Web.Areas.Config.Models.AuthorizationRole
+{
+    public class CreateModel : ConfigAuthorizationRoleCreateModel
+    {
+        public Disco.Models.Repository.AuthorizationRole AuthorizationRole { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Disco.Web/Areas/Config/Models/AuthorizationRole/IndexModel.cs b/Disco.Web/Areas/Config/Models/AuthorizationRole/IndexModel.cs
new file mode 100644
index 00000000..e427dc0d
--- /dev/null
+++ b/Disco.Web/Areas/Config/Models/AuthorizationRole/IndexModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using Disco.Data.Repository;
+using Disco.Models.UI.Config.AuthorizationRole;
+using Disco.Models.Authorization;
+
+namespace Disco.Web.Areas.Config.Models.AuthorizationRole
+{
+    public class IndexModel : ConfigAuthorizationRoleIndexModel
+    {
+        public List<IRoleToken> Tokens { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Disco.Web/Areas/Config/Models/AuthorizationRole/ShowModel.cs b/Disco.Web/Areas/Config/Models/AuthorizationRole/ShowModel.cs
new file mode 100644
index 00000000..b963fa1f
--- /dev/null
+++ b/Disco.Web/Areas/Config/Models/AuthorizationRole/ShowModel.cs
@@ -0,0 +1,54 @@
+using Disco.Models.Authorization;
+using Disco.Models.Interop.ActiveDirectory;
+using Disco.Models.UI.Config.AuthorizationRole;
+using Disco.Web.Models.Shared;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Disco.Web.Areas.Config.Models.AuthorizationRole
+{
+    public class ShowModel : ConfigAuthorizationRoleShowModel
+    {
+        public IRoleToken Token { get; set; }
+
+        public List<SubjectDescriptor> Subjects { get; set; }
+
+        public IClaimNavigatorItem ClaimNavigator { get; set; }
+
+        public FancyTreeNode[] ClaimNavigatorFancyTreeNodes
+        {
+            get
+            {
+                var rootNode = FancyTreeNode.FromClaimNavigatorItem(this.ClaimNavigator, false);
+                rootNode.expanded = true;
+
+                return new FancyTreeNode[] {
+                    rootNode
+                };
+            }
+        }
+
+        public class SubjectDescriptor
+        {
+            public bool IsGroup { get; set; }
+            public string Name { get; set; }
+            public string Id { get; set; }
+
+            public static SubjectDescriptor FromActiveDirectoryObject(IActiveDirectoryObject ADObject)
+            {
+                var item = new SubjectDescriptor()
+                {
+                    Id = ADObject.SamAccountName,
+                    Name = ADObject.Name
+                };
+
+                if (ADObject is ActiveDirectoryGroup)
+                    item.IsGroup = true;
+
+                return item;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Disco.Web/Areas/Config/Models/DeviceBatch/IndexModel.cs b/Disco.Web/Areas/Config/Models/DeviceBatch/IndexModel.cs
index 49d2147d..5f3af37f 100644
--- a/Disco.Web/Areas/Config/Models/DeviceBatch/IndexModel.cs
+++ b/Disco.Web/Areas/Config/Models/DeviceBatch/IndexModel.cs
@@ -11,10 +11,10 @@ namespace Disco.Web.Areas.Config.Models.DeviceBatch
     {
         public List<ConfigDeviceBatchIndexModelItem> DeviceBatches { get; set; }
 
-        public static IndexModel Build(DiscoDataContext dbContext)
+        public static IndexModel Build(DiscoDataContext Database)
         {
             var m = new IndexModel();
-            m.DeviceBatches = dbContext.DeviceBatches.OrderBy(db => db.Name).Select(db => new _IndexModelItem()
+            m.DeviceBatches = Database.DeviceBatches.OrderBy(db => db.Name).Select(db => new _IndexModelItem()
             {
                 Id = db.Id,
                 Name = db.Name,
@@ -28,6 +28,9 @@ namespace Disco.Web.Areas.Config.Models.DeviceBatch
                 InsuredUntil = db.InsuredUntil
             }).ToArray().Cast<ConfigDeviceBatchIndexModelItem>().ToList();
 
+            foreach (var item in m.DeviceBatches.Where(db => db.DefaultDeviceModel == null))
+                item.DefaultDeviceModel = "<None Specified>";
+
             return m;
         }
 
diff --git a/Disco.Web/Areas/Config/Models/DeviceBatch/ShowModel.cs b/Disco.Web/Areas/Config/Models/DeviceBatch/ShowModel.cs
index 7d7aa083..13db03f2 100644
--- a/Disco.Web/Areas/Config/Models/DeviceBatch/ShowModel.cs
+++ b/Disco.Web/Areas/Config/Models/DeviceBatch/ShowModel.cs
@@ -10,6 +10,7 @@ namespace Disco.Web.Areas.Config.Models.DeviceBatch
     public class ShowModel : ConfigDeviceBatchShowModel
     {
         public Disco.Models.Repository.DeviceBatch DeviceBatch { get; set; }
+        public Disco.Models.Repository.DeviceModel DefaultDeviceModel { get; set; }
         public List<Disco.Models.Repository.DeviceModel> DeviceModels { get; set; }
         public List<ConfigDeviceBatchShowModelMembership> DeviceModelMembers { get; set; }
         public int DeviceCount { get; set; }
diff --git a/Disco.Web/Areas/Config/Models/DeviceModel/IndexModel.cs b/Disco.Web/Areas/Config/Models/DeviceModel/IndexModel.cs
index 5bad732d..51c3fa6f 100644
--- a/Disco.Web/Areas/Config/Models/DeviceModel/IndexModel.cs
+++ b/Disco.Web/Areas/Config/Models/DeviceModel/IndexModel.cs
@@ -11,10 +11,10 @@ namespace Disco.Web.Areas.Config.Models.DeviceModel
     {
         public List<ConfigDeviceModelIndexModelItem> DeviceModels { get; set; }
 
-        public static IndexModel Build(DiscoDataContext dbContext)
+        public static IndexModel Build(DiscoDataContext Database)
         {
             var m = new IndexModel();
-            m.DeviceModels = dbContext.DeviceModels.OrderBy(dm => dm.Description).Select(dm => new _IndexModelItem()
+            m.DeviceModels = Database.DeviceModels.OrderBy(dm => dm.Description).Select(dm => new _IndexModelItem()
             {
                 Id = dm.Id,
                 Name = dm.Description,
diff --git a/Disco.Web/Areas/Config/Models/DeviceProfile/IndexModel.cs b/Disco.Web/Areas/Config/Models/DeviceProfile/IndexModel.cs
index e000e5f0..6293c1a5 100644
--- a/Disco.Web/Areas/Config/Models/DeviceProfile/IndexModel.cs
+++ b/Disco.Web/Areas/Config/Models/DeviceProfile/IndexModel.cs
@@ -12,10 +12,10 @@ namespace Disco.Web.Areas.Config.Models.DeviceProfile
     {
         public List<ConfigDeviceProfileIndexModelItem> DeviceProfiles { get; set; }
 
-        public static IndexModel Build(DiscoDataContext dbContext)
+        public static IndexModel Build(DiscoDataContext Database)
         {
             var m = new IndexModel();
-            m.DeviceProfiles = dbContext.DeviceProfiles.OrderBy(dp => dp.Name).Select(dp => new _IndexModelItem()
+            m.DeviceProfiles = Database.DeviceProfiles.OrderBy(dp => dp.Name).Select(dp => new _IndexModelItem()
             {
                 Id = dp.Id,
                 Name = dp.Name,
@@ -31,7 +31,7 @@ namespace Disco.Web.Areas.Config.Models.DeviceProfile
             {
                 foreach (var dp in m.DeviceProfiles)
                     if (dp.Address.HasValue)
-                        dp.AddressName = dbContext.DiscoConfiguration.OrganisationAddresses.GetAddress(dp.Address.Value).Name;
+                        dp.AddressName = Database.DiscoConfiguration.OrganisationAddresses.GetAddress(dp.Address.Value).Name;
             }
 
             return m;
diff --git a/Disco.Web/Areas/Config/Models/DeviceProfile/ShowModel.cs b/Disco.Web/Areas/Config/Models/DeviceProfile/ShowModel.cs
index 962471fd..c4fe28c8 100644
--- a/Disco.Web/Areas/Config/Models/DeviceProfile/ShowModel.cs
+++ b/Disco.Web/Areas/Config/Models/DeviceProfile/ShowModel.cs
@@ -12,6 +12,7 @@ namespace Disco.Web.Areas.Config.Models.DeviceProfile
     {
         public Disco.Models.Repository.DeviceProfile DeviceProfile { get; set; }
         public List<SelectListItem> DeviceProfileDistributionTypes { get; set; }
+        public Disco.Models.BI.Config.OrganisationAddress DefaultOrganisationAddress { get; set; }
         public List<Disco.Models.BI.Config.OrganisationAddress> OrganisationAddresses { get; set; }
 
         public List<PluginFeatureManifest> CertificateProviders { get; set; }
diff --git a/Disco.Web/Areas/Config/Models/DocumentTemplate/CreateModel.cs b/Disco.Web/Areas/Config/Models/DocumentTemplate/CreateModel.cs
index b2bc7279..c08fe793 100644
--- a/Disco.Web/Areas/Config/Models/DocumentTemplate/CreateModel.cs
+++ b/Disco.Web/Areas/Config/Models/DocumentTemplate/CreateModel.cs
@@ -55,12 +55,12 @@ namespace Disco.Web.Areas.Config.Models.DocumentTemplate
             }
         }
 
-        public void UpdateModel(DiscoDataContext dbContext)
+        public void UpdateModel(DiscoDataContext Database)
         {
             if (this.JobTypes == null)
-                JobTypes = dbContext.JobTypes.ToList();
+                JobTypes = Database.JobTypes.ToList();
             if (this.JobSubTypes == null)
-                JobSubTypes = dbContext.JobSubTypes.ToList();
+                JobSubTypes = Database.JobSubTypes.ToList();
         }
 
     }
diff --git a/Disco.Web/Areas/Config/Models/DocumentTemplate/ShowModel.cs b/Disco.Web/Areas/Config/Models/DocumentTemplate/ShowModel.cs
index 91f57d18..b7790831 100644
--- a/Disco.Web/Areas/Config/Models/DocumentTemplate/ShowModel.cs
+++ b/Disco.Web/Areas/Config/Models/DocumentTemplate/ShowModel.cs
@@ -36,26 +36,26 @@ namespace Disco.Web.Areas.Config.Models.DocumentTemplate
             }
         }
 
-        public void UpdateModel(DiscoDataContext dbContext)
+        public void UpdateModel(DiscoDataContext Database)
         {
 
             switch (this.DocumentTemplate.Scope)
             {
                 case Disco.Models.Repository.DocumentTemplate.DocumentTemplateScopes.Device:
-                    this.StoredInstanceCount = dbContext.DeviceAttachments.Count(a => a.DocumentTemplateId == this.DocumentTemplate.Id);
+                    this.StoredInstanceCount = Database.DeviceAttachments.Count(a => a.DocumentTemplateId == this.DocumentTemplate.Id);
                     break;
                 case Disco.Models.Repository.DocumentTemplate.DocumentTemplateScopes.Job:
-                    this.StoredInstanceCount = dbContext.JobAttachments.Count(a => a.DocumentTemplateId == this.DocumentTemplate.Id);
+                    this.StoredInstanceCount = Database.JobAttachments.Count(a => a.DocumentTemplateId == this.DocumentTemplate.Id);
                     break;
                 case Disco.Models.Repository.DocumentTemplate.DocumentTemplateScopes.User:
-                    this.StoredInstanceCount = dbContext.UserAttachments.Count(a => a.DocumentTemplateId == this.DocumentTemplate.Id);
+                    this.StoredInstanceCount = Database.UserAttachments.Count(a => a.DocumentTemplateId == this.DocumentTemplate.Id);
                     break;
             }
 
             if (this.JobTypes == null)
-                JobTypes = dbContext.JobTypes.ToList();
+                JobTypes = Database.JobTypes.ToList();
             if (this.JobSubTypes == null)
-                JobSubTypes = dbContext.JobSubTypes.ToList();
+                JobSubTypes = Database.JobSubTypes.ToList();
 
             if (DocumentTemplate != null)
             {
diff --git a/Disco.Web/Areas/Config/Models/SystemConfig/IndexModel.cs b/Disco.Web/Areas/Config/Models/SystemConfig/IndexModel.cs
index a7def612..7a522f0a 100644
--- a/Disco.Web/Areas/Config/Models/SystemConfig/IndexModel.cs
+++ b/Disco.Web/Areas/Config/Models/SystemConfig/IndexModel.cs
@@ -102,9 +102,9 @@ namespace Disco.Web.Areas.Config.Models.SystemConfig
             };
         }
 
-        public void ToConfiguration(DiscoDataContext db)
+        public void ToConfiguration(DiscoDataContext Database)
         {
-            SystemConfiguration config = db.DiscoConfiguration;
+            SystemConfiguration config = Database.DiscoConfiguration;
             //config.DataStoreLocation = DataStoreLocation;
             config.ProxyAddress = ProxyAddress;
             config.ProxyPort = ProxyPort;
@@ -112,11 +112,11 @@ namespace Disco.Web.Areas.Config.Models.SystemConfig
             config.ProxyPassword = ProxyPassword;
             DiscoApplication.SetGlobalProxy(ProxyAddress, ProxyPort, ProxyUsername, ProxyPassword);
 
-            db.SaveChanges();
+            Database.SaveChanges();
 
             // Try and check for updates if needed - After Proxy Changed
-            if (db.DiscoConfiguration.UpdateLastCheck == null
-                || db.DiscoConfiguration.UpdateLastCheck.ResponseTimestamp < DateTime.Now.AddDays(-1))
+            if (Database.DiscoConfiguration.UpdateLastCheck == null
+                || Database.DiscoConfiguration.UpdateLastCheck.ResponseTimestamp < DateTime.Now.AddDays(-1))
             {
                 Disco.BI.Interop.Community.UpdateCheckTask.ScheduleNow();
             }
diff --git a/Disco.Web/Areas/Config/Views/AuthorizationRole/Create.cshtml b/Disco.Web/Areas/Config/Views/AuthorizationRole/Create.cshtml
new file mode 100644
index 00000000..ab13efa1
--- /dev/null
+++ b/Disco.Web/Areas/Config/Views/AuthorizationRole/Create.cshtml
@@ -0,0 +1,28 @@
+@model Disco.Web.Areas.Config.Models.AuthorizationRole.CreateModel
+@{
+    Authorization.Require(Claims.DiscoAdminAccount);
+    ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Authorization Roles", MVC.Config.AuthorizationRole.Index(null), "Create");
+}
+@using (Html.BeginForm())
+{ 
+    <div class="form" style="width: 450px">
+        <table>
+            <tr>
+                <th>
+                    Name:
+                </th>
+                <td>
+                    @Html.EditorFor(model => model.AuthorizationRole.Name)<br />@Html.ValidationMessageFor(model => model.AuthorizationRole.Name)
+                </td>
+            </tr>
+        </table>
+        <p class="actions">
+            <input type="submit" class="button" value="Create" />
+        </p>
+    </div>
+    <script type="text/javascript">
+        $(function () {
+            $('#AuthorizationRole_Name').focus().select();
+        });
+    </script>
+}
diff --git a/Disco.Web/Areas/Config/Views/AuthorizationRole/Create.generated.cs b/Disco.Web/Areas/Config/Views/AuthorizationRole/Create.generated.cs
new file mode 100644
index 00000000..602fa6eb
--- /dev/null
+++ b/Disco.Web/Areas/Config/Views/AuthorizationRole/Create.generated.cs
@@ -0,0 +1,122 @@
+#pragma warning disable 1591
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.18051
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Disco.Web.Areas.Config.Views.AuthorizationRole
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using System.Net;
+    using System.Text;
+    using System.Web;
+    using System.Web.Helpers;
+    using System.Web.Mvc;
+    using System.Web.Mvc.Ajax;
+    using System.Web.Mvc.Html;
+    using System.Web.Routing;
+    using System.Web.Security;
+    using System.Web.UI;
+    using System.Web.WebPages;
+    using Disco.BI.Extensions;
+    using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
+    using Disco.Web;
+    using Disco.Web.Extensions;
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
+    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/AuthorizationRole/Create.cshtml")]
+    public partial class Create : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.AuthorizationRole.CreateModel>
+    {
+        public Create()
+        {
+        }
+        public override void Execute()
+        {
+            
+            #line 2 "..\..\Areas\Config\Views\AuthorizationRole\Create.cshtml"
+  
+    Authorization.Require(Claims.DiscoAdminAccount);
+    ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Authorization Roles", MVC.Config.AuthorizationRole.Index(null), "Create");
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n");
+
+            
+            #line 6 "..\..\Areas\Config\Views\AuthorizationRole\Create.cshtml"
+ using (Html.BeginForm())
+{ 
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
+
+WriteLiteral(" class=\"form\"");
+
+WriteLiteral(" style=\"width: 450px\"");
+
+WriteLiteral(">\r\n        <table>\r\n            <tr>\r\n                <th>\r\n                    N" +
+"ame:\r\n                </th>\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 15 "..\..\Areas\Config\Views\AuthorizationRole\Create.cshtml"
+               Write(Html.EditorFor(model => model.AuthorizationRole.Name));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("<br />");
+
+            
+            #line 15 "..\..\Areas\Config\Views\AuthorizationRole\Create.cshtml"
+                                                                           Write(Html.ValidationMessageFor(model => model.AuthorizationRole.Name));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </td>\r\n            </tr>\r\n        </table>\r\n        <p");
+
+WriteLiteral(" class=\"actions\"");
+
+WriteLiteral(">\r\n            <input");
+
+WriteLiteral(" type=\"submit\"");
+
+WriteLiteral(" class=\"button\"");
+
+WriteLiteral(" value=\"Create\"");
+
+WriteLiteral(" />\r\n        </p>\r\n    </div>\r\n");
+
+WriteLiteral("    <script");
+
+WriteLiteral(" type=\"text/javascript\"");
+
+WriteLiteral(">\r\n        $(function () {\r\n            $(\'#AuthorizationRole_Name\').focus().sele" +
+"ct();\r\n        });\r\n    </script>\r\n");
+
+            
+            #line 28 "..\..\Areas\Config\Views\AuthorizationRole\Create.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/Disco.Web/Areas/Config/Views/AuthorizationRole/Index.cshtml b/Disco.Web/Areas/Config/Views/AuthorizationRole/Index.cshtml
new file mode 100644
index 00000000..759aea3b
--- /dev/null
+++ b/Disco.Web/Areas/Config/Views/AuthorizationRole/Index.cshtml
@@ -0,0 +1,43 @@
+@model Disco.Web.Areas.Config.Models.AuthorizationRole.IndexModel
+@{
+    Authorization.Require(Claims.DiscoAdminAccount);
+    ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Authorization Roles");
+}
+@if (Model.Tokens.Count == 0)
+{
+    <div class="form" style="width: 450px; padding: 100px 0;">
+        <h2>No authorization roles are configured</h2>
+    </div>  
+}
+else
+{
+    <table class="tableData">
+        <tr>
+            <th>Name
+            </th>
+            <th>Linked Groups/Users
+            </th>
+        </tr>
+        @foreach (var item in Model.Tokens)
+        {
+            <tr>
+                <td>
+                    @Html.ActionLink(item.Role.Name, MVC.Config.AuthorizationRole.Index(item.Role.Id))
+                </td>
+                <td>
+                    @if (item.SubjectIds.Count == 0)
+                    {
+                        <span class="smallMessage">&lt;None&gt;</span>
+                    }
+                    else
+                    {
+                        @(string.Join(", ", item.SubjectIds.OrderBy(i => i)))
+                    }
+                </td>
+            </tr>
+        }
+    </table>
+}
+<div class="actionBar">
+    @Html.ActionLinkButton("Create Authorization Role", MVC.Config.AuthorizationRole.Create())
+</div>
diff --git a/Disco.Web/Areas/Config/Views/AuthorizationRole/Index.generated.cs b/Disco.Web/Areas/Config/Views/AuthorizationRole/Index.generated.cs
new file mode 100644
index 00000000..e901d3c3
--- /dev/null
+++ b/Disco.Web/Areas/Config/Views/AuthorizationRole/Index.generated.cs
@@ -0,0 +1,197 @@
+#pragma warning disable 1591
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.18051
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Disco.Web.Areas.Config.Views.AuthorizationRole
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using System.Net;
+    using System.Text;
+    using System.Web;
+    using System.Web.Helpers;
+    using System.Web.Mvc;
+    using System.Web.Mvc.Ajax;
+    using System.Web.Mvc.Html;
+    using System.Web.Routing;
+    using System.Web.Security;
+    using System.Web.UI;
+    using System.Web.WebPages;
+    using Disco.BI.Extensions;
+    using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
+    using Disco.Web;
+    using Disco.Web.Extensions;
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
+    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/AuthorizationRole/Index.cshtml")]
+    public partial class Index : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.AuthorizationRole.IndexModel>
+    {
+        public Index()
+        {
+        }
+        public override void Execute()
+        {
+            
+            #line 2 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+  
+    Authorization.Require(Claims.DiscoAdminAccount);
+    ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Authorization Roles");
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n");
+
+            
+            #line 6 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+ if (Model.Tokens.Count == 0)
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
+
+WriteLiteral(" class=\"form\"");
+
+WriteLiteral(" style=\"width: 450px; padding: 100px 0;\"");
+
+WriteLiteral(">\r\n        <h2>No authorization roles are configured</h2>\r\n    </div>  \r\n");
+
+            
+            #line 11 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+}
+else
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <table");
+
+WriteLiteral(" class=\"tableData\"");
+
+WriteLiteral(">\r\n        <tr>\r\n            <th>Name\r\n            </th>\r\n            <th>Linked " +
+"Groups/Users\r\n            </th>\r\n        </tr>\r\n");
+
+            
+            #line 21 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 21 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+         foreach (var item in Model.Tokens)
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <tr>\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 25 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+               Write(Html.ActionLink(item.Role.Name, MVC.Config.AuthorizationRole.Index(item.Role.Id)));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </td>\r\n                <td>\r\n");
+
+            
+            #line 28 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 28 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+                     if (item.SubjectIds.Count == 0)
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None&gt;</span>\r\n");
+
+            
+            #line 31 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+                    }
+                    else
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 34 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+                    Write(string.Join(", ", item.SubjectIds.OrderBy(i => i)));
+
+            
+            #line default
+            #line hidden
+            
+            #line 34 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+                                                                             
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </td>\r\n            </tr>\r\n");
+
+            
+            #line 38 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    </table>\r\n");
+
+            
+            #line 40 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+WriteLiteral("<div");
+
+WriteLiteral(" class=\"actionBar\"");
+
+WriteLiteral(">\r\n");
+
+WriteLiteral("    ");
+
+            
+            #line 42 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
+Write(Html.ActionLinkButton("Create Authorization Role", MVC.Config.AuthorizationRole.Create()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n</div>\r\n");
+
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/Disco.Web/Areas/Config/Views/AuthorizationRole/Show.cshtml b/Disco.Web/Areas/Config/Views/AuthorizationRole/Show.cshtml
new file mode 100644
index 00000000..b3cce872
--- /dev/null
+++ b/Disco.Web/Areas/Config/Views/AuthorizationRole/Show.cshtml
@@ -0,0 +1,320 @@
+@model Disco.Web.Areas.Config.Models.AuthorizationRole.ShowModel
+@using Disco.Models.Authorization;
+@{
+    Authorization.Require(Claims.DiscoAdminAccount);
+    ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Authorization Roles", MVC.Config.AuthorizationRole.Index(null), Model.Token.Role.Name);
+    Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
+    Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
+    Html.BundleDeferred("~/Style/Fancytree");
+    Html.BundleDeferred("~/ClientScripts/Modules/jQuery-Fancytree");
+}
+<div id="Config_AuthRoles_Show" class="form" style="width: 550px">
+    <table>
+        <tr>
+            <th style="width: 150px">Id:
+            </th>
+            <td>
+                @Html.DisplayFor(model => model.Token.Role.Id)
+            </td>
+        </tr>
+        <tr>
+            <th>Name:
+            </th>
+            <td>@Html.EditorFor(model => model.Token.Role.Name)
+                @AjaxHelpers.AjaxSave()
+                @AjaxHelpers.AjaxLoader()
+                <script type="text/javascript">
+                    $(function () {
+                        document.DiscoFunctions.PropertyChangeHelper(
+                            $('#Token_Role_Name'),
+                            'Invalid Name',
+                            '@(Url.Action(MVC.API.AuthorizationRole.UpdateName(Model.Token.Role.Id)))',
+                            'RoleName'
+                        );
+                    });
+                </script>
+            </td>
+        </tr>
+        <tr>
+            <th>Linked Groups/Users:</th>
+            <td>
+                @if (Model.Token.SubjectIds.Count == 0)
+                {
+                    <span class="smallMessage">None Associated</span>
+                }
+                else
+                {
+                    <ul id="Config_AuthRoles_Subjects" class="none">
+                        @foreach (var sg in Model.Subjects)
+                        {
+                            <li class="@(sg.IsGroup ? "group" : "user")">@(sg.Id == sg.Name ? sg.Id : string.Format("{0} [{1}]", sg.Name, sg.Id))</li>
+                        }
+                    </ul>
+                }
+                <div>
+                    <a id="Config_AuthRoles_Subjects_Update" href="#" class="button small">Update</a>
+                    <div id="Config_AuthRoles_Subjects_Update_Dialog" class="dialog" title="Authorization Role Linked Groups/Users">
+                        <div id="Config_AuthRoles_Subjects_Update_Dialog_ListContainer">
+                            <span id="Config_AuthRoles_Subjects_Update_Dialog_None" class="smallMessage">None Associated</span>
+                            <ul id="Config_AuthRoles_Subjects_Update_Dialog_List" class="none">
+                                @foreach (var sg in Model.Subjects)
+                                {
+                                    <li class="@(sg.IsGroup ? "group" : "user")" data-subjectid="@sg.Id">@(sg.Id == sg.Name ? sg.Id : string.Format("{0} [{1}]", sg.Name, sg.Id)) <span class="remove"></span></li>
+                                }
+                            </ul>
+                        </div>
+                        <div id="Config_AuthRoles_Subjects_Update_Dialog_AddContainer">
+                            <input type="text" id="Config_AuthRoles_Subjects_Update_Dialog_TextAdd" />
+                            <a id="Config_AuthRoles_Subjects_Update_Dialog_Add" href="#" class="button small">Add</a>
+                        </div>
+                        <form id="Config_AuthRoles_Subjects_Update_Dialog_Form" action="@(Url.Action(MVC.API.AuthorizationRole.UpdateSubjects(Model.Token.Role.Id, null, true)))" method="post"></form>
+                    </div>
+                    <script>
+                        (function(){
+                            var dialog, textAdd, list, noSubjects, form;
+                            
+                            function showDialog(){
+                                if (!dialog){
+                                    dialog = $('#Config_AuthRoles_Subjects_Update_Dialog').dialog({
+                                        resizable: false,
+                                        modal: true,
+                                        autoOpen: false,
+                                        width: 350,
+                                        height: 420,
+                                        buttons: {
+                                            "Save Changes": saveChanges,
+                                            Cancel: cancel
+                                        }
+                                    });
+
+                                    dialog.on('click', '.remove', remove);
+
+                                    list = $('#Config_AuthRoles_Subjects_Update_Dialog_List');
+                                    noSubjects = $('#Config_AuthRoles_Subjects_Update_Dialog_None');
+
+                                    textAdd = $('#Config_AuthRoles_Subjects_Update_Dialog_TextAdd');
+
+                                    textAdd.watermark('Search Subjects')
+                                        .autocomplete({
+                                            source: '@(Url.Action(MVC.API.AuthorizationRole.SearchSubjects()))',
+                                            minLength: 2,
+                                            focus: function (e, ui) {
+                                                textAdd.val(ui.item.Id);
+                                                return false;
+                                            },
+                                            select: function (e, ui) {
+                                                textAdd.val(ui.item.Id).blur();
+                                                return false;
+                                            }
+                                        }).data('ui-autocomplete')._renderItem = function (ul, item) {
+                                            return $("<li></li>")
+                                                .data("item.autocomplete", item)
+                                                .append("<a><strong>" + item.Name + "</strong><br>" + item.Id + " (" + item.Type + ")</a>")
+                                                .appendTo(ul);
+                                        };
+
+                                    $('#Config_AuthRoles_Subjects_Update_Dialog_Add').click(add);
+                                }
+
+                                dialog.dialog('open');
+
+                                updateNoSubjects();
+                                return false;
+                            }
+
+                            function cancel(){
+                                $(this).dialog("close");
+
+                                list.find('li').each(function(){
+                                    $this = $(this);
+                                    if ($this.is('[data-subjectstatus="new"]')){
+                                        $this.remove();
+                                    }else{
+                                        if ($this.is('[data-subjectstatus="removed"]')){
+                                            $this.show();
+                                        }
+                                    }
+                                });
+                            }
+
+                            function remove(){
+                                $this = $(this).closest('li');
+
+                                if ($this.is('[data-subjectstatus="new"]')){
+                                    $this.remove();
+                                }else{
+                                    $this.attr('data-subjectstatus', 'removed').hide();
+                                }
+
+                                updateNoSubjects();
+                            }
+
+                            function add(){
+                                
+                                var id = textAdd.val();
+
+                                $.ajax({
+                                    url: '@Url.Action(MVC.API.AuthorizationRole.Subject())',
+                                    method: 'get',
+                                    data: { Id: id }
+                                }).done(function(response){
+                                    if (response){
+                                        if (list.find('li[data-subjectid="'+response.Id+'"]').length == 0){
+                                            var li = $('<li>')
+                                                .append($('<span>').text(response.Id == response.Name ?  response.Id : response.Name + ' [' + response.Id + ']'))
+                                                .append($('<span>').addClass('remove'))
+                                                .addClass(response.Type)
+                                                .attr('data-subjectid', response.Id)
+                                                .attr('data-subjectstatus', 'new');
+
+                                            list.append(li);
+
+                                            updateNoSubjects();                                        
+                                        }else{
+                                            alert('That subject has already been added');
+                                        }
+                                    }else{
+                                        alert('Unknown Id');
+                                    }
+                                }).fail(function(jqXHR, textStatus, errorThrown){
+                                    alert('Error: ' + errorThrown);
+                                });
+                                }
+
+                            function updateNoSubjects(){
+                                if (list.find('li:visible').length > 0)
+                                    noSubjects.hide();
+                                else
+                                    noSubjects.show();
+                            }
+
+                            function saveChanges(){
+                                var form = $('#Config_AuthRoles_Subjects_Update_Dialog_Form').empty();
+
+                                list.find('li[data-subjectstatus!="removed"]').each(function(){
+                                    var subjectId = $(this).attr('data-subjectid');
+                                    
+                                    form.append($('<input>').attr({
+                                        'name': 'Subjects',
+                                        'type': 'hidden'
+                                    }).val(subjectId));
+
+                                }).get();
+
+                                form.submit();
+
+                                dialog.dialog("disable");
+                                dialog.dialog("option", "buttons", null);
+                            }
+
+                            $(function(){
+                                $('#Config_AuthRoles_Subjects_Update').click(showDialog);
+                            });
+
+                        })();
+                    </script>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2">
+                <div id="Config_AuthRoles_Claims_Tree">
+                </div>
+                <div>
+                    <a href="#" id="Config_AuthRoles_Claims_SaveChanges" class="button small disabled">Save Changes</a>@AjaxHelpers.AjaxLoader()
+                </div>
+                <script>
+                    (function(){
+                        var claimNodes = @(new HtmlString(Newtonsoft.Json.JsonConvert.SerializeObject(Model.ClaimNavigatorFancyTreeNodes)));
+
+                        $(function(){
+                            var saveButton = $('#Config_AuthRoles_Claims_SaveChanges');
+                            var ajaxLoading = saveButton.next('.ajaxLoading');
+
+                            var tree = $('#Config_AuthRoles_Claims_Tree').fancytree({
+                                source: claimNodes,
+                                checkbox: true,
+                                selectMode: 3,
+                                select: function(){
+                                    saveButton.removeClass('disabled');
+                                }
+                            });
+
+                            saveButton.click(function(){
+                                if (!saveButton.is('.disabled')){
+                                    var selectedNodes = tree.fancytree('getTree').getSelectedNodes();
+
+                                    var selectedKeys = [];
+                                    for (var i = 0; i < selectedNodes.length; i++) {
+                                        var node = selectedNodes[i];
+                                        if (!node.folder)
+                                            selectedKeys.push(node.key);
+                                    }
+
+                                    ajaxLoading.show()
+
+                                    $.ajax({
+                                        url: '@Url.Action(MVC.API.AuthorizationRole.UpdateClaims(Model.Token.Role.Id))',
+                                        method: 'post',
+                                        data: { ClaimKeys: selectedKeys },
+                                        traditional: true
+                                    }).done(function(response, result){
+                                        if (result != 'success' || response != 'OK') {
+                                            alert('Unable to save changes:\n' + response);
+                                            ajaxLoading.hide();
+                                        } else {
+                                            saveButton.addClass('disabled');
+                                            ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                        }
+                                    }).fail(function(jqXHR, textStatus, errorThrown){
+                                        alert('Error: ' + errorThrown);
+                                    });
+                                }
+                                return false;
+                            });
+                        });
+                    })();
+                </script>
+            </td>
+        </tr>
+    </table>
+</div>
+<div class="actionBar">
+    @Html.ActionLinkButton("Delete", MVC.API.AuthorizationRole.Delete(Model.Token.Role.Id, true), "Config_AuthRoles_Actions_Delete_Button")
+    <div id="Config_AuthRoles_Actions_Delete_Dialog" title="Delete this Authorization Role?">
+        <p>
+            <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
+            This item will be permanently deleted and cannot be recovered.<br />
+            <br />
+            Are you sure?
+        </p>
+    </div>
+    <script type="text/javascript">
+        $(function () {
+            var button = $('#Config_AuthRoles_Actions_Delete_Button');
+            var buttonDialog = $('#Config_AuthRoles_Actions_Delete_Dialog');
+            var buttonLink = button.attr('href');
+            button.attr('href', '#');
+            button.click(function () {
+                buttonDialog.dialog('open');
+                return false;
+            });
+            buttonDialog.dialog({
+                resizable: false,
+                modal: true,
+                autoOpen: false,
+                buttons: {
+                    "Delete": function () {
+                        var $this = $(this);
+                        $this.dialog("disable");
+                        $this.dialog("option", "buttons", null);
+                        window.location.href = buttonLink;
+                    },
+                    Cancel: function () {
+                        $(this).dialog("close");
+                    }
+                }
+            });
+        });
+    </script>
+</div>
diff --git a/Disco.Web/Areas/Config/Views/AuthorizationRole/Show.generated.cs b/Disco.Web/Areas/Config/Views/AuthorizationRole/Show.generated.cs
new file mode 100644
index 00000000..adf7fc60
--- /dev/null
+++ b/Disco.Web/Areas/Config/Views/AuthorizationRole/Show.generated.cs
@@ -0,0 +1,632 @@
+#pragma warning disable 1591
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.18051
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Disco.Web.Areas.Config.Views.AuthorizationRole
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using System.Net;
+    using System.Text;
+    using System.Web;
+    using System.Web.Helpers;
+    using System.Web.Mvc;
+    using System.Web.Mvc.Ajax;
+    using System.Web.Mvc.Html;
+    using System.Web.Routing;
+    using System.Web.Security;
+    using System.Web.UI;
+    using System.Web.WebPages;
+    using Disco.BI.Extensions;
+    
+    #line 2 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+    using Disco.Models.Authorization;
+    
+    #line default
+    #line hidden
+    using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
+    using Disco.Web;
+    using Disco.Web.Extensions;
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
+    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/AuthorizationRole/Show.cshtml")]
+    public partial class Show : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.AuthorizationRole.ShowModel>
+    {
+        public Show()
+        {
+        }
+        public override void Execute()
+        {
+            
+            #line 3 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+  
+    Authorization.Require(Claims.DiscoAdminAccount);
+    ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Authorization Roles", MVC.Config.AuthorizationRole.Index(null), Model.Token.Role.Name);
+    Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
+    Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
+    Html.BundleDeferred("~/Style/Fancytree");
+    Html.BundleDeferred("~/ClientScripts/Modules/jQuery-Fancytree");
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<div");
+
+WriteLiteral(" id=\"Config_AuthRoles_Show\"");
+
+WriteLiteral(" class=\"form\"");
+
+WriteLiteral(" style=\"width: 550px\"");
+
+WriteLiteral(">\r\n    <table>\r\n        <tr>\r\n            <th");
+
+WriteLiteral(" style=\"width: 150px\"");
+
+WriteLiteral(">Id:\r\n            </th>\r\n            <td>\r\n");
+
+WriteLiteral("                ");
+
+            
+            #line 17 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+           Write(Html.DisplayFor(model => model.Token.Role.Id));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Name:\r\n        " +
+"    </th>\r\n            <td>");
+
+            
+            #line 23 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+           Write(Html.EditorFor(model => model.Token.Role.Name));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n");
+
+WriteLiteral("                ");
+
+            
+            #line 24 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+           Write(AjaxHelpers.AjaxSave());
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n");
+
+WriteLiteral("                ");
+
+            
+            #line 25 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+           Write(AjaxHelpers.AjaxLoader());
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                <script");
+
+WriteLiteral(" type=\"text/javascript\"");
+
+WriteLiteral(">\r\n                    $(function () {\r\n                        document.DiscoFun" +
+"ctions.PropertyChangeHelper(\r\n                            $(\'#Token_Role_Name\')," +
+"\r\n                            \'Invalid Name\',\r\n                            \'");
+
+            
+            #line 31 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                         Write(Url.Action(MVC.API.AuthorizationRole.UpdateName(Model.Token.Role.Id)));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\',\r\n                            \'RoleName\'\r\n                        );\r\n         " +
+"           });\r\n                </script>\r\n            </td>\r\n        </tr>\r\n   " +
+"     <tr>\r\n            <th>Linked Groups/Users:</th>\r\n            <td>\r\n");
+
+            
+            #line 41 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 41 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                 if (Model.Token.SubjectIds.Count == 0)
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">None Associated</span>\r\n");
+
+            
+            #line 44 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                }
+                else
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <ul");
+
+WriteLiteral(" id=\"Config_AuthRoles_Subjects\"");
+
+WriteLiteral(" class=\"none\"");
+
+WriteLiteral(">\r\n");
+
+            
+            #line 48 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 48 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                         foreach (var sg in Model.Subjects)
+                        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            <li");
+
+WriteAttribute("class", Tuple.Create(" class=\"", 2069), Tuple.Create("\"", 2109)
+            
+            #line 50 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+, Tuple.Create(Tuple.Create("", 2077), Tuple.Create<System.Object, System.Int32>(sg.IsGroup ? "group" : "user"
+            
+            #line default
+            #line hidden
+, 2077), false)
+);
+
+WriteLiteral(">");
+
+            
+            #line 50 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                                                                     Write(sg.Id == sg.Name ? sg.Id : string.Format("{0} [{1}]", sg.Name, sg.Id));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</li>\r\n");
+
+            
+            #line 51 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    </ul>\r\n");
+
+            
+            #line 53 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <div>\r\n                    <a");
+
+WriteLiteral(" id=\"Config_AuthRoles_Subjects_Update\"");
+
+WriteLiteral(" href=\"#\"");
+
+WriteLiteral(" class=\"button small\"");
+
+WriteLiteral(">Update</a>\r\n                    <div");
+
+WriteLiteral(" id=\"Config_AuthRoles_Subjects_Update_Dialog\"");
+
+WriteLiteral(" class=\"dialog\"");
+
+WriteLiteral(" title=\"Authorization Role Linked Groups/Users\"");
+
+WriteLiteral(">\r\n                        <div");
+
+WriteLiteral(" id=\"Config_AuthRoles_Subjects_Update_Dialog_ListContainer\"");
+
+WriteLiteral(">\r\n                            <span");
+
+WriteLiteral(" id=\"Config_AuthRoles_Subjects_Update_Dialog_None\"");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">None Associated</span>\r\n                            <ul");
+
+WriteLiteral(" id=\"Config_AuthRoles_Subjects_Update_Dialog_List\"");
+
+WriteLiteral(" class=\"none\"");
+
+WriteLiteral(">\r\n");
+
+            
+            #line 60 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 60 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                                 foreach (var sg in Model.Subjects)
+                                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                    <li");
+
+WriteAttribute("class", Tuple.Create(" class=\"", 2982), Tuple.Create("\"", 3022)
+            
+            #line 62 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+, Tuple.Create(Tuple.Create("", 2990), Tuple.Create<System.Object, System.Int32>(sg.IsGroup ? "group" : "user"
+            
+            #line default
+            #line hidden
+, 2990), false)
+);
+
+WriteLiteral(" data-subjectid=\"");
+
+            
+            #line 62 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                                                                                            Write(sg.Id);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\"");
+
+WriteLiteral(">");
+
+            
+            #line 62 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                                                                                                     Write(sg.Id == sg.Name ? sg.Id : string.Format("{0} [{1}]", sg.Name, sg.Id));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(" <span");
+
+WriteLiteral(" class=\"remove\"");
+
+WriteLiteral("></span></li>\r\n");
+
+            
+            #line 63 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            </ul>\r\n                        </div>\r\n              " +
+"          <div");
+
+WriteLiteral(" id=\"Config_AuthRoles_Subjects_Update_Dialog_AddContainer\"");
+
+WriteLiteral(">\r\n                            <input");
+
+WriteLiteral(" type=\"text\"");
+
+WriteLiteral(" id=\"Config_AuthRoles_Subjects_Update_Dialog_TextAdd\"");
+
+WriteLiteral(" />\r\n                            <a");
+
+WriteLiteral(" id=\"Config_AuthRoles_Subjects_Update_Dialog_Add\"");
+
+WriteLiteral(" href=\"#\"");
+
+WriteLiteral(" class=\"button small\"");
+
+WriteLiteral(">Add</a>\r\n                        </div>\r\n                        <form");
+
+WriteLiteral(" id=\"Config_AuthRoles_Subjects_Update_Dialog_Form\"");
+
+WriteAttribute("action", Tuple.Create(" action=\"", 3681), Tuple.Create("\"", 3778)
+            
+            #line 70 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+         , Tuple.Create(Tuple.Create("", 3690), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.AuthorizationRole.UpdateSubjects(Model.Token.Role.Id, null, true))
+            
+            #line default
+            #line hidden
+, 3690), false)
+);
+
+WriteLiteral(" method=\"post\"");
+
+WriteLiteral("></form>\r\n                    </div>\r\n                    <script>\r\n             " +
+"           (function(){\r\n                            var dialog, textAdd, list, " +
+"noSubjects, form;\r\n                            \r\n                            fun" +
+"ction showDialog(){\r\n                                if (!dialog){\r\n            " +
+"                        dialog = $(\'#Config_AuthRoles_Subjects_Update_Dialog\').d" +
+"ialog({\r\n                                        resizable: false,\r\n            " +
+"                            modal: true,\r\n                                      " +
+"  autoOpen: false,\r\n                                        width: 350,\r\n       " +
+"                                 height: 420,\r\n                                 " +
+"       buttons: {\r\n                                            \"Save Changes\": s" +
+"aveChanges,\r\n                                            Cancel: cancel\r\n       " +
+"                                 }\r\n                                    });\r\n\r\n " +
+"                                   dialog.on(\'click\', \'.remove\', remove);\r\n\r\n   " +
+"                                 list = $(\'#Config_AuthRoles_Subjects_Update_Dia" +
+"log_List\');\r\n                                    noSubjects = $(\'#Config_AuthRol" +
+"es_Subjects_Update_Dialog_None\');\r\n\r\n                                    textAdd" +
+" = $(\'#Config_AuthRoles_Subjects_Update_Dialog_TextAdd\');\r\n\r\n                   " +
+"                 textAdd.watermark(\'Search Subjects\')\r\n                         " +
+"               .autocomplete({\r\n                                            sour" +
+"ce: \'");
+
+            
+            #line 99 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                                                 Write(Url.Action(MVC.API.AuthorizationRole.SearchSubjects()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\',\r\n                                            minLength: 2,\r\n                  " +
+"                          focus: function (e, ui) {\r\n                           " +
+"                     textAdd.val(ui.item.Id);\r\n                                 " +
+"               return false;\r\n                                            },\r\n  " +
+"                                          select: function (e, ui) {\r\n          " +
+"                                      textAdd.val(ui.item.Id).blur();\r\n         " +
+"                                       return false;\r\n                          " +
+"                  }\r\n                                        }).data(\'ui-autocom" +
+"plete\')._renderItem = function (ul, item) {\r\n                                   " +
+"         return $(\"<li></li>\")\r\n                                                " +
+".data(\"item.autocomplete\", item)\r\n                                              " +
+"  .append(\"<a><strong>\" + item.Name + \"</strong><br>\" + item.Id + \" (\" + item.Ty" +
+"pe + \")</a>\")\r\n                                                .appendTo(ul);\r\n " +
+"                                       };\r\n\r\n                                   " +
+" $(\'#Config_AuthRoles_Subjects_Update_Dialog_Add\').click(add);\r\n                " +
+"                }\r\n\r\n                                dialog.dialog(\'open\');\r\n\r\n " +
+"                               updateNoSubjects();\r\n                            " +
+"    return false;\r\n                            }\r\n\r\n                            " +
+"function cancel(){\r\n                                $(this).dialog(\"close\");\r\n\r\n" +
+"                                list.find(\'li\').each(function(){\r\n              " +
+"                      $this = $(this);\r\n                                    if (" +
+"$this.is(\'[data-subjectstatus=\"new\"]\')){\r\n                                      " +
+"  $this.remove();\r\n                                    }else{\r\n                 " +
+"                       if ($this.is(\'[data-subjectstatus=\"removed\"]\')){\r\n       " +
+"                                     $this.show();\r\n                            " +
+"            }\r\n                                    }\r\n                          " +
+"      });\r\n                            }\r\n\r\n                            function" +
+" remove(){\r\n                                $this = $(this).closest(\'li\');\r\n\r\n  " +
+"                              if ($this.is(\'[data-subjectstatus=\"new\"]\')){\r\n    " +
+"                                $this.remove();\r\n                               " +
+" }else{\r\n                                    $this.attr(\'data-subjectstatus\', \'r" +
+"emoved\').hide();\r\n                                }\r\n\r\n                         " +
+"       updateNoSubjects();\r\n                            }\r\n\r\n                   " +
+"         function add(){\r\n                                \r\n                    " +
+"            var id = textAdd.val();\r\n\r\n                                $.ajax({\r" +
+"\n                                    url: \'");
+
+            
+            #line 157 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                                     Write(Url.Action(MVC.API.AuthorizationRole.Subject()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\',\r\n                                    method: \'get\',\r\n                         " +
+"           data: { Id: id }\r\n                                }).done(function(re" +
+"sponse){\r\n                                    if (response){\r\n                  " +
+"                      if (list.find(\'li[data-subjectid=\"\'+response.Id+\'\"]\').leng" +
+"th == 0){\r\n                                            var li = $(\'<li>\')\r\n     " +
+"                                           .append($(\'<span>\').text(response.Id " +
+"== response.Name ?  response.Id : response.Name + \' [\' + response.Id + \']\'))\r\n  " +
+"                                              .append($(\'<span>\').addClass(\'remo" +
+"ve\'))\r\n                                                .addClass(response.Type)\r" +
+"\n                                                .attr(\'data-subjectid\', respons" +
+"e.Id)\r\n                                                .attr(\'data-subjectstatus" +
+"\', \'new\');\r\n\r\n                                            list.append(li);\r\n\r\n  " +
+"                                          updateNoSubjects();                   " +
+"                     \r\n                                        }else{\r\n         " +
+"                                   alert(\'That subject has already been added\');" +
+"\r\n                                        }\r\n                                   " +
+" }else{\r\n                                        alert(\'Unknown Id\');\r\n         " +
+"                           }\r\n                                }).fail(function(j" +
+"qXHR, textStatus, errorThrown){\r\n                                    alert(\'Erro" +
+"r: \' + errorThrown);\r\n                                });\r\n                     " +
+"           }\r\n\r\n                            function updateNoSubjects(){\r\n      " +
+"                          if (list.find(\'li:visible\').length > 0)\r\n             " +
+"                       noSubjects.hide();\r\n                                else\r" +
+"\n                                    noSubjects.show();\r\n                       " +
+"     }\r\n\r\n                            function saveChanges(){\r\n                 " +
+"               var form = $(\'#Config_AuthRoles_Subjects_Update_Dialog_Form\').emp" +
+"ty();\r\n\r\n                                list.find(\'li[data-subjectstatus!=\"remo" +
+"ved\"]\').each(function(){\r\n                                    var subjectId = $(" +
+"this).attr(\'data-subjectid\');\r\n                                    \r\n           " +
+"                         form.append($(\'<input>\').attr({\r\n                      " +
+"                  \'name\': \'Subjects\',\r\n                                        \'" +
+"type\': \'hidden\'\r\n                                    }).val(subjectId));\r\n\r\n    " +
+"                            }).get();\r\n\r\n                                form.su" +
+"bmit();\r\n\r\n                                dialog.dialog(\"disable\");\r\n          " +
+"                      dialog.dialog(\"option\", \"buttons\", null);\r\n               " +
+"             }\r\n\r\n                            $(function(){\r\n                   " +
+"             $(\'#Config_AuthRoles_Subjects_Update\').click(showDialog);\r\n        " +
+"                    });\r\n\r\n                        })();\r\n                    </" +
+"script>\r\n                </div>\r\n            </td>\r\n        </tr>\r\n        <tr>\r" +
+"\n            <td");
+
+WriteLiteral(" colspan=\"2\"");
+
+WriteLiteral(">\r\n                <div");
+
+WriteLiteral(" id=\"Config_AuthRoles_Claims_Tree\"");
+
+WriteLiteral(">\r\n                </div>\r\n                <div>\r\n                    <a");
+
+WriteLiteral(" href=\"#\"");
+
+WriteLiteral(" id=\"Config_AuthRoles_Claims_SaveChanges\"");
+
+WriteLiteral(" class=\"button small disabled\"");
+
+WriteLiteral(">Save Changes</a>");
+
+            
+            #line 224 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                                                                                                                  Write(AjaxHelpers.AjaxLoader());
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </div>\r\n                <script>\r\n                    (function" +
+"(){\r\n                        var claimNodes = ");
+
+            
+            #line 228 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                                     Write(new HtmlString(Newtonsoft.Json.JsonConvert.SerializeObject(Model.ClaimNavigatorFancyTreeNodes)));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@";
+
+                        $(function(){
+                            var saveButton = $('#Config_AuthRoles_Claims_SaveChanges');
+                            var ajaxLoading = saveButton.next('.ajaxLoading');
+
+                            var tree = $('#Config_AuthRoles_Claims_Tree').fancytree({
+                                source: claimNodes,
+                                checkbox: true,
+                                selectMode: 3,
+                                select: function(){
+                                    saveButton.removeClass('disabled');
+                                }
+                            });
+
+                            saveButton.click(function(){
+                                if (!saveButton.is('.disabled')){
+                                    var selectedNodes = tree.fancytree('getTree').getSelectedNodes();
+
+                                    var selectedKeys = [];
+                                    for (var i = 0; i < selectedNodes.length; i++) {
+                                        var node = selectedNodes[i];
+                                        if (!node.folder)
+                                            selectedKeys.push(node.key);
+                                    }
+
+                                    ajaxLoading.show()
+
+                                    $.ajax({
+                                        url: '");
+
+            
+            #line 257 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+                                         Write(Url.Action(MVC.API.AuthorizationRole.UpdateClaims(Model.Token.Role.Id)));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"',
+                                        method: 'post',
+                                        data: { ClaimKeys: selectedKeys },
+                                        traditional: true
+                                    }).done(function(response, result){
+                                        if (result != 'success' || response != 'OK') {
+                                            alert('Unable to save changes:\n' + response);
+                                            ajaxLoading.hide();
+                                        } else {
+                                            saveButton.addClass('disabled');
+                                            ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                        }
+                                    }).fail(function(jqXHR, textStatus, errorThrown){
+                                        alert('Error: ' + errorThrown);
+                                    });
+                                }
+                                return false;
+                            });
+                        });
+                    })();
+                </script>
+            </td>
+        </tr>
+    </table>
+</div>
+<div");
+
+WriteLiteral(" class=\"actionBar\"");
+
+WriteLiteral(">\r\n");
+
+WriteLiteral("    ");
+
+            
+            #line 283 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
+Write(Html.ActionLinkButton("Delete", MVC.API.AuthorizationRole.Delete(Model.Token.Role.Id, true), "Config_AuthRoles_Actions_Delete_Button"));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n    <div");
+
+WriteLiteral(" id=\"Config_AuthRoles_Actions_Delete_Dialog\"");
+
+WriteLiteral(" title=\"Delete this Authorization Role?\"");
+
+WriteLiteral(">\r\n        <p>\r\n            <span");
+
+WriteLiteral(" class=\"ui-icon ui-icon-alert\"");
+
+WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\"");
+
+WriteLiteral("></span>\r\n            This item will be permanently deleted and cannot be recover" +
+"ed.<br />\r\n            <br />\r\n            Are you sure?\r\n        </p>\r\n    </di" +
+"v>\r\n    <script");
+
+WriteLiteral(" type=\"text/javascript\"");
+
+WriteLiteral(@">
+        $(function () {
+            var button = $('#Config_AuthRoles_Actions_Delete_Button');
+            var buttonDialog = $('#Config_AuthRoles_Actions_Delete_Dialog');
+            var buttonLink = button.attr('href');
+            button.attr('href', '#');
+            button.click(function () {
+                buttonDialog.dialog('open');
+                return false;
+            });
+            buttonDialog.dialog({
+                resizable: false,
+                modal: true,
+                autoOpen: false,
+                buttons: {
+                    ""Delete"": function () {
+                        var $this = $(this);
+                        $this.dialog(""disable"");
+                        $this.dialog(""option"", ""buttons"", null);
+                        window.location.href = buttonLink;
+                    },
+                    Cancel: function () {
+                        $(this).dialog(""close"");
+                    }
+                }
+            });
+        });
+    </script>
+</div>
+");
+
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/Disco.Web/Areas/Config/Views/Config/Index.cshtml b/Disco.Web/Areas/Config/Views/Config/Index.cshtml
index 52b78767..fe4e5962 100644
--- a/Disco.Web/Areas/Config/Views/Config/Index.cshtml
+++ b/Disco.Web/Areas/Config/Views/Config/Index.cshtml
@@ -1,62 +1,106 @@
 @model Disco.Web.Areas.Config.Models.Config.IndexModel
 @{
+    Authorization.Require(Claims.Config.Show);
     ViewBag.Title = "Configuration";
 }
 <table id="pageMenu">
     <tr>
-        <td>
-            <div class="pageMenuArea">
-                <h2>Hosting</h2>
-                @Html.ActionLinkClass("System", MVC.Config.SystemConfig.Index(), "config")
-                <div class="pageMenuBlurb">
-                    Update system configuration, such as the Data Storage Location and Proxy settings.
+        @if (Authorization.HasAny(Claims.Config.System.Show, Claims.Config.Organisation.Show, Claims.DiscoAdminAccount, Claims.Config.Logging.Show))
+        {
+            <td>
+                <div class="pageMenuArea">
+                    <h2>Hosting</h2>
+                    @if (Authorization.Has(Claims.Config.System.Show))
+                    {
+                        @Html.ActionLinkClass("System", MVC.Config.SystemConfig.Index(), "config")
+                        <div class="pageMenuBlurb">
+                            Update system configuration, such as the Data Storage Location and Proxy settings.
+                        </div>
+                    }
+                    @if (Authorization.Has(Claims.Config.Organisation.Show))
+                    {
+                        @Html.ActionLinkClass("Organisation Details", MVC.Config.Organisation.Index(), "config")
+                        <div class="pageMenuBlurb">
+                            Update the Organisation Name, Logo and Addresses associated with this organisation.
+                        </div>
+                    }
+                    @if (Authorization.Has(Claims.DiscoAdminAccount))
+                    {
+                        @Html.ActionLinkClass("Authorization Roles", MVC.Config.AuthorizationRole.Index(), "config")
+                        <div class="pageMenuBlurb">
+                            Configure roles and permissions for users.
+                        </div>
+                    }
+                    @if (Authorization.Has(Claims.Config.Logging.Show))
+                    {
+                        @Html.ActionLinkClass("Logging", MVC.Config.Logging.Index(), "config")
+                        <div class="pageMenuBlurb">
+                            Export Log files from various Disco Modules and view Live Logging.
+                        </div>
+                    }
                 </div>
-                @Html.ActionLinkClass("Organisation Details", MVC.Config.Organisation.Index(), "config")
-                <div class="pageMenuBlurb">
-                    Update the Organisation Name, Logo and Addresses associated with this organisation.
-                </div>
-                @Html.ActionLinkClass("Logging", MVC.Config.Logging.Index(), "config")
-                <div class="pageMenuBlurb">
-                    Export Log files from various Disco Modules and view Live Logging.
-                </div>
-            </div>
-        </td>
-        <td>
-            <div class="pageMenuArea">
-                <h2>Devices</h2>
-                @Html.ActionLinkClass("Models", MVC.Config.DeviceModel.Index(), "config")
-                <div class="pageMenuBlurb">
-                    Configure Components, Product Images and default settings for Device Models.
-                </div>
-                @Html.ActionLinkClass("Batches", MVC.Config.DeviceBatch.Index(), "config")
-                <div class="pageMenuBlurb">
-                    Create and Configure Device Batches.
-                </div>
-                @Html.ActionLinkClass("Profiles", MVC.Config.DeviceProfile.Index(), "config")
-                <div class="pageMenuBlurb">
-                    Configure Device Profiles including computer name generation, distribution and Active
+            </td>
+        }
+        @if (Authorization.HasAny(Claims.Config.DeviceModel.Show, Claims.Config.DeviceBatch.Show, Claims.Config.DeviceProfile.Show, Claims.Config.Enrolment.Show))
+        {
+            <td>
+                <div class="pageMenuArea">
+                    <h2>Devices</h2>
+                    @if (Authorization.Has(Claims.Config.DeviceModel.Show))
+                    {
+                        @Html.ActionLinkClass("Models", MVC.Config.DeviceModel.Index(), "config")
+                        <div class="pageMenuBlurb">
+                            Configure Components, Product Images and default settings for Device Models.
+                        </div>
+                    }
+                    @if (Authorization.Has(Claims.Config.DeviceBatch.Show))
+                    {
+                        @Html.ActionLinkClass("Batches", MVC.Config.DeviceBatch.Index(), "config")
+                        <div class="pageMenuBlurb">
+                            Create and Configure Device Batches.
+                        </div>
+                    }
+                    @if (Authorization.Has(Claims.Config.DeviceProfile.Show))
+                    {
+                        @Html.ActionLinkClass("Profiles", MVC.Config.DeviceProfile.Index(), "config")
+                        <div class="pageMenuBlurb">
+                            Configure Device Profiles including computer name generation, distribution and Active
                     Directory OU layout.
+                        </div>
+                    }
+                    @if (Authorization.Has(Claims.Config.Enrolment.Show))
+                    {
+                        @Html.ActionLinkClass("Enrolment", MVC.Config.Enrolment.Index(), "config")
+                        <div class="pageMenuBlurb">
+                            Configure Enrolment settings including secure credentials.
+                        </div>
+                    }
                 </div>
-                @Html.ActionLinkClass("Enrolment", MVC.Config.Enrolment.Index(), "config")
-                <div class="pageMenuBlurb">
-                    Configure Enrolment settings including secure credentials.
-                </div>
-            </div>
-        </td>
-        <td>
-            <div class="pageMenuArea">
-                <h2>Features</h2>
-                @Html.ActionLinkClass("Document Templates", MVC.Config.DocumentTemplate.Index(), "config")
-                <div class="pageMenuBlurb">
-                    Create, Update and Bulk Generate documents based on PDF Templates for Jobs, Devices
+            </td>
+        }
+        @if (Authorization.HasAny(Claims.Config.DocumentTemplate.Show, Claims.Config.Plugin.Show))
+        {
+            <td>
+                <div class="pageMenuArea">
+                    <h2>Features</h2>
+                    @if (Authorization.Has(Claims.Config.DocumentTemplate.Show))
+                    {
+                        @Html.ActionLinkClass("Document Templates", MVC.Config.DocumentTemplate.Index(), "config")
+                        <div class="pageMenuBlurb">
+                            Create, Update and Bulk Generate documents based on PDF Templates for Jobs, Devices
                     and Users.
+                        </div>
+                    }
+                    @if (Authorization.Has(Claims.Config.Plugin.Show))
+                    {
+                        @Html.ActionLinkClass("Plugins", MVC.Config.Plugins.Index(), "config")
+                        <div class="pageMenuBlurb">
+                            Manage extensions to the Disco platform.
+                        </div>
+                    }
                 </div>
-                @Html.ActionLinkClass("Plugins", MVC.Config.Plugins.Index(), "config")
-                <div class="pageMenuBlurb">
-                    Manage extensions to the Disco platform.
-                </div>
-            </div>
-        </td>
+            </td>
+        }
     </tr>
 </table>
 @{
diff --git a/Disco.Web/Areas/Config/Views/Config/Index.generated.cs b/Disco.Web/Areas/Config/Views/Config/Index.generated.cs
index f4a294c3..f2471c80 100644
--- a/Disco.Web/Areas/Config/Views/Config/Index.generated.cs
+++ b/Disco.Web/Areas/Config/Views/Config/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.Config
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/Config/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.Config.IndexModel>
+    public partial class Index : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.Config.IndexModel>
     {
         public Index()
         {
@@ -43,6 +45,7 @@ namespace Disco.Web.Areas.Config.Views.Config
             
             #line 2 "..\..\Areas\Config\Views\Config\Index.cshtml"
   
+    Authorization.Require(Claims.Config.Show);
     ViewBag.Title = "Configuration";
 
             
@@ -52,170 +55,485 @@ WriteLiteral("\r\n<table");
 
 WriteLiteral(" id=\"pageMenu\"");
 
-WriteLiteral(">\r\n    <tr>\r\n        <td>\r\n            <div");
+WriteLiteral(">\r\n    <tr>\r\n");
+
+            
+            #line 8 "..\..\Areas\Config\Views\Config\Index.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 8 "..\..\Areas\Config\Views\Config\Index.cshtml"
+         if (Authorization.HasAny(Claims.Config.System.Show, Claims.Config.Organisation.Show, Claims.DiscoAdminAccount, Claims.Config.Logging.Show))
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <td>\r\n                <div");
 
 WriteLiteral(" class=\"pageMenuArea\"");
 
-WriteLiteral(">\r\n                <h2>Hosting</h2>\r\n");
-
-WriteLiteral("                ");
+WriteLiteral(">\r\n                    <h2>Hosting</h2>\r\n");
 
             
-            #line 10 "..\..\Areas\Config\Views\Config\Index.cshtml"
-           Write(Html.ActionLinkClass("System", MVC.Config.SystemConfig.Index(), "config"));
+            #line 13 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 13 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                     if (Authorization.Has(Claims.Config.System.Show))
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 15 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                   Write(Html.ActionLinkClass("System", MVC.Config.SystemConfig.Index(), "config"));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <div");
-
-WriteLiteral(" class=\"pageMenuBlurb\"");
-
-WriteLiteral(">\r\n                    Update system configuration, such as the Data Storage Loca" +
-"tion and Proxy settings.\r\n                </div>\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 14 "..\..\Areas\Config\Views\Config\Index.cshtml"
-           Write(Html.ActionLinkClass("Organisation Details", MVC.Config.Organisation.Index(), "config"));
+            #line 15 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                                                                                                  
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <div");
+WriteLiteral("                        <div");
 
 WriteLiteral(" class=\"pageMenuBlurb\"");
 
-WriteLiteral(">\r\n                    Update the Organisation Name, Logo and Addresses associate" +
-"d with this organisation.\r\n                </div>\r\n");
-
-WriteLiteral("                ");
+WriteLiteral(">\r\n                            Update system configuration, such as the Data Stor" +
+"age Location and Proxy settings.\r\n                        </div>\r\n");
 
             
-            #line 18 "..\..\Areas\Config\Views\Config\Index.cshtml"
-           Write(Html.ActionLinkClass("Logging", MVC.Config.Logging.Index(), "config"));
+            #line 19 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                    }
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <div");
+WriteLiteral("                    ");
+
+            
+            #line 20 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                     if (Authorization.Has(Claims.Config.Organisation.Show))
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 22 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                   Write(Html.ActionLinkClass("Organisation Details", MVC.Config.Organisation.Index(), "config"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 22 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                                                                                                                
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <div");
 
 WriteLiteral(" class=\"pageMenuBlurb\"");
 
-WriteLiteral(">\r\n                    Export Log files from various Disco Modules and view Live " +
-"Logging.\r\n                </div>\r\n            </div>\r\n        </td>\r\n        <td" +
-">\r\n            <div");
+WriteLiteral(">\r\n                            Update the Organisation Name, Logo and Addresses a" +
+"ssociated with this organisation.\r\n                        </div>\r\n");
 
-WriteLiteral(" class=\"pageMenuArea\"");
+            
+            #line 26 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                    }
 
-WriteLiteral(">\r\n                <h2>Devices</h2>\r\n");
-
-WriteLiteral("                ");
+            
+            #line default
+            #line hidden
+WriteLiteral("                    ");
 
             
             #line 27 "..\..\Areas\Config\Views\Config\Index.cshtml"
-           Write(Html.ActionLinkClass("Models", MVC.Config.DeviceModel.Index(), "config"));
+                     if (Authorization.Has(Claims.DiscoAdminAccount))
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 29 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                   Write(Html.ActionLinkClass("Authorization Roles", MVC.Config.AuthorizationRole.Index(), "config"));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <div");
-
-WriteLiteral(" class=\"pageMenuBlurb\"");
-
-WriteLiteral(">\r\n                    Configure Components, Product Images and default settings " +
-"for Device Models.\r\n                </div>\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 31 "..\..\Areas\Config\Views\Config\Index.cshtml"
-           Write(Html.ActionLinkClass("Batches", MVC.Config.DeviceBatch.Index(), "config"));
+            #line 29 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                                                                                                                    
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <div");
+WriteLiteral("                        <div");
 
 WriteLiteral(" class=\"pageMenuBlurb\"");
 
-WriteLiteral(">\r\n                    Create and Configure Device Batches.\r\n                </di" +
-"v>\r\n");
-
-WriteLiteral("                ");
+WriteLiteral(">\r\n                            Configure roles and permissions for users.\r\n      " +
+"                  </div>\r\n");
 
             
-            #line 35 "..\..\Areas\Config\Views\Config\Index.cshtml"
-           Write(Html.ActionLinkClass("Profiles", MVC.Config.DeviceProfile.Index(), "config"));
+            #line 33 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                    }
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <div");
+WriteLiteral("                    ");
+
+            
+            #line 34 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                     if (Authorization.Has(Claims.Config.Logging.Show))
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 36 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                   Write(Html.ActionLinkClass("Logging", MVC.Config.Logging.Index(), "config"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 36 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                                                                                              
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <div");
 
 WriteLiteral(" class=\"pageMenuBlurb\"");
 
-WriteLiteral(">\r\n                    Configure Device Profiles including computer name generati" +
-"on, distribution and Active\r\n                    Directory OU layout.\r\n         " +
-"       </div>\r\n");
-
-WriteLiteral("                ");
+WriteLiteral(">\r\n                            Export Log files from various Disco Modules and vi" +
+"ew Live Logging.\r\n                        </div>\r\n");
 
             
             #line 40 "..\..\Areas\Config\Views\Config\Index.cshtml"
-           Write(Html.ActionLinkClass("Enrolment", MVC.Config.Enrolment.Index(), "config"));
+                    }
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <div");
+WriteLiteral("                </div>\r\n            </td>\r\n");
 
-WriteLiteral(" class=\"pageMenuBlurb\"");
+            
+            #line 43 "..\..\Areas\Config\Views\Config\Index.cshtml"
+        }
 
-WriteLiteral(">\r\n                    Configure Enrolment settings including secure credentials." +
-"\r\n                </div>\r\n            </div>\r\n        </td>\r\n        <td>\r\n     " +
-"       <div");
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 44 "..\..\Areas\Config\Views\Config\Index.cshtml"
+         if (Authorization.HasAny(Claims.Config.DeviceModel.Show, Claims.Config.DeviceBatch.Show, Claims.Config.DeviceProfile.Show, Claims.Config.Enrolment.Show))
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <td>\r\n                <div");
 
 WriteLiteral(" class=\"pageMenuArea\"");
 
-WriteLiteral(">\r\n                <h2>Features</h2>\r\n");
-
-WriteLiteral("                ");
+WriteLiteral(">\r\n                    <h2>Devices</h2>\r\n");
 
             
             #line 49 "..\..\Areas\Config\Views\Config\Index.cshtml"
-           Write(Html.ActionLinkClass("Document Templates", MVC.Config.DocumentTemplate.Index(), "config"));
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 49 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                     if (Authorization.Has(Claims.Config.DeviceModel.Show))
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 51 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                   Write(Html.ActionLinkClass("Models", MVC.Config.DeviceModel.Index(), "config"));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <div");
-
-WriteLiteral(" class=\"pageMenuBlurb\"");
-
-WriteLiteral(">\r\n                    Create, Update and Bulk Generate documents based on PDF Te" +
-"mplates for Jobs, Devices\r\n                    and Users.\r\n                </div" +
-">\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 54 "..\..\Areas\Config\Views\Config\Index.cshtml"
-           Write(Html.ActionLinkClass("Plugins", MVC.Config.Plugins.Index(), "config"));
+            #line 51 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                                                                                                 
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <div");
+WriteLiteral("                        <div");
 
 WriteLiteral(" class=\"pageMenuBlurb\"");
 
-WriteLiteral(">\r\n                    Manage extensions to the Disco platform.\r\n                " +
-"</div>\r\n            </div>\r\n        </td>\r\n    </tr>\r\n</table>\r\n");
+WriteLiteral(">\r\n                            Configure Components, Product Images and default s" +
+"ettings for Device Models.\r\n                        </div>\r\n");
+
+            
+            #line 55 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    ");
+
+            
+            #line 56 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                     if (Authorization.Has(Claims.Config.DeviceBatch.Show))
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 58 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                   Write(Html.ActionLinkClass("Batches", MVC.Config.DeviceBatch.Index(), "config"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 58 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                                                                                                  
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <div");
+
+WriteLiteral(" class=\"pageMenuBlurb\"");
+
+WriteLiteral(">\r\n                            Create and Configure Device Batches.\r\n            " +
+"            </div>\r\n");
 
             
             #line 62 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    ");
+
+            
+            #line 63 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                     if (Authorization.Has(Claims.Config.DeviceProfile.Show))
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 65 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                   Write(Html.ActionLinkClass("Profiles", MVC.Config.DeviceProfile.Index(), "config"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 65 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                                                                                                     
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <div");
+
+WriteLiteral(" class=\"pageMenuBlurb\"");
+
+WriteLiteral(">\r\n                            Configure Device Profiles including computer name " +
+"generation, distribution and Active\r\n                    Directory OU layout.\r\n " +
+"                       </div>\r\n");
+
+            
+            #line 70 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    ");
+
+            
+            #line 71 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                     if (Authorization.Has(Claims.Config.Enrolment.Show))
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 73 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                   Write(Html.ActionLinkClass("Enrolment", MVC.Config.Enrolment.Index(), "config"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 73 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                                                                                                  
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <div");
+
+WriteLiteral(" class=\"pageMenuBlurb\"");
+
+WriteLiteral(">\r\n                            Configure Enrolment settings including secure cred" +
+"entials.\r\n                        </div>\r\n");
+
+            
+            #line 77 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n            </td>\r\n");
+
+            
+            #line 80 "..\..\Areas\Config\Views\Config\Index.cshtml"
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 81 "..\..\Areas\Config\Views\Config\Index.cshtml"
+         if (Authorization.HasAny(Claims.Config.DocumentTemplate.Show, Claims.Config.Plugin.Show))
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <td>\r\n                <div");
+
+WriteLiteral(" class=\"pageMenuArea\"");
+
+WriteLiteral(">\r\n                    <h2>Features</h2>\r\n");
+
+            
+            #line 86 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 86 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                     if (Authorization.Has(Claims.Config.DocumentTemplate.Show))
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 88 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                   Write(Html.ActionLinkClass("Document Templates", MVC.Config.DocumentTemplate.Index(), "config"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 88 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                                                                                                                  
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <div");
+
+WriteLiteral(" class=\"pageMenuBlurb\"");
+
+WriteLiteral(">\r\n                            Create, Update and Bulk Generate documents based o" +
+"n PDF Templates for Jobs, Devices\r\n                    and Users.\r\n             " +
+"           </div>\r\n");
+
+            
+            #line 93 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    ");
+
+            
+            #line 94 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                     if (Authorization.Has(Claims.Config.Plugin.Show))
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 96 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                   Write(Html.ActionLinkClass("Plugins", MVC.Config.Plugins.Index(), "config"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 96 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                                                                                              
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <div");
+
+WriteLiteral(" class=\"pageMenuBlurb\"");
+
+WriteLiteral(">\r\n                            Manage extensions to the Disco platform.\r\n        " +
+"                </div>\r\n");
+
+            
+            #line 100 "..\..\Areas\Config\Views\Config\Index.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n            </td>\r\n");
+
+            
+            #line 103 "..\..\Areas\Config\Views\Config\Index.cshtml"
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    </tr>\r\n</table>\r\n");
+
+            
+            #line 106 "..\..\Areas\Config\Views\Config\Index.cshtml"
   
     if (Model.UpdateAvailable)
     {
@@ -229,14 +547,14 @@ WriteLiteral(" id=\"updateAvailableContainer\"");
 
 WriteLiteral(">\r\n        <div>An updated version of Disco is available</div>\r\n        <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 3034), Tuple.Create("\"", 3070)
+WriteAttribute("href", Tuple.Create(" href=\"", 5401), Tuple.Create("\"", 5437)
             
-            #line 67 "..\..\Areas\Config\Views\Config\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 3041), Tuple.Create<System.Object, System.Int32>(Model.UpdateResponse.UrlLink
+            #line 111 "..\..\Areas\Config\Views\Config\Index.cshtml"
+, Tuple.Create(Tuple.Create("", 5408), Tuple.Create<System.Object, System.Int32>(Model.UpdateResponse.UrlLink
             
             #line default
             #line hidden
-, 3041), false)
+, 5408), false)
 );
 
 WriteLiteral(" target=\"_blank\"");
@@ -244,7 +562,7 @@ WriteLiteral(" target=\"_blank\"");
 WriteLiteral(">Download Disco v");
 
             
-            #line 67 "..\..\Areas\Config\Views\Config\Index.cshtml"
+            #line 111 "..\..\Areas\Config\Views\Config\Index.cshtml"
                                                                             Write(Model.UpdateResponse.Version);
 
             
@@ -261,13 +579,13 @@ WriteLiteral(@"    <script>
 ");
 
             
-            #line 75 "..\..\Areas\Config\Views\Config\Index.cshtml"
+            #line 119 "..\..\Areas\Config\Views\Config\Index.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 75 "..\..\Areas\Config\Views\Config\Index.cshtml"
+            #line 119 "..\..\Areas\Config\Views\Config\Index.cshtml"
                   
         if (Model.UpdateResponse.VersionReleasedTimestamp < DateTime.Now.AddDays(-7))
         {
@@ -283,7 +601,7 @@ WriteLiteral("\r\n                updateAvailableContainer.effect(\"shake\", { t
 WriteLiteral("\r\n");
 
             
-            #line 81 "..\..\Areas\Config\Views\Config\Index.cshtml"
+            #line 125 "..\..\Areas\Config\Views\Config\Index.cshtml"
         }
                 
             
@@ -292,7 +610,7 @@ WriteLiteral("\r\n");
 WriteLiteral("\r\n            });\r\n        })();\r\n    </script>\r\n");
 
             
-            #line 86 "..\..\Areas\Config\Views\Config\Index.cshtml"
+            #line 130 "..\..\Areas\Config\Views\Config\Index.cshtml"
     }
 
             
diff --git a/Disco.Web/Areas/Config/Views/DeviceBatch/Create.cshtml b/Disco.Web/Areas/Config/Views/DeviceBatch/Create.cshtml
index 816f9ca4..614e73b4 100644
--- a/Disco.Web/Areas/Config/Views/DeviceBatch/Create.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceBatch/Create.cshtml
@@ -1,5 +1,6 @@
 @model Disco.Web.Areas.Config.Models.DeviceBatch.CreateModel
 @{
+    Authorization.Require(Claims.Config.DeviceBatch.Create);
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Batches", MVC.Config.DeviceBatch.Index(null), "Create");
 }
 @using (Html.BeginForm())
diff --git a/Disco.Web/Areas/Config/Views/DeviceBatch/Create.generated.cs b/Disco.Web/Areas/Config/Views/DeviceBatch/Create.generated.cs
index 9be6c625..ebd18ba3 100644
--- a/Disco.Web/Areas/Config/Views/DeviceBatch/Create.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceBatch/Create.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceBatch/Create.cshtml")]
-    public partial class Create : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceBatch.CreateModel>
+    public partial class Create : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DeviceBatch.CreateModel>
     {
         public Create()
         {
@@ -43,6 +45,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
             
             #line 2 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
   
+    Authorization.Require(Claims.Config.DeviceBatch.Create);
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Batches", MVC.Config.DeviceBatch.Index(null), "Create");
 
             
@@ -51,7 +54,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
 WriteLiteral("\r\n");
 
             
-            #line 5 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
+            #line 6 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
  using (Html.BeginForm())
 { 
 
@@ -70,7 +73,7 @@ WriteLiteral(">\r\n        <table>\r\n            <tr>\r\n                <th>\r
 WriteLiteral("                    ");
 
             
-            #line 14 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
+            #line 15 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
                Write(Html.EditorFor(model => model.DeviceBatch.Name));
 
             
@@ -79,7 +82,7 @@ WriteLiteral("                    ");
 WriteLiteral("<br />");
 
             
-            #line 14 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
+            #line 15 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
                                                                      Write(Html.ValidationMessageFor(model => model.DeviceBatch.Name));
 
             
@@ -90,7 +93,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 "d>");
 
             
-            #line 21 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
+            #line 22 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
                Write(Html.EditorFor(model => model.DeviceBatch.PurchaseDate));
 
             
@@ -99,7 +102,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 WriteLiteral("<br />");
 
             
-            #line 21 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
+            #line 22 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
                                                                              Write(Html.ValidationMessageFor(model => model.DeviceBatch.PurchaseDate));
 
             
@@ -136,7 +139,7 @@ WriteLiteral(@">
 ");
 
             
-            #line 39 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
+            #line 40 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
 }
 
             
diff --git a/Disco.Web/Areas/Config/Views/DeviceBatch/Index.cshtml b/Disco.Web/Areas/Config/Views/DeviceBatch/Index.cshtml
index 9de32b13..aeeff154 100644
--- a/Disco.Web/Areas/Config/Views/DeviceBatch/Index.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceBatch/Index.cshtml
@@ -1,69 +1,78 @@
 @model Disco.Web.Areas.Config.Models.DeviceBatch.IndexModel
 @{
+    Authorization.Require(Claims.Config.DeviceBatch.Show);
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Batches");
 }
-<table class="tableData">
-    <tr>
-        <th>
-            Name
-        </th>
-        <th>
-            Default Model
-        </th>
-        <th>
-            Purchase Date
-        </th>
-        <th>
-            Warranty Expires
-        </th>
-        <th>
-            Insurance Expires
-        </th>
-        <th>
-            Device Count
-        </th>
-    </tr>
-    @foreach (var item in Model.DeviceBatches)
-    {
+@if (Model.DeviceBatches.Count == 0)
+{
+    <div class="form" style="width: 450px; padding: 100px 0;">
+        <h2>No device batches are configured</h2>
+    </div>  
+}
+else
+{
+    <table class="tableData">
         <tr>
-            <td>
-                @Html.ActionLink(item.Name, MVC.Config.DeviceBatch.Index(item.Id))
-            </td>
-            <td>
-                @item.DefaultDeviceModel
-            </td>
-            <td>
-                @CommonHelpers.FriendlyDate(item.PurchaseDate)
-            </td>
-            <td>
-                @CommonHelpers.FriendlyDate(item.WarrantyExpires, "Unknown")
-            </td>
-            <td>
-                @CommonHelpers.FriendlyDate(item.InsuredUntil, item.InsuranceSupplier == null ? "N/A" : "Unknown")
-                @(item.InsuranceSupplier == null ? string.Empty : string.Format("[{0}]", item.InsuranceSupplier))
-            </td>
-            <td>
-                @if (item.PurchaseUnitQuantity.HasValue)
-                { 
-                    <span>@item.DeviceCount.ToString("n0")/@(item.PurchaseUnitQuantity.Value.ToString("n0"))</span>
-                }
-                else
-                { 
-                    @item.DeviceCount.ToString("n0")
-                }
-                @if (item.DeviceDecommissionedCount > 0)
-                { 
-                    <span class="smallMessage" title="@(item.DeviceDecommissionedCount.ToString("n0")) Decommissioned">
-                        (@(item.DeviceDecommissionedCount.ToString("n0")))</span>
-                }
-            </td>
+            <th>Name
+            </th>
+            <th>Default Model
+            </th>
+            <th>Purchase Date
+            </th>
+            <th>Warranty Expires
+            </th>
+            <th>Insurance Expires
+            </th>
+            <th>Device Count
+            </th>
         </tr>
-    }
-</table>
-<div class="actionBar">
-    @if (Model.DeviceBatches.Count > 0)
-    { 
-        @Html.ActionLinkButton("Timeline", MVC.Config.DeviceBatch.Timeline())
-    }
-    @Html.ActionLinkButton("Create Device Batch", MVC.Config.DeviceBatch.Create())
-</div>
+        @foreach (var item in Model.DeviceBatches)
+        {
+            <tr>
+                <td>
+                    @Html.ActionLink(item.Name, MVC.Config.DeviceBatch.Index(item.Id))
+                </td>
+                <td>
+                    @item.DefaultDeviceModel
+                </td>
+                <td>
+                    @CommonHelpers.FriendlyDate(item.PurchaseDate)
+                </td>
+                <td>
+                    @CommonHelpers.FriendlyDate(item.WarrantyExpires, "Unknown")
+                </td>
+                <td>
+                    @CommonHelpers.FriendlyDate(item.InsuredUntil, item.InsuranceSupplier == null ? "N/A" : "Unknown")
+                    @(item.InsuranceSupplier == null ? string.Empty : string.Format("[{0}]", item.InsuranceSupplier))
+                </td>
+                <td>
+                    @if (item.PurchaseUnitQuantity.HasValue)
+                    { 
+                        <span>@item.DeviceCount.ToString("n0")/@(item.PurchaseUnitQuantity.Value.ToString("n0"))</span>
+                    }
+                    else
+                    { 
+                        @item.DeviceCount.ToString("n0")
+                    }
+                    @if (item.DeviceDecommissionedCount > 0)
+                    { 
+                        <span class="smallMessage" title="@(item.DeviceDecommissionedCount.ToString("n0")) Decommissioned">(@(item.DeviceDecommissionedCount.ToString("n0")))</span>
+                    }
+                </td>
+            </tr>
+        }
+    </table>
+}
+@if (Authorization.HasAny(Claims.Config.DeviceBatch.Create, Claims.Config.DeviceBatch.ShowTimeline))
+{
+    <div class="actionBar">
+        @if (Authorization.Has(Claims.Config.DeviceBatch.ShowTimeline) && Model.DeviceBatches.Count > 0)
+        { 
+            @Html.ActionLinkButton("Timeline", MVC.Config.DeviceBatch.Timeline())
+        }
+        @if (Authorization.HasAll(Claims.Config.DeviceBatch.Create, Claims.Config.DeviceBatch.Configure))
+        {
+            @Html.ActionLinkButton("Create Device Batch", MVC.Config.DeviceBatch.Create())
+        }
+    </div>
+}
\ No newline at end of file
diff --git a/Disco.Web/Areas/Config/Views/DeviceBatch/Index.generated.cs b/Disco.Web/Areas/Config/Views/DeviceBatch/Index.generated.cs
index f6da7c17..68ade0ce 100644
--- a/Disco.Web/Areas/Config/Views/DeviceBatch/Index.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceBatch/Index.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceBatch/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceBatch.IndexModel>
+    public partial class Index : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DeviceBatch.IndexModel>
     {
         public Index()
         {
@@ -43,139 +45,161 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
             
             #line 2 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
   
+    Authorization.Require(Claims.Config.DeviceBatch.Show);
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Batches");
 
             
-            #line default
-            #line hidden
-WriteLiteral("\r\n<table");
-
-WriteLiteral(" class=\"tableData\"");
-
-WriteLiteral(@">
-    <tr>
-        <th>
-            Name
-        </th>
-        <th>
-            Default Model
-        </th>
-        <th>
-            Purchase Date
-        </th>
-        <th>
-            Warranty Expires
-        </th>
-        <th>
-            Insurance Expires
-        </th>
-        <th>
-            Device Count
-        </th>
-    </tr>
-");
-
-            
-            #line 26 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 26 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-     foreach (var item in Model.DeviceBatches)
-    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <tr>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 30 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-           Write(Html.ActionLink(item.Name, MVC.Config.DeviceBatch.Index(item.Id)));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 33 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-           Write(item.DefaultDeviceModel);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 36 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-           Write(CommonHelpers.FriendlyDate(item.PurchaseDate));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 39 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-           Write(CommonHelpers.FriendlyDate(item.WarrantyExpires, "Unknown"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 42 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-           Write(CommonHelpers.FriendlyDate(item.InsuredUntil, item.InsuranceSupplier == null ? "N/A" : "Unknown"));
-
-            
             #line default
             #line hidden
 WriteLiteral("\r\n");
 
-WriteLiteral("                ");
-
             
-            #line 43 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-            Write(item.InsuranceSupplier == null ? string.Empty : string.Format("[{0}]", item.InsuranceSupplier));
+            #line 6 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+ if (Model.DeviceBatches.Count == 0)
+{
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
+WriteLiteral("    <div");
+
+WriteLiteral(" class=\"form\"");
+
+WriteLiteral(" style=\"width: 450px; padding: 100px 0;\"");
+
+WriteLiteral(">\r\n        <h2>No device batches are configured</h2>\r\n    </div>  \r\n");
+
+            
+            #line 11 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+}
+else
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <table");
+
+WriteLiteral(" class=\"tableData\"");
+
+WriteLiteral(@">
+        <tr>
+            <th>Name
+            </th>
+            <th>Default Model
+            </th>
+            <th>Purchase Date
+            </th>
+            <th>Warranty Expires
+            </th>
+            <th>Insurance Expires
+            </th>
+            <th>Device Count
+            </th>
+        </tr>
+");
+
+            
+            #line 29 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 29 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+         foreach (var item in Model.DeviceBatches)
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <tr>\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 33 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+               Write(Html.ActionLink(item.Name, MVC.Config.DeviceBatch.Index(item.Id)));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </td>\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 36 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+               Write(item.DefaultDeviceModel);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </td>\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 39 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+               Write(CommonHelpers.FriendlyDate(item.PurchaseDate));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </td>\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 42 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+               Write(CommonHelpers.FriendlyDate(item.WarrantyExpires, "Unknown"));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </td>\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 45 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+               Write(CommonHelpers.FriendlyDate(item.InsuredUntil, item.InsuranceSupplier == null ? "N/A" : "Unknown"));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n");
+
+WriteLiteral("                    ");
 
             
             #line 46 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 46 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-                 if (item.PurchaseUnitQuantity.HasValue)
-                { 
+                Write(item.InsuranceSupplier == null ? string.Empty : string.Format("[{0}]", item.InsuranceSupplier));
 
             
             #line default
             #line hidden
-WriteLiteral("                    <span>");
+WriteLiteral("\r\n                </td>\r\n                <td>\r\n");
 
             
-            #line 48 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-                     Write(item.DeviceCount.ToString("n0"));
+            #line 49 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 49 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+                     if (item.PurchaseUnitQuantity.HasValue)
+                    { 
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <span>");
+
+            
+            #line 51 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+                         Write(item.DeviceCount.ToString("n0"));
 
             
             #line default
@@ -183,8 +207,8 @@ WriteLiteral("                    <span>");
 WriteLiteral("/");
 
             
-            #line 48 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-                                                       Write(item.PurchaseUnitQuantity.Value.ToString("n0"));
+            #line 51 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+                                                           Write(item.PurchaseUnitQuantity.Value.ToString("n0"));
 
             
             #line default
@@ -192,59 +216,59 @@ WriteLiteral("/");
 WriteLiteral("</span>\r\n");
 
             
-            #line 49 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-                }
-                else
-                { 
-                    
-            
-            #line default
-            #line hidden
-            
             #line 52 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-               Write(item.DeviceCount.ToString("n0"));
+                    }
+                    else
+                    { 
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 55 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+                   Write(item.DeviceCount.ToString("n0"));
 
             
             #line default
             #line hidden
             
-            #line 52 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-                                                    
-                }
+            #line 55 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+                                                        
+                    }
 
             
             #line default
             #line hidden
-WriteLiteral("                ");
-
-            
-            #line 54 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-                 if (item.DeviceDecommissionedCount > 0)
-                { 
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <span");
-
-WriteLiteral(" class=\"smallMessage\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 1775), Tuple.Create("\"", 1846)
-            
-            #line 56 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 1783), Tuple.Create<System.Object, System.Int32>(item.DeviceDecommissionedCount.ToString("n0")
-            
-            #line default
-            #line hidden
-, 1783), false)
-, Tuple.Create(Tuple.Create(" ", 1831), Tuple.Create("Decommissioned", 1832), true)
-);
-
-WriteLiteral(">\r\n                        (");
+WriteLiteral("                    ");
 
             
             #line 57 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-                     Write(item.DeviceDecommissionedCount.ToString("n0"));
+                     if (item.DeviceDecommissionedCount > 0)
+                    { 
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteAttribute("title", Tuple.Create(" title=\"", 2117), Tuple.Create("\"", 2188)
+            
+            #line 59 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+, Tuple.Create(Tuple.Create("", 2125), Tuple.Create<System.Object, System.Int32>(item.DeviceDecommissionedCount.ToString("n0")
+            
+            #line default
+            #line hidden
+, 2125), false)
+, Tuple.Create(Tuple.Create(" ", 2173), Tuple.Create("Decommissioned", 2174), true)
+);
+
+WriteLiteral(">(");
+
+            
+            #line 59 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+                                                                                                                        Write(item.DeviceDecommissionedCount.ToString("n0"));
 
             
             #line default
@@ -252,67 +276,106 @@ WriteLiteral(">\r\n                        (");
 WriteLiteral(")</span>\r\n");
 
             
-            #line 58 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-                }
+            #line 60 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+                    }
 
             
             #line default
             #line hidden
-WriteLiteral("            </td>\r\n        </tr>\r\n");
+WriteLiteral("                </td>\r\n            </tr>\r\n");
 
             
-            #line 61 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-    }
+            #line 63 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+        }
 
             
             #line default
             #line hidden
-WriteLiteral("</table>\r\n<div");
+WriteLiteral("    </table>\r\n");
+
+            
+            #line 65 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+            
+            #line 66 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+ if (Authorization.HasAny(Claims.Config.DeviceBatch.Create, Claims.Config.DeviceBatch.ShowTimeline))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
 
 WriteLiteral(" class=\"actionBar\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 64 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 64 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-     if (Model.DeviceBatches.Count > 0)
-    { 
+            #line 69 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
         
             
             #line default
             #line hidden
             
-            #line 66 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-   Write(Html.ActionLinkButton("Timeline", MVC.Config.DeviceBatch.Timeline()));
+            #line 69 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+         if (Authorization.Has(Claims.Config.DeviceBatch.ShowTimeline) && Model.DeviceBatches.Count > 0)
+        { 
+            
+            
+            #line default
+            #line hidden
+            
+            #line 71 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+       Write(Html.ActionLinkButton("Timeline", MVC.Config.DeviceBatch.Timeline()));
 
             
             #line default
             #line hidden
             
-            #line 66 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-                                                                             
-    }
+            #line 71 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+                                                                                 
+        }
 
             
             #line default
             #line hidden
-WriteLiteral("    ");
+WriteLiteral("        ");
 
             
-            #line 68 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-Write(Html.ActionLinkButton("Create Device Batch", MVC.Config.DeviceBatch.Create()));
+            #line 73 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+         if (Authorization.HasAll(Claims.Config.DeviceBatch.Create, Claims.Config.DeviceBatch.Configure))
+        {
+            
+            
+            #line default
+            #line hidden
+            
+            #line 75 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+       Write(Html.ActionLinkButton("Create Device Batch", MVC.Config.DeviceBatch.Create()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>\r\n");
+            
+            #line 75 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+                                                                                          
+        }
 
+            
+            #line default
+            #line hidden
+WriteLiteral("    </div>\r\n");
+
+            
+            #line 78 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
+}
+            
+            #line default
+            #line hidden
         }
     }
 }
diff --git a/Disco.Web/Areas/Config/Views/DeviceBatch/Show.cshtml b/Disco.Web/Areas/Config/Views/DeviceBatch/Show.cshtml
index e817597f..8b5ea585 100644
--- a/Disco.Web/Areas/Config/Views/DeviceBatch/Show.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceBatch/Show.cshtml
@@ -1,9 +1,18 @@
 @model Disco.Web.Areas.Config.Models.DeviceBatch.ShowModel
 @{
+    Authorization.Require(Claims.Config.DeviceBatch.Show);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Batches", MVC.Config.DeviceBatch.Index(null), Model.DeviceBatch.ToString());
-    Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
-    Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
-    Html.BundleDeferred("~/ClientScripts/Modules/tinymce");
+
+    var canConfig = Authorization.Has(Claims.Config.DeviceBatch.Configure);
+    var canDeviceModelShow = Authorization.Has(Claims.Config.DeviceModel.Show);
+
+    if (canConfig)
+    {
+        Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
+        Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
+        Html.BundleDeferred("~/ClientScripts/Modules/tinymce");
+    }
 }
 <div class="form deviceBatches" style="width: 730px">
     <table>
@@ -17,26 +26,35 @@
         <tr>
             <th>Name:
             </th>
-            <td>@Html.EditorFor(model => model.DeviceBatch.Name)
-                @AjaxHelpers.AjaxSave()
-                @AjaxHelpers.AjaxLoader()
-                <script type="text/javascript">
-                    $(function () {
-                        document.DiscoFunctions.PropertyChangeHelper(
-                            $('#DeviceBatch_Name'),
-                            'Invalid Name',
-                            '@(Url.Action(MVC.API.DeviceBatch.UpdateName(Model.DeviceBatch.Id)))',
+            <td>
+                @if (canConfig)
+                {
+                    @Html.EditorFor(model => model.DeviceBatch.Name)
+                    @AjaxHelpers.AjaxSave()
+                    @AjaxHelpers.AjaxLoader()
+                    <script type="text/javascript">
+                        $(function () {
+                            document.DiscoFunctions.PropertyChangeHelper(
+                                $('#DeviceBatch_Name'),
+                                'Invalid Name',
+                                '@(Url.Action(MVC.API.DeviceBatch.UpdateName(Model.DeviceBatch.Id)))',
                             'BatchName'
                         );
-                    });
-                </script>
+                        });
+                    </script>
+                }
+                else
+                {
+                    @Model.DeviceBatch.Name
+                }
             </td>
         </tr>
         <tr>
             <th>Default Device Model:
             </th>
-            <td>
-                @Html.DropDownListFor(model => model.DeviceBatch.DefaultDeviceModelId, Model.DeviceModels.ToSelectListItems())
+            <td>@if (canConfig)
+                {
+                @Html.DropDownListFor(model => model.DeviceBatch.DefaultDeviceModelId, Model.DeviceModels.ToSelectListItems(null, true))
                 @AjaxHelpers.AjaxSave()
                 @AjaxHelpers.AjaxLoader()
                 <script type="text/javascript">
@@ -49,6 +67,15 @@
                         );
                     });
                 </script>
+                }
+                else
+                {
+                    if (Model.DefaultDeviceModel == null)
+                    {<span class="smallMessage">&lt;None Specified&gt;</span>}
+                    else
+                    {@Model.DefaultDeviceModel.ToString();
+                    }
+                }
                 <br />
                 <span class="smallMessage">Devices added offline will default to this Device Model.
                     Once a device enrols the Device Model will be accurately represented.</span>
@@ -72,7 +99,14 @@
                             {
                                 <tr>
                                     <td>
-                                        @Html.ActionLink(membership.DeviceModel.ToString(), MVC.Config.DeviceModel.Index(membership.DeviceModel.Id))
+                                        @if (canDeviceModelShow)
+                                        {
+                                            @Html.ActionLink(membership.DeviceModel.ToString(), MVC.Config.DeviceModel.Index(membership.DeviceModel.Id))
+                                        }
+                                        else
+                                        {
+                                            @membership.DeviceModel.ToString()
+                                        }
                                     </td>
                                     <td>
                                         @membership.DeviceCount.ToString("n0")
@@ -115,27 +149,35 @@
                         <th class="name" style="width: 100px">Purchase Date:
                         </th>
                         <td>
-                            @Html.EditorFor(model => model.DeviceBatch.PurchaseDate)
-                            @AjaxHelpers.AjaxLoader()
-                            <script>
-                                $(function () {
-                                    var dateField = $('#DeviceBatch_PurchaseDate');
-                                    document.DiscoFunctions.DateChangeHelper(
-                                        dateField,
-                                        'Invalid Date',
-                                        '@(Url.Action(MVC.API.DeviceBatch.UpdatePurchaseDate(Model.DeviceBatch.Id)))',
+                            @if (canConfig)
+                            {
+                                @Html.EditorFor(model => model.DeviceBatch.PurchaseDate)
+                                @AjaxHelpers.AjaxLoader()
+                                <script>
+                                    $(function () {
+                                        var dateField = $('#DeviceBatch_PurchaseDate');
+                                        document.DiscoFunctions.DateChangeHelper(
+                                            dateField,
+                                            'Invalid Date',
+                                            '@(Url.Action(MVC.API.DeviceBatch.UpdatePurchaseDate(Model.DeviceBatch.Id)))',
                                         'PurchaseDate',
                                         null,
                                         true
                                     );
-                                });
-                            </script>
+                                    });
+                                </script>
+                            }
+                            else
+                            {
+                                @CommonHelpers.FriendlyDate(Model.DeviceBatch.PurchaseDate)
+                            }
                         </td>
                     </tr>
                     <tr>
                         <th>Supplier:
                         </th>
-                        <td>
+                        <td>@if (canConfig)
+                            {
                             @Html.EditorFor(model => model.DeviceBatch.Supplier)
                             @AjaxHelpers.AjaxSave()
                             @AjaxHelpers.AjaxLoader()
@@ -149,12 +191,21 @@
                                     );
                                 });
                             </script>
+                            }
+                            else
+                            {
+                                if (string.IsNullOrEmpty(Model.DeviceBatch.Supplier))
+                                {<span class="smallMessage">&lt;None Specified&gt;</span>}
+                                else
+                                {@Model.DeviceBatch.Supplier}
+                            }
                         </td>
                     </tr>
                     <tr>
                         <th>Unit Cost:
                         </th>
-                        <td>
+                        <td>@if (canConfig)
+                            {
                             @Html.EditorFor(model => model.DeviceBatch.UnitCost)
                             @AjaxHelpers.AjaxSave()
                             @AjaxHelpers.AjaxLoader()
@@ -168,12 +219,21 @@
                                     );
                                 });
                             </script>
+                            }
+                            else
+                            {
+                                if (!Model.DeviceBatch.UnitCost.HasValue)
+                                {<span class="smallMessage">&lt;None Specified&gt;</span>}
+                                else
+                                {@Model.DeviceBatch.UnitCost.Value.ToString("C")}
+                            }
                         </td>
                     </tr>
                     <tr>
                         <th>Quantity:
                         </th>
-                        <td>
+                        <td>@if (canConfig)
+                            {
                             @Html.EditorFor(model => model.DeviceBatch.UnitQuantity)
                             @AjaxHelpers.AjaxSave()
                             @AjaxHelpers.AjaxLoader()
@@ -187,6 +247,14 @@
                                     );
                                 });
                             </script>
+                            }
+                            else
+                            {
+                                if (!Model.DeviceBatch.UnitQuantity.HasValue)
+                                {<span class="smallMessage">&lt;None Specified&gt;</span>}
+                                else
+                                {@Model.DeviceBatch.UnitQuantity.Value.ToString("n0")}
+                            }
                         </td>
                     </tr>
                 </table>
@@ -194,55 +262,65 @@
                     <div>
                         Details @AjaxHelpers.AjaxLoader("ajaxPurchaseDetails")
                     </div>
-                    @Html.EditorFor(model => model.DeviceBatch.PurchaseDetails)
-                    <script type="text/javascript">
-                        $(function () {
-                            var model = {
-                                $field: $('#DeviceBatch_PurchaseDetails'),
-                                fieldName: 'PurchaseDetails',
-                                $ajax_loading: null,
-                                $ajax_ok: null,
-                                updated: function () {
-                                    if (!model.$ajax_loading)
-                                        model.$ajax_loading = $('#ajax' + model.fieldName + '_loading');
-                                    if (!model.$ajax_ok)
-                                        model.$ajax_ok = $('#ajax' + model.fieldName + '_ok');
-                                    model.$ajax_loading.show();
-                                    var data = {};
-                                    data[model.fieldName] = model.$field.tinymce().getContent();
-                                    $.ajax({
-                                        url: '@(Url.Action(MVC.API.DeviceBatch.UpdatePurchaseDetails(Model.DeviceBatch.Id)))',
-                                        dataType: 'json',
-                                        data: data,
-                                        traditional: true,
-                                        type: 'POST',
-                                        success: function (d) {
-                                            if (d == 'OK') {
+                    @if (canConfig)
+                    {
+                        @Html.EditorFor(model => model.DeviceBatch.PurchaseDetails)
+                        <script type="text/javascript">
+                            $(function () {
+                                var model = {
+                                    $field: $('#DeviceBatch_PurchaseDetails'),
+                                    fieldName: 'PurchaseDetails',
+                                    $ajax_loading: null,
+                                    $ajax_ok: null,
+                                    updated: function () {
+                                        if (!model.$ajax_loading)
+                                            model.$ajax_loading = $('#ajax' + model.fieldName + '_loading');
+                                        if (!model.$ajax_ok)
+                                            model.$ajax_ok = $('#ajax' + model.fieldName + '_ok');
+                                        model.$ajax_loading.show();
+                                        var data = {};
+                                        data[model.fieldName] = model.$field.tinymce().getContent();
+                                        $.ajax({
+                                            url: '@(Url.Action(MVC.API.DeviceBatch.UpdatePurchaseDetails(Model.DeviceBatch.Id)))',
+                                            dataType: 'json',
+                                            data: data,
+                                            traditional: true,
+                                            type: 'POST',
+                                            success: function (d) {
+                                                if (d == 'OK') {
+                                                    model.$ajax_loading.hide();
+                                                    model.$ajax_ok.show().delay('fast').fadeOut('slow');
+                                                } else {
+                                                    model.$ajax_loading.hide();
+                                                    alert('Unable to update purchase details: ' + d);
+                                                }
+                                            },
+                                            error: function (jqXHR, textStatus, errorThrown) {
+                                                alert('Unable to update purchase details: ' + errorThrown);
                                                 model.$ajax_loading.hide();
-                                                model.$ajax_ok.show().delay('fast').fadeOut('slow');
-                                            } else {
-                                                model.$ajax_loading.hide();
-                                                alert('Unable to update purchase details: ' + d);
                                             }
-                                        },
-                                        error: function (jqXHR, textStatus, errorThrown) {
-                                            alert('Unable to update purchase details: ' + errorThrown);
-                                            model.$ajax_loading.hide();
-                                        }
-                                    })
-                                }
-                            };
+                                        })
+                                    }
+                                };
 
-                            model.$field.tinymce({
-                                theme: 'simple',
-                                setup: function (ed) {
-                                    ed.onInit.add(function (ed) {
-                                        $(ed.getWin()).blur(model.updated);
-                                    });
-                                }
+                                model.$field.tinymce({
+                                    theme: 'simple',
+                                    setup: function (ed) {
+                                        ed.onInit.add(function (ed) {
+                                            $(ed.getWin()).blur(model.updated);
+                                        });
+                                    }
+                                });
                             });
-                        });
-                    </script>
+                        </script>
+                    }
+                    else
+                    {
+                        if (string.IsNullOrEmpty(Model.DeviceBatch.PurchaseDetails))
+                        {<span class="smallMessage">&lt;None Specified&gt;</span>}
+                        else
+                        {@(new HtmlString(Model.DeviceBatch.PurchaseDetails))}
+                    }
                 </div>
             </td>
         </tr>
@@ -255,21 +333,28 @@
                         <th class="name" style="width: 100px">Valid Until:
                         </th>
                         <td>
-                            @Html.EditorFor(model => model.DeviceBatch.WarrantyValidUntil)
-                            @AjaxHelpers.AjaxLoader()
-                            <script>
-                                $(function () {
-                                    var dateField = $('#DeviceBatch_WarrantyValidUntil');
-                                    document.DiscoFunctions.DateChangeHelper(
-                                        dateField,
-                                        'Warranty Valid Until',
-                                        '@(Url.Action(MVC.API.DeviceBatch.UpdateWarrantyValidUntil(Model.DeviceBatch.Id)))',
+                            @if (canConfig)
+                            {
+                                @Html.EditorFor(model => model.DeviceBatch.WarrantyValidUntil)
+                                @AjaxHelpers.AjaxLoader()
+                                <script>
+                                    $(function () {
+                                        var dateField = $('#DeviceBatch_WarrantyValidUntil');
+                                        document.DiscoFunctions.DateChangeHelper(
+                                            dateField,
+                                            'Warranty Valid Until',
+                                            '@(Url.Action(MVC.API.DeviceBatch.UpdateWarrantyValidUntil(Model.DeviceBatch.Id)))',
                                         'WarrantyValidUntil',
                                         null,
                                         true
                                     );
-                                });
-                            </script>
+                                    });
+                                </script>
+                            }
+                            else
+                            {
+                                @CommonHelpers.FriendlyDate(Model.DeviceBatch.WarrantyValidUntil, "Unknown")
+                            }
                         </td>
                     </tr>
                 </table>
@@ -277,55 +362,65 @@
                     <div>
                         Details @AjaxHelpers.AjaxLoader("ajaxWarrantyDetails")
                     </div>
-                    @Html.EditorFor(model => model.DeviceBatch.WarrantyDetails)
-                    <script type="text/javascript">
-                        $(function () {
-                            var model = {
-                                $field: $('#DeviceBatch_WarrantyDetails'),
-                                fieldName: 'WarrantyDetails',
-                                $ajax_loading: null,
-                                $ajax_ok: null,
-                                updated: function () {
-                                    if (!model.$ajax_loading)
-                                        model.$ajax_loading = $('#ajax' + model.fieldName + '_loading');
-                                    if (!model.$ajax_ok)
-                                        model.$ajax_ok = $('#ajax' + model.fieldName + '_ok');
-                                    model.$ajax_loading.show();
-                                    var data = {};
-                                    data[model.fieldName] = model.$field.tinymce().getContent();
-                                    $.ajax({
-                                        url: '@(Url.Action(MVC.API.DeviceBatch.UpdateWarrantyDetails(Model.DeviceBatch.Id)))',
-                                        dataType: 'json',
-                                        data: data,
-                                        traditional: true,
-                                        type: 'POST',
-                                        success: function (d) {
-                                            if (d == 'OK') {
+                    @if (canConfig)
+                    {
+                        @Html.EditorFor(model => model.DeviceBatch.WarrantyDetails)
+                        <script type="text/javascript">
+                            $(function () {
+                                var model = {
+                                    $field: $('#DeviceBatch_WarrantyDetails'),
+                                    fieldName: 'WarrantyDetails',
+                                    $ajax_loading: null,
+                                    $ajax_ok: null,
+                                    updated: function () {
+                                        if (!model.$ajax_loading)
+                                            model.$ajax_loading = $('#ajax' + model.fieldName + '_loading');
+                                        if (!model.$ajax_ok)
+                                            model.$ajax_ok = $('#ajax' + model.fieldName + '_ok');
+                                        model.$ajax_loading.show();
+                                        var data = {};
+                                        data[model.fieldName] = model.$field.tinymce().getContent();
+                                        $.ajax({
+                                            url: '@(Url.Action(MVC.API.DeviceBatch.UpdateWarrantyDetails(Model.DeviceBatch.Id)))',
+                                            dataType: 'json',
+                                            data: data,
+                                            traditional: true,
+                                            type: 'POST',
+                                            success: function (d) {
+                                                if (d == 'OK') {
+                                                    model.$ajax_loading.hide();
+                                                    model.$ajax_ok.show().delay('fast').fadeOut('slow');
+                                                } else {
+                                                    model.$ajax_loading.hide();
+                                                    alert('Unable to update warranty details: ' + d);
+                                                }
+                                            },
+                                            error: function (jqXHR, textStatus, errorThrown) {
+                                                alert('Unable to update warranty details: ' + errorThrown);
                                                 model.$ajax_loading.hide();
-                                                model.$ajax_ok.show().delay('fast').fadeOut('slow');
-                                            } else {
-                                                model.$ajax_loading.hide();
-                                                alert('Unable to update warranty details: ' + d);
                                             }
-                                        },
-                                        error: function (jqXHR, textStatus, errorThrown) {
-                                            alert('Unable to update warranty details: ' + errorThrown);
-                                            model.$ajax_loading.hide();
-                                        }
-                                    })
-                                }
-                            };
+                                        })
+                                    }
+                                };
 
-                            model.$field.tinymce({
-                                theme: 'simple',
-                                setup: function (ed) {
-                                    ed.onInit.add(function (ed) {
-                                        $(ed.getWin()).blur(model.updated);
-                                    });
-                                }
+                                model.$field.tinymce({
+                                    theme: 'simple',
+                                    setup: function (ed) {
+                                        ed.onInit.add(function (ed) {
+                                            $(ed.getWin()).blur(model.updated);
+                                        });
+                                    }
+                                });
                             });
-                        });
-                    </script>
+                        </script>
+                    }
+                    else
+                    {
+                        if (string.IsNullOrEmpty(Model.DeviceBatch.WarrantyDetails))
+                        {<span class="smallMessage">&lt;None Specified&gt;</span>}
+                        else
+                        {@(new HtmlString(Model.DeviceBatch.WarrantyDetails))}
+                    }
                 </div>
             </td>
         </tr>
@@ -337,7 +432,8 @@
                     <tr>
                         <th class="name" style="width: 100px">Supplier:
                         </th>
-                        <td>
+                        <td>@if (canConfig)
+                            {
                             @Html.EditorFor(model => model.DeviceBatch.InsuranceSupplier)
                             @AjaxHelpers.AjaxSave()
                             @AjaxHelpers.AjaxLoader()
@@ -351,12 +447,22 @@
                                     );
                                 });
                             </script>
+                            }
+                            else
+                            {
+                                if (string.IsNullOrEmpty(Model.DeviceBatch.InsuranceSupplier))
+                                {<span class="smallMessage">&lt;None Specified&gt;</span>}
+                                else
+                                {@Model.DeviceBatch.InsuranceSupplier;
+                                }
+                            }
                         </td>
                     </tr>
                     <tr>
                         <th class="name">Insured Date:
                         </th>
-                        <td>
+                        <td>@if (canConfig)
+                            {
                             @Html.EditorFor(model => model.DeviceBatch.InsuredDate)
                             @AjaxHelpers.AjaxLoader()
                             <script>
@@ -372,12 +478,18 @@
                                     );
                                 });
                             </script>
+                            }
+                            else
+                            {
+                            @CommonHelpers.FriendlyDate(Model.DeviceBatch.InsuredDate, "Unknown")
+                            }
                         </td>
                     </tr>
                     <tr>
                         <th class="name">Insured Until:
                         </th>
-                        <td>
+                        <td>@if (canConfig)
+                            {
                             @Html.EditorFor(model => model.DeviceBatch.InsuredUntil)
                             @AjaxHelpers.AjaxLoader()
                             <script>
@@ -393,6 +505,11 @@
                                     );
                                 });
                             </script>
+                            }
+                            else
+                            {
+                            @CommonHelpers.FriendlyDate(Model.DeviceBatch.InsuredUntil, "Unknown")
+                            }
                         </td>
                     </tr>
                 </table>
@@ -400,54 +517,64 @@
                     <div>
                         Details @AjaxHelpers.AjaxLoader("ajaxInsuranceDetails")
                     </div>
-                    @Html.EditorFor(model => model.DeviceBatch.InsuranceDetails)
-                    <script type="text/javascript">
-                        $(function () {
-                            var model = {
-                                $DeviceBatch_Comments: $('#DeviceBatch_InsuranceDetails'),
-                                $ajax_loading: null,
-                                $ajax_ok: null,
-                                updated: function () {
-                                    if (!model.$ajax_loading)
-                                        model.$ajax_loading = $('#ajaxInsuranceDetails_loading');
-                                    if (!model.$ajax_ok)
-                                        model.$ajax_ok = $('#ajaxInsuranceDetails_ok');
-                                    model.$ajax_loading.show();
-                                    var data = { InsuranceDetails: model.$DeviceBatch_Comments.tinymce().getContent() };
-                                    $.ajax({
-                                        url: '@(Url.Action(MVC.API.DeviceBatch.UpdateInsuranceDetails(Model.DeviceBatch.Id)))',
-                                        dataType: 'json',
-                                        data: data,
-                                        traditional: true,
-                                        type: 'POST',
-                                        success: function (d) {
-                                            if (d == 'OK') {
+                    @if (canConfig)
+                    {
+                        @Html.EditorFor(model => model.DeviceBatch.InsuranceDetails)
+                        <script type="text/javascript">
+                            $(function () {
+                                var model = {
+                                    $DeviceBatch_Comments: $('#DeviceBatch_InsuranceDetails'),
+                                    $ajax_loading: null,
+                                    $ajax_ok: null,
+                                    updated: function () {
+                                        if (!model.$ajax_loading)
+                                            model.$ajax_loading = $('#ajaxInsuranceDetails_loading');
+                                        if (!model.$ajax_ok)
+                                            model.$ajax_ok = $('#ajaxInsuranceDetails_ok');
+                                        model.$ajax_loading.show();
+                                        var data = { InsuranceDetails: model.$DeviceBatch_Comments.tinymce().getContent() };
+                                        $.ajax({
+                                            url: '@(Url.Action(MVC.API.DeviceBatch.UpdateInsuranceDetails(Model.DeviceBatch.Id)))',
+                                            dataType: 'json',
+                                            data: data,
+                                            traditional: true,
+                                            type: 'POST',
+                                            success: function (d) {
+                                                if (d == 'OK') {
+                                                    model.$ajax_loading.hide();
+                                                    model.$ajax_ok.show().delay('fast').fadeOut('slow');
+                                                } else {
+                                                    model.$ajax_loading.hide();
+                                                    alert('Unable to update insurance details: ' + d);
+                                                }
+                                            },
+                                            error: function (jqXHR, textStatus, errorThrown) {
+                                                alert('Unable to update insurance details: ' + errorThrown);
                                                 model.$ajax_loading.hide();
-                                                model.$ajax_ok.show().delay('fast').fadeOut('slow');
-                                            } else {
-                                                model.$ajax_loading.hide();
-                                                alert('Unable to update insurance details: ' + d);
                                             }
-                                        },
-                                        error: function (jqXHR, textStatus, errorThrown) {
-                                            alert('Unable to update insurance details: ' + errorThrown);
-                                            model.$ajax_loading.hide();
-                                        }
-                                    })
-                                }
-                            };
+                                        })
+                                    }
+                                };
 
-                            model.$DeviceBatch_Comments.tinymce({
-                                theme: 'simple',
-                                setup: function (ed) {
-                                    //ed.onChange.add(model.updatedThrottle);
-                                    ed.onInit.add(function (ed) {
-                                        $(ed.getWin()).blur(model.updated);
-                                    });
-                                }
+                                model.$DeviceBatch_Comments.tinymce({
+                                    theme: 'simple',
+                                    setup: function (ed) {
+                                        //ed.onChange.add(model.updatedThrottle);
+                                        ed.onInit.add(function (ed) {
+                                            $(ed.getWin()).blur(model.updated);
+                                        });
+                                    }
+                                });
                             });
-                        });
-                    </script>
+                        </script>
+                    }
+                    else
+                    {
+                        if (string.IsNullOrEmpty(Model.DeviceBatch.InsuranceDetails))
+                        {<span class="smallMessage">&lt;None Specified&gt;</span>}
+                        else
+                        {@(new HtmlString(Model.DeviceBatch.InsuranceDetails))}
+                    }
                 </div>
             </td>
         </tr>
@@ -455,7 +582,8 @@
             <th>Comments:<br />
                 @AjaxHelpers.AjaxLoader("ajaxComments")
             </th>
-            <td>
+            <td>@if (canConfig)
+                {
                 @Html.EditorFor(model => model.DeviceBatch.Comments)
                 <script type="text/javascript">
                     $(function () {
@@ -504,6 +632,14 @@
                         });
                     });
                 </script>
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(Model.DeviceBatch.Comments))
+                    {<span class="smallMessage">&lt;None Specified&gt;</span>}
+                    else
+                    {@(new HtmlString(Model.DeviceBatch.Comments))}
+                }
             </td>
         </tr>
     </table>
@@ -514,8 +650,14 @@
         @Html.ActionLinkButton("Delete", MVC.API.DeviceBatch.Delete(Model.DeviceBatch.Id, true), "buttonDelete")
     }
     @if (Model.DeviceCount > 0)
-    { 
+    {
+        if (Authorization.Has(Claims.Device.Actions.Export))
+        {
         @Html.ActionLinkButton("Export Devices", MVC.API.DeviceBatch.ExportDevices(Model.DeviceBatch.Id))
+        }
+        if (Authorization.Has(Claims.Device.Search))
+        {
         @Html.ActionLinkButton("View Devices", MVC.Search.Query(Model.DeviceBatch.Id.ToString(), "DeviceBatch"))
+        }
     }
 </div>
diff --git a/Disco.Web/Areas/Config/Views/DeviceBatch/Show.generated.cs b/Disco.Web/Areas/Config/Views/DeviceBatch/Show.generated.cs
index e7c7e316..d67c3be8 100644
--- a/Disco.Web/Areas/Config/Views/DeviceBatch/Show.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceBatch/Show.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceBatch/Show.cshtml")]
-    public partial class Show : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceBatch.ShowModel>
+    public partial class Show : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DeviceBatch.ShowModel>
     {
         public Show()
         {
@@ -43,10 +45,19 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
             
             #line 2 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
   
+    Authorization.Require(Claims.Config.DeviceBatch.Show);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Batches", MVC.Config.DeviceBatch.Index(null), Model.DeviceBatch.ToString());
-    Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
-    Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
-    Html.BundleDeferred("~/ClientScripts/Modules/tinymce");
+
+    var canConfig = Authorization.Has(Claims.Config.DeviceBatch.Configure);
+    var canDeviceModelShow = Authorization.Has(Claims.Config.DeviceModel.Show);
+
+    if (canConfig)
+    {
+        Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
+        Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
+        Html.BundleDeferred("~/ClientScripts/Modules/tinymce");
+    }
 
             
             #line default
@@ -66,96 +77,170 @@ WriteLiteral(">Id:\r\n            </th>\r\n            <td>\r\n");
 WriteLiteral("                ");
 
             
-            #line 14 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 23 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
            Write(Html.DisplayFor(model => model.DeviceBatch.Id));
 
             
             #line default
             #line hidden
 WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Name:\r\n        " +
-"    </th>\r\n            <td>");
+"    </th>\r\n            <td>\r\n");
 
             
-            #line 20 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-           Write(Html.EditorFor(model => model.DeviceBatch.Name));
+            #line 30 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 30 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                 if (canConfig)
+                {
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 32 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+               Write(Html.EditorFor(model => model.DeviceBatch.Name));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 21 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-           Write(AjaxHelpers.AjaxSave());
+            #line 32 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                    
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 33 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+               Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 22 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-           Write(AjaxHelpers.AjaxLoader());
+            #line 33 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                           
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 34 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+               Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 34 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                             
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n                    $(function () {\r\n                        document.DiscoFun" +
-"ctions.PropertyChangeHelper(\r\n                            $(\'#DeviceBatch_Name\')" +
-",\r\n                            \'Invalid Name\',\r\n                            \'");
+WriteLiteral(@">
+                        $(function () {
+                            document.DiscoFunctions.PropertyChangeHelper(
+                                $('#DeviceBatch_Name'),
+                                'Invalid Name',
+                                '");
 
             
-            #line 28 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-                         Write(Url.Action(MVC.API.DeviceBatch.UpdateName(Model.DeviceBatch.Id)));
+            #line 40 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                             Write(Url.Action(MVC.API.DeviceBatch.UpdateName(Model.DeviceBatch.Id)));
 
             
             #line default
             #line hidden
 WriteLiteral("\',\r\n                            \'BatchName\'\r\n                        );\r\n        " +
-"            });\r\n                </script>\r\n            </td>\r\n        </tr>\r\n  " +
-"      <tr>\r\n            <th>Default Device Model:\r\n            </th>\r\n          " +
-"  <td>\r\n");
-
-WriteLiteral("                ");
+"                });\r\n                    </script>\r\n");
 
             
-            #line 39 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-           Write(Html.DropDownListFor(model => model.DeviceBatch.DefaultDeviceModelId, Model.DeviceModels.ToSelectListItems()));
+            #line 45 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                }
+                else
+                {
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 48 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+               Write(Model.DeviceBatch.Name);
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
+            
+            #line 48 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                           
+                }
 
             
-            #line 40 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Default Device Mo" +
+"del:\r\n            </th>\r\n            <td>");
+
+            
+            #line 55 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 57 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+           Write(Html.DropDownListFor(model => model.DeviceBatch.DefaultDeviceModelId, Model.DeviceModels.ToSelectListItems(null, true)));
+
+            
+            #line default
+            #line hidden
+            
+            #line 57 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                                                                        
+                
+            
+            #line default
+            #line hidden
+            
+            #line 58 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 41 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 58 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                       
+                
+            
+            #line default
+            #line hidden
+            
+            #line 59 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 59 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -165,15 +250,56 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 "  \'");
 
             
-            #line 47 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 65 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                          Write(Url.Action(MVC.API.DeviceBatch.UpdateDefaultDeviceModelId(Model.DeviceBatch.Id)));
 
             
             #line default
             #line hidden
 WriteLiteral("\',\r\n                            \'DefaultDeviceModelId\'\r\n                        )" +
-";\r\n                    });\r\n                </script>\r\n                <br />\r\n " +
-"               <span");
+";\r\n                    });\r\n                </script>\r\n");
+
+            
+            #line 70 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                }
+                else
+                {
+                    if (Model.DefaultDeviceModel == null)
+                    {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>");
+
+            
+            #line 74 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                             }
+                    else
+                    {
+            
+            #line default
+            #line hidden
+            
+            #line 76 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                Write(Model.DefaultDeviceModel.ToString());
+
+            
+            #line default
+            #line hidden
+            
+            #line 76 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                         ;
+                    }
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <br />\r\n                <span");
 
 WriteLiteral(" class=\"smallMessage\"");
 
@@ -183,13 +309,13 @@ WriteLiteral(">Devices added offline will default to this Device Model.\r\n
 "      <td>\r\n");
 
             
-            #line 60 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 87 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 60 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 87 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                  if (Model.DeviceModelMembers.Count > 0)
                 {
 
@@ -212,13 +338,13 @@ WriteLiteral(@">
 ");
 
             
-            #line 71 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 98 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 71 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 98 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                              foreach (var membership in Model.DeviceModelMembers.OrderByDescending(dmm => dmm.DeviceCount))
                             {
 
@@ -227,22 +353,59 @@ WriteLiteral(@">
             #line hidden
 WriteLiteral("                                <tr>\r\n                                    <td>\r\n");
 
-WriteLiteral("                                        ");
-
             
-            #line 75 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-                                   Write(Html.ActionLink(membership.DeviceModel.ToString(), MVC.Config.DeviceModel.Index(membership.DeviceModel.Id)));
+            #line 102 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                        
+            
+            #line default
+            #line hidden
+            
+            #line 102 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                         if (canDeviceModelShow)
+                                        {
+                                            
+            
+            #line default
+            #line hidden
+            
+            #line 104 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                       Write(Html.ActionLink(membership.DeviceModel.ToString(), MVC.Config.DeviceModel.Index(membership.DeviceModel.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                                    </td>\r\n                                    " +
-"<td>\r\n");
+            
+            #line 104 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                                                                                        
+                                        }
+                                        else
+                                        {
+                                            
+            
+            #line default
+            #line hidden
+            
+            #line 108 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                       Write(membership.DeviceModel.ToString());
+
+            
+            #line default
+            #line hidden
+            
+            #line 108 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                              
+                                        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                    </td>\r\n                                    <t" +
+"d>\r\n");
 
 WriteLiteral("                                        ");
 
             
-            #line 78 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 112 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                    Write(membership.DeviceCount.ToString("n0"));
 
             
@@ -254,7 +417,7 @@ WriteLiteral("\r\n                                    </td>\r\n
 WriteLiteral("                                        ");
 
             
-            #line 81 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 115 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                    Write(membership.DeviceDecommissionedCount.ToString("n0"));
 
             
@@ -264,7 +427,7 @@ WriteLiteral("\r\n                                    </td>\r\n
 ">\r\n");
 
             
-            #line 84 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 118 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                             }
 
             
@@ -274,7 +437,7 @@ WriteLiteral("                        </tbody>\r\n                        <tfoot
 "              <tr>\r\n                                <th>Total Models: ");
 
             
-            #line 88 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 122 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                              Write(Model.DeviceModelMembers.Count.ToString("n0"));
 
             
@@ -283,7 +446,7 @@ WriteLiteral("                        </tbody>\r\n                        <tfoot
 WriteLiteral("</th>\r\n                                <th>");
 
             
-            #line 89 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 123 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                Write(Model.DeviceCount.ToString("n0"));
 
             
@@ -292,7 +455,7 @@ WriteLiteral("</th>\r\n                                <th>");
 WriteLiteral("</th>\r\n                                <th>");
 
             
-            #line 90 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 124 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                Write(Model.DeviceDecommissionedCount.ToString("n0"));
 
             
@@ -302,7 +465,7 @@ WriteLiteral("</th>\r\n                            </tr>\r\n
 "               </table>\r\n");
 
             
-            #line 94 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 128 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                 }
                 else
                 {
@@ -317,7 +480,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No device models are referenced in this batch.</div>\r\n");
 
             
-            #line 98 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 132 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                 }
 
             
@@ -326,7 +489,7 @@ WriteLiteral(">No device models are referenced in this batch.</div>\r\n");
 WriteLiteral("                ");
 
             
-            #line 99 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 133 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                  if (Model.DeviceBatch.UnitQuantity.HasValue && Model.DeviceBatch.UnitQuantity.Value > Model.DeviceCount)
                 {
                     var missingCount = Model.DeviceBatch.UnitQuantity.Value - Model.DeviceCount;
@@ -351,7 +514,7 @@ WriteLiteral("></span>\r\n");
 WriteLiteral("                        ");
 
             
-            #line 104 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 138 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                    Write(Model.DeviceCount.ToString("n0"));
 
             
@@ -360,7 +523,7 @@ WriteLiteral("                        ");
 WriteLiteral(" of ");
 
             
-            #line 104 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 138 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                                          Write(Model.DeviceBatch.UnitQuantity.Value.ToString("n0"));
 
             
@@ -369,7 +532,7 @@ WriteLiteral(" of ");
 WriteLiteral(" purchased devices are managed by Disco. <strong>");
 
             
-            #line 104 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 138 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                                                                                                                                                Write(missingCount.ToString("n0"));
 
             
@@ -378,7 +541,7 @@ WriteLiteral(" purchased devices are managed by Disco. <strong>");
 WriteLiteral(" ");
 
             
-            #line 104 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 138 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                                                                                                                                                                              Write(missingCount == 1 ? "is" : "are");
 
             
@@ -387,7 +550,7 @@ WriteLiteral(" ");
 WriteLiteral(" not managed</strong>.\r\n                    </div>\r\n");
 
             
-            #line 106 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 140 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                 }
 
             
@@ -410,38 +573,59 @@ WriteLiteral(" style=\"width: 100px\"");
 
 WriteLiteral(">Purchase Date:\r\n                        </th>\r\n                        <td>\r\n");
 
-WriteLiteral("                            ");
-
             
-            #line 118 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-                       Write(Html.EditorFor(model => model.DeviceBatch.PurchaseDate));
+            #line 152 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 152 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                             if (canConfig)
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 154 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                           Write(Html.EditorFor(model => model.DeviceBatch.PurchaseDate));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
             
-            #line 119 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-                       Write(AjaxHelpers.AjaxLoader());
+            #line 154 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                        
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 155 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                           Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral(@"
-                            <script>
-                                $(function () {
-                                    var dateField = $('#DeviceBatch_PurchaseDate');
-                                    document.DiscoFunctions.DateChangeHelper(
-                                        dateField,
-                                        'Invalid Date',
-                                        '");
+            
+            #line 155 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                         
 
             
-            #line 126 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-                                     Write(Url.Action(MVC.API.DeviceBatch.UpdatePurchaseDate(Model.DeviceBatch.Id)));
+            #line default
+            #line hidden
+WriteLiteral(@"                                <script>
+                                    $(function () {
+                                        var dateField = $('#DeviceBatch_PurchaseDate');
+                                        document.DiscoFunctions.DateChangeHelper(
+                                            dateField,
+                                            'Invalid Date',
+                                            '");
+
+            
+            #line 162 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                         Write(Url.Action(MVC.API.DeviceBatch.UpdatePurchaseDate(Model.DeviceBatch.Id)));
 
             
             #line default
@@ -451,48 +635,89 @@ WriteLiteral(@"',
                                         null,
                                         true
                                     );
-                                });
-                            </script>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>Supplier:
-                        </th>
-                        <td>
+                                    });
+                                </script>
 ");
 
-WriteLiteral("                            ");
+            
+            #line 169 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            }
+                            else
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 172 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                           Write(CommonHelpers.FriendlyDate(Model.DeviceBatch.PurchaseDate));
 
             
-            #line 139 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line default
+            #line hidden
+            
+            #line 172 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                           
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </td>\r\n                    </tr>\r\n                    <tr" +
+">\r\n                        <th>Supplier:\r\n                        </th>\r\n       " +
+"                 <td>");
+
+            
+            #line 179 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                             if (canConfig)
+                            {
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 181 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(Html.EditorFor(model => model.DeviceBatch.Supplier));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
             
-            #line 140 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 181 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 182 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
             
-            #line 141 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 182 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                   
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 183 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                            <script");
+            
+            #line 183 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                     
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -504,57 +729,110 @@ WriteLiteral(@">
                                         '");
 
             
-            #line 147 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 189 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                      Write(Url.Action(MVC.API.DeviceBatch.UpdateSupplier(Model.DeviceBatch.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral(@"',
-                                        'Supplier'
-                                    );
-                                });
-                            </script>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>Unit Cost:
-                        </th>
-                        <td>
-");
-
-WriteLiteral("                            ");
+WriteLiteral("\',\r\n                                        \'Supplier\'\r\n                         " +
+"           );\r\n                                });\r\n                            " +
+"</script>\r\n");
 
             
-            #line 158 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 194 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            }
+                            else
+                            {
+                                if (string.IsNullOrEmpty(Model.DeviceBatch.Supplier))
+                                {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>");
+
+            
+            #line 198 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                         }
+                                else
+                                {
+            
+            #line default
+            #line hidden
+            
+            #line 200 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            Write(Model.DeviceBatch.Supplier);
+
+            
+            #line default
+            #line hidden
+            
+            #line 200 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                            }
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </td>\r\n                    </tr>\r\n                    <tr" +
+">\r\n                        <th>Unit Cost:\r\n                        </th>\r\n      " +
+"                  <td>");
+
+            
+            #line 207 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                             if (canConfig)
+                            {
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 209 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(Html.EditorFor(model => model.DeviceBatch.UnitCost));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
             
-            #line 159 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 209 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 210 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
             
-            #line 160 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 210 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                   
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 211 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                            <script");
+            
+            #line 211 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                     
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -566,57 +844,110 @@ WriteLiteral(@">
                                         '");
 
             
-            #line 166 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 217 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                      Write(Url.Action(MVC.API.DeviceBatch.UpdateUnitCost(Model.DeviceBatch.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral(@"',
-                                        'UnitCost'
-                                    );
-                                });
-                            </script>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>Quantity:
-                        </th>
-                        <td>
-");
-
-WriteLiteral("                            ");
+WriteLiteral("\',\r\n                                        \'UnitCost\'\r\n                         " +
+"           );\r\n                                });\r\n                            " +
+"</script>\r\n");
 
             
-            #line 177 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 222 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            }
+                            else
+                            {
+                                if (!Model.DeviceBatch.UnitCost.HasValue)
+                                {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>");
+
+            
+            #line 226 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                         }
+                                else
+                                {
+            
+            #line default
+            #line hidden
+            
+            #line 228 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            Write(Model.DeviceBatch.UnitCost.Value.ToString("C"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 228 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                }
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </td>\r\n                    </tr>\r\n                    <tr" +
+">\r\n                        <th>Quantity:\r\n                        </th>\r\n       " +
+"                 <td>");
+
+            
+            #line 235 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                             if (canConfig)
+                            {
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 237 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(Html.EditorFor(model => model.DeviceBatch.UnitQuantity));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
             
-            #line 178 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 237 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                    
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 238 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
             
-            #line 179 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 238 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                   
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 239 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                            <script");
+            
+            #line 239 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                     
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -628,28 +959,64 @@ WriteLiteral(@">
                                         '");
 
             
-            #line 185 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 245 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                      Write(Url.Action(MVC.API.DeviceBatch.UpdateUnitQuantity(Model.DeviceBatch.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral(@"',
-                                        'UnitQuantity'
-                                    );
-                                });
-                            </script>
-                        </td>
-                    </tr>
-                </table>
-                <div");
+WriteLiteral("\',\r\n                                        \'UnitQuantity\'\r\n                     " +
+"               );\r\n                                });\r\n                        " +
+"    </script>\r\n");
+
+            
+            #line 250 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            }
+                            else
+                            {
+                                if (!Model.DeviceBatch.UnitQuantity.HasValue)
+                                {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>");
+
+            
+            #line 254 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                         }
+                                else
+                                {
+            
+            #line default
+            #line hidden
+            
+            #line 256 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            Write(Model.DeviceBatch.UnitQuantity.Value.ToString("n0"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 256 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                     }
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </td>\r\n                    </tr>\r\n                </table" +
+">\r\n                <div");
 
 WriteLiteral(" id=\"DeviceBatch_PurchaseDetails_Container\"");
 
 WriteLiteral(">\r\n                    <div>\r\n                        Details ");
 
             
-            #line 195 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 263 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                            Write(AjaxHelpers.AjaxLoader("ajaxPurchaseDetails"));
 
             
@@ -657,68 +1024,129 @@ WriteLiteral(">\r\n                    <div>\r\n                        Details
             #line hidden
 WriteLiteral("\r\n                    </div>\r\n");
 
-WriteLiteral("                    ");
-
             
-            #line 197 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-               Write(Html.EditorFor(model => model.DeviceBatch.PurchaseDetails));
+            #line 265 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 265 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                     if (canConfig)
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 267 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                   Write(Html.EditorFor(model => model.DeviceBatch.PurchaseDetails));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    <script");
+            
+            #line 267 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                   
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-                        $(function () {
-                            var model = {
-                                $field: $('#DeviceBatch_PurchaseDetails'),
-                                fieldName: 'PurchaseDetails',
-                                $ajax_loading: null,
-                                $ajax_ok: null,
-                                updated: function () {
-                                    if (!model.$ajax_loading)
-                                        model.$ajax_loading = $('#ajax' + model.fieldName + '_loading');
-                                    if (!model.$ajax_ok)
-                                        model.$ajax_ok = $('#ajax' + model.fieldName + '_ok');
-                                    model.$ajax_loading.show();
-                                    var data = {};
-                                    data[model.fieldName] = model.$field.tinymce().getContent();
-                                    $.ajax({
-                                        url: '");
+                            $(function () {
+                                var model = {
+                                    $field: $('#DeviceBatch_PurchaseDetails'),
+                                    fieldName: 'PurchaseDetails',
+                                    $ajax_loading: null,
+                                    $ajax_ok: null,
+                                    updated: function () {
+                                        if (!model.$ajax_loading)
+                                            model.$ajax_loading = $('#ajax' + model.fieldName + '_loading');
+                                        if (!model.$ajax_ok)
+                                            model.$ajax_ok = $('#ajax' + model.fieldName + '_ok');
+                                        model.$ajax_loading.show();
+                                        var data = {};
+                                        data[model.fieldName] = model.$field.tinymce().getContent();
+                                        $.ajax({
+                                            url: '");
 
             
-            #line 214 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-                                          Write(Url.Action(MVC.API.DeviceBatch.UpdatePurchaseDetails(Model.DeviceBatch.Id)));
+            #line 284 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                              Write(Url.Action(MVC.API.DeviceBatch.UpdatePurchaseDetails(Model.DeviceBatch.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral("\',\r\n                                        dataType: \'json\',\r\n                  " +
-"                      data: data,\r\n                                        tradi" +
-"tional: true,\r\n                                        type: \'POST\',\r\n          " +
-"                              success: function (d) {\r\n                         " +
-"                   if (d == \'OK\') {\r\n                                           " +
-"     model.$ajax_loading.hide();\r\n                                              " +
-"  model.$ajax_ok.show().delay(\'fast\').fadeOut(\'slow\');\r\n                        " +
-"                    } else {\r\n                                                mo" +
-"del.$ajax_loading.hide();\r\n                                                alert" +
-"(\'Unable to update purchase details: \' + d);\r\n                                  " +
-"          }\r\n                                        },\r\n                       " +
-"                 error: function (jqXHR, textStatus, errorThrown) {\r\n           " +
-"                                 alert(\'Unable to update purchase details: \' + e" +
-"rrorThrown);\r\n                                            model.$ajax_loading.hi" +
-"de();\r\n                                        }\r\n                              " +
-"      })\r\n                                }\r\n                            };\r\n\r\n " +
-"                           model.$field.tinymce({\r\n                             " +
-"   theme: \'simple\',\r\n                                setup: function (ed) {\r\n   " +
-"                                 ed.onInit.add(function (ed) {\r\n                " +
-"                        $(ed.getWin()).blur(model.updated);\r\n                   " +
-"                 });\r\n                                }\r\n                       " +
-"     });\r\n                        });\r\n                    </script>\r\n          " +
-"      </div>\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Wa" +
-"rranty:\r\n            </th>\r\n            <td");
+WriteLiteral("\',\r\n                                            dataType: \'json\',\r\n              " +
+"                              data: data,\r\n                                     " +
+"       traditional: true,\r\n                                            type: \'PO" +
+"ST\',\r\n                                            success: function (d) {\r\n     " +
+"                                           if (d == \'OK\') {\r\n                   " +
+"                                 model.$ajax_loading.hide();\r\n                  " +
+"                                  model.$ajax_ok.show().delay(\'fast\').fadeOut(\'s" +
+"low\');\r\n                                                } else {\r\n              " +
+"                                      model.$ajax_loading.hide();\r\n             " +
+"                                       alert(\'Unable to update purchase details:" +
+" \' + d);\r\n                                                }\r\n                   " +
+"                         },\r\n                                            error: " +
+"function (jqXHR, textStatus, errorThrown) {\r\n                                   " +
+"             alert(\'Unable to update purchase details: \' + errorThrown);\r\n      " +
+"                                          model.$ajax_loading.hide();\r\n         " +
+"                                   }\r\n                                        })" +
+"\r\n                                    }\r\n                                };\r\n\r\n " +
+"                               model.$field.tinymce({\r\n                         " +
+"           theme: \'simple\',\r\n                                    setup: function" +
+" (ed) {\r\n                                        ed.onInit.add(function (ed) {\r\n" +
+"                                            $(ed.getWin()).blur(model.updated);\r" +
+"\n                                        });\r\n                                  " +
+"  }\r\n                                });\r\n                            });\r\n     " +
+"                   </script>\r\n");
+
+            
+            #line 316 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                    }
+                    else
+                    {
+                        if (string.IsNullOrEmpty(Model.DeviceBatch.PurchaseDetails))
+                        {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>");
+
+            
+            #line 320 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                 }
+                        else
+                        {
+            
+            #line default
+            #line hidden
+            
+            #line 322 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                     Write(new HtmlString(Model.DeviceBatch.PurchaseDetails));
+
+            
+            #line default
+            #line hidden
+            
+            #line 322 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                             }
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n         " +
+"   <th>Warranty:\r\n            </th>\r\n            <td");
 
 WriteLiteral(" class=\"details\"");
 
@@ -734,38 +1162,59 @@ WriteLiteral(" style=\"width: 100px\"");
 
 WriteLiteral(">Valid Until:\r\n                        </th>\r\n                        <td>\r\n");
 
-WriteLiteral("                            ");
-
             
-            #line 258 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-                       Write(Html.EditorFor(model => model.DeviceBatch.WarrantyValidUntil));
+            #line 336 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 336 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                             if (canConfig)
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 338 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                           Write(Html.EditorFor(model => model.DeviceBatch.WarrantyValidUntil));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
             
-            #line 259 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-                       Write(AjaxHelpers.AjaxLoader());
+            #line 338 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                              
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 339 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                           Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral(@"
-                            <script>
-                                $(function () {
-                                    var dateField = $('#DeviceBatch_WarrantyValidUntil');
-                                    document.DiscoFunctions.DateChangeHelper(
-                                        dateField,
-                                        'Warranty Valid Until',
-                                        '");
+            
+            #line 339 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                         
 
             
-            #line 266 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-                                     Write(Url.Action(MVC.API.DeviceBatch.UpdateWarrantyValidUntil(Model.DeviceBatch.Id)));
+            #line default
+            #line hidden
+WriteLiteral(@"                                <script>
+                                    $(function () {
+                                        var dateField = $('#DeviceBatch_WarrantyValidUntil');
+                                        document.DiscoFunctions.DateChangeHelper(
+                                            dateField,
+                                            'Warranty Valid Until',
+                                            '");
+
+            
+            #line 346 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                         Write(Url.Action(MVC.API.DeviceBatch.UpdateWarrantyValidUntil(Model.DeviceBatch.Id)));
 
             
             #line default
@@ -775,19 +1224,43 @@ WriteLiteral(@"',
                                         null,
                                         true
                                     );
-                                });
-                            </script>
-                        </td>
-                    </tr>
-                </table>
-                <div");
+                                    });
+                                </script>
+");
+
+            
+            #line 353 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            }
+                            else
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 356 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                           Write(CommonHelpers.FriendlyDate(Model.DeviceBatch.WarrantyValidUntil, "Unknown"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 356 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                                            
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </td>\r\n                    </tr>\r\n                </table" +
+">\r\n                <div");
 
 WriteLiteral(" id=\"DeviceBatch_WarrantyDetails_Container\"");
 
 WriteLiteral(">\r\n                    <div>\r\n                        Details ");
 
             
-            #line 278 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 363 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                            Write(AjaxHelpers.AjaxLoader("ajaxWarrantyDetails"));
 
             
@@ -795,68 +1268,129 @@ WriteLiteral(">\r\n                    <div>\r\n                        Details
             #line hidden
 WriteLiteral("\r\n                    </div>\r\n");
 
-WriteLiteral("                    ");
-
             
-            #line 280 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-               Write(Html.EditorFor(model => model.DeviceBatch.WarrantyDetails));
+            #line 365 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 365 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                     if (canConfig)
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 367 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                   Write(Html.EditorFor(model => model.DeviceBatch.WarrantyDetails));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    <script");
+            
+            #line 367 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                   
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-                        $(function () {
-                            var model = {
-                                $field: $('#DeviceBatch_WarrantyDetails'),
-                                fieldName: 'WarrantyDetails',
-                                $ajax_loading: null,
-                                $ajax_ok: null,
-                                updated: function () {
-                                    if (!model.$ajax_loading)
-                                        model.$ajax_loading = $('#ajax' + model.fieldName + '_loading');
-                                    if (!model.$ajax_ok)
-                                        model.$ajax_ok = $('#ajax' + model.fieldName + '_ok');
-                                    model.$ajax_loading.show();
-                                    var data = {};
-                                    data[model.fieldName] = model.$field.tinymce().getContent();
-                                    $.ajax({
-                                        url: '");
+                            $(function () {
+                                var model = {
+                                    $field: $('#DeviceBatch_WarrantyDetails'),
+                                    fieldName: 'WarrantyDetails',
+                                    $ajax_loading: null,
+                                    $ajax_ok: null,
+                                    updated: function () {
+                                        if (!model.$ajax_loading)
+                                            model.$ajax_loading = $('#ajax' + model.fieldName + '_loading');
+                                        if (!model.$ajax_ok)
+                                            model.$ajax_ok = $('#ajax' + model.fieldName + '_ok');
+                                        model.$ajax_loading.show();
+                                        var data = {};
+                                        data[model.fieldName] = model.$field.tinymce().getContent();
+                                        $.ajax({
+                                            url: '");
 
             
-            #line 297 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-                                          Write(Url.Action(MVC.API.DeviceBatch.UpdateWarrantyDetails(Model.DeviceBatch.Id)));
+            #line 384 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                              Write(Url.Action(MVC.API.DeviceBatch.UpdateWarrantyDetails(Model.DeviceBatch.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral("\',\r\n                                        dataType: \'json\',\r\n                  " +
-"                      data: data,\r\n                                        tradi" +
-"tional: true,\r\n                                        type: \'POST\',\r\n          " +
-"                              success: function (d) {\r\n                         " +
-"                   if (d == \'OK\') {\r\n                                           " +
-"     model.$ajax_loading.hide();\r\n                                              " +
-"  model.$ajax_ok.show().delay(\'fast\').fadeOut(\'slow\');\r\n                        " +
-"                    } else {\r\n                                                mo" +
-"del.$ajax_loading.hide();\r\n                                                alert" +
-"(\'Unable to update warranty details: \' + d);\r\n                                  " +
-"          }\r\n                                        },\r\n                       " +
-"                 error: function (jqXHR, textStatus, errorThrown) {\r\n           " +
-"                                 alert(\'Unable to update warranty details: \' + e" +
-"rrorThrown);\r\n                                            model.$ajax_loading.hi" +
-"de();\r\n                                        }\r\n                              " +
-"      })\r\n                                }\r\n                            };\r\n\r\n " +
-"                           model.$field.tinymce({\r\n                             " +
-"   theme: \'simple\',\r\n                                setup: function (ed) {\r\n   " +
-"                                 ed.onInit.add(function (ed) {\r\n                " +
-"                        $(ed.getWin()).blur(model.updated);\r\n                   " +
-"                 });\r\n                                }\r\n                       " +
-"     });\r\n                        });\r\n                    </script>\r\n          " +
-"      </div>\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>In" +
-"surance:\r\n            </th>\r\n            <td");
+WriteLiteral("\',\r\n                                            dataType: \'json\',\r\n              " +
+"                              data: data,\r\n                                     " +
+"       traditional: true,\r\n                                            type: \'PO" +
+"ST\',\r\n                                            success: function (d) {\r\n     " +
+"                                           if (d == \'OK\') {\r\n                   " +
+"                                 model.$ajax_loading.hide();\r\n                  " +
+"                                  model.$ajax_ok.show().delay(\'fast\').fadeOut(\'s" +
+"low\');\r\n                                                } else {\r\n              " +
+"                                      model.$ajax_loading.hide();\r\n             " +
+"                                       alert(\'Unable to update warranty details:" +
+" \' + d);\r\n                                                }\r\n                   " +
+"                         },\r\n                                            error: " +
+"function (jqXHR, textStatus, errorThrown) {\r\n                                   " +
+"             alert(\'Unable to update warranty details: \' + errorThrown);\r\n      " +
+"                                          model.$ajax_loading.hide();\r\n         " +
+"                                   }\r\n                                        })" +
+"\r\n                                    }\r\n                                };\r\n\r\n " +
+"                               model.$field.tinymce({\r\n                         " +
+"           theme: \'simple\',\r\n                                    setup: function" +
+" (ed) {\r\n                                        ed.onInit.add(function (ed) {\r\n" +
+"                                            $(ed.getWin()).blur(model.updated);\r" +
+"\n                                        });\r\n                                  " +
+"  }\r\n                                });\r\n                            });\r\n     " +
+"                   </script>\r\n");
+
+            
+            #line 416 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                    }
+                    else
+                    {
+                        if (string.IsNullOrEmpty(Model.DeviceBatch.WarrantyDetails))
+                        {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>");
+
+            
+            #line 420 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                 }
+                        else
+                        {
+            
+            #line default
+            #line hidden
+            
+            #line 422 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                     Write(new HtmlString(Model.DeviceBatch.WarrantyDetails));
+
+            
+            #line default
+            #line hidden
+            
+            #line 422 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                             }
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n         " +
+"   <th>Insurance:\r\n            </th>\r\n            <td");
 
 WriteLiteral(" class=\"details\"");
 
@@ -870,40 +1404,59 @@ WriteLiteral(" class=\"name\"");
 
 WriteLiteral(" style=\"width: 100px\"");
 
-WriteLiteral(">Supplier:\r\n                        </th>\r\n                        <td>\r\n");
-
-WriteLiteral("                            ");
+WriteLiteral(">Supplier:\r\n                        </th>\r\n                        <td>");
 
             
-            #line 341 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 435 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                             if (canConfig)
+                            {
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 437 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(Html.EditorFor(model => model.DeviceBatch.InsuranceSupplier));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
             
-            #line 342 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 437 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                         
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 438 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
             
-            #line 343 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 438 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                   
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 439 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                            <script");
+            
+            #line 439 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                     
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -915,48 +1468,100 @@ WriteLiteral(@">
                                         '");
 
             
-            #line 349 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 445 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                      Write(Url.Action(MVC.API.DeviceBatch.UpdateInsuranceSupplier(Model.DeviceBatch.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral(@"',
-                                        'InsuranceSupplier'
-                                    );
-                                });
-                            </script>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th");
+WriteLiteral("\',\r\n                                        \'InsuranceSupplier\'\r\n                " +
+"                    );\r\n                                });\r\n                   " +
+"         </script>\r\n");
+
+            
+            #line 450 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            }
+                            else
+                            {
+                                if (string.IsNullOrEmpty(Model.DeviceBatch.InsuranceSupplier))
+                                {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>");
+
+            
+            #line 454 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                         }
+                                else
+                                {
+            
+            #line default
+            #line hidden
+            
+            #line 456 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            Write(Model.DeviceBatch.InsuranceSupplier);
+
+            
+            #line default
+            #line hidden
+            
+            #line 456 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                     ;
+                                }
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </td>\r\n                    </tr>\r\n                    <tr" +
+">\r\n                        <th");
 
 WriteLiteral(" class=\"name\"");
 
-WriteLiteral(">Insured Date:\r\n                        </th>\r\n                        <td>\r\n");
-
-WriteLiteral("                            ");
+WriteLiteral(">Insured Date:\r\n                        </th>\r\n                        <td>");
 
             
-            #line 360 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 464 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                             if (canConfig)
+                            {
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 466 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(Html.EditorFor(model => model.DeviceBatch.InsuredDate));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
             
-            #line 361 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 466 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                   
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 467 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral(@"
-                            <script>
+            
+            #line 467 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                     
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"                            <script>
                                 $(function () {
                                     var dateField = $('#DeviceBatch_InsuredDate');
                                     document.DiscoFunctions.DateChangeHelper(
@@ -965,7 +1570,7 @@ WriteLiteral(@"
                                         '");
 
             
-            #line 368 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 474 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                      Write(Url.Action(MVC.API.DeviceBatch.UpdateInsuredDate(Model.DeviceBatch.Id)));
 
             
@@ -978,37 +1583,76 @@ WriteLiteral(@"',
                                     );
                                 });
                             </script>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th");
+");
+
+            
+            #line 481 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            }
+                            else
+                            {
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 484 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                       Write(CommonHelpers.FriendlyDate(Model.DeviceBatch.InsuredDate, "Unknown"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 484 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                                 
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </td>\r\n                    </tr>\r\n                    <tr" +
+">\r\n                        <th");
 
 WriteLiteral(" class=\"name\"");
 
-WriteLiteral(">Insured Until:\r\n                        </th>\r\n                        <td>\r\n");
-
-WriteLiteral("                            ");
+WriteLiteral(">Insured Until:\r\n                        </th>\r\n                        <td>");
 
             
-            #line 381 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 491 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                             if (canConfig)
+                            {
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 493 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(Html.EditorFor(model => model.DeviceBatch.InsuredUntil));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
             
-            #line 382 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 493 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                    
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 494 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                        Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral(@"
-                            <script>
+            
+            #line 494 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                     
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"                            <script>
                                 $(function () {
                                     var dateField = $('#DeviceBatch_InsuredUntil');
                                     document.DiscoFunctions.DateChangeHelper(
@@ -1017,7 +1661,7 @@ WriteLiteral(@"
                                         '");
 
             
-            #line 389 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 501 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                      Write(Url.Action(MVC.API.DeviceBatch.UpdateInsuredUntil(Model.DeviceBatch.Id)));
 
             
@@ -1030,17 +1674,41 @@ WriteLiteral(@"',
                                     );
                                 });
                             </script>
-                        </td>
-                    </tr>
-                </table>
-                <div");
+");
+
+            
+            #line 508 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                            }
+                            else
+                            {
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 511 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                       Write(CommonHelpers.FriendlyDate(Model.DeviceBatch.InsuredUntil, "Unknown"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 511 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                                  
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </td>\r\n                    </tr>\r\n                </table" +
+">\r\n                <div");
 
 WriteLiteral(" id=\"DeviceBatch_InsuranceDetails_Container\"");
 
 WriteLiteral(">\r\n                    <div>\r\n                        Details ");
 
             
-            #line 401 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 518 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                            Write(AjaxHelpers.AjaxLoader("ajaxInsuranceDetails"));
 
             
@@ -1048,89 +1716,163 @@ WriteLiteral(">\r\n                    <div>\r\n                        Details
             #line hidden
 WriteLiteral("\r\n                    </div>\r\n");
 
-WriteLiteral("                    ");
-
             
-            #line 403 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-               Write(Html.EditorFor(model => model.DeviceBatch.InsuranceDetails));
+            #line 520 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 520 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                     if (canConfig)
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 522 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                   Write(Html.EditorFor(model => model.DeviceBatch.InsuranceDetails));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    <script");
+            
+            #line 522 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                    
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-                        $(function () {
-                            var model = {
-                                $DeviceBatch_Comments: $('#DeviceBatch_InsuranceDetails'),
-                                $ajax_loading: null,
-                                $ajax_ok: null,
-                                updated: function () {
-                                    if (!model.$ajax_loading)
-                                        model.$ajax_loading = $('#ajaxInsuranceDetails_loading');
-                                    if (!model.$ajax_ok)
-                                        model.$ajax_ok = $('#ajaxInsuranceDetails_ok');
-                                    model.$ajax_loading.show();
-                                    var data = { InsuranceDetails: model.$DeviceBatch_Comments.tinymce().getContent() };
-                                    $.ajax({
-                                        url: '");
+                            $(function () {
+                                var model = {
+                                    $DeviceBatch_Comments: $('#DeviceBatch_InsuranceDetails'),
+                                    $ajax_loading: null,
+                                    $ajax_ok: null,
+                                    updated: function () {
+                                        if (!model.$ajax_loading)
+                                            model.$ajax_loading = $('#ajaxInsuranceDetails_loading');
+                                        if (!model.$ajax_ok)
+                                            model.$ajax_ok = $('#ajaxInsuranceDetails_ok');
+                                        model.$ajax_loading.show();
+                                        var data = { InsuranceDetails: model.$DeviceBatch_Comments.tinymce().getContent() };
+                                        $.ajax({
+                                            url: '");
 
             
-            #line 418 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
-                                          Write(Url.Action(MVC.API.DeviceBatch.UpdateInsuranceDetails(Model.DeviceBatch.Id)));
+            #line 537 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                              Write(Url.Action(MVC.API.DeviceBatch.UpdateInsuranceDetails(Model.DeviceBatch.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral("\',\r\n                                        dataType: \'json\',\r\n                  " +
-"                      data: data,\r\n                                        tradi" +
-"tional: true,\r\n                                        type: \'POST\',\r\n          " +
-"                              success: function (d) {\r\n                         " +
-"                   if (d == \'OK\') {\r\n                                           " +
-"     model.$ajax_loading.hide();\r\n                                              " +
-"  model.$ajax_ok.show().delay(\'fast\').fadeOut(\'slow\');\r\n                        " +
-"                    } else {\r\n                                                mo" +
-"del.$ajax_loading.hide();\r\n                                                alert" +
-"(\'Unable to update insurance details: \' + d);\r\n                                 " +
-"           }\r\n                                        },\r\n                      " +
-"                  error: function (jqXHR, textStatus, errorThrown) {\r\n          " +
-"                                  alert(\'Unable to update insurance details: \' +" +
-" errorThrown);\r\n                                            model.$ajax_loading." +
-"hide();\r\n                                        }\r\n                            " +
-"        })\r\n                                }\r\n                            };\r\n\r" +
-"\n                            model.$DeviceBatch_Comments.tinymce({\r\n            " +
-"                    theme: \'simple\',\r\n                                setup: fun" +
-"ction (ed) {\r\n                                    //ed.onChange.add(model.update" +
-"dThrottle);\r\n                                    ed.onInit.add(function (ed) {\r\n" +
-"                                        $(ed.getWin()).blur(model.updated);\r\n   " +
-"                                 });\r\n                                }\r\n       " +
-"                     });\r\n                        });\r\n                    </scr" +
-"ipt>\r\n                </div>\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n  " +
-"          <th>Comments:<br />\r\n");
+WriteLiteral("\',\r\n                                            dataType: \'json\',\r\n              " +
+"                              data: data,\r\n                                     " +
+"       traditional: true,\r\n                                            type: \'PO" +
+"ST\',\r\n                                            success: function (d) {\r\n     " +
+"                                           if (d == \'OK\') {\r\n                   " +
+"                                 model.$ajax_loading.hide();\r\n                  " +
+"                                  model.$ajax_ok.show().delay(\'fast\').fadeOut(\'s" +
+"low\');\r\n                                                } else {\r\n              " +
+"                                      model.$ajax_loading.hide();\r\n             " +
+"                                       alert(\'Unable to update insurance details" +
+": \' + d);\r\n                                                }\r\n                  " +
+"                          },\r\n                                            error:" +
+" function (jqXHR, textStatus, errorThrown) {\r\n                                  " +
+"              alert(\'Unable to update insurance details: \' + errorThrown);\r\n    " +
+"                                            model.$ajax_loading.hide();\r\n       " +
+"                                     }\r\n                                        " +
+"})\r\n                                    }\r\n                                };\r\n\r" +
+"\n                                model.$DeviceBatch_Comments.tinymce({\r\n        " +
+"                            theme: \'simple\',\r\n                                  " +
+"  setup: function (ed) {\r\n                                        //ed.onChange." +
+"add(model.updatedThrottle);\r\n                                        ed.onInit.a" +
+"dd(function (ed) {\r\n                                            $(ed.getWin()).b" +
+"lur(model.updated);\r\n                                        });\r\n              " +
+"                      }\r\n                                });\r\n                  " +
+"          });\r\n                        </script>\r\n");
+
+            
+            #line 570 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                    }
+                    else
+                    {
+                        if (string.IsNullOrEmpty(Model.DeviceBatch.InsuranceDetails))
+                        {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>");
+
+            
+            #line 574 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                                 }
+                        else
+                        {
+            
+            #line default
+            #line hidden
+            
+            #line 576 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                     Write(new HtmlString(Model.DeviceBatch.InsuranceDetails));
+
+            
+            #line default
+            #line hidden
+            
+            #line 576 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                              }
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n         " +
+"   <th>Comments:<br />\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 456 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 583 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader("ajaxComments"));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            </th>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
+WriteLiteral("\r\n            </th>\r\n            <td>");
 
             
-            #line 459 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 585 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 587 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
            Write(Html.EditorFor(model => model.DeviceBatch.Comments));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 587 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                    
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -1151,7 +1893,7 @@ WriteLiteral(@">
                                     url: '");
 
             
-            #line 474 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 602 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                       Write(Url.Action(MVC.API.DeviceBatch.UpdateComments(Model.DeviceBatch.Id)));
 
             
@@ -1178,21 +1920,61 @@ WriteLiteral("\',\r\n                                    dataType: \'json\',\r\n
 "           ed.onInit.add(function (ed) {\r\n                                    $(" +
 "ed.getWin()).blur(model.updated);\r\n                                });\r\n        " +
 "                    }\r\n                        });\r\n                    });\r\n   " +
-"             </script>\r\n            </td>\r\n        </tr>\r\n    </table>\r\n</div>\r\n" +
-"<div");
+"             </script>\r\n");
+
+            
+            #line 635 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(Model.DeviceBatch.Comments))
+                    {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>");
+
+            
+            #line 639 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                             }
+                    else
+                    {
+            
+            #line default
+            #line hidden
+            
+            #line 641 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                 Write(new HtmlString(Model.DeviceBatch.Comments));
+
+            
+            #line default
+            #line hidden
+            
+            #line 641 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+                                                                  }
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n    </table>\r\n</div>\r\n<div");
 
 WriteLiteral(" class=\"actionBar\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 512 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 648 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 512 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 648 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
      if (Model.CanDelete)
     { 
         
@@ -1200,14 +1982,14 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 514 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 650 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
    Write(Html.ActionLinkButton("Delete", MVC.API.DeviceBatch.Delete(Model.DeviceBatch.Id, true), "buttonDelete"));
 
             
             #line default
             #line hidden
             
-            #line 514 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 650 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                                                                                                 
     }
 
@@ -1217,37 +1999,43 @@ WriteLiteral(">\r\n");
 WriteLiteral("    ");
 
             
-            #line 516 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 652 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
      if (Model.DeviceCount > 0)
-    { 
+    {
+        if (Authorization.Has(Claims.Device.Actions.Export))
+        {
         
             
             #line default
             #line hidden
             
-            #line 518 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 656 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
    Write(Html.ActionLinkButton("Export Devices", MVC.API.DeviceBatch.ExportDevices(Model.DeviceBatch.Id)));
 
             
             #line default
             #line hidden
             
-            #line 518 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 656 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                                                                                          
+        }
+        if (Authorization.Has(Claims.Device.Search))
+        {
         
             
             #line default
             #line hidden
             
-            #line 519 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 660 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
    Write(Html.ActionLinkButton("View Devices", MVC.Search.Query(Model.DeviceBatch.Id.ToString(), "DeviceBatch")));
 
             
             #line default
             #line hidden
             
-            #line 519 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
+            #line 660 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
                                                                                                                 
+        }
     }
 
             
diff --git a/Disco.Web/Areas/Config/Views/DeviceBatch/Timeline.cshtml b/Disco.Web/Areas/Config/Views/DeviceBatch/Timeline.cshtml
index 7f585277..fed516e6 100644
--- a/Disco.Web/Areas/Config/Views/DeviceBatch/Timeline.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceBatch/Timeline.cshtml
@@ -1,4 +1,6 @@
 @{
+    Authorization.Require(Claims.Config.DeviceBatch.ShowTimeline);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Batches", MVC.Config.DeviceBatch.Index(null), "Timeline");
     Html.BundleDeferred("~/Style/Timeline");
     Html.BundleDeferred("~/ClientScripts/Modules/Timeline");
diff --git a/Disco.Web/Areas/Config/Views/DeviceBatch/Timeline.generated.cs b/Disco.Web/Areas/Config/Views/DeviceBatch/Timeline.generated.cs
index d856ba45..4dfaa1ab 100644
--- a/Disco.Web/Areas/Config/Views/DeviceBatch/Timeline.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceBatch/Timeline.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceBatch/Timeline.cshtml")]
-    public partial class Timeline : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class Timeline : Disco.Services.Web.WebViewPage<dynamic>
     {
         public Timeline()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
             
             #line 1 "..\..\Areas\Config\Views\DeviceBatch\Timeline.cshtml"
   
+    Authorization.Require(Claims.Config.DeviceBatch.ShowTimeline);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Batches", MVC.Config.DeviceBatch.Index(null), "Timeline");
     Html.BundleDeferred("~/Style/Timeline");
     Html.BundleDeferred("~/ClientScripts/Modules/Timeline");
@@ -63,7 +67,7 @@ WriteLiteral(" type=\"text/javascript\"");
 WriteLiteral(">\r\n    (function () {\r\n        var dataUrl = \'");
 
             
-            #line 10 "..\..\Areas\Config\Views\DeviceBatch\Timeline.cshtml"
+            #line 12 "..\..\Areas\Config\Views\DeviceBatch\Timeline.cshtml"
                    Write(Url.Action(MVC.API.DeviceBatch.Timeline()));
 
             
diff --git a/Disco.Web/Areas/Config/Views/DeviceModel/GenericComponents.cshtml b/Disco.Web/Areas/Config/Views/DeviceModel/GenericComponents.cshtml
index 67f64a16..92c6c83d 100644
--- a/Disco.Web/Areas/Config/Views/DeviceModel/GenericComponents.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceModel/GenericComponents.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Areas.Config.Models.DeviceModel.ComponentsModel
 @{
+    Authorization.Require(Claims.Config.DeviceModel.Show);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Models", MVC.Config.DeviceModel.Index(null), "Generic Components");
 }
 @Html.Partial(MVC.Config.DeviceModel.Views._DeviceComponentsTable, Model)
\ No newline at end of file
diff --git a/Disco.Web/Areas/Config/Views/DeviceModel/GenericComponents.generated.cs b/Disco.Web/Areas/Config/Views/DeviceModel/GenericComponents.generated.cs
index 2bec1f0b..45cbc4f7 100644
--- a/Disco.Web/Areas/Config/Views/DeviceModel/GenericComponents.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceModel/GenericComponents.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DeviceModel
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceModel/GenericComponents.cshtml")]
-    public partial class GenericComponents : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceModel.ComponentsModel>
+    public partial class GenericComponents : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DeviceModel.ComponentsModel>
     {
         public GenericComponents()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Areas.Config.Views.DeviceModel
             
             #line 2 "..\..\Areas\Config\Views\DeviceModel\GenericComponents.cshtml"
   
+    Authorization.Require(Claims.Config.DeviceModel.Show);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Models", MVC.Config.DeviceModel.Index(null), "Generic Components");
 
             
@@ -51,7 +55,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceModel
 WriteLiteral("\r\n");
 
             
-            #line 5 "..\..\Areas\Config\Views\DeviceModel\GenericComponents.cshtml"
+            #line 7 "..\..\Areas\Config\Views\DeviceModel\GenericComponents.cshtml"
 Write(Html.Partial(MVC.Config.DeviceModel.Views._DeviceComponentsTable, Model));
 
             
diff --git a/Disco.Web/Areas/Config/Views/DeviceModel/Index.cshtml b/Disco.Web/Areas/Config/Views/DeviceModel/Index.cshtml
index 90b6920c..00ba40bb 100644
--- a/Disco.Web/Areas/Config/Views/DeviceModel/Index.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceModel/Index.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Areas.Config.Models.DeviceModel.IndexModel
 @{
+    Authorization.Require(Claims.Config.DeviceModel.Show);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Models");
 }
 <table class="tableData">
diff --git a/Disco.Web/Areas/Config/Views/DeviceModel/Index.generated.cs b/Disco.Web/Areas/Config/Views/DeviceModel/Index.generated.cs
index 97b67a3f..7357a8a9 100644
--- a/Disco.Web/Areas/Config/Views/DeviceModel/Index.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceModel/Index.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DeviceModel
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceModel/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceModel.IndexModel>
+    public partial class Index : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DeviceModel.IndexModel>
     {
         public Index()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Areas.Config.Views.DeviceModel
             
             #line 2 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
   
+    Authorization.Require(Claims.Config.DeviceModel.Show);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Models");
 
             
@@ -73,13 +77,13 @@ WriteLiteral(@">
 ");
 
             
-            #line 23 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+            #line 25 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 23 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+            #line 25 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
      foreach (var item in Model.DeviceModels)
     {
 
@@ -91,7 +95,7 @@ WriteLiteral("        <tr>\r\n            <td>\r\n");
 WriteLiteral("                ");
 
             
-            #line 27 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+            #line 29 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
            Write(Html.ActionLink(item.ToString(), MVC.Config.DeviceModel.Index(item.Id)));
 
             
@@ -102,7 +106,7 @@ WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
 WriteLiteral("                ");
 
             
-            #line 30 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+            #line 32 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
            Write(Html.DisplayFor(modelItem => item.Manufacturer));
 
             
@@ -113,7 +117,7 @@ WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
 WriteLiteral("                ");
 
             
-            #line 33 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+            #line 35 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
            Write(Html.DisplayFor(modelItem => item.Model));
 
             
@@ -124,7 +128,7 @@ WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
 WriteLiteral("                ");
 
             
-            #line 36 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+            #line 38 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
            Write(Html.DisplayFor(modelItem => item.ModelType));
 
             
@@ -135,7 +139,7 @@ WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
 WriteLiteral("                ");
 
             
-            #line 39 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+            #line 41 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
            Write(item.DeviceCount.ToString("n0"));
 
             
@@ -144,13 +148,13 @@ WriteLiteral("                ");
 WriteLiteral("\r\n");
 
             
-            #line 40 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+            #line 42 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 40 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+            #line 42 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
                  if (item.DeviceDecommissionedCount > 0)
                 { 
 
@@ -161,21 +165,21 @@ WriteLiteral("                    <span");
 
 WriteLiteral(" class=\"smallMessage\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 1167), Tuple.Create("\"", 1223)
+WriteAttribute("title", Tuple.Create(" title=\"", 1233), Tuple.Create("\"", 1289)
             
-            #line 42 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 1175), Tuple.Create<System.Object, System.Int32>(item.DeviceDecommissionedCount
+            #line 44 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+, Tuple.Create(Tuple.Create("", 1241), Tuple.Create<System.Object, System.Int32>(item.DeviceDecommissionedCount
             
             #line default
             #line hidden
-, 1175), false)
-, Tuple.Create(Tuple.Create(" ", 1208), Tuple.Create("Decommissioned", 1209), true)
+, 1241), false)
+, Tuple.Create(Tuple.Create(" ", 1274), Tuple.Create("Decommissioned", 1275), true)
 );
 
 WriteLiteral(">\r\n                        (");
 
             
-            #line 43 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+            #line 45 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
                      Write(item.DeviceDecommissionedCount.ToString("n0"));
 
             
@@ -184,7 +188,7 @@ WriteLiteral(">\r\n                        (");
 WriteLiteral(")</span>\r\n");
 
             
-            #line 44 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+            #line 46 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
                 }
 
             
@@ -193,7 +197,7 @@ WriteLiteral(")</span>\r\n");
 WriteLiteral("            </td>\r\n        </tr>\r\n");
 
             
-            #line 47 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+            #line 49 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
     }
 
             
@@ -208,7 +212,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("    ");
 
             
-            #line 50 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
+            #line 52 "..\..\Areas\Config\Views\DeviceModel\Index.cshtml"
 Write(Html.ActionLinkButton("Generic Components", MVC.Config.DeviceModel.GenericComponents()));
 
             
diff --git a/Disco.Web/Areas/Config/Views/DeviceModel/Show.cshtml b/Disco.Web/Areas/Config/Views/DeviceModel/Show.cshtml
index a0663f9f..30bd4f4c 100644
--- a/Disco.Web/Areas/Config/Views/DeviceModel/Show.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceModel/Show.cshtml
@@ -1,37 +1,44 @@
 @model Disco.Web.Areas.Config.Models.DeviceModel.ShowModel
 @{
+    Authorization.Require(Claims.Config.DeviceModel.Show);
+
+    var canConfig = Authorization.Has(Claims.Config.DeviceModel.Configure);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Models", MVC.Config.DeviceModel.Index(null), Model.DeviceModel.ToString());
 }
 <div class="form" style="width: 530px">
     <table>
         <tr>
-            <th style="width: 150px">
-                Id:
+            <th style="width: 150px">Id:
             </th>
             <td>
                 @Html.DisplayFor(model => model.DeviceModel.Id)
             </td>
         </tr>
         <tr>
-            <th>
-                Description:
+            <th>Description:
             </th>
-            <td>@Html.EditorFor(model => model.DeviceModel.Description)
+            <td>@if (canConfig)
+                {
+                @Html.EditorFor(model => model.DeviceModel.Description)
                 @AjaxHelpers.AjaxSave()
                 @AjaxHelpers.AjaxLoader()
+                }
+                else
+                {
+                @Html.DisplayFor(model => model.DeviceModel.Description)
+                }
             </td>
         </tr>
         <tr>
-            <th>
-                Manufacturer:
+            <th>Manufacturer:
             </th>
             <td>
                 @Html.DisplayFor(model => model.DeviceModel.Manufacturer)
             </td>
         </tr>
         <tr>
-            <th>
-                Model:
+            <th>Model:
             </th>
             <td>
                 @Html.DisplayFor(model => model.DeviceModel.Model)
@@ -48,169 +55,206 @@
             </td>
         </tr>
         <tr>
-            <th>
-                Default Purchase Date:
+            <th>Default Purchase Date:
             </th>
-            <td>
+            <td>@if (canConfig)
+                {
                 @Html.EditorFor(model => model.DeviceModel.DefaultPurchaseDate)
                 @AjaxHelpers.AjaxLoader()
+                }
+                else
+                {
+                @CommonHelpers.FriendlyDate(Model.DeviceModel.DefaultPurchaseDate, "Unknown")
+                }
             </td>
         </tr>
         <tr>
-            <th>
-                Default Warranty Provider:
+            <th>Default Warranty Provider:
             </th>
-            <td>
+            <td>@if (canConfig)
+                {
                 @Html.DropDownListFor(model => model.DeviceModel.DefaultWarrantyProvider, Model.WarrantyProviders.ToSelectListItems(Model.DeviceModel.DefaultWarrantyProvider, true, "None"))
                 @AjaxHelpers.AjaxLoader()
+                }
+                else
+                {
+                    if (Model.DeviceModel.DefaultWarrantyProvider == null)
+                    {
+                <span class="smallMessage">&lt;None Specified&gt;</span>
+                    }
+                    else
+                    {
+                        var provider = Model.WarrantyProviders.FirstOrDefault(wp => wp.Id == Model.DeviceModel.DefaultWarrantyProvider);
+                        if (provider == null)
+                        {
+                <span class="smallMessage">&lt;None Specified&gt;</span>
+                        }
+                        else
+                        {
+                @provider.Name
+                        }
+                    }
+                }
             </td>
         </tr>
         <tr>
-            <th>
-                Type:
+            <th>Type:
             </th>
             <td>
                 @Html.DisplayFor(model => model.DeviceModel.ModelType)
             </td>
         </tr>
         <tr>
-            <th>
-                Image:
+            <th>Image:
             </th>
             <td>
                 <img alt="Model Image" src="@Url.Action(MVC.API.DeviceModel.Image(Model.DeviceModel.Id, Model.DeviceModel.ImageHash()))" />
             </td>
         </tr>
-        <tr>
-            <th>
-                <label for="DeviceModel_Image">
-                    Update Image:
-                </label>
-            </th>
-            <td>
-                @using (Html.BeginForm(MVC.API.DeviceModel.Image(Model.DeviceModel.Id, true, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
-                {
-                    <input type="file" name="Image" id="Image" style="width: 250px;" />
-                    <input class="button" type="submit" value="Update" />
-                }
-            </td>
-        </tr>
+        @if (canConfig)
+        {
+            <tr>
+                <th>
+                    <label for="DeviceModel_Image">
+                        Update Image:
+                    </label>
+                </th>
+                <td>
+                    @using (Html.BeginForm(MVC.API.DeviceModel.Image(Model.DeviceModel.Id, true, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
+                    {
+                        <input type="file" name="Image" id="Image" style="width: 250px;" />
+                        <input class="button" type="submit" value="Update" />
+                    }
+                </td>
+            </tr>
+        }
     </table>
-    <script type="text/javascript">
-        $(function () {
-            var $Description = $('#DeviceModel_Description');
-            var $DescriptionAjaxSave = $Description.next('.ajaxSave');
-            $Description
-                    .watermark('Model Description')
-                    .focus(function () { $Description.select() })
-                    .keydown(function (e) {
-                        $DescriptionAjaxSave.show();
-                        if (e.which == 13) {
-                            $(this).blur();
-                        }
-                    }).blur(function () {
-                        $DescriptionAjaxSave.hide();
+    @if (canConfig)
+    {
+        <script type="text/javascript">
+            $(function () {
+                var $Description = $('#DeviceModel_Description');
+                var $DescriptionAjaxSave = $Description.next('.ajaxSave');
+                $Description
+                        .watermark('Model Description')
+                        .focus(function () { $Description.select() })
+                        .keydown(function (e) {
+                            $DescriptionAjaxSave.show();
+                            if (e.which == 13) {
+                                $(this).blur();
+                            }
+                        }).blur(function () {
+                            $DescriptionAjaxSave.hide();
+                        })
+                        .change(function () {
+                            $DescriptionAjaxSave.hide();
+                            var $ajaxLoading = $DescriptionAjaxSave.next('.ajaxLoading').show();
+                            var data = { Description: $Description.val() };
+                            $.ajax({
+                                url: '@Url.Action(MVC.API.DeviceModel.UpdateDescription(Model.DeviceModel.Id))',
+                                dataType: 'json',
+                                data: data,
+                                success: function (d) {
+                                    if (d == 'OK') {
+                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                    } else {
+                                        $ajaxLoading.hide();
+                                        alert('Unable to update description: ' + d);
+                                    }
+                                },
+                                error: function (jqXHR, textStatus, errorThrown) {
+                                    alert('Unable to update description: ' + textStatus);
+                                    $ajaxLoading.hide();
+                                }
+                            });
+                        });
+            });
+        </script>
+        <script type="text/javascript">
+            $(function () {
+                var $dataField = $('#DeviceModel_DefaultPurchaseDate');
+                var $ajaxLoading = $dataField.next('.ajaxLoading');
+                var dateFieldValue = $dataField.val();
+                var dateFieldChangeToken = null;
+                $dataField
+                    .watermark('None')
+                    .datepicker({
+                        changeYear: true,
+                        changeMonth: true,
+                        dateFormat: 'yy/mm/dd'
                     })
                     .change(function () {
-                        $DescriptionAjaxSave.hide();
-                        var $ajaxLoading = $DescriptionAjaxSave.next('.ajaxLoading').show();
-                        var data = { Description: $Description.val() };
-                        $.ajax({
-                            url: '@Url.Action(MVC.API.DeviceModel.UpdateDescription(Model.DeviceModel.Id))',
-                            dataType: 'json',
-                            data: data,
-                            success: function (d) {
-                                if (d == 'OK') {
-                                    $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
-                                } else {
-                                    $ajaxLoading.hide();
-                                    alert('Unable to update description: ' + d);
-                                }
-                            },
-                            error: function (jqXHR, textStatus, errorThrown) {
-                                alert('Unable to update description: ' + textStatus);
-                                $ajaxLoading.hide();
-                            }
-                        });
+                        var dateText = $dataField.val();
+                        if (dateFieldValue.toLowerCase() != dateText.toLowerCase()) {
+                            dateFieldValue = dateText;
+                            if (dateFieldChangeToken)
+                                window.clearTimeout(dateFieldChangeToken);
+                            dateFieldChangeToken = window.setTimeout(function () {
+                                $ajaxLoading.show();
+                                var data = {};
+                                data['DefaultPurchaseDate'] = dateFieldValue;
+                                $.getJSON('@(Url.Action(MVC.API.DeviceModel.UpdateDefaultPurchaseDate(Model.DeviceModel.Id)))', data, function (response, result) {
+                                    if (result != 'success' || response != 'OK') {
+                                        alert('Unable to change Date:\n' + response);
+                                        $ajaxLoading.hide();
+                                    } else {
+                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                    }
+                                })
+                                dateFieldChangeToken = null;
+                            }, 500);
+                        }
+                    }).focus(function () {
+                        $(this).select();
                     });
-        });
-    </script>
-    <script type="text/javascript">
-        $(function () {
-            var $dataField = $('#DeviceModel_DefaultPurchaseDate');
-            var $ajaxLoading = $dataField.next('.ajaxLoading');
-            var dateFieldValue = $dataField.val();
-            var dateFieldChangeToken = null;
-            $dataField
-                .watermark('None')
-                .datepicker({
-                    changeYear: true,
-                    changeMonth: true,
-                    dateFormat: 'yy/mm/dd'
-                })
-                .change(function () {
-                    var dateText = $dataField.val();
-                    if (dateFieldValue.toLowerCase() != dateText.toLowerCase()) {
-                        dateFieldValue = dateText;
-                        if (dateFieldChangeToken)
-                            window.clearTimeout(dateFieldChangeToken);
-                        dateFieldChangeToken = window.setTimeout(function () {
+            });
+        </script>
+        <script type="text/javascript">
+            $(function () {
+                var $DefaultWarrantyProvider = $('#DeviceModel_DefaultWarrantyProvider');
+                var $ajaxLoading = $DefaultWarrantyProvider.next('.ajaxLoading');
+                $DefaultWarrantyProvider
+                        .change(function () {
                             $ajaxLoading.show();
-                            var data = {};
-                            data['DefaultPurchaseDate'] = dateFieldValue;
-                            $.getJSON('@(Url.Action(MVC.API.DeviceModel.UpdateDefaultPurchaseDate(Model.DeviceModel.Id)))', data, function (response, result) {
-                                if (result != 'success' || response != 'OK') {
-                                    alert('Unable to change Date:\n' + response);
+                            var data = { DefaultWarrantyProvider: $DefaultWarrantyProvider.val() };
+                            $.ajax({
+                                url: '@Url.Action(MVC.API.DeviceModel.UpdateDefaultWarrantyProvider(Model.DeviceModel.Id))',
+                                dataType: 'json',
+                                data: data,
+                                success: function (d) {
+                                    if (d == 'OK') {
+                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                    } else {
+                                        $ajaxLoading.hide();
+                                        alert('Unable to default warranty provider: ' + d);
+                                    }
+                                },
+                                error: function (jqXHR, textStatus, errorThrown) {
+                                    alert('Unable to default warranty provider: ' + textStatus);
                                     $ajaxLoading.hide();
-                                } else {
-                                    $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
                                 }
-                            })
-                            dateFieldChangeToken = null;
-                        }, 500);
-                    }
-                }).focus(function () {
-                    $(this).select();
-                });
-        });
-    </script>
-    <script type="text/javascript">
-        $(function () {
-            var $DefaultWarrantyProvider = $('#DeviceModel_DefaultWarrantyProvider');
-            var $ajaxLoading = $DefaultWarrantyProvider.next('.ajaxLoading');
-            $DefaultWarrantyProvider
-                    .change(function () {
-                        $ajaxLoading.show();
-                        var data = { DefaultWarrantyProvider: $DefaultWarrantyProvider.val() };
-                        $.ajax({
-                            url: '@Url.Action(MVC.API.DeviceModel.UpdateDefaultWarrantyProvider(Model.DeviceModel.Id))',
-                            dataType: 'json',
-                            data: data,
-                            success: function (d) {
-                                if (d == 'OK') {
-                                    $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
-                                } else {
-                                    $ajaxLoading.hide();
-                                    alert('Unable to default warranty provider: ' + d);
-                                }
-                            },
-                            error: function (jqXHR, textStatus, errorThrown) {
-                                alert('Unable to default warranty provider: ' + textStatus);
-                                $ajaxLoading.hide();
-                            }
+                            });
                         });
-                    });
-        });
-    </script>
+            });
+        </script>
+    }
 </div>
-<h2>
-    Components</h2>
+<h2>Components</h2>
 @Html.Partial(MVC.Config.DeviceModel.Views._DeviceComponentsTable, Model.DeviceComponentsModel)
 <div class="actionBar">
-     @if (Model.CanDelete)
+    @if (Model.CanDelete)
     { 
         @Html.ActionLinkButton("Delete", MVC.API.DeviceModel.Delete(Model.DeviceModel.Id, true), "buttonDelete")
     }
-    @Html.ActionLinkButton("Export Devices", MVC.API.DeviceModel.ExportDevices(Model.DeviceModel.Id))
-    @Html.ActionLinkButton("View Devices", MVC.Search.Query(Model.DeviceModel.Id.ToString(), "DeviceModel"))
+    @if (Model.DeviceCount > 0)
+    {
+        if (Authorization.Has(Claims.Device.Actions.Export))
+        {
+        @Html.ActionLinkButton("Export Devices", MVC.API.DeviceModel.ExportDevices(Model.DeviceModel.Id))
+        }
+        if (Authorization.Has(Claims.Device.Search))
+        {
+        @Html.ActionLinkButton("View Devices", MVC.Search.Query(Model.DeviceModel.Id.ToString(), "DeviceModel"))
+        }
+    }
 </div>
diff --git a/Disco.Web/Areas/Config/Views/DeviceModel/Show.generated.cs b/Disco.Web/Areas/Config/Views/DeviceModel/Show.generated.cs
index c970be4e..ae00e34f 100644
--- a/Disco.Web/Areas/Config/Views/DeviceModel/Show.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceModel/Show.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DeviceModel
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceModel/Show.cshtml")]
-    public partial class Show : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceModel.ShowModel>
+    public partial class Show : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DeviceModel.ShowModel>
     {
         public Show()
         {
@@ -43,6 +45,10 @@ namespace Disco.Web.Areas.Config.Views.DeviceModel
             
             #line 2 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
   
+    Authorization.Require(Claims.Config.DeviceModel.Show);
+
+    var canConfig = Authorization.Has(Claims.Config.DeviceModel.Configure);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Models", MVC.Config.DeviceModel.Index(null), Model.DeviceModel.ToString());
 
             
@@ -58,68 +64,107 @@ WriteLiteral(">\r\n    <table>\r\n        <tr>\r\n            <th");
 
 WriteLiteral(" style=\"width: 150px\"");
 
-WriteLiteral(">\r\n                Id:\r\n            </th>\r\n            <td>\r\n");
+WriteLiteral(">Id:\r\n            </th>\r\n            <td>\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 12 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 15 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
            Write(Html.DisplayFor(model => model.DeviceModel.Id));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>\r\n             " +
-"   Description:\r\n            </th>\r\n            <td>");
+WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Description:\r\n " +
+"           </th>\r\n            <td>");
 
             
-            #line 19 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 21 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 23 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
            Write(Html.EditorFor(model => model.DeviceModel.Description));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 20 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 23 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                                                       
+                
+            
+            #line default
+            #line hidden
+            
+            #line 24 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 21 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 24 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                       
+                
+            
+            #line default
+            #line hidden
+            
+            #line 25 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>\r\n             " +
-"   Manufacturer:\r\n            </th>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
+            
+            #line 25 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                         
+                }
+                else
+                {
+                
+            
+            #line default
+            #line hidden
             
             #line 29 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-           Write(Html.DisplayFor(model => model.DeviceModel.Manufacturer));
+           Write(Html.DisplayFor(model => model.DeviceModel.Description));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>\r\n             " +
-"   Model:\r\n            </th>\r\n            <td>\r\n");
+            
+            #line 29 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                                                        
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Manufacturer:\r\n  " +
+"          </th>\r\n            <td>\r\n");
 
 WriteLiteral("                ");
 
             
             #line 37 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+           Write(Html.DisplayFor(model => model.DeviceModel.Manufacturer));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Model:\r\n       " +
+"     </th>\r\n            <td>\r\n");
+
+WriteLiteral("                ");
+
+            
+            #line 44 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
            Write(Html.DisplayFor(model => model.DeviceModel.Model));
 
             
@@ -129,7 +174,7 @@ WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n
 "\r\n            <td>\r\n                <div><strong>");
 
             
-            #line 43 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 50 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
                         Write(Model.DeviceCount.ToString("n0"));
 
             
@@ -138,7 +183,7 @@ WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n
 WriteLiteral("</strong> ");
 
             
-            #line 43 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 50 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
                                                                     Write(Model.DeviceCount == 1 ? "devices is" : "devices are");
 
             
@@ -147,13 +192,13 @@ WriteLiteral("</strong> ");
 WriteLiteral(" of this model type.</div>\r\n");
 
             
-            #line 44 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 51 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 44 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 51 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
                  if (Model.DeviceDecommissionedCount > 0)
                 {
 
@@ -167,7 +212,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">");
 
             
-            #line 46 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 53 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
                                          Write(Model.DeviceDecommissionedCount.ToString("n0"));
 
             
@@ -176,7 +221,7 @@ WriteLiteral(">");
 WriteLiteral(" ");
 
             
-            #line 46 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 53 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
                                                                                           Write(Model.DeviceDecommissionedCount == 1 ? "device is" : "devices are");
 
             
@@ -185,108 +230,228 @@ WriteLiteral(" ");
 WriteLiteral(" decommissioned.</div>\r\n");
 
             
-            #line 47 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 54 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
                 }
 
             
             #line default
             #line hidden
-WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>\r\n               " +
-" Default Purchase Date:\r\n            </th>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Default Purchase " +
+"Date:\r\n            </th>\r\n            <td>");
 
             
-            #line 55 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-           Write(Html.EditorFor(model => model.DeviceModel.DefaultPurchaseDate));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 56 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-           Write(AjaxHelpers.AjaxLoader());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>\r\n             " +
-"   Default Warranty Provider:\r\n            </th>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 64 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-           Write(Html.DropDownListFor(model => model.DeviceModel.DefaultWarrantyProvider, Model.WarrantyProviders.ToSelectListItems(Model.DeviceModel.DefaultWarrantyProvider, true, "None")));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 65 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-           Write(AjaxHelpers.AjaxLoader());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>\r\n             " +
-"   Type:\r\n            </th>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 73 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-           Write(Html.DisplayFor(model => model.DeviceModel.ModelType));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>\r\n             " +
-"   Image:\r\n            </th>\r\n            <td>\r\n                <img");
-
-WriteLiteral(" alt=\"Model Image\"");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 2690), Tuple.Create("\"", 2787)
-            
-            #line 81 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 2696), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.DeviceModel.Id, Model.DeviceModel.ImageHash()))
-            
-            #line default
-            #line hidden
-, 2696), false)
-);
-
-WriteLiteral(" />\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>\r\n          " +
-"      <label");
-
-WriteLiteral(" for=\"DeviceModel_Image\"");
-
-WriteLiteral(">\r\n                    Update Image:\r\n                </label>\r\n            </th>" +
-"\r\n            <td>\r\n");
-
-            
-            #line 91 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 60 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                 if (canConfig)
+                {
                 
             
             #line default
             #line hidden
             
-            #line 91 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-                 using (Html.BeginForm(MVC.API.DeviceModel.Image(Model.DeviceModel.Id, true, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
-                {
+            #line 62 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+           Write(Html.EditorFor(model => model.DeviceModel.DefaultPurchaseDate));
 
             
             #line default
             #line hidden
-WriteLiteral("                    <input");
+            
+            #line 62 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                                                               
+                
+            
+            #line default
+            #line hidden
+            
+            #line 63 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+           Write(AjaxHelpers.AjaxLoader());
+
+            
+            #line default
+            #line hidden
+            
+            #line 63 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                         
+                }
+                else
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 67 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+           Write(CommonHelpers.FriendlyDate(Model.DeviceModel.DefaultPurchaseDate, "Unknown"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 67 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                                                                             
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Default Warranty " +
+"Provider:\r\n            </th>\r\n            <td>");
+
+            
+            #line 74 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 76 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+           Write(Html.DropDownListFor(model => model.DeviceModel.DefaultWarrantyProvider, Model.WarrantyProviders.ToSelectListItems(Model.DeviceModel.DefaultWarrantyProvider, true, "None")));
+
+            
+            #line default
+            #line hidden
+            
+            #line 76 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                                                                                                                                                                             
+                
+            
+            #line default
+            #line hidden
+            
+            #line 77 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+           Write(AjaxHelpers.AjaxLoader());
+
+            
+            #line default
+            #line hidden
+            
+            #line 77 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                         
+                }
+                else
+                {
+                    if (Model.DeviceModel.DefaultWarrantyProvider == null)
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>\r\n");
+
+            
+            #line 84 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                    }
+                    else
+                    {
+                        var provider = Model.WarrantyProviders.FirstOrDefault(wp => wp.Id == Model.DeviceModel.DefaultWarrantyProvider);
+                        if (provider == null)
+                        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>\r\n");
+
+            
+            #line 91 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                        }
+                        else
+                        {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 94 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+           Write(provider.Name);
+
+            
+            #line default
+            #line hidden
+            
+            #line 94 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                              
+                        }
+                    }
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Type:\r\n          " +
+"  </th>\r\n            <td>\r\n");
+
+WriteLiteral("                ");
+
+            
+            #line 104 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+           Write(Html.DisplayFor(model => model.DeviceModel.ModelType));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Image:\r\n       " +
+"     </th>\r\n            <td>\r\n                <img");
+
+WriteLiteral(" alt=\"Model Image\"");
+
+WriteAttribute("src", Tuple.Create(" src=\"", 3910), Tuple.Create("\"", 4007)
+            
+            #line 111 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+, Tuple.Create(Tuple.Create("", 3916), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.DeviceModel.Id, Model.DeviceModel.ImageHash()))
+            
+            #line default
+            #line hidden
+, 3916), false)
+);
+
+WriteLiteral(" />\r\n            </td>\r\n        </tr>\r\n");
+
+            
+            #line 114 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 114 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+         if (canConfig)
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <tr>\r\n                <th>\r\n                    <label");
+
+WriteLiteral(" for=\"DeviceModel_Image\"");
+
+WriteLiteral(">\r\n                        Update Image:\r\n                    </label>\r\n         " +
+"       </th>\r\n                <td>\r\n");
+
+            
+            #line 123 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 123 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                     using (Html.BeginForm(MVC.API.DeviceModel.Image(Model.DeviceModel.Id, true, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <input");
 
 WriteLiteral(" type=\"file\"");
 
@@ -298,7 +463,7 @@ WriteLiteral(" style=\"width: 250px;\"");
 
 WriteLiteral(" />\r\n");
 
-WriteLiteral("                    <input");
+WriteLiteral("                        <input");
 
 WriteLiteral(" class=\"button\"");
 
@@ -309,164 +474,199 @@ WriteLiteral(" value=\"Update\"");
 WriteLiteral(" />\r\n");
 
             
-            #line 95 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-                }
+            #line 127 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                    }
 
             
             #line default
             #line hidden
-WriteLiteral("            </td>\r\n        </tr>\r\n    </table>\r\n    <script");
+WriteLiteral("                </td>\r\n            </tr>\r\n");
+
+            
+            #line 130 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    </table>\r\n");
+
+            
+            #line 132 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 132 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+     if (canConfig)
+    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-        $(function () {
-            var $Description = $('#DeviceModel_Description');
-            var $DescriptionAjaxSave = $Description.next('.ajaxSave');
-            $Description
-                    .watermark('Model Description')
-                    .focus(function () { $Description.select() })
-                    .keydown(function (e) {
-                        $DescriptionAjaxSave.show();
-                        if (e.which == 13) {
-                            $(this).blur();
-                        }
-                    }).blur(function () {
-                        $DescriptionAjaxSave.hide();
-                    })
-                    .change(function () {
-                        $DescriptionAjaxSave.hide();
-                        var $ajaxLoading = $DescriptionAjaxSave.next('.ajaxLoading').show();
-                        var data = { Description: $Description.val() };
-                        $.ajax({
-                            url: '");
+            $(function () {
+                var $Description = $('#DeviceModel_Description');
+                var $DescriptionAjaxSave = $Description.next('.ajaxSave');
+                $Description
+                        .watermark('Model Description')
+                        .focus(function () { $Description.select() })
+                        .keydown(function (e) {
+                            $DescriptionAjaxSave.show();
+                            if (e.which == 13) {
+                                $(this).blur();
+                            }
+                        }).blur(function () {
+                            $DescriptionAjaxSave.hide();
+                        })
+                        .change(function () {
+                            $DescriptionAjaxSave.hide();
+                            var $ajaxLoading = $DescriptionAjaxSave.next('.ajaxLoading').show();
+                            var data = { Description: $Description.val() };
+                            $.ajax({
+                                url: '");
 
             
-            #line 119 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-                             Write(Url.Action(MVC.API.DeviceModel.UpdateDescription(Model.DeviceModel.Id)));
+            #line 154 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                 Write(Url.Action(MVC.API.DeviceModel.UpdateDescription(Model.DeviceModel.Id)));
 
             
             #line default
             #line hidden
 WriteLiteral(@"',
-                            dataType: 'json',
-                            data: data,
-                            success: function (d) {
-                                if (d == 'OK') {
-                                    $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
-                                } else {
+                                dataType: 'json',
+                                data: data,
+                                success: function (d) {
+                                    if (d == 'OK') {
+                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                    } else {
+                                        $ajaxLoading.hide();
+                                        alert('Unable to update description: ' + d);
+                                    }
+                                },
+                                error: function (jqXHR, textStatus, errorThrown) {
+                                    alert('Unable to update description: ' + textStatus);
                                     $ajaxLoading.hide();
-                                    alert('Unable to update description: ' + d);
                                 }
-                            },
-                            error: function (jqXHR, textStatus, errorThrown) {
-                                alert('Unable to update description: ' + textStatus);
-                                $ajaxLoading.hide();
-                            }
+                            });
                         });
-                    });
-        });
-    </script>
-    <script");
+            });
+        </script>
+");
+
+WriteLiteral("        <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-        $(function () {
-            var $dataField = $('#DeviceModel_DefaultPurchaseDate');
-            var $ajaxLoading = $dataField.next('.ajaxLoading');
-            var dateFieldValue = $dataField.val();
-            var dateFieldChangeToken = null;
-            $dataField
-                .watermark('None')
-                .datepicker({
-                    changeYear: true,
-                    changeMonth: true,
-                    dateFormat: 'yy/mm/dd'
-                })
-                .change(function () {
-                    var dateText = $dataField.val();
-                    if (dateFieldValue.toLowerCase() != dateText.toLowerCase()) {
-                        dateFieldValue = dateText;
-                        if (dateFieldChangeToken)
-                            window.clearTimeout(dateFieldChangeToken);
-                        dateFieldChangeToken = window.setTimeout(function () {
-                            $ajaxLoading.show();
-                            var data = {};
-                            data['DefaultPurchaseDate'] = dateFieldValue;
-                            $.getJSON('");
+            $(function () {
+                var $dataField = $('#DeviceModel_DefaultPurchaseDate');
+                var $ajaxLoading = $dataField.next('.ajaxLoading');
+                var dateFieldValue = $dataField.val();
+                var dateFieldChangeToken = null;
+                $dataField
+                    .watermark('None')
+                    .datepicker({
+                        changeYear: true,
+                        changeMonth: true,
+                        dateFormat: 'yy/mm/dd'
+                    })
+                    .change(function () {
+                        var dateText = $dataField.val();
+                        if (dateFieldValue.toLowerCase() != dateText.toLowerCase()) {
+                            dateFieldValue = dateText;
+                            if (dateFieldChangeToken)
+                                window.clearTimeout(dateFieldChangeToken);
+                            dateFieldChangeToken = window.setTimeout(function () {
+                                $ajaxLoading.show();
+                                var data = {};
+                                data['DefaultPurchaseDate'] = dateFieldValue;
+                                $.getJSON('");
 
             
-            #line 161 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-                                   Write(Url.Action(MVC.API.DeviceModel.UpdateDefaultPurchaseDate(Model.DeviceModel.Id)));
+            #line 196 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                       Write(Url.Action(MVC.API.DeviceModel.UpdateDefaultPurchaseDate(Model.DeviceModel.Id)));
 
             
             #line default
             #line hidden
 WriteLiteral(@"', data, function (response, result) {
-                                if (result != 'success' || response != 'OK') {
-                                    alert('Unable to change Date:\n' + response);
-                                    $ajaxLoading.hide();
-                                } else {
-                                    $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
-                                }
-                            })
-                            dateFieldChangeToken = null;
-                        }, 500);
-                    }
-                }).focus(function () {
-                    $(this).select();
-                });
-        });
-    </script>
-    <script");
+                                    if (result != 'success' || response != 'OK') {
+                                        alert('Unable to change Date:\n' + response);
+                                        $ajaxLoading.hide();
+                                    } else {
+                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                    }
+                                })
+                                dateFieldChangeToken = null;
+                            }, 500);
+                        }
+                    }).focus(function () {
+                        $(this).select();
+                    });
+            });
+        </script>
+");
+
+WriteLiteral("        <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-        $(function () {
-            var $DefaultWarrantyProvider = $('#DeviceModel_DefaultWarrantyProvider');
-            var $ajaxLoading = $DefaultWarrantyProvider.next('.ajaxLoading');
-            $DefaultWarrantyProvider
-                    .change(function () {
-                        $ajaxLoading.show();
-                        var data = { DefaultWarrantyProvider: $DefaultWarrantyProvider.val() };
-                        $.ajax({
-                            url: '");
+            $(function () {
+                var $DefaultWarrantyProvider = $('#DeviceModel_DefaultWarrantyProvider');
+                var $ajaxLoading = $DefaultWarrantyProvider.next('.ajaxLoading');
+                $DefaultWarrantyProvider
+                        .change(function () {
+                            $ajaxLoading.show();
+                            var data = { DefaultWarrantyProvider: $DefaultWarrantyProvider.val() };
+                            $.ajax({
+                                url: '");
 
             
-            #line 186 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-                             Write(Url.Action(MVC.API.DeviceModel.UpdateDefaultWarrantyProvider(Model.DeviceModel.Id)));
+            #line 221 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                 Write(Url.Action(MVC.API.DeviceModel.UpdateDefaultWarrantyProvider(Model.DeviceModel.Id)));
 
             
             #line default
             #line hidden
 WriteLiteral(@"',
-                            dataType: 'json',
-                            data: data,
-                            success: function (d) {
-                                if (d == 'OK') {
-                                    $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
-                                } else {
+                                dataType: 'json',
+                                data: data,
+                                success: function (d) {
+                                    if (d == 'OK') {
+                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                    } else {
+                                        $ajaxLoading.hide();
+                                        alert('Unable to default warranty provider: ' + d);
+                                    }
+                                },
+                                error: function (jqXHR, textStatus, errorThrown) {
+                                    alert('Unable to default warranty provider: ' + textStatus);
                                     $ajaxLoading.hide();
-                                    alert('Unable to default warranty provider: ' + d);
                                 }
-                            },
-                            error: function (jqXHR, textStatus, errorThrown) {
-                                alert('Unable to default warranty provider: ' + textStatus);
-                                $ajaxLoading.hide();
-                            }
+                            });
                         });
-                    });
-        });
-    </script>
-</div>
-<h2>
-    Components</h2>
+            });
+        </script>
 ");
 
             
-            #line 208 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 240 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</div>\r\n<h2>Components</h2>\r\n");
+
+            
+            #line 243 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
 Write(Html.Partial(MVC.Config.DeviceModel.Views._DeviceComponentsTable, Model.DeviceComponentsModel));
 
             
@@ -479,28 +679,28 @@ WriteLiteral(" class=\"actionBar\"");
 WriteLiteral(">\r\n");
 
             
-            #line 210 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-     
+            #line 245 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+    
             
             #line default
             #line hidden
             
-            #line 210 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-      if (Model.CanDelete)
+            #line 245 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+     if (Model.CanDelete)
     { 
         
             
             #line default
             #line hidden
             
-            #line 212 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 247 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
    Write(Html.ActionLinkButton("Delete", MVC.API.DeviceModel.Delete(Model.DeviceModel.Id, true), "buttonDelete"));
 
             
             #line default
             #line hidden
             
-            #line 212 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+            #line 247 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
                                                                                                                 
     }
 
@@ -510,24 +710,49 @@ WriteLiteral(">\r\n");
 WriteLiteral("    ");
 
             
-            #line 214 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-Write(Html.ActionLinkButton("Export Devices", MVC.API.DeviceModel.ExportDevices(Model.DeviceModel.Id)));
+            #line 249 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+     if (Model.DeviceCount > 0)
+    {
+        if (Authorization.Has(Claims.Device.Actions.Export))
+        {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 253 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+   Write(Html.ActionLinkButton("Export Devices", MVC.API.DeviceModel.ExportDevices(Model.DeviceModel.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
             
-            #line 215 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
-Write(Html.ActionLinkButton("View Devices", MVC.Search.Query(Model.DeviceModel.Id.ToString(), "DeviceModel")));
+            #line 253 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                                                                                         
+        }
+        if (Authorization.Has(Claims.Device.Search))
+        {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 257 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+   Write(Html.ActionLinkButton("View Devices", MVC.Search.Query(Model.DeviceModel.Id.ToString(), "DeviceModel")));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>\r\n");
+            
+            #line 257 "..\..\Areas\Config\Views\DeviceModel\Show.cshtml"
+                                                                                                                
+        }
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</div>\r\n");
 
         }
     }
diff --git a/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.cshtml b/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.cshtml
index d5306cf4..a3f1e5e3 100644
--- a/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.cshtml
@@ -1,271 +1,312 @@
 @model Disco.Web.Areas.Config.Models.DeviceModel.ComponentsModel
 @{
+    Authorization.Require(Claims.Config.DeviceModel.Show);
+
+    var canConfig = Authorization.Has(Claims.Config.DeviceModel.ConfigureComponents);
+
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-jQueryExtensions");
 }
-<table id="deviceComponents" data-devicemodelid="@(Model.DeviceModelId.HasValue ? Model.DeviceModelId.Value.ToString() : string.Empty)">
-    <tr>
-        <th>
-            Description
-        </th>
-        <th>
-            Cost
-        </th>
-        <th>
-            Job Types
-        </th>
-        <th class="actions">
-            &nbsp;
-        </th>
-    </tr>
-    @foreach (var item in Model.DeviceComponents)
-    {
-        <tr data-devicecomponentid="@item.Id">
-            <td>
-                <input type="text" class="description" value="@item.Description" />
-            </td>
-            <td>
-                <input type="text" class="cost" value="@item.Cost.ToString("C")" />
-            </td>
-            <td>
-                <span class="edit@(item.JobSubTypes.Count > 0 ? " editAlert" : string.Empty)"></span>
-            </td>
-            <td>
-                <span class="remove"></span>
+@if (canConfig)
+{
+    <table id="deviceComponents" data-devicemodelid="@(Model.DeviceModelId.HasValue ? Model.DeviceModelId.Value.ToString() : string.Empty)">
+        <tr>
+            <th>Description
+            </th>
+            <th>Cost
+            </th>
+            <th>Job Types
+            </th>
+            <th class="actions">&nbsp;
+            </th>
+        </tr>
+        @foreach (var item in Model.DeviceComponents)
+        {
+            <tr data-devicecomponentid="@item.Id">
+                <td>
+                    <input type="text" class="description" value="@item.Description" />
+                </td>
+                <td>
+                    <input type="text" class="cost" value="@item.Cost.ToString("C")" />
+                </td>
+                <td>
+                    <span class="edit@(item.JobSubTypes.Count > 0 ? " editAlert" : string.Empty)"></span>
+                </td>
+                <td>
+                    <span class="remove"></span>
+                </td>
+            </tr>
+        }
+        <tr>
+            <td colspan="4">
+                <a href="#" id="addDeviceComponent">Add Component</a>
             </td>
         </tr>
-    }
-    <tr>
-        <td colspan="4">
-            <a href="#" id="addDeviceComponent">Add Component</a>
-        </td>
-    </tr>
-</table>
-<script type="text/javascript">
-    $(function () {
-        var $deviceComponents = $('#deviceComponents');
+    </table>
+    <script type="text/javascript">
+        $(function () {
+            var $deviceComponents = $('#deviceComponents');
 
-        $('#addDeviceComponent').click(function () {
-            var dc = $('<tr><td><input type="text" class="description" /></td><td><input type="text" class="cost" /></td><td><span class="edit"></span></td><td><span class="remove"></span></td></tr>');
-            dc.find('input').focus(function () { $(this).select() })
-            dc.insertBefore($deviceComponents.find('tr').last());
-            dc.find('input.description').focus();
-            return false;
-        });
+            $('#addDeviceComponent').click(function () {
+                var dc = $('<tr><td><input type="text" class="description" /></td><td><input type="text" class="cost" /></td><td><span class="edit"></span></td><td><span class="remove"></span></td></tr>');
+                dc.find('input').focus(function () { $(this).select() })
+                dc.insertBefore($deviceComponents.find('tr').last());
+                dc.find('input.description').focus();
+                return false;
+            });
 
-        $deviceComponents.on('change', 'input', updateComponent);
-        $deviceComponents.on('focus', 'input', function () { $(this).select(); });
+            $deviceComponents.on('change', 'input', updateComponent);
+            $deviceComponents.on('focus', 'input', function () { $(this).select(); });
 
-        $deviceComponents.on('click', 'span.remove', removeComponent);
-        $deviceComponents.on('click', 'span.edit', editComponentJobTypes);
+            $deviceComponents.on('click', 'span.remove', removeComponent);
+            $deviceComponents.on('click', 'span.edit', editComponentJobTypes);
 
-        function removeComponentConfirmed(id, row) {
-            var data = { id: id };
-            $.ajax({
-                url: '@Url.Action(MVC.API.DeviceModel.ComponentRemove())',
-                dataType: 'json',
-                data: data,
-                success: function (d) {
-                    if (d == 'OK') {
-                        row.remove();
-                    } else {
-                        alert('Unable to remove component: ' + d);
+            function removeComponentConfirmed(id, row) {
+                var data = { id: id };
+                $.ajax({
+                    url: '@Url.Action(MVC.API.DeviceModel.ComponentRemove())',
+                    dataType: 'json',
+                    data: data,
+                    success: function (d) {
+                        if (d == 'OK') {
+                            row.remove();
+                        } else {
+                            alert('Unable to remove component: ' + d);
+                        }
+                    },
+                    error: function (jqXHR, textStatus, errorThrown) {
+                        alert('Unable to remove component: ' + textStatus);
+                    }
+                });
+        }
+            function removeComponent() {
+                var componentRow = $(this).closest('tr');
+                var id = componentRow.attr('data-devicecomponentid');
+                if (id) {
+                    var dialog = $("#dialogConfirmRemove");
+                    var buttons = dialog.dialog("option", "buttons");
+                    buttons['Remove'] = function () { removeComponentConfirmed(id, componentRow); $(this).dialog("close"); };
+                    var buttons = dialog.dialog("option", "buttons", buttons);
+                    dialog.dialog('open');
+                } else {
+                    // New - Remove
+                    componentRow.remove();
+                }
+            }
+            function updateComponent() {
+                var componentRow = $(this).closest('tr');
+                componentRow.find('input').attr('disabled', true).addClass('updating');
+
+                var id = componentRow.attr('data-devicecomponentid');
+                if (id) {
+                    // Update
+                    var data = {
+                        id: id,
+                        Description: componentRow.find('input.description').val(),
+                        Cost: componentRow.find('input.cost').val()
+                    };
+                    $.ajax({
+                        url: '@Url.Action(MVC.API.DeviceModel.ComponentUpdate())',
+                        dataType: 'json',
+                        type: 'POST',
+                        data: data,
+                        success: function (d) {
+                            componentRow.find('input').attr('disabled', false).removeClass('updating');
+                            if (d.Result == 'OK') {
+                                componentRow.find('input.description').val(d.Component.Description);
+                                componentRow.find('input.cost').val(d.Component.Cost);
+                            } else {
+                                alert('Unable to update component: ' + d.Result);
+                            }
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            alert('Unable to update component: ' + textStatus);
+                        }
+                    });
+                } else {
+                    // Add
+                    id = componentRow.closest('table').attr('data-devicemodelid');
+                    var data = {
+                        id: id,
+                        Description: componentRow.find('input.description').val(),
+                        Cost: componentRow.find('input.cost').val()
+                    };
+                    $.ajax({
+                        url: '@Url.Action(MVC.API.DeviceModel.ComponentAdd(null, null, null))',
+                        dataType: 'json',
+                        type: 'POST',
+                        data: data,
+                        success: function (d) {
+                            componentRow.find('input').attr('disabled', false).removeClass('updating');
+                            if (d.Result == 'OK') {
+                                componentRow.attr('data-devicecomponentid', d.Component.Id);
+                                componentRow.find('input.description').val(d.Component.Description);
+                                componentRow.find('input.cost').val(d.Component.Cost);
+                            } else {
+                                alert('Unable to add component: ' + d.Result);
+                            }
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            alert('Unable to add component: ' + textStatus);
+                        }
+                    });
+                }
+            }
+            function editComponentJobTypes() {
+                var edit$this = $(this);
+                var componentRow = edit$this.closest('tr');
+
+                var id = componentRow.attr('data-devicecomponentid');
+
+                if (id) {
+                    var data = {
+                        id: id
+                    };
+                    $.ajax({
+                        url: '@Url.Action(MVC.API.DeviceModel.Component())',
+                        dataType: 'json',
+                        data: data,
+                        success: function (d) {
+                            componentRow.find('input').attr('disabled', false).removeClass('updating');
+                            if (d.Result == 'OK') {
+                                $dialogUpdateJobTypes = $('#dialogUpdateJobTypes');
+                                $dialogUpdateJobTypes.find('input:checked').each(function () { $(this).prop('checked', false) });
+                                for (var i = 0; i < d.Component.JobSubTypes.length; i++) {
+                                    var sjt = d.Component.JobSubTypes[i];
+                                    $dialogUpdateJobTypes.find('#SubTypes_' + sjt).prop('checked', true);
+                                }
+                                $('#CheckboxBulkSelect_dialogUpdateJobTypes').checkboxBulkSelect('update');
+                                var buttons = $dialogUpdateJobTypes.dialog("option", "buttons");
+                                buttons['Save'] = function () {
+                                    $dialogUpdateJobTypes.dialog("disable");
+                                    var selectedSJTs = [];
+                                    $dialogUpdateJobTypes.find('input:checked').each(function () { selectedSJTs.push($(this).val()) });
+
+                                    var data = {
+                                        id: id,
+                                        JobSubTypes: selectedSJTs
+                                    };
+                                    $.ajax({
+                                        url: '@Url.Action(MVC.API.DeviceModel.ComponentUpdateJobSubTypes())',
+                                        dataType: 'json',
+                                        type: 'POST',
+                                        traditional: true,
+                                        data: data,
+                                        success: function (d) {
+                                            if (d.Result == 'OK') {
+                                                if (d.Component.JobSubTypes.length > 0) {
+                                                    edit$this.addClass('editAlert');
+                                                } else {
+                                                    edit$this.removeClass('editAlert');
+                                                }
+                                                $dialogUpdateJobTypes.dialog("enable");
+                                                $dialogUpdateJobTypes.dialog("close");
+                                            } else {
+                                                alert('Unable to update component sub types: ' + d.Result);
+                                            }
+                                        },
+                                        error: function (jqXHR, textStatus, errorThrown) {
+                                            alert('Unable to update component sub types: ' + textStatus);
+                                        }
+                                    });
+                                };
+                                var buttons = $dialogUpdateJobTypes.dialog("option", "buttons", buttons);
+                                $dialogUpdateJobTypes.dialog('open');
+                            } else {
+                                alert('Unable to load component: ' + d.Result);
+                            }
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            alert('Unable to load component: ' + textStatus);
+                        }
+                    });
+                }
+
+            }
+
+            $("#dialogConfirmRemove").dialog({
+                resizable: false,
+                height: 140,
+                modal: true,
+                autoOpen: false,
+                buttons: {
+                    "Remove": function () {
+                        $(this).dialog("close");
+                    },
+                    Cancel: function () {
+                        $(this).dialog("close");
                     }
-                },
-                error: function (jqXHR, textStatus, errorThrown) {
-                    alert('Unable to remove component: ' + textStatus);
                 }
             });
-        }
-        function removeComponent() {
-            var componentRow = $(this).closest('tr');
-            var id = componentRow.attr('data-devicecomponentid');
-            if (id) {
-                var dialog = $("#dialogConfirmRemove");
-                var buttons = dialog.dialog("option", "buttons");
-                buttons['Remove'] = function () { removeComponentConfirmed(id, componentRow); $(this).dialog("close"); };
-                var buttons = dialog.dialog("option", "buttons", buttons);
-                dialog.dialog('open');
-            } else {
-                // New - Remove
-                componentRow.remove();
-            }
-        }
-        function updateComponent() {
-            var componentRow = $(this).closest('tr');
-            componentRow.find('input').attr('disabled', true).addClass('updating');
 
-            var id = componentRow.attr('data-devicecomponentid');
-            if (id) {
-                // Update
-                var data = {
-                    id: id,
-                    Description: componentRow.find('input.description').val(),
-                    Cost: componentRow.find('input.cost').val()
-                };
-                $.ajax({
-                    url: '@Url.Action(MVC.API.DeviceModel.ComponentUpdate())',
-                    dataType: 'json',
-                    type: 'POST',
-                    data: data,
-                    success: function (d) {
-                        componentRow.find('input').attr('disabled', false).removeClass('updating');
-                        if (d.Result == 'OK') {
-                            componentRow.find('input.description').val(d.Component.Description);
-                            componentRow.find('input.cost').val(d.Component.Cost);
-                        } else {
-                            alert('Unable to update component: ' + d.Result);
-                        }
+            $('#dialogUpdateJobTypes').dialog({
+                resizable: false,
+                modal: true,
+                autoOpen: false,
+                width: 550,
+                buttons: {
+                    "Save": function () {
+                        $(this).dialog("close");
                     },
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        alert('Unable to update component: ' + textStatus);
+                    Cancel: function () {
+                        $(this).dialog("close");
                     }
-                });
-            } else {
-                // Add
-                id = componentRow.closest('table').attr('data-devicemodelid');
-                var data = {
-                    id: id,
-                    Description: componentRow.find('input.description').val(),
-                    Cost: componentRow.find('input.cost').val()
-                };
-                $.ajax({
-                    url: '@Url.Action(MVC.API.DeviceModel.ComponentAdd(null, null, null))',
-                    dataType: 'json',
-                    type: 'POST',
-                    data: data,
-                    success: function (d) {
-                        componentRow.find('input').attr('disabled', false).removeClass('updating');
-                        if (d.Result == 'OK') {
-                            componentRow.attr('data-devicecomponentid', d.Component.Id);
-                            componentRow.find('input.description').val(d.Component.Description);
-                            componentRow.find('input.cost').val(d.Component.Cost);
-                        } else {
-                            alert('Unable to add component: ' + d.Result);
-                        }
-                    },
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        alert('Unable to add component: ' + textStatus);
-                    }
-                });
-            }
-        }
-        function editComponentJobTypes() {
-            var edit$this = $(this);
-            var componentRow = edit$this.closest('tr');
-
-            var id = componentRow.attr('data-devicecomponentid');
-
-            if (id) {
-                var data = {
-                    id: id
-                };
-                $.ajax({
-                    url: '@Url.Action(MVC.API.DeviceModel.Component())',
-                    dataType: 'json',
-                    data: data,
-                    success: function (d) {
-                        componentRow.find('input').attr('disabled', false).removeClass('updating');
-                        if (d.Result == 'OK') {
-                            $dialogUpdateJobTypes = $('#dialogUpdateJobTypes');
-                            $dialogUpdateJobTypes.find('input:checked').each(function () { $(this).prop('checked', false) });
-                            for (var i = 0; i < d.Component.JobSubTypes.length; i++) {
-                                var sjt = d.Component.JobSubTypes[i];
-                                $dialogUpdateJobTypes.find('#SubTypes_' + sjt).prop('checked', true);
-                            }
-                            $('#CheckboxBulkSelect_dialogUpdateJobTypes').checkboxBulkSelect('update');
-                            var buttons = $dialogUpdateJobTypes.dialog("option", "buttons");
-                            buttons['Save'] = function () {
-                                $dialogUpdateJobTypes.dialog("disable");
-                                var selectedSJTs = [];
-                                $dialogUpdateJobTypes.find('input:checked').each(function () { selectedSJTs.push($(this).val()) });
-
-                                var data = {
-                                    id: id,
-                                    JobSubTypes: selectedSJTs
-                                };
-                                $.ajax({
-                                    url: '@Url.Action(MVC.API.DeviceModel.ComponentUpdateJobSubTypes())',
-                                    dataType: 'json',
-                                    type: 'POST',
-                                    traditional: true,
-                                    data: data,
-                                    success: function (d) {
-                                        if (d.Result == 'OK') {
-                                            if (d.Component.JobSubTypes.length > 0) {
-                                                edit$this.addClass('editAlert');
-                                            } else {
-                                                edit$this.removeClass('editAlert');
-                                            }
-                                            $dialogUpdateJobTypes.dialog("enable");
-                                            $dialogUpdateJobTypes.dialog("close");
-                                        } else {
-                                            alert('Unable to update component sub types: ' + d.Result);
-                                        }
-                                    },
-                                    error: function (jqXHR, textStatus, errorThrown) {
-                                        alert('Unable to update component sub types: ' + textStatus);
-                                    }
-                                });
-                            };
-                            var buttons = $dialogUpdateJobTypes.dialog("option", "buttons", buttons);
-                            $dialogUpdateJobTypes.dialog('open');
-                        } else {
-                            alert('Unable to load component: ' + d.Result);
-                        }
-                    },
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        alert('Unable to load component: ' + textStatus);
-                    }
-                });
-            }
-
-        }
-
-        $("#dialogConfirmRemove").dialog({
-            resizable: false,
-            height: 140,
-            modal: true,
-            autoOpen: false,
-            buttons: {
-                "Remove": function () {
-                    $(this).dialog("close");
-                },
-                Cancel: function () {
-                    $(this).dialog("close");
                 }
-            }
-        });
+            });
 
-        $('#dialogUpdateJobTypes').dialog({
-            resizable: false,
-            modal: true,
-            autoOpen: false,
-            width: 550,
-            buttons: {
-                "Save": function () {
-                    $(this).dialog("close");
-                },
-                Cancel: function () {
-                    $(this).dialog("close");
-                }
-            }
+            $('#CheckboxBulkSelect_dialogUpdateJobTypes').checkboxBulkSelect({ parentSelector: 'div' });
         });
-
-        $('#CheckboxBulkSelect_dialogUpdateJobTypes').checkboxBulkSelect({ parentSelector: 'div' });
-    });
-</script>
-<div id="dialogUpdateJobTypes" title="Update Job Types">
-    <div>
-        <h2>
-            Hardware Non-Warranty Job Types</h2>
-        @CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.ToSelectListItems(), 2)
-        <br />
-        <span id="CheckboxBulkSelect_dialogUpdateJobTypes" class="checkboxBulkSelectContainer">
-        </span>
+    </script>
+    <div id="dialogUpdateJobTypes" title="Update Job Types">
+        <div>
+            <h2>Hardware Non-Warranty Job Types</h2>
+            @CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.ToSelectListItems(), 2)
+            <br />
+            <span id="CheckboxBulkSelect_dialogUpdateJobTypes" class="checkboxBulkSelectContainer"></span>
+        </div>
     </div>
-</div>
-<div id="dialogConfirmRemove" title="Delete this Component?">
-    <p>
-        <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
-        This item will be permanently deleted and cannot be recovered. Are you sure?</p>
-</div>
+    <div id="dialogConfirmRemove" title="Delete this Component?">
+        <p>
+            <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
+            This item will be permanently deleted and cannot be recovered. Are you sure?
+        </p>
+    </div>
+}
+else
+{
+    <table id="deviceComponents" data-devicemodelid="@(Model.DeviceModelId.HasValue ? Model.DeviceModelId.Value.ToString() : string.Empty)">
+        <tr>
+            <th>Description
+            </th>
+            <th>Cost
+            </th>
+            <th>Job Types
+            </th>
+        </tr>
+        @foreach (var item in Model.DeviceComponents)
+        {
+            <tr data-devicecomponentid="@item.Id">
+                <td>
+                    @item.Description
+                </td>
+                <td>
+                    @item.Cost.ToString("C")
+                </td>
+                <td>
+                    @if (item.JobSubTypes.Count > 0)
+                    {
+                        <ul>
+                            @foreach (var jst in item.JobSubTypes)
+                            {
+                                <li>@jst.Description</li>
+                            }
+                        </ul>
+                    }
+                    else
+                    {
+                        <span class="smallMessage">&lt;None Specified&gt;</span>
+                    }
+                </td>
+            </tr>
+        }
+    </table>
+}
\ No newline at end of file
diff --git a/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.generated.cs b/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.generated.cs
index 52326875..1328bf5d 100644
--- a/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DeviceModel
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.cshtml")]
-    public partial class DeviceComponentsTable : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceModel.ComponentsModel>
+    public partial class DeviceComponentsTable : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DeviceModel.ComponentsModel>
     {
         public DeviceComponentsTable()
         {
@@ -43,370 +45,564 @@ namespace Disco.Web.Areas.Config.Views.DeviceModel
             
             #line 2 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
   
+    Authorization.Require(Claims.Config.DeviceModel.Show);
+
+    var canConfig = Authorization.Has(Claims.Config.DeviceModel.ConfigureComponents);
+
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-jQueryExtensions");
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n<table");
+WriteLiteral("\r\n");
+
+            
+            #line 9 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+ if (canConfig)
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <table");
 
 WriteLiteral(" id=\"deviceComponents\"");
 
 WriteLiteral(" data-devicemodelid=\"");
 
             
-            #line 5 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-                                             Write(Model.DeviceModelId.HasValue ? Model.DeviceModelId.Value.ToString() : string.Empty);
+            #line 11 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                                                 Write(Model.DeviceModelId.HasValue ? Model.DeviceModelId.Value.ToString() : string.Empty);
 
             
             #line default
             #line hidden
 WriteLiteral("\"");
 
-WriteLiteral(">\r\n    <tr>\r\n        <th>\r\n            Description\r\n        </th>\r\n        <th>\r\n" +
-"            Cost\r\n        </th>\r\n        <th>\r\n            Job Types\r\n        </" +
-"th>\r\n        <th");
+WriteLiteral(">\r\n        <tr>\r\n            <th>Description\r\n            </th>\r\n            <th>" +
+"Cost\r\n            </th>\r\n            <th>Job Types\r\n            </th>\r\n         " +
+"   <th");
 
 WriteLiteral(" class=\"actions\"");
 
-WriteLiteral(">\r\n            &nbsp;\r\n        </th>\r\n    </tr>\r\n");
+WriteLiteral(">&nbsp;\r\n            </th>\r\n        </tr>\r\n");
 
             
-            #line 20 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-    
+            #line 22 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+        
             
             #line default
             #line hidden
             
-            #line 20 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-     foreach (var item in Model.DeviceComponents)
-    {
+            #line 22 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+         foreach (var item in Model.DeviceComponents)
+        {
 
             
             #line default
             #line hidden
-WriteLiteral("        <tr");
+WriteLiteral("            <tr");
 
 WriteLiteral(" data-devicecomponentid=\"");
 
             
-            #line 22 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-                               Write(item.Id);
+            #line 24 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                                   Write(item.Id);
 
             
             #line default
             #line hidden
 WriteLiteral("\"");
 
-WriteLiteral(">\r\n            <td>\r\n                <input");
+WriteLiteral(">\r\n                <td>\r\n                    <input");
 
 WriteLiteral(" type=\"text\"");
 
 WriteLiteral(" class=\"description\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 704), Tuple.Create("\"", 729)
+WriteAttribute("value", Tuple.Create(" value=\"", 883), Tuple.Create("\"", 908)
             
-            #line 24 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-, Tuple.Create(Tuple.Create("", 712), Tuple.Create<System.Object, System.Int32>(item.Description
+            #line 26 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+, Tuple.Create(Tuple.Create("", 891), Tuple.Create<System.Object, System.Int32>(item.Description
             
             #line default
             #line hidden
-, 712), false)
+, 891), false)
 );
 
-WriteLiteral(" />\r\n            </td>\r\n            <td>\r\n                <input");
+WriteLiteral(" />\r\n                </td>\r\n                <td>\r\n                    <input");
 
 WriteLiteral(" type=\"text\"");
 
 WriteLiteral(" class=\"cost\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 819), Tuple.Create("\"", 851)
+WriteAttribute("value", Tuple.Create(" value=\"", 1010), Tuple.Create("\"", 1042)
             
-            #line 27 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-, Tuple.Create(Tuple.Create("", 827), Tuple.Create<System.Object, System.Int32>(item.Cost.ToString("C")
+            #line 29 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+, Tuple.Create(Tuple.Create("", 1018), Tuple.Create<System.Object, System.Int32>(item.Cost.ToString("C")
             
             #line default
             #line hidden
-, 827), false)
+, 1018), false)
 );
 
-WriteLiteral(" />\r\n            </td>\r\n            <td>\r\n                <span");
+WriteLiteral(" />\r\n                </td>\r\n                <td>\r\n                    <span");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 915), Tuple.Create("\"", 986)
-, Tuple.Create(Tuple.Create("", 923), Tuple.Create("edit", 923), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 1118), Tuple.Create("\"", 1189)
+, Tuple.Create(Tuple.Create("", 1126), Tuple.Create("edit", 1126), true)
             
-            #line 30 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-, Tuple.Create(Tuple.Create("", 927), Tuple.Create<System.Object, System.Int32>(item.JobSubTypes.Count > 0 ? " editAlert" : string.Empty
+            #line 32 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+, Tuple.Create(Tuple.Create("", 1130), Tuple.Create<System.Object, System.Int32>(item.JobSubTypes.Count > 0 ? " editAlert" : string.Empty
             
             #line default
             #line hidden
-, 927), false)
+, 1130), false)
 );
 
-WriteLiteral("></span>\r\n            </td>\r\n            <td>\r\n                <span");
+WriteLiteral("></span>\r\n                </td>\r\n                <td>\r\n                    <span");
 
 WriteLiteral(" class=\"remove\"");
 
-WriteLiteral("></span>\r\n            </td>\r\n        </tr>\r\n");
+WriteLiteral("></span>\r\n                </td>\r\n            </tr>\r\n");
 
             
-            #line 36 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-    }
+            #line 38 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+        }
 
             
             #line default
             #line hidden
-WriteLiteral("    <tr>\r\n        <td");
+WriteLiteral("        <tr>\r\n            <td");
 
 WriteLiteral(" colspan=\"4\"");
 
-WriteLiteral(">\r\n            <a");
+WriteLiteral(">\r\n                <a");
 
 WriteLiteral(" href=\"#\"");
 
 WriteLiteral(" id=\"addDeviceComponent\"");
 
-WriteLiteral(">Add Component</a>\r\n        </td>\r\n    </tr>\r\n</table>\r\n<script");
+WriteLiteral(">Add Component</a>\r\n            </td>\r\n        </tr>\r\n    </table>\r\n");
+
+WriteLiteral("    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-    $(function () {
-        var $deviceComponents = $('#deviceComponents');
+        $(function () {
+            var $deviceComponents = $('#deviceComponents');
 
-        $('#addDeviceComponent').click(function () {
-            var dc = $('<tr><td><input type=""text"" class=""description"" /></td><td><input type=""text"" class=""cost"" /></td><td><span class=""edit""></span></td><td><span class=""remove""></span></td></tr>');
-            dc.find('input').focus(function () { $(this).select() })
-            dc.insertBefore($deviceComponents.find('tr').last());
-            dc.find('input.description').focus();
-            return false;
-        });
+            $('#addDeviceComponent').click(function () {
+                var dc = $('<tr><td><input type=""text"" class=""description"" /></td><td><input type=""text"" class=""cost"" /></td><td><span class=""edit""></span></td><td><span class=""remove""></span></td></tr>');
+                dc.find('input').focus(function () { $(this).select() })
+                dc.insertBefore($deviceComponents.find('tr').last());
+                dc.find('input.description').focus();
+                return false;
+            });
 
-        $deviceComponents.on('change', 'input', updateComponent);
-        $deviceComponents.on('focus', 'input', function () { $(this).select(); });
+            $deviceComponents.on('change', 'input', updateComponent);
+            $deviceComponents.on('focus', 'input', function () { $(this).select(); });
 
-        $deviceComponents.on('click', 'span.remove', removeComponent);
-        $deviceComponents.on('click', 'span.edit', editComponentJobTypes);
+            $deviceComponents.on('click', 'span.remove', removeComponent);
+            $deviceComponents.on('click', 'span.edit', editComponentJobTypes);
 
-        function removeComponentConfirmed(id, row) {
-            var data = { id: id };
-            $.ajax({
-                url: '");
-
-            
-            #line 64 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-                 Write(Url.Action(MVC.API.DeviceModel.ComponentRemove()));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\',\r\n                dataType: \'json\',\r\n                data: data,\r\n             " +
-"   success: function (d) {\r\n                    if (d == \'OK\') {\r\n              " +
-"          row.remove();\r\n                    } else {\r\n                        a" +
-"lert(\'Unable to remove component: \' + d);\r\n                    }\r\n              " +
-"  },\r\n                error: function (jqXHR, textStatus, errorThrown) {\r\n      " +
-"              alert(\'Unable to remove component: \' + textStatus);\r\n             " +
-"   }\r\n            });\r\n        }\r\n        function removeComponent() {\r\n        " +
-"    var componentRow = $(this).closest(\'tr\');\r\n            var id = componentRow" +
-".attr(\'data-devicecomponentid\');\r\n            if (id) {\r\n                var dia" +
-"log = $(\"#dialogConfirmRemove\");\r\n                var buttons = dialog.dialog(\"o" +
-"ption\", \"buttons\");\r\n                buttons[\'Remove\'] = function () { removeCom" +
-"ponentConfirmed(id, componentRow); $(this).dialog(\"close\"); };\r\n                " +
-"var buttons = dialog.dialog(\"option\", \"buttons\", buttons);\r\n                dial" +
-"og.dialog(\'open\');\r\n            } else {\r\n                // New - Remove\r\n     " +
-"           componentRow.remove();\r\n            }\r\n        }\r\n        function up" +
-"dateComponent() {\r\n            var componentRow = $(this).closest(\'tr\');\r\n      " +
-"      componentRow.find(\'input\').attr(\'disabled\', true).addClass(\'updating\');\r\n\r" +
-"\n            var id = componentRow.attr(\'data-devicecomponentid\');\r\n            " +
-"if (id) {\r\n                // Update\r\n                var data = {\r\n            " +
-"        id: id,\r\n                    Description: componentRow.find(\'input.descr" +
-"iption\').val(),\r\n                    Cost: componentRow.find(\'input.cost\').val()" +
-"\r\n                };\r\n                $.ajax({\r\n                    url: \'");
-
-            
-            #line 106 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-                     Write(Url.Action(MVC.API.DeviceModel.ComponentUpdate()));
-
-            
-            #line default
-            #line hidden
-WriteLiteral(@"',
-                    dataType: 'json',
-                    type: 'POST',
-                    data: data,
-                    success: function (d) {
-                        componentRow.find('input').attr('disabled', false).removeClass('updating');
-                        if (d.Result == 'OK') {
-                            componentRow.find('input.description').val(d.Component.Description);
-                            componentRow.find('input.cost').val(d.Component.Cost);
-                        } else {
-                            alert('Unable to update component: ' + d.Result);
-                        }
-                    },
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        alert('Unable to update component: ' + textStatus);
-                    }
-                });
-            } else {
-                // Add
-                id = componentRow.closest('table').attr('data-devicemodelid');
-                var data = {
-                    id: id,
-                    Description: componentRow.find('input.description').val(),
-                    Cost: componentRow.find('input.cost').val()
-                };
+            function removeComponentConfirmed(id, row) {
+                var data = { id: id };
                 $.ajax({
                     url: '");
 
             
-            #line 132 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-                     Write(Url.Action(MVC.API.DeviceModel.ComponentAdd(null, null, null)));
-
-            
-            #line default
-            #line hidden
-WriteLiteral(@"',
-                    dataType: 'json',
-                    type: 'POST',
-                    data: data,
-                    success: function (d) {
-                        componentRow.find('input').attr('disabled', false).removeClass('updating');
-                        if (d.Result == 'OK') {
-                            componentRow.attr('data-devicecomponentid', d.Component.Id);
-                            componentRow.find('input.description').val(d.Component.Description);
-                            componentRow.find('input.cost').val(d.Component.Cost);
-                        } else {
-                            alert('Unable to add component: ' + d.Result);
-                        }
-                    },
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        alert('Unable to add component: ' + textStatus);
-                    }
-                });
-            }
-        }
-        function editComponentJobTypes() {
-            var edit$this = $(this);
-            var componentRow = edit$this.closest('tr');
-
-            var id = componentRow.attr('data-devicecomponentid');
-
-            if (id) {
-                var data = {
-                    id: id
-                };
-                $.ajax({
-                    url: '");
-
-            
-            #line 163 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-                     Write(Url.Action(MVC.API.DeviceModel.Component()));
+            #line 66 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                     Write(Url.Action(MVC.API.DeviceModel.ComponentRemove()));
 
             
             #line default
             #line hidden
 WriteLiteral("\',\r\n                    dataType: \'json\',\r\n                    data: data,\r\n     " +
-"               success: function (d) {\r\n                        componentRow.fin" +
-"d(\'input\').attr(\'disabled\', false).removeClass(\'updating\');\r\n                   " +
-"     if (d.Result == \'OK\') {\r\n                            $dialogUpdateJobTypes " +
-"= $(\'#dialogUpdateJobTypes\');\r\n                            $dialogUpdateJobTypes" +
-".find(\'input:checked\').each(function () { $(this).prop(\'checked\', false) });\r\n  " +
-"                          for (var i = 0; i < d.Component.JobSubTypes.length; i+" +
-"+) {\r\n                                var sjt = d.Component.JobSubTypes[i];\r\n   " +
-"                             $dialogUpdateJobTypes.find(\'#SubTypes_\' + sjt).prop" +
-"(\'checked\', true);\r\n                            }\r\n                            $" +
-"(\'#CheckboxBulkSelect_dialogUpdateJobTypes\').checkboxBulkSelect(\'update\');\r\n    " +
-"                        var buttons = $dialogUpdateJobTypes.dialog(\"option\", \"bu" +
-"ttons\");\r\n                            buttons[\'Save\'] = function () {\r\n         " +
-"                       $dialogUpdateJobTypes.dialog(\"disable\");\r\n               " +
-"                 var selectedSJTs = [];\r\n                                $dialog" +
-"UpdateJobTypes.find(\'input:checked\').each(function () { selectedSJTs.push($(this" +
-").val()) });\r\n\r\n                                var data = {\r\n                  " +
-"                  id: id,\r\n                                    JobSubTypes: sele" +
-"ctedSJTs\r\n                                };\r\n                                $." +
-"ajax({\r\n                                    url: \'");
+"               success: function (d) {\r\n                        if (d == \'OK\') {" +
+"\r\n                            row.remove();\r\n                        } else {\r\n " +
+"                           alert(\'Unable to remove component: \' + d);\r\n         " +
+"               }\r\n                    },\r\n                    error: function (j" +
+"qXHR, textStatus, errorThrown) {\r\n                        alert(\'Unable to remov" +
+"e component: \' + textStatus);\r\n                    }\r\n                });\r\n     " +
+"   }\r\n            function removeComponent() {\r\n                var componentRow" +
+" = $(this).closest(\'tr\');\r\n                var id = componentRow.attr(\'data-devi" +
+"cecomponentid\');\r\n                if (id) {\r\n                    var dialog = $(" +
+"\"#dialogConfirmRemove\");\r\n                    var buttons = dialog.dialog(\"optio" +
+"n\", \"buttons\");\r\n                    buttons[\'Remove\'] = function () { removeCom" +
+"ponentConfirmed(id, componentRow); $(this).dialog(\"close\"); };\r\n                " +
+"    var buttons = dialog.dialog(\"option\", \"buttons\", buttons);\r\n                " +
+"    dialog.dialog(\'open\');\r\n                } else {\r\n                    // New" +
+" - Remove\r\n                    componentRow.remove();\r\n                }\r\n      " +
+"      }\r\n            function updateComponent() {\r\n                var component" +
+"Row = $(this).closest(\'tr\');\r\n                componentRow.find(\'input\').attr(\'d" +
+"isabled\', true).addClass(\'updating\');\r\n\r\n                var id = componentRow.a" +
+"ttr(\'data-devicecomponentid\');\r\n                if (id) {\r\n                    /" +
+"/ Update\r\n                    var data = {\r\n                        id: id,\r\n   " +
+"                     Description: componentRow.find(\'input.description\').val(),\r" +
+"\n                        Cost: componentRow.find(\'input.cost\').val()\r\n          " +
+"          };\r\n                    $.ajax({\r\n                        url: \'");
 
             
-            #line 187 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-                                     Write(Url.Action(MVC.API.DeviceModel.ComponentUpdateJobSubTypes()));
+            #line 108 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                         Write(Url.Action(MVC.API.DeviceModel.ComponentUpdate()));
 
             
             #line default
             #line hidden
-WriteLiteral("\',\r\n                                    dataType: \'json\',\r\n                      " +
-"              type: \'POST\',\r\n                                    traditional: tr" +
-"ue,\r\n                                    data: data,\r\n                          " +
-"          success: function (d) {\r\n                                        if (d" +
-".Result == \'OK\') {\r\n                                            if (d.Component." +
-"JobSubTypes.length > 0) {\r\n                                                edit$" +
-"this.addClass(\'editAlert\');\r\n                                            } else " +
-"{\r\n                                                edit$this.removeClass(\'editAl" +
-"ert\');\r\n                                            }\r\n                         " +
-"                   $dialogUpdateJobTypes.dialog(\"enable\");\r\n                    " +
-"                        $dialogUpdateJobTypes.dialog(\"close\");\r\n                " +
-"                        } else {\r\n                                            al" +
-"ert(\'Unable to update component sub types: \' + d.Result);\r\n                     " +
-"                   }\r\n                                    },\r\n                  " +
-"                  error: function (jqXHR, textStatus, errorThrown) {\r\n          " +
-"                              alert(\'Unable to update component sub types: \' + t" +
-"extStatus);\r\n                                    }\r\n                            " +
-"    });\r\n                            };\r\n                            var buttons" +
-" = $dialogUpdateJobTypes.dialog(\"option\", \"buttons\", buttons);\r\n                " +
-"            $dialogUpdateJobTypes.dialog(\'open\');\r\n                        } els" +
-"e {\r\n                            alert(\'Unable to load component: \' + d.Result);" +
-"\r\n                        }\r\n                    },\r\n                    error: " +
-"function (jqXHR, textStatus, errorThrown) {\r\n                        alert(\'Unab" +
-"le to load component: \' + textStatus);\r\n                    }\r\n                }" +
-");\r\n            }\r\n\r\n        }\r\n\r\n        $(\"#dialogConfirmRemove\").dialog({\r\n  " +
-"          resizable: false,\r\n            height: 140,\r\n            modal: true,\r" +
-"\n            autoOpen: false,\r\n            buttons: {\r\n                \"Remove\":" +
-" function () {\r\n                    $(this).dialog(\"close\");\r\n                }," +
-"\r\n                Cancel: function () {\r\n                    $(this).dialog(\"clo" +
-"se\");\r\n                }\r\n            }\r\n        });\r\n\r\n        $(\'#dialogUpdate" +
-"JobTypes\').dialog({\r\n            resizable: false,\r\n            modal: true,\r\n  " +
-"          autoOpen: false,\r\n            width: 550,\r\n            buttons: {\r\n   " +
-"             \"Save\": function () {\r\n                    $(this).dialog(\"close\");" +
-"\r\n                },\r\n                Cancel: function () {\r\n                   " +
-" $(this).dialog(\"close\");\r\n                }\r\n            }\r\n        });\r\n\r\n    " +
-"    $(\'#CheckboxBulkSelect_dialogUpdateJobTypes\').checkboxBulkSelect({ parentSel" +
-"ector: \'div\' });\r\n    });\r\n</script>\r\n<div");
+WriteLiteral(@"',
+                        dataType: 'json',
+                        type: 'POST',
+                        data: data,
+                        success: function (d) {
+                            componentRow.find('input').attr('disabled', false).removeClass('updating');
+                            if (d.Result == 'OK') {
+                                componentRow.find('input.description').val(d.Component.Description);
+                                componentRow.find('input.cost').val(d.Component.Cost);
+                            } else {
+                                alert('Unable to update component: ' + d.Result);
+                            }
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            alert('Unable to update component: ' + textStatus);
+                        }
+                    });
+                } else {
+                    // Add
+                    id = componentRow.closest('table').attr('data-devicemodelid');
+                    var data = {
+                        id: id,
+                        Description: componentRow.find('input.description').val(),
+                        Cost: componentRow.find('input.cost').val()
+                    };
+                    $.ajax({
+                        url: '");
+
+            
+            #line 134 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                         Write(Url.Action(MVC.API.DeviceModel.ComponentAdd(null, null, null)));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"',
+                        dataType: 'json',
+                        type: 'POST',
+                        data: data,
+                        success: function (d) {
+                            componentRow.find('input').attr('disabled', false).removeClass('updating');
+                            if (d.Result == 'OK') {
+                                componentRow.attr('data-devicecomponentid', d.Component.Id);
+                                componentRow.find('input.description').val(d.Component.Description);
+                                componentRow.find('input.cost').val(d.Component.Cost);
+                            } else {
+                                alert('Unable to add component: ' + d.Result);
+                            }
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            alert('Unable to add component: ' + textStatus);
+                        }
+                    });
+                }
+            }
+            function editComponentJobTypes() {
+                var edit$this = $(this);
+                var componentRow = edit$this.closest('tr');
+
+                var id = componentRow.attr('data-devicecomponentid');
+
+                if (id) {
+                    var data = {
+                        id: id
+                    };
+                    $.ajax({
+                        url: '");
+
+            
+            #line 165 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                         Write(Url.Action(MVC.API.DeviceModel.Component()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\',\r\n                        dataType: \'json\',\r\n                        data: data" +
+",\r\n                        success: function (d) {\r\n                            " +
+"componentRow.find(\'input\').attr(\'disabled\', false).removeClass(\'updating\');\r\n   " +
+"                         if (d.Result == \'OK\') {\r\n                              " +
+"  $dialogUpdateJobTypes = $(\'#dialogUpdateJobTypes\');\r\n                         " +
+"       $dialogUpdateJobTypes.find(\'input:checked\').each(function () { $(this).pr" +
+"op(\'checked\', false) });\r\n                                for (var i = 0; i < d." +
+"Component.JobSubTypes.length; i++) {\r\n                                    var sj" +
+"t = d.Component.JobSubTypes[i];\r\n                                    $dialogUpda" +
+"teJobTypes.find(\'#SubTypes_\' + sjt).prop(\'checked\', true);\r\n                    " +
+"            }\r\n                                $(\'#CheckboxBulkSelect_dialogUpda" +
+"teJobTypes\').checkboxBulkSelect(\'update\');\r\n                                var " +
+"buttons = $dialogUpdateJobTypes.dialog(\"option\", \"buttons\");\r\n                  " +
+"              buttons[\'Save\'] = function () {\r\n                                 " +
+"   $dialogUpdateJobTypes.dialog(\"disable\");\r\n                                   " +
+" var selectedSJTs = [];\r\n                                    $dialogUpdateJobTyp" +
+"es.find(\'input:checked\').each(function () { selectedSJTs.push($(this).val()) });" +
+"\r\n\r\n                                    var data = {\r\n                          " +
+"              id: id,\r\n                                        JobSubTypes: sele" +
+"ctedSJTs\r\n                                    };\r\n                              " +
+"      $.ajax({\r\n                                        url: \'");
+
+            
+            #line 189 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                                         Write(Url.Action(MVC.API.DeviceModel.ComponentUpdateJobSubTypes()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\',\r\n                                        dataType: \'json\',\r\n                  " +
+"                      type: \'POST\',\r\n                                        tra" +
+"ditional: true,\r\n                                        data: data,\r\n          " +
+"                              success: function (d) {\r\n                         " +
+"                   if (d.Result == \'OK\') {\r\n                                    " +
+"            if (d.Component.JobSubTypes.length > 0) {\r\n                         " +
+"                           edit$this.addClass(\'editAlert\');\r\n                   " +
+"                             } else {\r\n                                         " +
+"           edit$this.removeClass(\'editAlert\');\r\n                                " +
+"                }\r\n                                                $dialogUpdate" +
+"JobTypes.dialog(\"enable\");\r\n                                                $dia" +
+"logUpdateJobTypes.dialog(\"close\");\r\n                                            " +
+"} else {\r\n                                                alert(\'Unable to updat" +
+"e component sub types: \' + d.Result);\r\n                                         " +
+"   }\r\n                                        },\r\n                              " +
+"          error: function (jqXHR, textStatus, errorThrown) {\r\n                  " +
+"                          alert(\'Unable to update component sub types: \' + textS" +
+"tatus);\r\n                                        }\r\n                            " +
+"        });\r\n                                };\r\n                               " +
+" var buttons = $dialogUpdateJobTypes.dialog(\"option\", \"buttons\", buttons);\r\n    " +
+"                            $dialogUpdateJobTypes.dialog(\'open\');\r\n             " +
+"               } else {\r\n                                alert(\'Unable to load c" +
+"omponent: \' + d.Result);\r\n                            }\r\n                       " +
+" },\r\n                        error: function (jqXHR, textStatus, errorThrown) {\r" +
+"\n                            alert(\'Unable to load component: \' + textStatus);\r\n" +
+"                        }\r\n                    });\r\n                }\r\n\r\n       " +
+"     }\r\n\r\n            $(\"#dialogConfirmRemove\").dialog({\r\n                resiza" +
+"ble: false,\r\n                height: 140,\r\n                modal: true,\r\n       " +
+"         autoOpen: false,\r\n                buttons: {\r\n                    \"Remo" +
+"ve\": function () {\r\n                        $(this).dialog(\"close\");\r\n          " +
+"          },\r\n                    Cancel: function () {\r\n                       " +
+" $(this).dialog(\"close\");\r\n                    }\r\n                }\r\n           " +
+" });\r\n\r\n            $(\'#dialogUpdateJobTypes\').dialog({\r\n                resizab" +
+"le: false,\r\n                modal: true,\r\n                autoOpen: false,\r\n    " +
+"            width: 550,\r\n                buttons: {\r\n                    \"Save\":" +
+" function () {\r\n                        $(this).dialog(\"close\");\r\n              " +
+"      },\r\n                    Cancel: function () {\r\n                        $(t" +
+"his).dialog(\"close\");\r\n                    }\r\n                }\r\n            });" +
+"\r\n\r\n            $(\'#CheckboxBulkSelect_dialogUpdateJobTypes\').checkboxBulkSelect" +
+"({ parentSelector: \'div\' });\r\n        });\r\n    </script>\r\n");
+
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"dialogUpdateJobTypes\"");
 
 WriteLiteral(" title=\"Update Job Types\"");
 
-WriteLiteral(">\r\n    <div>\r\n        <h2>\r\n            Hardware Non-Warranty Job Types</h2>\r\n");
+WriteLiteral(">\r\n        <div>\r\n            <h2>Hardware Non-Warranty Job Types</h2>\r\n");
 
-WriteLiteral("        ");
+WriteLiteral("            ");
 
             
-            #line 261 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
-   Write(CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.ToSelectListItems(), 2));
+            #line 262 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+       Write(CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.ToSelectListItems(), 2));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n        <br />\r\n        <span");
+WriteLiteral("\r\n            <br />\r\n            <span");
 
 WriteLiteral(" id=\"CheckboxBulkSelect_dialogUpdateJobTypes\"");
 
 WriteLiteral(" class=\"checkboxBulkSelectContainer\"");
 
-WriteLiteral(">\r\n        </span>\r\n    </div>\r\n</div>\r\n<div");
+WriteLiteral("></span>\r\n        </div>\r\n    </div>\r\n");
+
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"dialogConfirmRemove\"");
 
 WriteLiteral(" title=\"Delete this Component?\"");
 
-WriteLiteral(">\r\n    <p>\r\n        <span");
+WriteLiteral(">\r\n        <p>\r\n            <span");
 
 WriteLiteral(" class=\"ui-icon ui-icon-alert\"");
 
 WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\"");
 
-WriteLiteral("></span>\r\n        This item will be permanently deleted and cannot be recovered. " +
-"Are you sure?</p>\r\n</div>\r\n");
+WriteLiteral("></span>\r\n            This item will be permanently deleted and cannot be recover" +
+"ed. Are you sure?\r\n        </p>\r\n    </div>\r\n");
 
+            
+            #line 273 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+}
+else
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <table");
+
+WriteLiteral(" id=\"deviceComponents\"");
+
+WriteLiteral(" data-devicemodelid=\"");
+
+            
+            #line 276 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                                                 Write(Model.DeviceModelId.HasValue ? Model.DeviceModelId.Value.ToString() : string.Empty);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\"");
+
+WriteLiteral(">\r\n        <tr>\r\n            <th>Description\r\n            </th>\r\n            <th>" +
+"Cost\r\n            </th>\r\n            <th>Job Types\r\n            </th>\r\n        <" +
+"/tr>\r\n");
+
+            
+            #line 285 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 285 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+         foreach (var item in Model.DeviceComponents)
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <tr");
+
+WriteLiteral(" data-devicecomponentid=\"");
+
+            
+            #line 287 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                                   Write(item.Id);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\"");
+
+WriteLiteral(">\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 289 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+               Write(item.Description);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </td>\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 292 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+               Write(item.Cost.ToString("C"));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </td>\r\n                <td>\r\n");
+
+            
+            #line 295 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 295 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                     if (item.JobSubTypes.Count > 0)
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <ul>\r\n");
+
+            
+            #line 298 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 298 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                             foreach (var jst in item.JobSubTypes)
+                            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <li>");
+
+            
+            #line 300 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                               Write(jst.Description);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</li>\r\n");
+
+            
+            #line 301 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </ul>\r\n");
+
+            
+            #line 303 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                    }
+                    else
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>\r\n");
+
+            
+            #line 307 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </td>\r\n            </tr>\r\n");
+
+            
+            #line 310 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    </table>\r\n");
+
+            
+            #line 312 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+}
+            
+            #line default
+            #line hidden
         }
     }
 }
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/Create.cshtml b/Disco.Web/Areas/Config/Views/DeviceProfile/Create.cshtml
index 38eafefd..a49250ac 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/Create.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/Create.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Areas.Config.Models.DeviceProfile.CreateModel
 @{
+    Authorization.RequireAll(Claims.Config.DeviceProfile.Create, Claims.Config.DeviceProfile.Configure);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Profiles", MVC.Config.DeviceProfile.Index(null), "Create");
 }
 @using (Html.BeginForm())
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/Create.generated.cs b/Disco.Web/Areas/Config/Views/DeviceProfile/Create.generated.cs
index 9af139e0..71f7e9b6 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/Create.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/Create.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceProfile/Create.cshtml")]
-    public partial class Create : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceProfile.CreateModel>
+    public partial class Create : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DeviceProfile.CreateModel>
     {
         public Create()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
             
             #line 2 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
   
+    Authorization.RequireAll(Claims.Config.DeviceProfile.Create, Claims.Config.DeviceProfile.Configure);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Profiles", MVC.Config.DeviceProfile.Index(null), "Create");
 
             
@@ -51,7 +55,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
 WriteLiteral("\r\n");
 
             
-            #line 5 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
+            #line 7 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
  using (Html.BeginForm())
 { 
     
@@ -59,14 +63,14 @@ WriteLiteral("\r\n");
             #line default
             #line hidden
             
-            #line 7 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
+            #line 9 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
 Write(Html.ValidationSummary(false));
 
             
             #line default
             #line hidden
             
-            #line 7 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
+            #line 9 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
                                   
 
             
@@ -84,7 +88,7 @@ WriteLiteral(">\r\n        <table>\r\n            <tr>\r\n                <th>\r
 WriteLiteral("                ");
 
             
-            #line 15 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
+            #line 17 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
            Write(Html.TextBoxFor(model => model.DeviceProfile.Name));
 
             
@@ -93,7 +97,7 @@ WriteLiteral("                ");
 WriteLiteral("<br />");
 
             
-            #line 15 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
+            #line 17 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
                                                                     Write(Html.ValidationMessageFor(model => model.DeviceProfile.Name));
 
             
@@ -103,7 +107,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 ">\r\n                    Short Name:\r\n                </th>\r\n                <td>");
 
             
-            #line 22 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
+            #line 24 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
                Write(Html.TextBoxFor(model => model.DeviceProfile.ShortName));
 
             
@@ -112,7 +116,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 WriteLiteral("<br />");
 
             
-            #line 22 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
+            #line 24 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
                                                                              Write(Html.ValidationMessageFor(model => model.DeviceProfile.ShortName));
 
             
@@ -123,7 +127,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 "");
 
             
-            #line 29 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
+            #line 31 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
                Write(Html.TextBoxFor(model => model.DeviceProfile.Description));
 
             
@@ -132,7 +136,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 WriteLiteral("<br />");
 
             
-            #line 29 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
+            #line 31 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
                                                                                Write(Html.ValidationMessageFor(model => model.DeviceProfile.Description));
 
             
@@ -143,7 +147,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n        </table>
 WriteLiteral("        ");
 
             
-            #line 33 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
+            #line 35 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
    Write(Html.HiddenFor(model => model.DeviceProfile.ComputerNameTemplate));
 
             
@@ -154,7 +158,7 @@ WriteLiteral("\r\n");
 WriteLiteral("        ");
 
             
-            #line 34 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
+            #line 36 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
    Write(Html.HiddenFor(model => model.DeviceProfile.ProvisionADAccount));
 
             
@@ -165,7 +169,7 @@ WriteLiteral("\r\n");
 WriteLiteral("        ");
 
             
-            #line 35 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
+            #line 37 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
    Write(Html.HiddenFor(model => model.DeviceProfile.DistributionType));
 
             
@@ -193,7 +197,7 @@ WriteLiteral(">\r\n        $(function () {\r\n            $(\'#Name\').focus().s
 "\r\n    </script>\r\n");
 
             
-            #line 45 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
+            #line 47 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
 }
 
             
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/Defaults.cshtml b/Disco.Web/Areas/Config/Views/DeviceProfile/Defaults.cshtml
index 6b31e58a..15922834 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/Defaults.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/Defaults.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Areas.Config.Models.DeviceProfile.DefaultsModel
 @{
+    Authorization.Require(Claims.Config.DeviceProfile.ConfigureDefaults);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Profiles", MVC.Config.DeviceProfile.Index(null), "Defaults");
 }
 <div class="form" style="width: 600px">
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/Defaults.generated.cs b/Disco.Web/Areas/Config/Views/DeviceProfile/Defaults.generated.cs
index d3b6cc16..caea009a 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/Defaults.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/Defaults.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceProfile/Defaults.cshtml")]
-    public partial class Defaults : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceProfile.DefaultsModel>
+    public partial class Defaults : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DeviceProfile.DefaultsModel>
     {
         public Defaults()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
             
             #line 2 "..\..\Areas\Config\Views\DeviceProfile\Defaults.cshtml"
   
+    Authorization.Require(Claims.Config.DeviceProfile.ConfigureDefaults);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Profiles", MVC.Config.DeviceProfile.Index(null), "Defaults");
 
             
@@ -69,7 +73,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                ");
 
             
-            #line 12 "..\..\Areas\Config\Views\DeviceProfile\Defaults.cshtml"
+            #line 14 "..\..\Areas\Config\Views\DeviceProfile\Defaults.cshtml"
            Write(Html.DropDownListFor(m => m.Default, Model.DeviceProfiles.ToSelectListItems(Model.Default)));
 
             
@@ -80,7 +84,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 13 "..\..\Areas\Config\Views\DeviceProfile\Defaults.cshtml"
+            #line 15 "..\..\Areas\Config\Views\DeviceProfile\Defaults.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
@@ -99,7 +103,7 @@ WriteLiteral(@">
                             $.getJSON('");
 
             
-            #line 20 "..\..\Areas\Config\Views\DeviceProfile\Defaults.cshtml"
+            #line 22 "..\..\Areas\Config\Views\DeviceProfile\Defaults.cshtml"
                                    Write(Url.Action(MVC.API.DeviceProfile.Default()));
 
             
@@ -133,7 +137,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                ");
 
             
-            #line 38 "..\..\Areas\Config\Views\DeviceProfile\Defaults.cshtml"
+            #line 40 "..\..\Areas\Config\Views\DeviceProfile\Defaults.cshtml"
            Write(Html.DropDownListFor(m => m.DefaultAddDeviceOffline, Model.DeviceProfilesAndNone.ToSelectListItems(Model.DefaultAddDeviceOffline)));
 
             
@@ -144,7 +148,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 39 "..\..\Areas\Config\Views\DeviceProfile\Defaults.cshtml"
+            #line 41 "..\..\Areas\Config\Views\DeviceProfile\Defaults.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
@@ -163,7 +167,7 @@ WriteLiteral(@">
                             $.getJSON('");
 
             
-            #line 46 "..\..\Areas\Config\Views\DeviceProfile\Defaults.cshtml"
+            #line 48 "..\..\Areas\Config\Views\DeviceProfile\Defaults.cshtml"
                                    Write(Url.Action(MVC.API.DeviceProfile.DefaultAddDeviceOffline()));
 
             
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/Index.cshtml b/Disco.Web/Areas/Config/Views/DeviceProfile/Index.cshtml
index 734d8016..1649cb0b 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/Index.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/Index.cshtml
@@ -1,9 +1,17 @@
 @model Disco.Web.Areas.Config.Models.DeviceProfile.IndexModel
 @{
+    Authorization.Require(Claims.Config.DeviceProfile.Show);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Profiles");
 }
 @Html.Partial(MVC.Config.DeviceProfile.Views._Table, Model, new ViewDataDictionary())
 <div class="actionBar">
-    @Html.ActionLinkButton("Modify Default Profiles", MVC.Config.DeviceProfile.Defaults())
-    @Html.ActionLinkButton("Create Device Profile", MVC.Config.DeviceProfile.Create())
+    @if (Authorization.Has(Claims.Config.DeviceProfile.ConfigureDefaults))
+    {
+        @Html.ActionLinkButton("Modify Default Profiles", MVC.Config.DeviceProfile.Defaults())
+    }
+    @if (Authorization.HasAll(Claims.Config.DeviceProfile.Configure, Claims.Config.DeviceProfile.Create))
+    {
+        @Html.ActionLinkButton("Create Device Profile", MVC.Config.DeviceProfile.Create())
+    }
 </div>
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/Index.generated.cs b/Disco.Web/Areas/Config/Views/DeviceProfile/Index.generated.cs
index c060ec51..d3832837 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/Index.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceProfile/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceProfile.IndexModel>
+    public partial class Index : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DeviceProfile.IndexModel>
     {
         public Index()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
             
             #line 2 "..\..\Areas\Config\Views\DeviceProfile\Index.cshtml"
   
+    Authorization.Require(Claims.Config.DeviceProfile.Show);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Profiles");
 
             
@@ -51,7 +55,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
 WriteLiteral("\r\n");
 
             
-            #line 5 "..\..\Areas\Config\Views\DeviceProfile\Index.cshtml"
+            #line 7 "..\..\Areas\Config\Views\DeviceProfile\Index.cshtml"
 Write(Html.Partial(MVC.Config.DeviceProfile.Views._Table, Model, new ViewDataDictionary()));
 
             
@@ -63,27 +67,61 @@ WriteLiteral(" class=\"actionBar\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("    ");
-
             
-            #line 7 "..\..\Areas\Config\Views\DeviceProfile\Index.cshtml"
-Write(Html.ActionLinkButton("Modify Default Profiles", MVC.Config.DeviceProfile.Defaults()));
+            #line 9 "..\..\Areas\Config\Views\DeviceProfile\Index.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 9 "..\..\Areas\Config\Views\DeviceProfile\Index.cshtml"
+     if (Authorization.Has(Claims.Config.DeviceProfile.ConfigureDefaults))
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 11 "..\..\Areas\Config\Views\DeviceProfile\Index.cshtml"
+   Write(Html.ActionLinkButton("Modify Default Profiles", MVC.Config.DeviceProfile.Defaults()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
             
-            #line 8 "..\..\Areas\Config\Views\DeviceProfile\Index.cshtml"
-Write(Html.ActionLinkButton("Create Device Profile", MVC.Config.DeviceProfile.Create()));
+            #line 11 "..\..\Areas\Config\Views\DeviceProfile\Index.cshtml"
+                                                                                              
+    }
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>\r\n");
+WriteLiteral("    ");
+
+            
+            #line 13 "..\..\Areas\Config\Views\DeviceProfile\Index.cshtml"
+     if (Authorization.HasAll(Claims.Config.DeviceProfile.Configure, Claims.Config.DeviceProfile.Create))
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 15 "..\..\Areas\Config\Views\DeviceProfile\Index.cshtml"
+   Write(Html.ActionLinkButton("Create Device Profile", MVC.Config.DeviceProfile.Create()));
+
+            
+            #line default
+            #line hidden
+            
+            #line 15 "..\..\Areas\Config\Views\DeviceProfile\Index.cshtml"
+                                                                                          
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</div>\r\n");
 
         }
     }
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml b/Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml
index 3eb245c1..ab90c678 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml
@@ -1,8 +1,18 @@
 @model Disco.Web.Areas.Config.Models.DeviceProfile.ShowModel
 @{
+    Authorization.Require(Claims.Config.DeviceProfile.Show);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Profiles", MVC.Config.DeviceProfile.Index(null), Model.DeviceProfile.ToString());
-    Html.BundleDeferred("~/Style/jQueryUI/dynatree");
-    Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-DynaTree");
+
+    var canConfig = Authorization.Has(Claims.Config.DeviceProfile.Configure);
+    var canConfigExpression = Authorization.Has(Claims.Config.DeviceProfile.ConfigureComputerNameTemplate);
+    var canDelete = (Authorization.Has(Claims.Config.DeviceProfile.Delete) && Model.CanDelete);
+
+    if (canConfig)
+    {
+        Html.BundleDeferred("~/Style/jQueryUI/dynatree");
+        Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-DynaTree");
+    }
 }
 <div id="configurationDeviceProfileShow" class="form" style="width: 600px">
     <table>
@@ -16,7 +26,9 @@
         <tr>
             <th>Name:
             </th>
-            <td>@Html.TextBoxFor(model => model.DeviceProfile.Name)
+            <td>@if (canConfig)
+                {
+                @Html.TextBoxFor(model => model.DeviceProfile.Name)
                 @AjaxHelpers.AjaxSave()
                 @AjaxHelpers.AjaxLoader()
                 <script type="text/javascript">
@@ -58,12 +70,19 @@
                             });
                     });
                 </script>
+                }
+                else
+                {
+                @Model.DeviceProfile.Name
+                }
             </td>
         </tr>
         <tr>
             <th>Short Name:
             </th>
-            <td>@Html.TextBoxFor(model => model.DeviceProfile.ShortName)
+            <td>@if (canConfig)
+                {
+                @Html.TextBoxFor(model => model.DeviceProfile.ShortName)
                 @AjaxHelpers.AjaxSave()
                 @AjaxHelpers.AjaxLoader()
                 <script type="text/javascript">
@@ -105,12 +124,19 @@
                             });
                     });
                 </script>
+                }
+                else
+                {
+                @Model.DeviceProfile.ShortName
+                }
             </td>
         </tr>
         <tr>
             <th>Description:
             </th>
-            <td>@Html.TextBoxFor(model => model.DeviceProfile.Description)
+            <td>@if (canConfig)
+                {
+                @Html.TextBoxFor(model => model.DeviceProfile.Description)
                 @AjaxHelpers.AjaxSave()
                 @AjaxHelpers.AjaxLoader()
                 <script type="text/javascript">
@@ -152,6 +178,11 @@
                             });
                     });
                 </script>
+                }
+                else
+                {
+                @Model.DeviceProfile.Description
+                }
             </td>
         </tr>
         <tr>
@@ -167,7 +198,8 @@
         <tr>
             <th>Distribution Type:
             </th>
-            <td>
+            <td>@if (canConfig)
+                {
                 @Html.DropDownList("DeviceProfile_DistributionType", Model.DeviceProfileDistributionTypes)
                 @AjaxHelpers.AjaxLoader()
                 <script type="text/javascript">
@@ -187,12 +219,18 @@
                         });
                     });
                 </script>
+                }
+                else
+                {
+                @Model.DeviceProfile.DistributionType.ToString()
+                }
             </td>
         </tr>
         <tr>
             <th>Address:
             </th>
-            <td>
+            <td>@if (canConfig)
+                {
                 @Html.DropDownListFor(m => m.DeviceProfile.DefaultOrganisationAddress, Model.OrganisationAddresses.ToSelectListItems(Model.DeviceProfile.DefaultOrganisationAddress, true, "None"))
                 @AjaxHelpers.AjaxLoader()
                 <script type="text/javascript">
@@ -212,12 +250,25 @@
                         });
                     });
                 </script>
+                }
+                else
+                {
+                    if (Model.DefaultOrganisationAddress == null)
+                    {
+                <span class="smallMessage">&lt;None Specified&gt;</span>
+                    }
+                    else
+                    {
+                @Model.DefaultOrganisationAddress.ToString()
+                    }
+                }
             </td>
         </tr>
         <tr>
             <th>Allocate Certificates:
             </th>
-            <td>
+            <td>@if (canConfig)
+                {
                 @Html.DropDownListFor(model => model.DeviceProfile.CertificateProviderId, Model.CertificateProviders.ToSelectListItems(null, true, "Not Allocated"))
                 @AjaxHelpers.AjaxLoader()
                 <script type="text/javascript">
@@ -248,12 +299,34 @@
                         });
                     });
                 </script>
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(Model.DeviceProfile.CertificateProviderId))
+                    {
+                <span class="smallMessage">&lt;None Allocated&gt;</span>
+                    }
+                    else
+                    {
+                        var cp = Model.CertificateProviders.FirstOrDefault(p => p.Id == Model.DeviceProfile.CertificateProviderId);
+                        if (cp == null)
+                        {
+                <span class="smallMessage">&lt;None Allocated&gt;</span>
+                        }
+                        else
+                        {
+                @cp.Name
+                        }
+                    }
+                }
             </td>
         </tr>
         <tr>
             <th>Computer Name Template Expression:
             </th>
-            <td>@Html.TextBoxFor(model => model.DeviceProfile.ComputerNameTemplate)
+            <td>@if (canConfig && canConfigExpression)
+                {
+                @Html.TextBoxFor(model => model.DeviceProfile.ComputerNameTemplate)
                 @AjaxHelpers.AjaxSave()
                 @AjaxHelpers.AjaxLoader()
                 <a id="expressionBrowserAnchor" href="@(Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser()))">&nbsp;</a>
@@ -295,60 +368,89 @@
                             });
                     });
                 </script>
+                }
+                else
+                {
+                    if (string.IsNullOrWhiteSpace(Model.DeviceProfile.ComputerNameTemplate))
+                    {
+                <span class="smallMessage">&lt;None Specified&gt;</span>
+                    }
+                    else
+                    {
+                <div class="code">
+                    @Model.DeviceProfile.ComputerNameTemplate
+                </div>
+                    }
+                }
                 <div style="margin-top: 8px;">
                     <label for="DeviceProfile_ProvisionADAccount">
                         Provision Active Directory Account:
                     </label>
-                    <input id="DeviceProfile_ProvisionADAccount" type="checkbox" @(Model.DeviceProfile.ProvisionADAccount ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty))/>
-                    @AjaxHelpers.AjaxLoader()
-                    <script type="text/javascript">
-                        $(function () {
-                            $('#DeviceProfile_ProvisionADAccount').click(function () {
-                                var $this = $(this);
-                                var $ajaxLoading = $this.next('.ajaxLoading').show();
-                                var data = { ProvisionADAccount: $this.is(':checked') };
-                                $.getJSON('@Url.Action(MVC.API.DeviceProfile.UpdateProvisionADAccount(Model.DeviceProfile.Id))', data, function (response, result) {
-                                    if (result != 'success' || response != 'OK') {
-                                        alert('Unable to change Provision AD Account:\n' + response);
-                                        $ajaxLoading.hide();
-                                    } else {
-                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
-                                    }
+                    @if (canConfig)
+                    {
+                        <input id="DeviceProfile_ProvisionADAccount" type="checkbox" @(Model.DeviceProfile.ProvisionADAccount ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty))/>
+                        @AjaxHelpers.AjaxLoader()
+                        <script type="text/javascript">
+                            $(function () {
+                                $('#DeviceProfile_ProvisionADAccount').click(function () {
+                                    var $this = $(this);
+                                    var $ajaxLoading = $this.next('.ajaxLoading').show();
+                                    var data = { ProvisionADAccount: $this.is(':checked') };
+                                    $.getJSON('@Url.Action(MVC.API.DeviceProfile.UpdateProvisionADAccount(Model.DeviceProfile.Id))', data, function (response, result) {
+                                        if (result != 'success' || response != 'OK') {
+                                            alert('Unable to change Provision AD Account:\n' + response);
+                                            $ajaxLoading.hide();
+                                        } else {
+                                            $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                        }
+                                    });
                                 });
                             });
-                        });
-                    </script>
+                        </script>
+                    }
+                    else
+                    {
+                        <input id="DeviceProfile_ProvisionADAccount" type="checkbox" @(Model.DeviceProfile.ProvisionADAccount ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)) disabled="disabled" />
+                    }
                 </div>
                 <div style="margin-top: 8px;">
                     <label for="DeviceProfile_EnforceComputerNameConvention">
                         Enforce Naming Convention:
                     </label>
-                    <input id="DeviceProfile_EnforceComputerNameConvention" type="checkbox" @(Model.DeviceProfile.EnforceComputerNameConvention ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty))/>
-                    @AjaxHelpers.AjaxLoader()
-                    <script type="text/javascript">
-                        $(function () {
-                            $('#DeviceProfile_EnforceComputerNameConvention').click(function () {
-                                var $this = $(this);
-                                var $ajaxLoading = $this.next('.ajaxLoading').show();
-                                var data = { EnforceComputerNameConvention: $this.is(':checked') };
-                                $.getJSON('@Url.Action(MVC.API.DeviceProfile.UpdateEnforceComputerNameConvention(Model.DeviceProfile.Id))', data, function (response, result) {
-                                    if (result != 'success' || response != 'OK') {
-                                        alert('Unable to change Enforce Computer Name Convention:\n' + response);
-                                        $ajaxLoading.hide();
-                                    } else {
-                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
-                                    }
+                    @if (canConfig)
+                    {
+                        <input id="DeviceProfile_EnforceComputerNameConvention" type="checkbox" @(Model.DeviceProfile.EnforceComputerNameConvention ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty))/>
+                        @AjaxHelpers.AjaxLoader()
+                        <script type="text/javascript">
+                            $(function () {
+                                $('#DeviceProfile_EnforceComputerNameConvention').click(function () {
+                                    var $this = $(this);
+                                    var $ajaxLoading = $this.next('.ajaxLoading').show();
+                                    var data = { EnforceComputerNameConvention: $this.is(':checked') };
+                                    $.getJSON('@Url.Action(MVC.API.DeviceProfile.UpdateEnforceComputerNameConvention(Model.DeviceProfile.Id))', data, function (response, result) {
+                                        if (result != 'success' || response != 'OK') {
+                                            alert('Unable to change Enforce Computer Name Convention:\n' + response);
+                                            $ajaxLoading.hide();
+                                        } else {
+                                            $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                        }
+                                    });
                                 });
                             });
-                        });
-                    </script>
+                        </script>
+                    }
+                    else
+                    {
+                        <input id="DeviceProfile_EnforceComputerNameConvention" type="checkbox" @(Model.DeviceProfile.EnforceComputerNameConvention ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)) disabled="disabled" />
+                    }
                 </div>
             </td>
         </tr>
         <tr>
             <th>Default Organisational Unit:
             </th>
-            <td>
+            <td>@if (canConfig)
+                {
                 @Html.HiddenFor(model => model.DeviceProfile.OrganisationalUnit)
                 <div id="displayOrganisationalUnit">
                 </div>
@@ -466,19 +568,35 @@
                         updateDisplayOrganisationalUnit();
                     });
                 </script>
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(Model.DeviceProfile.OrganisationalUnit))
+                    {
+                <span>{Default Computers Container}</span>
+                    }
+                    else
+                    {
+                <span>
+                    @string.Join(" > ", Model.DeviceProfile.OrganisationalUnit.Split(',').Select(s => s.Substring(3)).Reverse())
+                </span>
+                    }
+                }
                 <div style="margin-top: 8px;">
                     <label for="DeviceProfile_EnforceOrganisationalUnit">
                         Enforce:
                     </label>
-                    <input id="DeviceProfile_EnforceOrganisationalUnit" type="checkbox" @(Model.DeviceProfile.EnforceOrganisationalUnit ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty))/>
-                    @AjaxHelpers.AjaxLoader()
-                    <script type="text/javascript">
-                        $(function () {
-                            $('#DeviceProfile_EnforceOrganisationalUnit').click(function () {
-                                var $this = $(this);
-                                var $ajaxLoading = $this.next('.ajaxLoading').show();
-                                var data = { EnforceOrganisationalUnit: $this.is(':checked') };
-                                $.getJSON('@Url.Action(MVC.API.DeviceProfile.UpdateEnforceOrganisationalUnit(Model.DeviceProfile.Id))', data, function (response, result) {
+                    @if (canConfig)
+                    {
+                        <input id="DeviceProfile_EnforceOrganisationalUnit" type="checkbox" @(Model.DeviceProfile.EnforceOrganisationalUnit ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty))/>
+                        @AjaxHelpers.AjaxLoader()
+                        <script type="text/javascript">
+                            $(function () {
+                                $('#DeviceProfile_EnforceOrganisationalUnit').click(function () {
+                                    var $this = $(this);
+                                    var $ajaxLoading = $this.next('.ajaxLoading').show();
+                                    var data = { EnforceOrganisationalUnit: $this.is(':checked') };
+                                    $.getJSON('@Url.Action(MVC.API.DeviceProfile.UpdateEnforceOrganisationalUnit(Model.DeviceProfile.Id))', data, function (response, result) {
                                     if (result != 'success' || response != 'OK') {
                                         alert('Unable to change Enforce Organisation Unit:\n' + response);
                                         $ajaxLoading.hide();
@@ -488,51 +606,65 @@
                                 });
                             });
                         });
-                    </script>
+                        </script>
+                    }
+                    else
+                    {
+                        <input id="DeviceProfile_EnforceOrganisationalUnit" type="checkbox" @(Model.DeviceProfile.EnforceOrganisationalUnit ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)) disabled="disabled" />
+                    }
                 </div>
             </td>
         </tr>
     </table>
 </div>
-<div id="dialogConfirmDelete" title="Delete this Device Profile?">
-    <p>
-        <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
-        This item will be permanently deleted and cannot be recovered. Are you sure?
-    </p>
-</div>
-<script type="text/javascript">
-    $(function () {
+@if (canDelete)
+{
+    <div id="dialogConfirmDelete" title="Delete this Device Profile?">
+        <p>
+            <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
+            This item will be permanently deleted and cannot be recovered. Are you sure?
+        </p>
+    </div>
+    <script type="text/javascript">
+        $(function () {
 
-        var button = $('#buttonDelete');
-        var buttonLink = button.attr('href');
-        button.attr('href', '#');
-        button.click(function () {
-            $("#dialogConfirmDelete").dialog('open');
-        });
+            var button = $('#buttonDelete');
+            var buttonLink = button.attr('href');
+            button.attr('href', '#');
+            button.click(function () {
+                $("#dialogConfirmDelete").dialog('open');
+            });
 
-        $("#dialogConfirmDelete").dialog({
-            resizable: false,
-            height: 140,
-            modal: true,
-            autoOpen: false,
-            buttons: {
-                "Delete": function () {
-                    $(this).dialog('disable');
-                    window.location.href = buttonLink;
-                },
-                Cancel: function () {
-                    $(this).dialog("close");
+            $("#dialogConfirmDelete").dialog({
+                resizable: false,
+                height: 140,
+                modal: true,
+                autoOpen: false,
+                buttons: {
+                    "Delete": function () {
+                        $(this).dialog('disable');
+                        window.location.href = buttonLink;
+                    },
+                    Cancel: function () {
+                        $(this).dialog("close");
+                    }
                 }
-            }
-        });
+            });
 
-    });
-</script>
+        });
+    </script>
+}
 <div class="actionBar">
-    @if (Model.CanDelete)
+    @if (canDelete)
     { 
         @Html.ActionLinkButton("Delete", MVC.API.DeviceProfile.Delete(Model.DeviceProfile.Id, true), "buttonDelete")
     }
-    @Html.ActionLinkButton("Export Devices", MVC.API.DeviceProfile.ExportDevices(Model.DeviceProfile.Id))
-    @Html.ActionLinkButton("View Devices", MVC.Search.Query(Model.DeviceProfile.Id.ToString(), "DeviceProfile"))
+    @if (Authorization.Has(Claims.Device.Actions.Export))
+    {
+        @Html.ActionLinkButton("Export Devices", MVC.API.DeviceProfile.ExportDevices(Model.DeviceProfile.Id))
+    }
+    @if (Authorization.Has(Claims.Device.Search))
+    {
+        @Html.ActionLinkButton("View Devices", MVC.Search.Query(Model.DeviceProfile.Id.ToString(), "DeviceProfile"))
+    }
 </div>
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs b/Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs
index e4cd7411..154e5373 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceProfile/Show.cshtml")]
-    public partial class Show : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceProfile.ShowModel>
+    public partial class Show : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DeviceProfile.ShowModel>
     {
         public Show()
         {
@@ -43,9 +45,19 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
             
             #line 2 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
   
+    Authorization.Require(Claims.Config.DeviceProfile.Show);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Profiles", MVC.Config.DeviceProfile.Index(null), Model.DeviceProfile.ToString());
-    Html.BundleDeferred("~/Style/jQueryUI/dynatree");
-    Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-DynaTree");
+
+    var canConfig = Authorization.Has(Claims.Config.DeviceProfile.Configure);
+    var canConfigExpression = Authorization.Has(Claims.Config.DeviceProfile.ConfigureComputerNameTemplate);
+    var canDelete = (Authorization.Has(Claims.Config.DeviceProfile.Delete) && Model.CanDelete);
+
+    if (canConfig)
+    {
+        Html.BundleDeferred("~/Style/jQueryUI/dynatree");
+        Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-DynaTree");
+    }
 
             
             #line default
@@ -64,7 +76,7 @@ WriteLiteral(">\r\n    <table>\r\n        <tr>\r\n            <th>Id:\r\n
 WriteLiteral("                ");
 
             
-            #line 13 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 23 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(Html.DisplayFor(model => model.DeviceProfile.Id));
 
             
@@ -74,35 +86,56 @@ WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n
 "    </th>\r\n            <td>");
 
             
-            #line 19 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 29 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 31 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(Html.TextBoxFor(model => model.DeviceProfile.Name));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 20 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 31 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                   
+                
+            
+            #line default
+            #line hidden
+            
+            #line 32 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 21 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 32 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                       
+                
+            
+            #line default
+            #line hidden
+            
+            #line 33 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 33 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -129,7 +162,7 @@ WriteLiteral(@">
                                     url: '");
 
             
-            #line 42 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 54 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                      Write(Url.Action(MVC.API.DeviceProfile.UpdateName(Model.DeviceProfile.Id)));
 
             
@@ -154,43 +187,86 @@ WriteLiteral(@"',
                             });
                     });
                 </script>
-            </td>
-        </tr>
-        <tr>
-            <th>Short Name:
-            </th>
-            <td>");
+");
 
             
-            #line 66 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 73 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                }
+                else
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 76 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+           Write(Model.DeviceProfile.Name);
+
+            
+            #line default
+            #line hidden
+            
+            #line 76 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                         
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Short Name:\r\n    " +
+"        </th>\r\n            <td>");
+
+            
+            #line 83 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 85 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(Html.TextBoxFor(model => model.DeviceProfile.ShortName));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 67 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 85 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                        
+                
+            
+            #line default
+            #line hidden
+            
+            #line 86 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 68 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 86 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                       
+                
+            
+            #line default
+            #line hidden
+            
+            #line 87 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 87 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -217,7 +293,7 @@ WriteLiteral(@">
                                     url: '");
 
             
-            #line 89 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 108 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                      Write(Url.Action(MVC.API.DeviceProfile.UpdateShortName(Model.DeviceProfile.Id)));
 
             
@@ -242,43 +318,86 @@ WriteLiteral(@"',
                             });
                     });
                 </script>
-            </td>
-        </tr>
-        <tr>
-            <th>Description:
-            </th>
-            <td>");
+");
 
             
-            #line 113 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 127 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                }
+                else
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 130 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+           Write(Model.DeviceProfile.ShortName);
+
+            
+            #line default
+            #line hidden
+            
+            #line 130 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                              
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Description:\r\n   " +
+"         </th>\r\n            <td>");
+
+            
+            #line 137 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 139 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(Html.TextBoxFor(model => model.DeviceProfile.Description));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 114 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 139 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                          
+                
+            
+            #line default
+            #line hidden
+            
+            #line 140 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 115 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 140 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                       
+                
+            
+            #line default
+            #line hidden
+            
+            #line 141 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 141 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -305,7 +424,7 @@ WriteLiteral(@">
                                     url: '");
 
             
-            #line 136 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 162 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                      Write(Url.Action(MVC.API.DeviceProfile.UpdateDescription(Model.DeviceProfile.Id)));
 
             
@@ -330,15 +449,37 @@ WriteLiteral(@"',
                             });
                     });
                 </script>
-            </td>
-        </tr>
-        <tr>
-            <th>Members</th>
-            <td>
-                <div><strong>");
+");
 
             
-            #line 160 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 181 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                }
+                else
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 184 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+           Write(Model.DeviceProfile.Description);
+
+            
+            #line default
+            #line hidden
+            
+            #line 184 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Members</th>\r\n   " +
+"         <td>\r\n                <div><strong>");
+
+            
+            #line 191 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                         Write(Model.DeviceCount.ToString("n0"));
 
             
@@ -347,7 +488,7 @@ WriteLiteral(@"',
 WriteLiteral("</strong> ");
 
             
-            #line 160 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 191 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                                                     Write(Model.DeviceCount == 1 ? "devices is a member" : "devices are members");
 
             
@@ -356,13 +497,13 @@ WriteLiteral("</strong> ");
 WriteLiteral(" of this profile.</div>\r\n");
 
             
-            #line 161 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 192 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 161 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 192 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                  if (Model.DeviceDecommissionedCount > 0)
                 {
 
@@ -376,7 +517,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">");
 
             
-            #line 163 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 194 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                          Write(Model.DeviceDecommissionedCount.ToString("n0"));
 
             
@@ -385,7 +526,7 @@ WriteLiteral(">");
 WriteLiteral(" ");
 
             
-            #line 163 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 194 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                                                                           Write(Model.DeviceDecommissionedCount == 1 ? "device is" : "devices are");
 
             
@@ -394,36 +535,52 @@ WriteLiteral(" ");
 WriteLiteral(" decommissioned.</div>\r\n");
 
             
-            #line 164 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 195 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                 }
 
             
             #line default
             #line hidden
 WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Distribution Type" +
-":\r\n            </th>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
+":\r\n            </th>\r\n            <td>");
 
             
-            #line 171 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 201 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 203 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(Html.DropDownList("DeviceProfile_DistributionType", Model.DeviceProfileDistributionTypes));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 172 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 203 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                                          
+                
+            
+            #line default
+            #line hidden
+            
+            #line 204 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 204 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -436,7 +593,7 @@ WriteLiteral(@">
                             $.getJSON('");
 
             
-            #line 179 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 211 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                   Write(Url.Action(MVC.API.DeviceProfile.UpdateDistributionType(Model.DeviceProfile.Id)));
 
             
@@ -453,35 +610,72 @@ WriteLiteral(@"', data, function (response, result) {
                         });
                     });
                 </script>
-            </td>
-        </tr>
-        <tr>
-            <th>Address:
-            </th>
-            <td>
 ");
 
-WriteLiteral("                ");
+            
+            #line 222 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                }
+                else
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 225 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+           Write(Model.DeviceProfile.DistributionType.ToString());
 
             
-            #line 196 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line default
+            #line hidden
+            
+            #line 225 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Address:\r\n       " +
+"     </th>\r\n            <td>");
+
+            
+            #line 232 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 234 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(Html.DropDownListFor(m => m.DeviceProfile.DefaultOrganisationAddress, Model.OrganisationAddresses.ToSelectListItems(Model.DeviceProfile.DefaultOrganisationAddress, true, "None")));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 197 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 234 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                                                                                                                                   
+                
+            
+            #line default
+            #line hidden
+            
+            #line 235 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 235 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -494,7 +688,7 @@ WriteLiteral(@">
                             $.getJSON('");
 
             
-            #line 204 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 242 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                   Write(Url.Action(MVC.API.DeviceProfile.UpdateDefaultOrganisationAddress(Model.DeviceProfile.Id)));
 
             
@@ -511,35 +705,90 @@ WriteLiteral(@"', data, function (response, result) {
                         });
                     });
                 </script>
-            </td>
-        </tr>
-        <tr>
-            <th>Allocate Certificates:
-            </th>
-            <td>
 ");
 
-WriteLiteral("                ");
+            
+            #line 253 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                }
+                else
+                {
+                    if (Model.DefaultOrganisationAddress == null)
+                    {
 
             
-            #line 221 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line default
+            #line hidden
+WriteLiteral("                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>\r\n");
+
+            
+            #line 259 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+                    else
+                    {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 262 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+           Write(Model.DefaultOrganisationAddress.ToString());
+
+            
+            #line default
+            #line hidden
+            
+            #line 262 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                            
+                    }
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Allocate Certific" +
+"ates:\r\n            </th>\r\n            <td>");
+
+            
+            #line 270 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 272 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(Html.DropDownListFor(model => model.DeviceProfile.CertificateProviderId, Model.CertificateProviders.ToSelectListItems(null, true, "Not Allocated")));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 222 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 272 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                                                                                                    
+                
+            
+            #line default
+            #line hidden
+            
+            #line 273 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 273 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -555,7 +804,7 @@ WriteLiteral(@">
                                 url: '");
 
             
-            #line 232 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 283 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                  Write(Url.Action(MVC.API.DeviceProfile.UpdateCertificateProviderId(Model.DeviceProfile.Id)));
 
             
@@ -580,57 +829,139 @@ WriteLiteral(@"',
                         });
                     });
                 </script>
-            </td>
-        </tr>
-        <tr>
-            <th>Computer Name Template Expression:
-            </th>
-            <td>");
+");
 
             
-            #line 256 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 302 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(Model.DeviceProfile.CertificateProviderId))
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Allocated&gt;</span>\r\n");
+
+            
+            #line 308 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+                    else
+                    {
+                        var cp = Model.CertificateProviders.FirstOrDefault(p => p.Id == Model.DeviceProfile.CertificateProviderId);
+                        if (cp == null)
+                        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Allocated&gt;</span>\r\n");
+
+            
+            #line 315 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                        }
+                        else
+                        {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 318 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+           Write(cp.Name);
+
+            
+            #line default
+            #line hidden
+            
+            #line 318 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                        
+                        }
+                    }
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Computer Name Tem" +
+"plate Expression:\r\n            </th>\r\n            <td>");
+
+            
+            #line 327 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                 if (canConfig && canConfigExpression)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 329 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(Html.TextBoxFor(model => model.DeviceProfile.ComputerNameTemplate));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 257 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 329 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                   
+                
+            
+            #line default
+            #line hidden
+            
+            #line 330 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 258 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 330 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                       
+                
+            
+            #line default
+            #line hidden
+            
+            #line 331 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <a");
-
-WriteLiteral(" id=\"expressionBrowserAnchor\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 13810), Tuple.Create("\"", 13879)
             
-            #line 259 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 13817), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser())
+            #line 331 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                         
+
             
             #line default
             #line hidden
-, 13817), false)
+WriteLiteral("                <a");
+
+WriteLiteral(" id=\"expressionBrowserAnchor\"");
+
+WriteAttribute("href", Tuple.Create(" href=\"", 16234), Tuple.Create("\"", 16303)
+            
+            #line 332 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+, Tuple.Create(Tuple.Create("", 16241), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser())
+            
+            #line default
+            #line hidden
+, 16241), false)
 );
 
-WriteLiteral(">&nbsp;</a>\r\n                <script");
+WriteLiteral(">&nbsp;</a>\r\n");
+
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -656,7 +987,7 @@ WriteLiteral(@">
                                     url: '");
 
             
-            #line 279 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 352 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                       Write(Url.Action(MVC.API.DeviceProfile.UpdateComputerNameTemplate(Model.DeviceProfile.Id)));
 
             
@@ -681,7 +1012,60 @@ WriteLiteral(@"',
                             });
                     });
                 </script>
-                <div");
+");
+
+            
+            #line 371 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                }
+                else
+                {
+                    if (string.IsNullOrWhiteSpace(Model.DeviceProfile.ComputerNameTemplate))
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>\r\n");
+
+            
+            #line 377 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+                    else
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <div");
+
+WriteLiteral(" class=\"code\"");
+
+WriteLiteral(">\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 381 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+               Write(Model.DeviceProfile.ComputerNameTemplate);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </div>\r\n");
+
+            
+            #line 383 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <div");
 
 WriteLiteral(" style=\"margin-top: 8px;\"");
 
@@ -690,7 +1074,23 @@ WriteLiteral(">\r\n                    <label");
 WriteLiteral(" for=\"DeviceProfile_ProvisionADAccount\"");
 
 WriteLiteral(">\r\n                        Provision Active Directory Account:\r\n                 " +
-"   </label>\r\n                    <input");
+"   </label>\r\n");
+
+            
+            #line 389 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 389 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                     if (canConfig)
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <input");
 
 WriteLiteral(" id=\"DeviceProfile_ProvisionADAccount\"");
 
@@ -699,55 +1099,100 @@ WriteLiteral(" type=\"checkbox\"");
 WriteLiteral(" ");
 
             
-            #line 302 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-                                                                             Write(Model.DeviceProfile.ProvisionADAccount ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
+            #line 391 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                 Write(Model.DeviceProfile.ProvisionADAccount ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
 
             
             #line default
             #line hidden
 WriteLiteral("/>\r\n");
 
-WriteLiteral("                    ");
-
             
-            #line 303 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-               Write(AjaxHelpers.AjaxLoader());
+            #line 392 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 392 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                   Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    <script");
+            
+            #line 392 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                 
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-                        $(function () {
-                            $('#DeviceProfile_ProvisionADAccount').click(function () {
-                                var $this = $(this);
-                                var $ajaxLoading = $this.next('.ajaxLoading').show();
-                                var data = { ProvisionADAccount: $this.is(':checked') };
-                                $.getJSON('");
+                            $(function () {
+                                $('#DeviceProfile_ProvisionADAccount').click(function () {
+                                    var $this = $(this);
+                                    var $ajaxLoading = $this.next('.ajaxLoading').show();
+                                    var data = { ProvisionADAccount: $this.is(':checked') };
+                                    $.getJSON('");
 
             
-            #line 310 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-                                      Write(Url.Action(MVC.API.DeviceProfile.UpdateProvisionADAccount(Model.DeviceProfile.Id)));
+            #line 399 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                          Write(Url.Action(MVC.API.DeviceProfile.UpdateProvisionADAccount(Model.DeviceProfile.Id)));
 
             
             #line default
             #line hidden
 WriteLiteral(@"', data, function (response, result) {
-                                    if (result != 'success' || response != 'OK') {
-                                        alert('Unable to change Provision AD Account:\n' + response);
-                                        $ajaxLoading.hide();
-                                    } else {
-                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
-                                    }
+                                        if (result != 'success' || response != 'OK') {
+                                            alert('Unable to change Provision AD Account:\n' + response);
+                                            $ajaxLoading.hide();
+                                        } else {
+                                            $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                        }
+                                    });
                                 });
                             });
-                        });
-                    </script>
-                </div>
-                <div");
+                        </script>
+");
+
+            
+            #line 410 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+                    else
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <input");
+
+WriteLiteral(" id=\"DeviceProfile_ProvisionADAccount\"");
+
+WriteLiteral(" type=\"checkbox\"");
+
+WriteLiteral(" ");
+
+            
+            #line 413 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                 Write(Model.DeviceProfile.ProvisionADAccount ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(" disabled=\"disabled\" />\r\n");
+
+            
+            #line 414 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n                <div");
 
 WriteLiteral(" style=\"margin-top: 8px;\"");
 
@@ -756,7 +1201,23 @@ WriteLiteral(">\r\n                    <label");
 WriteLiteral(" for=\"DeviceProfile_EnforceComputerNameConvention\"");
 
 WriteLiteral(">\r\n                        Enforce Naming Convention:\r\n                    </labe" +
-"l>\r\n                    <input");
+"l>\r\n");
+
+            
+            #line 420 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 420 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                     if (canConfig)
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <input");
 
 WriteLiteral(" id=\"DeviceProfile_EnforceComputerNameConvention\"");
 
@@ -765,76 +1226,131 @@ WriteLiteral(" type=\"checkbox\"");
 WriteLiteral(" ");
 
             
-            #line 326 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-                                                                                        Write(Model.DeviceProfile.EnforceComputerNameConvention ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
+            #line 422 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                            Write(Model.DeviceProfile.EnforceComputerNameConvention ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
 
             
             #line default
             #line hidden
 WriteLiteral("/>\r\n");
 
-WriteLiteral("                    ");
-
             
-            #line 327 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-               Write(AjaxHelpers.AjaxLoader());
+            #line 423 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 423 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                   Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    <script");
+            
+            #line 423 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                 
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-                        $(function () {
-                            $('#DeviceProfile_EnforceComputerNameConvention').click(function () {
-                                var $this = $(this);
-                                var $ajaxLoading = $this.next('.ajaxLoading').show();
-                                var data = { EnforceComputerNameConvention: $this.is(':checked') };
-                                $.getJSON('");
+                            $(function () {
+                                $('#DeviceProfile_EnforceComputerNameConvention').click(function () {
+                                    var $this = $(this);
+                                    var $ajaxLoading = $this.next('.ajaxLoading').show();
+                                    var data = { EnforceComputerNameConvention: $this.is(':checked') };
+                                    $.getJSON('");
 
             
-            #line 334 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-                                      Write(Url.Action(MVC.API.DeviceProfile.UpdateEnforceComputerNameConvention(Model.DeviceProfile.Id)));
+            #line 430 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                          Write(Url.Action(MVC.API.DeviceProfile.UpdateEnforceComputerNameConvention(Model.DeviceProfile.Id)));
 
             
             #line default
             #line hidden
 WriteLiteral(@"', data, function (response, result) {
-                                    if (result != 'success' || response != 'OK') {
-                                        alert('Unable to change Enforce Computer Name Convention:\n' + response);
-                                        $ajaxLoading.hide();
-                                    } else {
-                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
-                                    }
+                                        if (result != 'success' || response != 'OK') {
+                                            alert('Unable to change Enforce Computer Name Convention:\n' + response);
+                                            $ajaxLoading.hide();
+                                        } else {
+                                            $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                        }
+                                    });
                                 });
                             });
-                        });
-                    </script>
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <th>Default Organisational Unit:
-            </th>
-            <td>
+                        </script>
 ");
 
-WriteLiteral("                ");
+            
+            #line 441 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+                    else
+                    {
 
             
-            #line 352 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line default
+            #line hidden
+WriteLiteral("                        <input");
+
+WriteLiteral(" id=\"DeviceProfile_EnforceComputerNameConvention\"");
+
+WriteLiteral(" type=\"checkbox\"");
+
+WriteLiteral(" ");
+
+            
+            #line 444 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                            Write(Model.DeviceProfile.EnforceComputerNameConvention ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(" disabled=\"disabled\" />\r\n");
+
+            
+            #line 445 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n         " +
+"   <th>Default Organisational Unit:\r\n            </th>\r\n            <td>");
+
+            
+            #line 452 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 454 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(Html.HiddenFor(model => model.DeviceProfile.OrganisationalUnit));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <div");
+            
+            #line 454 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <div");
 
 WriteLiteral(" id=\"displayOrganisationalUnit\"");
 
-WriteLiteral(">\r\n                </div>\r\n                <a");
+WriteLiteral(">\r\n                </div>\r\n");
+
+WriteLiteral("                <a");
 
 WriteLiteral(" id=\"changeOrganisationalUnit\"");
 
@@ -843,13 +1359,26 @@ WriteLiteral(" href=\"#\"");
 WriteLiteral(">Change</a>");
 
             
-            #line 355 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 457 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                    
+            
+            #line default
+            #line hidden
+            
+            #line 457 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                                                Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <div");
+            
+            #line 457 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                             
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <div");
 
 WriteLiteral(" id=\"dialogOrganisationalUnit\"");
 
@@ -859,7 +1388,9 @@ WriteLiteral(">\r\n                    <div");
 
 WriteLiteral(" id=\"treeOrganisationalUnit\"");
 
-WriteLiteral(">\r\n                    </div>\r\n                </div>\r\n                <script");
+WriteLiteral(">\r\n                    </div>\r\n                </div>\r\n");
+
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -887,7 +1418,7 @@ WriteLiteral(@">
                             $.getJSON('");
 
             
-            #line 381 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 483 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                   Write(Url.Action(MVC.API.DeviceProfile.UpdateOrganisationalUnit(Model.DeviceProfile.Id, null)));
 
             
@@ -928,7 +1459,7 @@ WriteLiteral("\', data, function (response, result) {\r\n
 "getJSON(\'");
 
             
-            #line 430 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 532 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                        Write(Url.Action(MVC.API.DeviceProfile.OrganisationalUnits()));
 
             
@@ -958,7 +1489,52 @@ WriteLiteral("\', null, function (data) {\r\n                                var
 "ee();\r\n                        }\r\n                            ouDialog.dialog(\'o" +
 "pen\');\r\n                        };\r\n\r\n                        ouChangeLink.click" +
 "(ouChange);\r\n                        updateDisplayOrganisationalUnit();\r\n       " +
-"             });\r\n                </script>\r\n                <div");
+"             });\r\n                </script>\r\n");
+
+            
+            #line 571 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(Model.DeviceProfile.OrganisationalUnit))
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <span>{Default Computers Container}</span>\r\n");
+
+            
+            #line 577 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+                    else
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <span>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 581 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+               Write(string.Join(" > ", Model.DeviceProfile.OrganisationalUnit.Split(',').Select(s => s.Substring(3)).Reverse()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </span>\r\n");
+
+            
+            #line 583 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <div");
 
 WriteLiteral(" style=\"margin-top: 8px;\"");
 
@@ -966,8 +1542,23 @@ WriteLiteral(">\r\n                    <label");
 
 WriteLiteral(" for=\"DeviceProfile_EnforceOrganisationalUnit\"");
 
-WriteLiteral(">\r\n                        Enforce:\r\n                    </label>\r\n              " +
-"      <input");
+WriteLiteral(">\r\n                        Enforce:\r\n                    </label>\r\n");
+
+            
+            #line 589 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 589 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                     if (canConfig)
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <input");
 
 WriteLiteral(" id=\"DeviceProfile_EnforceOrganisationalUnit\"");
 
@@ -976,38 +1567,49 @@ WriteLiteral(" type=\"checkbox\"");
 WriteLiteral(" ");
 
             
-            #line 473 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-                                                                                    Write(Model.DeviceProfile.EnforceOrganisationalUnit ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
+            #line 591 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                        Write(Model.DeviceProfile.EnforceOrganisationalUnit ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
 
             
             #line default
             #line hidden
 WriteLiteral("/>\r\n");
 
-WriteLiteral("                    ");
-
             
-            #line 474 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-               Write(AjaxHelpers.AjaxLoader());
+            #line 592 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 592 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                   Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    <script");
+            
+            #line 592 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                 
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-                        $(function () {
-                            $('#DeviceProfile_EnforceOrganisationalUnit').click(function () {
-                                var $this = $(this);
-                                var $ajaxLoading = $this.next('.ajaxLoading').show();
-                                var data = { EnforceOrganisationalUnit: $this.is(':checked') };
-                                $.getJSON('");
+                            $(function () {
+                                $('#DeviceProfile_EnforceOrganisationalUnit').click(function () {
+                                    var $this = $(this);
+                                    var $ajaxLoading = $this.next('.ajaxLoading').show();
+                                    var data = { EnforceOrganisationalUnit: $this.is(':checked') };
+                                    $.getJSON('");
 
             
-            #line 481 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-                                      Write(Url.Action(MVC.API.DeviceProfile.UpdateEnforceOrganisationalUnit(Model.DeviceProfile.Id)));
+            #line 599 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                          Write(Url.Action(MVC.API.DeviceProfile.UpdateEnforceOrganisationalUnit(Model.DeviceProfile.Id)));
 
             
             #line default
@@ -1022,86 +1624,137 @@ WriteLiteral(@"', data, function (response, result) {
                                 });
                             });
                         });
-                    </script>
-                </div>
-            </td>
-        </tr>
-    </table>
-</div>
-<div");
+                        </script>
+");
+
+            
+            #line 610 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+                    else
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <input");
+
+WriteLiteral(" id=\"DeviceProfile_EnforceOrganisationalUnit\"");
+
+WriteLiteral(" type=\"checkbox\"");
+
+WriteLiteral(" ");
+
+            
+            #line 613 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                        Write(Model.DeviceProfile.EnforceOrganisationalUnit ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(" disabled=\"disabled\" />\r\n");
+
+            
+            #line 614 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n            </td>\r\n        </tr>\r\n    </table>\r\n</div>\r\n");
+
+            
+            #line 620 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+ if (canDelete)
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"dialogConfirmDelete\"");
 
 WriteLiteral(" title=\"Delete this Device Profile?\"");
 
-WriteLiteral(">\r\n    <p>\r\n        <span");
+WriteLiteral(">\r\n        <p>\r\n            <span");
 
 WriteLiteral(" class=\"ui-icon ui-icon-alert\"");
 
 WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\"");
 
-WriteLiteral("></span>\r\n        This item will be permanently deleted and cannot be recovered. " +
-"Are you sure?\r\n    </p>\r\n</div>\r\n<script");
+WriteLiteral("></span>\r\n            This item will be permanently deleted and cannot be recover" +
+"ed. Are you sure?\r\n        </p>\r\n    </div>\r\n");
+
+WriteLiteral("    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-    $(function () {
+        $(function () {
 
-        var button = $('#buttonDelete');
-        var buttonLink = button.attr('href');
-        button.attr('href', '#');
-        button.click(function () {
-            $(""#dialogConfirmDelete"").dialog('open');
-        });
+            var button = $('#buttonDelete');
+            var buttonLink = button.attr('href');
+            button.attr('href', '#');
+            button.click(function () {
+                $(""#dialogConfirmDelete"").dialog('open');
+            });
 
-        $(""#dialogConfirmDelete"").dialog({
-            resizable: false,
-            height: 140,
-            modal: true,
-            autoOpen: false,
-            buttons: {
-                ""Delete"": function () {
-                    $(this).dialog('disable');
-                    window.location.href = buttonLink;
-                },
-                Cancel: function () {
-                    $(this).dialog(""close"");
+            $(""#dialogConfirmDelete"").dialog({
+                resizable: false,
+                height: 140,
+                modal: true,
+                autoOpen: false,
+                buttons: {
+                    ""Delete"": function () {
+                        $(this).dialog('disable');
+                        window.location.href = buttonLink;
+                    },
+                    Cancel: function () {
+                        $(this).dialog(""close"");
+                    }
                 }
-            }
-        });
+            });
 
-    });
-</script>
-<div");
+        });
+    </script>
+");
+
+            
+            #line 656 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+WriteLiteral("<div");
 
 WriteLiteral(" class=\"actionBar\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 532 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 658 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 532 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-     if (Model.CanDelete)
+            #line 658 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+     if (canDelete)
     { 
         
             
             #line default
             #line hidden
             
-            #line 534 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 660 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
    Write(Html.ActionLinkButton("Delete", MVC.API.DeviceProfile.Delete(Model.DeviceProfile.Id, true), "buttonDelete"));
 
             
             #line default
             #line hidden
             
-            #line 534 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 660 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                                                                                                     
     }
 
@@ -1111,24 +1764,54 @@ WriteLiteral(">\r\n");
 WriteLiteral("    ");
 
             
-            #line 536 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-Write(Html.ActionLinkButton("Export Devices", MVC.API.DeviceProfile.ExportDevices(Model.DeviceProfile.Id)));
+            #line 662 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+     if (Authorization.Has(Claims.Device.Actions.Export))
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 664 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+   Write(Html.ActionLinkButton("Export Devices", MVC.API.DeviceProfile.ExportDevices(Model.DeviceProfile.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
+            
+            #line 664 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                                             
+    }
 
+            
+            #line default
+            #line hidden
 WriteLiteral("    ");
 
             
-            #line 537 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-Write(Html.ActionLinkButton("View Devices", MVC.Search.Query(Model.DeviceProfile.Id.ToString(), "DeviceProfile")));
+            #line 666 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+     if (Authorization.Has(Claims.Device.Search))
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 668 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+   Write(Html.ActionLinkButton("View Devices", MVC.Search.Query(Model.DeviceProfile.Id.ToString(), "DeviceProfile")));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>\r\n");
+            
+            #line 668 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                                                    
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</div>\r\n");
 
         }
     }
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/_Table.cshtml b/Disco.Web/Areas/Config/Views/DeviceProfile/_Table.cshtml
index 7e542421..8cf61b1c 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/_Table.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/_Table.cshtml
@@ -1,5 +1,8 @@
 @model Disco.Web.Areas.Config.Models.DeviceProfile.IndexModel
 @using Disco.Web.Areas.Config.Models.DeviceProfile
+@{
+    Authorization.Require(Claims.Config.DeviceProfile.Show);
+}
 @if (DiscoApplication.MultiSiteMode)
 {
     var deviceProfilesGrouped = Model.DeviceProfiles.OrderBy(i => i.AddressName).GroupBy(i => i.AddressName);
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/_Table.generated.cs b/Disco.Web/Areas/Config/Views/DeviceProfile/_Table.generated.cs
index 280c6f80..7ce8d553 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/_Table.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/_Table.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,6 +28,8 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     
     #line 2 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
@@ -39,7 +41,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceProfile/_Table.cshtml")]
-    public partial class Table : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceProfile.IndexModel>
+    public partial class Table : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DeviceProfile.IndexModel>
     {
         public Table()
         {
@@ -48,6 +50,16 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
         {
             
             #line 3 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
+  
+    Authorization.Require(Claims.Config.DeviceProfile.Show);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n");
+
+            
+            #line 6 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
  if (DiscoApplication.MultiSiteMode)
 {
     var deviceProfilesGrouped = Model.DeviceProfiles.OrderBy(i => i.AddressName).GroupBy(i => i.AddressName);
@@ -61,7 +73,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
 WriteLiteral(" <h2>");
 
             
-            #line 9 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
+            #line 12 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
          Write(deviceProfilesGroup.Key);
 
             
@@ -70,21 +82,21 @@ WriteLiteral(" <h2>");
 WriteLiteral("</h2> ");
 
             
-            #line 9 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
+            #line 12 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
                                             }
     
             
             #line default
             #line hidden
             
-            #line 10 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
+            #line 13 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
 Write(Html.Partial(MVC.Config.DeviceProfile.Views._TableRender, deviceProfilesGroup.Cast<_IndexModelItem>(), new ViewDataDictionary()));
 
             
             #line default
             #line hidden
             
-            #line 10 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
+            #line 13 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
                                                                                                                                              
     }
 }
@@ -95,14 +107,14 @@ else
             #line default
             #line hidden
             
-            #line 15 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
+            #line 18 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
 Write(Html.Partial(MVC.Config.DeviceProfile.Views._TableRender, Model.DeviceProfiles.Cast<_IndexModelItem>(), new ViewDataDictionary()));
 
             
             #line default
             #line hidden
             
-            #line 15 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
+            #line 18 "..\..\Areas\Config\Views\DeviceProfile\_Table.cshtml"
                                                                                                                                       
 }
 
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/_TableRender.cshtml b/Disco.Web/Areas/Config/Views/DeviceProfile/_TableRender.cshtml
index 17779a43..0ae7c179 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/_TableRender.cshtml
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/_TableRender.cshtml
@@ -1,4 +1,7 @@
 @model IEnumerable<Disco.Web.Areas.Config.Models.DeviceProfile._IndexModelItem>
+@{
+    Authorization.Require(Claims.Config.DeviceProfile.Show);
+}
 <table class="tableData deviceProfileTable">
     <tr>
         <th class="name">
diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/_TableRender.generated.cs b/Disco.Web/Areas/Config/Views/DeviceProfile/_TableRender.generated.cs
index 4c989a6f..354f9960 100644
--- a/Disco.Web/Areas/Config/Views/DeviceProfile/_TableRender.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DeviceProfile/_TableRender.generated.cs
@@ -28,19 +28,29 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceProfile/_TableRender.cshtml")]
-    public partial class TableRender : System.Web.Mvc.WebViewPage<IEnumerable<Disco.Web.Areas.Config.Models.DeviceProfile._IndexModelItem>>
+    public partial class TableRender : Disco.Services.Web.WebViewPage<IEnumerable<Disco.Web.Areas.Config.Models.DeviceProfile._IndexModelItem>>
     {
         public TableRender()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<table");
+            
+            #line 2 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
+  
+    Authorization.Require(Claims.Config.DeviceProfile.Show);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<table");
 
 WriteLiteral(" class=\"tableData deviceProfileTable\"");
 
@@ -63,13 +73,13 @@ WriteLiteral(" class=\"deviceCount\"");
 WriteLiteral(">\r\n            Device Count\r\n        </th>\r\n    </tr>\r\n");
 
             
-            #line 17 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
+            #line 20 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 17 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
+            #line 20 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
      foreach (var item in Model)
     {
 
@@ -81,7 +91,7 @@ WriteLiteral("        <tr>\r\n            <td>\r\n");
 WriteLiteral("                ");
 
             
-            #line 21 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
+            #line 24 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
            Write(Html.ActionLink(item.Name, MVC.Config.DeviceProfile.Index(item.Id)));
 
             
@@ -92,7 +102,7 @@ WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
 WriteLiteral("                ");
 
             
-            #line 24 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
+            #line 27 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
            Write(Html.DisplayFor(modelItem => item.Description));
 
             
@@ -103,7 +113,7 @@ WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
 WriteLiteral("                ");
 
             
-            #line 27 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
+            #line 30 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
            Write(Html.DisplayFor(modelItem => item.DistributionType));
 
             
@@ -114,7 +124,7 @@ WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
 WriteLiteral("                ");
 
             
-            #line 30 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
+            #line 33 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
            Write(item.DeviceCount.ToString("n0"));
 
             
@@ -123,13 +133,13 @@ WriteLiteral("                ");
 WriteLiteral("\r\n");
 
             
-            #line 31 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
+            #line 34 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 31 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
+            #line 34 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
                  if (item.DeviceDecommissionedCount > 0)
                 { 
 
@@ -140,21 +150,21 @@ WriteLiteral("                    <span");
 
 WriteLiteral(" class=\"smallMessage\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 996), Tuple.Create("\"", 1067)
+WriteAttribute("title", Tuple.Create(" title=\"", 1065), Tuple.Create("\"", 1136)
             
-            #line 33 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
-, Tuple.Create(Tuple.Create("", 1004), Tuple.Create<System.Object, System.Int32>(item.DeviceDecommissionedCount.ToString("n0")
+            #line 36 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
+, Tuple.Create(Tuple.Create("", 1073), Tuple.Create<System.Object, System.Int32>(item.DeviceDecommissionedCount.ToString("n0")
             
             #line default
             #line hidden
-, 1004), false)
-, Tuple.Create(Tuple.Create(" ", 1052), Tuple.Create("Decommissioned", 1053), true)
+, 1073), false)
+, Tuple.Create(Tuple.Create(" ", 1121), Tuple.Create("Decommissioned", 1122), true)
 );
 
 WriteLiteral(">\r\n                        (");
 
             
-            #line 34 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
+            #line 37 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
                      Write(item.DeviceDecommissionedCount.ToString("n0"));
 
             
@@ -163,7 +173,7 @@ WriteLiteral(">\r\n                        (");
 WriteLiteral(")</span>\r\n");
 
             
-            #line 35 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
+            #line 38 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
                 }
 
             
@@ -172,7 +182,7 @@ WriteLiteral(")</span>\r\n");
 WriteLiteral("            </td>\r\n        </tr>\r\n");
 
             
-            #line 38 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
+            #line 41 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
     }
 
             
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.cshtml
index d1e4bdef..aef1759c 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.cshtml
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Areas.Config.Models.DocumentTemplate.CreateModel
 @{
+    Authorization.RequireAll(Claims.Config.DocumentTemplate.Create, Claims.Config.DocumentTemplate.Configure);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates", MVC.Config.DocumentTemplate.Index(null), "Create");
 }
 @using (Html.BeginForm(MVC.Config.DocumentTemplate.Create(), FormMethod.Post, new { enctype = "multipart/form-data" }))
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/Create.generated.cs
index 5078ebc0..babd1d8d 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.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DocumentTemplate/Create.cshtml")]
-    public partial class Create : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DocumentTemplate.CreateModel>
+    public partial class Create : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DocumentTemplate.CreateModel>
     {
         public Create()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
             
             #line 2 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
   
+    Authorization.RequireAll(Claims.Config.DocumentTemplate.Create, Claims.Config.DocumentTemplate.Configure);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates", MVC.Config.DocumentTemplate.Index(null), "Create");
 
             
@@ -51,7 +55,7 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
 WriteLiteral("\r\n");
 
             
-            #line 5 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 7 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
  using (Html.BeginForm(MVC.Config.DocumentTemplate.Create(), FormMethod.Post, new { enctype = "multipart/form-data" }))
 { 
 
@@ -68,7 +72,7 @@ WriteLiteral(">\r\n        <table>\r\n            <tr>\r\n                <th>\r
 "d:\r\n                </th>\r\n                <td>");
 
             
-            #line 13 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 15 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
                Write(Html.TextBoxFor(model => model.DocumentTemplate.Id));
 
             
@@ -77,7 +81,7 @@ WriteLiteral(">\r\n        <table>\r\n            <tr>\r\n                <th>\r
 WriteLiteral("<br />");
 
             
-            #line 13 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 15 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
                                                                          Write(Html.ValidationMessageFor(model => model.DocumentTemplate.Id));
 
             
@@ -88,7 +92,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 "");
 
             
-            #line 20 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 22 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
                Write(Html.TextBoxFor(model => model.DocumentTemplate.Description));
 
             
@@ -97,7 +101,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 WriteLiteral("<br />");
 
             
-            #line 20 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 22 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
                                                                                   Write(Html.ValidationMessageFor(model => model.DocumentTemplate.Description));
 
             
@@ -109,7 +113,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 WriteLiteral("                    ");
 
             
-            #line 28 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 30 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
                Write(Html.DropDownListFor(model => model.DocumentTemplate.Scope, Model.Scopes.ToSelectListItems(null)));
 
             
@@ -126,7 +130,7 @@ WriteLiteral(" name=\"Template\"");
 WriteLiteral(" /><br />");
 
             
-            #line 36 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 38 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
                                                           Write(Html.ValidationMessage("Template"));
 
             
@@ -149,7 +153,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                    ");
 
             
-            #line 44 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 46 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
                Write(CommonHelpers.CheckBoxList("Types", Model.JobTypes.ToSelectListItems(Model.Types), 2));
 
             
@@ -158,13 +162,13 @@ WriteLiteral("                    ");
 WriteLiteral("\r\n                </td>\r\n            </tr>\r\n");
 
             
-            #line 47 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 49 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
             
             
             #line default
             #line hidden
             
-            #line 47 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 49 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
              foreach (var jt in Model.JobTypes)
             {
 
@@ -173,15 +177,15 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n");
             #line hidden
 WriteLiteral("                <tr");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 1914), Tuple.Create("\"", 1939)
-, Tuple.Create(Tuple.Create("", 1919), Tuple.Create("trJobSubType", 1919), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 2032), Tuple.Create("\"", 2057)
+, Tuple.Create(Tuple.Create("", 2037), Tuple.Create("trJobSubType", 2037), true)
             
-            #line 49 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
-, Tuple.Create(Tuple.Create("", 1931), Tuple.Create<System.Object, System.Int32>(jt.Id
+            #line 51 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+, Tuple.Create(Tuple.Create("", 2049), Tuple.Create<System.Object, System.Int32>(jt.Id
             
             #line default
             #line hidden
-, 1931), false)
+, 2049), false)
 );
 
 WriteLiteral(" class=\"jobSubTypes\"");
@@ -195,7 +199,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                        ");
 
             
-            #line 51 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 53 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
                    Write(jt.Description);
 
             
@@ -206,7 +210,7 @@ WriteLiteral("<br />\r\n                        Sub Types<br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 53 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 55 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
                Write(CommonHelpers.CheckboxBulkSelect(string.Format("CheckboxBulkSelect_{0}", jt.Id)));
 
             
@@ -221,7 +225,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                        ");
 
             
-            #line 56 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 58 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
                    Write(CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.Where(jst => jst.JobTypeId == jt.Id).ToList().ToSelectListItems(Model.SubTypes), 2));
 
             
@@ -230,7 +234,7 @@ WriteLiteral("                        ");
 WriteLiteral("\r\n                    </td>\r\n                </tr>   \r\n");
 
             
-            #line 59 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 61 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
             }
 
             
@@ -288,7 +292,7 @@ WriteLiteral(@">
 ");
 
             
-            #line 96 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
+            #line 98 "..\..\Areas\Config\Views\DocumentTemplate\Create.cshtml"
 }
             
             #line default
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/ExpressionBrowser.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/ExpressionBrowser.cshtml
index 81e3826d..d6a60935 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/ExpressionBrowser.cshtml
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/ExpressionBrowser.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Areas.Config.Models.DocumentTemplate.ExpressionBrowserModel
 @{
+    Authorization.Require(Claims.Config.Show);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates", MVC.Config.DocumentTemplate.Index(null), "Expression Browser");
     Html.BundleDeferred("~/Style/jQueryUI/dynatree");
     Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-DynaTree");
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/ExpressionBrowser2.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/ExpressionBrowser2.generated.cs
index babb2206..a6548e20 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/ExpressionBrowser2.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/ExpressionBrowser2.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DocumentTemplate/ExpressionBrowser.cshtml")]
-    public partial class ExpressionBrowser : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DocumentTemplate.ExpressionBrowserModel>
+    public partial class ExpressionBrowser : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DocumentTemplate.ExpressionBrowserModel>
     {
         public ExpressionBrowser()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
             
             #line 2 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
   
+    Authorization.Require(Claims.Config.Show);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates", MVC.Config.DocumentTemplate.Index(null), "Expression Browser");
     Html.BundleDeferred("~/Style/jQueryUI/dynatree");
     Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-DynaTree");
@@ -107,7 +111,7 @@ WriteLiteral(">\r\n    $(function () {\r\n        if (!document.DiscoFunctions)
 "oadTypeUrl = \'");
 
             
-            #line 40 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
+            #line 42 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
                        Write(Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser()));
 
             
@@ -160,7 +164,7 @@ WriteLiteral("\';\r\n        var deviceScopeTree = $(\'#deviceScopeTree\');\r\n
 "        loadType(deviceScopeTree.dynatree(\'getRoot\'), \'");
 
             
-            #line 104 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
+            #line 106 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
                                                    Write(Model.DeviceType);
 
             
@@ -170,7 +174,7 @@ WriteLiteral("\');\r\n\r\n        jobScopeTree.dynatree({ onLazyRead: lazyLoadNo
 "Type(jobScopeTree.dynatree(\'getRoot\'), \'");
 
             
-            #line 107 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
+            #line 109 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
                                                 Write(Model.JobType);
 
             
@@ -180,7 +184,7 @@ WriteLiteral("\');\r\n\r\n        userScopeTree.dynatree({ onLazyRead: lazyLoadN
 "dType(userScopeTree.dynatree(\'getRoot\'), \'");
 
             
-            #line 110 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
+            #line 112 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
                                                  Write(Model.UserType);
 
             
@@ -202,7 +206,7 @@ WriteLiteral(" type=\"text/javascript\"");
 WriteLiteral(">\r\n        $(function () {\r\n");
 
             
-            #line 121 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
+            #line 123 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
   
 foreach (var variable in Model.Variables)
 {
@@ -215,7 +219,7 @@ WriteLiteral("           ");
 WriteLiteral("document.DiscoFunctions.expressionInitVariable(\'");
 
             
-            #line 124 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
+            #line 126 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
                                                              Write(variable.Key);
 
             
@@ -224,7 +228,7 @@ WriteLiteral("document.DiscoFunctions.expressionInitVariable(\'");
 WriteLiteral("\', \'");
 
             
-            #line 124 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
+            #line 126 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
                                                                                Write(variable.Value);
 
             
@@ -235,7 +239,7 @@ WriteLiteral("\');");
 WriteLiteral("\r\n");
 
             
-            #line 125 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
+            #line 127 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
 }
 foreach (var variable in Model.ExtensionLibraries)
 {
@@ -248,7 +252,7 @@ WriteLiteral("           ");
 WriteLiteral("document.DiscoFunctions.expressionInitExpressionLibrary(\'");
 
             
-            #line 128 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
+            #line 130 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
                                                                       Write(variable.Key);
 
             
@@ -257,7 +261,7 @@ WriteLiteral("document.DiscoFunctions.expressionInitExpressionLibrary(\'");
 WriteLiteral("\', \'");
 
             
-            #line 128 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
+            #line 130 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
                                                                                         Write(variable.Value);
 
             
@@ -268,7 +272,7 @@ WriteLiteral("\');");
 WriteLiteral("\r\n");
 
             
-            #line 129 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
+            #line 131 "..\..\Areas\Config\Views\DocumentTemplate\ExpressionBrowser.cshtml"
 }
 
             
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.cshtml
index 1a031161..e9375a9f 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.cshtml
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.cshtml
@@ -1,4 +1,6 @@
 @{
+    Authorization.Require(Claims.Config.DocumentTemplate.ShowStatus);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates", MVC.Config.DocumentTemplate.Index(), "Import Status");
     Html.BundleDeferred("~/ClientScripts/Modules/Knockout");
     Html.BundleDeferred("~/ClientScripts/Modules/jQuery-SignalR");
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.generated.cs
index 6c833d70..42ed98dd 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DocumentTemplate/ImportStatus.cshtml")]
-    public partial class ImportStatus : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class ImportStatus : Disco.Services.Web.WebViewPage<dynamic>
     {
         public ImportStatus()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
             
             #line 1 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
   
+    Authorization.Require(Claims.Config.DocumentTemplate.ShowStatus);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates", MVC.Config.DocumentTemplate.Index(), "Import Status");
     Html.BundleDeferred("~/ClientScripts/Modules/Knockout");
     Html.BundleDeferred("~/ClientScripts/Modules/jQuery-SignalR");
@@ -261,7 +265,7 @@ WriteLiteral(">\r\n    $(function () {\r\n        var vm;\r\n        var host =
 " var urlDeviceShow = \'");
 
             
-            #line 102 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
+            #line 104 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
                          Write(Url.Action(MVC.Device.Show()));
 
             
@@ -270,7 +274,7 @@ WriteLiteral(">\r\n    $(function () {\r\n        var vm;\r\n        var host =
 WriteLiteral("/\'\r\n        var urlJobShow = \'");
 
             
-            #line 103 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
+            #line 105 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
                       Write(Url.Action(MVC.Job.Show()));
 
             
@@ -279,7 +283,7 @@ WriteLiteral("/\'\r\n        var urlJobShow = \'");
 WriteLiteral("/\'\r\n        var urlUserShow = \'");
 
             
-            #line 104 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
+            #line 106 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
                        Write(Url.Action(MVC.User.Show()));
 
             
@@ -288,7 +292,7 @@ WriteLiteral("/\'\r\n        var urlUserShow = \'");
 WriteLiteral("/\'\r\n        var urlPageThumbnail = \'");
 
             
-            #line 105 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
+            #line 107 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
                             Write(Url.Action(MVC.API.DocumentTemplate.ImporterThumbnail()));
 
             
@@ -297,7 +301,7 @@ WriteLiteral("/\'\r\n        var urlPageThumbnail = \'");
 WriteLiteral("/\'\r\n        var urlDocumentTemplate = \'");
 
             
-            #line 106 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
+            #line 108 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
                                Write(Url.Action(MVC.Config.DocumentTemplate.Index()));
 
             
@@ -306,7 +310,7 @@ WriteLiteral("/\'\r\n        var urlDocumentTemplate = \'");
 WriteLiteral("/\';\r\n        var urlManuallyAssign = \'");
 
             
-            #line 107 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
+            #line 109 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
                              Write(Url.Action(MVC.Config.DocumentTemplate.UndetectedPages()));
 
             
@@ -315,7 +319,7 @@ WriteLiteral("/\';\r\n        var urlManuallyAssign = \'");
 WriteLiteral("\';\r\n        var iconErrorUrl = \'url(");
 
             
-            #line 108 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
+            #line 110 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
                             Write(Links.ClientSource.Style.Images.Status.fail32_png);
 
             
@@ -423,7 +427,7 @@ WriteLiteral(")\';\r\n        var isLive = false;\r\n\r\n        function pageVi
 "          url: \'");
 
             
-            #line 283 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
+            #line 285 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
                   Write(Url.Action(MVC.API.Logging.RetrieveEvents()));
 
             
@@ -452,7 +456,7 @@ WriteLiteral(@"',
             liveConnection = $.connection('");
 
             
-            #line 303 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
+            #line 305 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
                                        Write(Url.Content("~/API/Logging/Notifications"));
 
             
@@ -461,7 +465,7 @@ WriteLiteral(@"',
 WriteLiteral("\', { addToGroups: \'");
 
             
-            #line 303 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
+            #line 305 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
                                                                                                        Write(Disco.BI.DocumentTemplateBI.Importer.DocumentImporterLog.Current.LiveLogGroupName);
 
             
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.cshtml
index 08f9ddc3..b93c40bf 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.cshtml
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.cshtml
@@ -1,37 +1,57 @@
 @model Disco.Web.Areas.Config.Models.DocumentTemplate.IndexModel
 @{
+    Authorization.Require(Claims.Config.DocumentTemplate.Show);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates");
 }
-<table class="tableData">
-    <tr>
-        <th>
-            Id
-        </th>
-        <th>
-            Description
-        </th>
-        <th>
-            Scope
-        </th>
-    </tr>
-    @foreach (var item in Model.DocumentTemplates)
-    {
+@if (Model.DocumentTemplates.Count == 0)
+{
+    <div class="form" style="width: 450px; padding: 100px 0;">
+        <h2>No document templates are configured</h2>
+    </div>  
+}
+else
+{
+    <table class="tableData">
         <tr>
-            <td>
-                @Html.ActionLink(item.Id.ToString(), MVC.Config.DocumentTemplate.Index(item.Id))
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.Description)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.Scope)
-            </td>
+            <th>Id
+            </th>
+            <th>Description
+            </th>
+            <th>Scope
+            </th>
         </tr>
-    }
-</table>
+        @foreach (var item in Model.DocumentTemplates)
+        {
+            <tr>
+                <td>
+                    @Html.ActionLink(item.Id.ToString(), MVC.Config.DocumentTemplate.Index(item.Id))
+                </td>
+                <td>
+                    @Html.DisplayFor(modelItem => item.Description)
+                </td>
+                <td>
+                    @Html.DisplayFor(modelItem => item.Scope)
+                </td>
+            </tr>
+        }
+    </table>
+}
 <div class="actionBar">
-    @Html.ActionLinkButton("Undetected Pages", MVC.Config.DocumentTemplate.UndetectedPages())
-    @Html.ActionLinkButton("Import Status", MVC.Config.DocumentTemplate.ImportStatus())
-    @Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser())
-    @Html.ActionLinkButton("Create Document Template", MVC.Config.DocumentTemplate.Create())
-</div>
\ No newline at end of file
+    @if (Authorization.Has(Claims.Config.DocumentTemplate.UndetectedPages))
+    {
+        @Html.ActionLinkButton("Undetected Pages", MVC.Config.DocumentTemplate.UndetectedPages())
+    }
+    @if (Authorization.Has(Claims.Config.DocumentTemplate.ShowStatus))
+    {
+        @Html.ActionLinkButton("Import Status", MVC.Config.DocumentTemplate.ImportStatus())
+    }
+    @if (Authorization.Has(Claims.Config.Show))
+    {
+        @Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser())
+    }
+    @if (Authorization.HasAll(Claims.Config.DocumentTemplate.Create, Claims.Config.DocumentTemplate.Configure))
+    {
+        @Html.ActionLinkButton("Create Document Template", MVC.Config.DocumentTemplate.Create())
+    }
+</div>
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.generated.cs
index e2233c92..10b81f39 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DocumentTemplate/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DocumentTemplate.IndexModel>
+    public partial class Index : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DocumentTemplate.IndexModel>
     {
         public Index()
         {
@@ -43,124 +45,224 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
             
             #line 2 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
   
+    Authorization.Require(Claims.Config.DocumentTemplate.Show);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates");
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n<table");
+WriteLiteral("\r\n");
+
+            
+            #line 7 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+ if (Model.DocumentTemplates.Count == 0)
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
+
+WriteLiteral(" class=\"form\"");
+
+WriteLiteral(" style=\"width: 450px; padding: 100px 0;\"");
+
+WriteLiteral(">\r\n        <h2>No document templates are configured</h2>\r\n    </div>  \r\n");
+
+            
+            #line 12 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+}
+else
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <table");
 
 WriteLiteral(" class=\"tableData\"");
 
-WriteLiteral(">\r\n    <tr>\r\n        <th>\r\n            Id\r\n        </th>\r\n        <th>\r\n         " +
-"   Description\r\n        </th>\r\n        <th>\r\n            Scope\r\n        </th>\r\n " +
-"   </tr>\r\n");
-
-            
-            #line 17 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 17 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
-     foreach (var item in Model.DocumentTemplates)
-    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <tr>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 21 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
-           Write(Html.ActionLink(item.Id.ToString(), MVC.Config.DocumentTemplate.Index(item.Id)));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
+WriteLiteral(">\r\n        <tr>\r\n            <th>Id\r\n            </th>\r\n            <th>Descripti" +
+"on\r\n            </th>\r\n            <th>Scope\r\n            </th>\r\n        </tr>\r\n" +
+"");
 
             
             #line 24 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
-           Write(Html.DisplayFor(modelItem => item.Description));
+        
+            
+            #line default
+            #line hidden
+            
+            #line 24 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+         foreach (var item in Model.DocumentTemplates)
+        {
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
+WriteLiteral("            <tr>\r\n                <td>\r\n");
 
-WriteLiteral("                ");
+WriteLiteral("                    ");
 
             
-            #line 27 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
-           Write(Html.DisplayFor(modelItem => item.Scope));
+            #line 28 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+               Write(Html.ActionLink(item.Id.ToString(), MVC.Config.DocumentTemplate.Index(item.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n");
+WriteLiteral("\r\n                </td>\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
 
             
-            #line 30 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
-    }
+            #line 31 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+               Write(Html.DisplayFor(modelItem => item.Description));
 
             
             #line default
             #line hidden
-WriteLiteral("</table>\r\n<div");
+WriteLiteral("\r\n                </td>\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 34 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+               Write(Html.DisplayFor(modelItem => item.Scope));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </td>\r\n            </tr>\r\n");
+
+            
+            #line 37 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    </table>\r\n");
+
+            
+            #line 39 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+WriteLiteral("<div");
 
 WriteLiteral(" class=\"actionBar\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("    ");
-
             
-            #line 33 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
-Write(Html.ActionLinkButton("Undetected Pages", MVC.Config.DocumentTemplate.UndetectedPages()));
+            #line 41 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 41 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+     if (Authorization.Has(Claims.Config.DocumentTemplate.UndetectedPages))
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 43 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+   Write(Html.ActionLinkButton("Undetected Pages", MVC.Config.DocumentTemplate.UndetectedPages()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
             
-            #line 34 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
-Write(Html.ActionLinkButton("Import Status", MVC.Config.DocumentTemplate.ImportStatus()));
+            #line 43 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+                                                                                                 
+    }
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
 WriteLiteral("    ");
 
             
-            #line 35 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
-Write(Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser()));
+            #line 45 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+     if (Authorization.Has(Claims.Config.DocumentTemplate.ShowStatus))
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 47 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+   Write(Html.ActionLinkButton("Import Status", MVC.Config.DocumentTemplate.ImportStatus()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
             
-            #line 36 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
-Write(Html.ActionLinkButton("Create Document Template", MVC.Config.DocumentTemplate.Create()));
+            #line 47 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+                                                                                           
+    }
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>");
+WriteLiteral("    ");
+
+            
+            #line 49 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+     if (Authorization.Has(Claims.Config.Show))
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 51 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+   Write(Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser()));
+
+            
+            #line default
+            #line hidden
+            
+            #line 51 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+                                                                                                     
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    ");
+
+            
+            #line 53 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+     if (Authorization.HasAll(Claims.Config.DocumentTemplate.Create, Claims.Config.DocumentTemplate.Configure))
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 55 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+   Write(Html.ActionLinkButton("Create Document Template", MVC.Config.DocumentTemplate.Create()));
+
+            
+            #line default
+            #line hidden
+            
+            #line 55 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
+                                                                                                
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</div>\r\n");
 
         }
     }
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml
index c5714c76..adc119a5 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml
@@ -1,28 +1,52 @@
 @model Disco.Web.Areas.Config.Models.DocumentTemplate.ShowModel
 @{
+    Authorization.Require(Claims.Config.DocumentTemplate.Show);
+
+    var canConfig = Authorization.Has(Claims.Config.DocumentTemplate.Configure);
+
+    #region Can Bulk Generate
+    var canBulkGenerate = Authorization.Has(Claims.Config.DocumentTemplate.BulkGenerate);
+    if (canBulkGenerate)
+    {
+        switch (Model.DocumentTemplate.Scope)
+        {
+            case DocumentTemplate.DocumentTemplateScopes.Device:
+                canBulkGenerate = Authorization.Has(Claims.Device.Actions.GenerateDocuments);
+                break;
+            case DocumentTemplate.DocumentTemplateScopes.Job:
+                canBulkGenerate = Authorization.Has(Claims.Job.Actions.GenerateDocuments);
+                break;
+            case DocumentTemplate.DocumentTemplateScopes.User:
+                canBulkGenerate = Authorization.Has(Claims.User.Actions.GenerateDocuments);
+                break;
+            default:
+                throw new InvalidOperationException("Invalid DocumentType Scope");
+        }
+    }
+    #endregion
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates", MVC.Config.DocumentTemplate.Index(null), Model.DocumentTemplate.Description);
 }
 <div class="form" style="width: 650px">
     <table>
         <tr>
-            <th>
-                Id:
+            <th>Id:
             </th>
             <td>@Html.DisplayFor(model => model.DocumentTemplate.Id)
             </td>
         </tr>
         <tr>
-            <th>
-                Stored Instances:
+            <th>Stored Instances:
             </th>
             <td>@Html.DisplayFor(model => model.StoredInstanceCount)
             </td>
         </tr>
         <tr>
-            <th>
-                Description:
+            <th>Description:
             </th>
-            <td>@Html.TextBoxFor(model => model.DocumentTemplate.Description)
+            <td>@if (canConfig)
+                {
+                @Html.TextBoxFor(model => model.DocumentTemplate.Description)
                 @AjaxHelpers.AjaxSave()
                 @AjaxHelpers.AjaxLoader()
                 <script type="text/javascript">
@@ -64,13 +88,25 @@
                                 });
                     });
                 </script>
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(Model.DocumentTemplate.Description))
+                    {
+                <span class="smallMessage">&lt;None Specified&gt;</span>
+                    }
+                    else
+                    {
+                @Model.DocumentTemplate.Description
+                    }
+                }
             </td>
         </tr>
         <tr>
-            <th>
-                Always Flatten Form:
+            <th>Always Flatten Form:
             </th>
-            <td>
+            <td>@if (canConfig)
+                {
                 <input id="DocumentTemplate_FlattenForm" type="checkbox" @(Model.DocumentTemplate.FlattenForm ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty))/>
                 @AjaxHelpers.AjaxLoader()
                 <script type="text/javascript">
@@ -90,13 +126,18 @@
                         });
                     });
                 </script>
+                }
+                else
+                {
+                <input id="DocumentTemplate_FlattenForm" type="checkbox" @(Model.DocumentTemplate.FlattenForm ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)) disabled="disabled" />
+                }
             </td>
         </tr>
         <tr>
-            <th>
-                Scope:
+            <th>Scope:
             </th>
-            <td>
+            <td>@if (canConfig)
+                {
                 @Html.DropDownListFor(model => model.DocumentTemplate.Scope, Model.Scopes.ToSelectListItems(null))
                 @AjaxHelpers.AjaxLoader()
                 <script type="text/javascript">
@@ -191,66 +232,92 @@
                         scopeChange();
                     });
                 </script>
+                }
+                else
+                {
+                @Model.DocumentTemplate.Scope
+                }
             </td>
         </tr>
-        <tr id="trJobTypes">
-            <th class="name">
-                Types:
-            </th>
-            <td class="value">
-                @CommonHelpers.CheckBoxList("Types", Model.JobTypes.ToSelectListItems(Model.Types), 2)
-            </td>
-        </tr>
-        @foreach (var jt in Model.JobTypes)
+        @if (canConfig || (Model.DocumentTemplate.Scope == DocumentTemplate.DocumentTemplateScopes.Job))
         {
+            <tr id="trJobTypes">
+                <th class="name">Types:
+                </th>
+                <td class="value">
+                    @CommonHelpers.CheckBoxList("Types", Model.JobTypes.ToSelectListItems(Model.Types), 2)
+                </td>
+            </tr>
+            foreach (var jt in Model.JobTypes)
+            {
             <tr id="trJobSubType@(jt.Id)" class="jobSubTypes">
                 <th class="name">
                     @jt.Description<br />
                     Sub Types<br />
-                    @CommonHelpers.CheckboxBulkSelect(string.Format("CheckboxBulkSelect_{0}", jt.Id))
+                    @if (canConfig)
+                    {
+                        @CommonHelpers.CheckboxBulkSelect(string.Format("CheckboxBulkSelect_{0}", jt.Id))
+                    }
                 </th>
                 <td class="value">
                     @CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.Where(jst => jst.JobTypeId == jt.Id).ToList().ToSelectListItems(Model.SubTypes), 2)
                 </td>
             </tr>   
+            }
+            if (canConfig)
+            {
+            <tr id="trJobTypeActions">
+                <th class="name"></th>
+                <td class="value">
+                    <a id="TypeAction_Save" href="#" class="button">Save Job Types</a>@AjaxHelpers.AjaxLoader()
+                </td>
+            </tr>
+            }
+            else if (Model.DocumentTemplate.Scope == DocumentTemplate.DocumentTemplateScopes.Job)
+            {
+            <script>
+                $(function () {
+                    $('.jobSubTypes').hide().find('input[type="checkbox"]').prop('disabled', true);
+                    $('#trJobTypes').find('input[type="checkbox"]').prop('disabled', true).filter(':checked').each(function () {
+                        $('#trJobSubType' + $(this).val()).show();
+                    });
+                });
+            </script>
+            }
         }
-        <tr id="trJobTypeActions">
-            <th class="name">
-            </th>
-            <td class="value">
-                <a id="TypeAction_Save" href="#" class="button">Save Job Types</a>@AjaxHelpers.AjaxLoader()
-            </td>
-        </tr>
         <tr>
-            <th>
-                Template PDF
+            <th>Template PDF
             </th>
             <td>
                 @Html.ActionLink("Download Template", MVC.API.DocumentTemplate.Template(Model.DocumentTemplate.Id))
-                <br />
-                @using (Html.BeginForm(MVC.API.DocumentTemplate.Template(Model.DocumentTemplate.Id, true, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
+                @if (canConfig && Authorization.Has(Claims.Config.DocumentTemplate.Upload))
                 {
+                    <br />
+                    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="Template" style="width: 250px;" />
                     <input class="button" type="submit" value="Upload" />
-                }
-                <script type="text/javascript">
-                    $(function () {
-                        var $template = $('#Template');
-                        $template.closest('form').submit(function () {
-                            if ($template.val() == '') {
-                                alert('A template file is required to upload.');
-                                return false;
-                            }
+                    }
+                    <script type="text/javascript">
+                        $(function () {
+                            var $template = $('#Template');
+                            $template.closest('form').submit(function () {
+                                if ($template.val() == '') {
+                                    alert('A template file is required to upload.');
+                                    return false;
+                                }
+                            });
                         });
-                    });
-                </script>
+                    </script>
+                }
             </td>
         </tr>
         <tr>
-            <th>
-                Filter Expression:
+            <th>Filter Expression:
             </th>
-            <td>@Html.TextBoxFor(model => model.DocumentTemplate.FilterExpression)
+            <td>@if (canConfig && Authorization.Has(Claims.Config.DocumentTemplate.ConfigureFilterExpression))
+                {
+                @Html.TextBoxFor(model => model.DocumentTemplate.FilterExpression)
                 @AjaxHelpers.AjaxRemove()
                 @AjaxHelpers.AjaxLoader()
                 <script type="text/javascript">
@@ -300,32 +367,47 @@
                         };
                     });
                 </script>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Bulk Generate
-            </th>
-            <td>
-                @using (Html.BeginForm(MVC.API.DocumentTemplate.BulkGenerate(Model.DocumentTemplate.Id), FormMethod.Post))
+                }
+                else
                 {
-                    <textarea name="DataIds"></textarea>
-                    <input class="button" type="submit" value="Generate" />
+                    if (string.IsNullOrWhiteSpace(Model.DocumentTemplate.FilterExpression))
+                    {
+                <span class="smallMessage">&lt;None Specified&gt;</span>
+                    }
+                    else
+                    {
+                <div class="code">
+                    @Model.DocumentTemplate.FilterExpression
+                </div>
+                    }
                 }
             </td>
         </tr>
+        @if (canBulkGenerate)
+        {
+            <tr>
+                <th>Bulk Generate
+                </th>
+                <td>
+                    @using (Html.BeginForm(MVC.API.DocumentTemplate.BulkGenerate(Model.DocumentTemplate.Id), FormMethod.Post))
+                    {
+                        <textarea name="DataIds"></textarea>
+                        <input class="button" type="submit" value="Generate" />
+                    }
+                </td>
+            </tr>
+        }
     </table>
 </div>
-<h2>
-    Template Expressions</h2>
+<h2>Template Expressions</h2>
 @Html.Partial(MVC.Config.DocumentTemplate.Views._ExpressionsTable, Model.TemplateExpressions)
 <div id="dialogConfirmDelete" title="Delete this Document Template?">
     <p>
-        <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 100px 0;">
-        </span>This item will be permanently deleted and cannot be recovered.<br />
+        <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 100px 0;"></span>This item will be permanently deleted and cannot be recovered.<br />
         <em>This <strong>will not delete attachments</strong> which have already been imported,
             but any generated documents will no longer be automatically imported.</em><br />
-        Are you sure?</p>
+        Are you sure?
+    </p>
 </div>
 <script type="text/javascript">
     $(function () {
@@ -357,6 +439,12 @@
     });
 </script>
 <div class="actionBar">
-    @Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser())
-    @Html.ActionLinkButton("Delete", MVC.API.DocumentTemplate.Delete(Model.DocumentTemplate.Id, true), "buttonDelete")
+    @if (Authorization.Has(Claims.Config.Show))
+    {
+        @Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser())
+    }
+    @if (Authorization.Has(Claims.Config.DocumentTemplate.Delete))
+    {
+        @Html.ActionLinkButton("Delete", MVC.API.DocumentTemplate.Delete(Model.DocumentTemplate.Id, true), "buttonDelete")
+    }
 </div>
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs
index e75108a1..17e99740 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DocumentTemplate/Show.cshtml")]
-    public partial class Show : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DocumentTemplate.ShowModel>
+    public partial class Show : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DocumentTemplate.ShowModel>
     {
         public Show()
         {
@@ -43,6 +45,31 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
             
             #line 2 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
   
+    Authorization.Require(Claims.Config.DocumentTemplate.Show);
+
+    var canConfig = Authorization.Has(Claims.Config.DocumentTemplate.Configure);
+
+    #region Can Bulk Generate
+    var canBulkGenerate = Authorization.Has(Claims.Config.DocumentTemplate.BulkGenerate);
+    if (canBulkGenerate)
+    {
+        switch (Model.DocumentTemplate.Scope)
+        {
+            case DocumentTemplate.DocumentTemplateScopes.Device:
+                canBulkGenerate = Authorization.Has(Claims.Device.Actions.GenerateDocuments);
+                break;
+            case DocumentTemplate.DocumentTemplateScopes.Job:
+                canBulkGenerate = Authorization.Has(Claims.Job.Actions.GenerateDocuments);
+                break;
+            case DocumentTemplate.DocumentTemplateScopes.User:
+                canBulkGenerate = Authorization.Has(Claims.User.Actions.GenerateDocuments);
+                break;
+            default:
+                throw new InvalidOperationException("Invalid DocumentType Scope");
+        }
+    }
+    #endregion
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates", MVC.Config.DocumentTemplate.Index(null), Model.DocumentTemplate.Description);
 
             
@@ -54,59 +81,80 @@ WriteLiteral(" class=\"form\"");
 
 WriteLiteral(" style=\"width: 650px\"");
 
-WriteLiteral(">\r\n    <table>\r\n        <tr>\r\n            <th>\r\n                Id:\r\n            " +
-"</th>\r\n            <td>");
+WriteLiteral(">\r\n    <table>\r\n        <tr>\r\n            <th>Id:\r\n            </th>\r\n           " +
+" <td>");
 
             
-            #line 11 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 35 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
            Write(Html.DisplayFor(model => model.DocumentTemplate.Id));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>\r\n             " +
-"   Stored Instances:\r\n            </th>\r\n            <td>");
+WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Stored Instance" +
+"s:\r\n            </th>\r\n            <td>");
 
             
-            #line 18 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 41 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
            Write(Html.DisplayFor(model => model.StoredInstanceCount));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>\r\n             " +
-"   Description:\r\n            </th>\r\n            <td>");
+WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Description:\r\n " +
+"           </th>\r\n            <td>");
 
             
-            #line 25 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 47 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 49 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
            Write(Html.TextBoxFor(model => model.DocumentTemplate.Description));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 26 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 49 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                                                             
+                
+            
+            #line default
+            #line hidden
+            
+            #line 50 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 27 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 50 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                       
+                
+            
+            #line default
+            #line hidden
+            
+            #line 51 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 51 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -133,7 +181,7 @@ WriteLiteral(@">
                                         url: '");
 
             
-            #line 48 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 72 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                                          Write(Url.Action(MVC.API.DocumentTemplate.UpdateDescription(Model.DocumentTemplate.Id)));
 
             
@@ -158,14 +206,62 @@ WriteLiteral(@"',
                                 });
                     });
                 </script>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Always Flatten Form:
-            </th>
-            <td>
-                <input");
+");
+
+            
+            #line 91 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(Model.DocumentTemplate.Description))
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>\r\n");
+
+            
+            #line 97 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                    }
+                    else
+                    {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 100 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+           Write(Model.DocumentTemplate.Description);
+
+            
+            #line default
+            #line hidden
+            
+            #line 100 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                                   
+                    }
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Always Flatten Fo" +
+"rm:\r\n            </th>\r\n            <td>");
+
+            
+            #line 108 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                 if (canConfig)
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <input");
 
 WriteLiteral(" id=\"DocumentTemplate_FlattenForm\"");
 
@@ -174,7 +270,7 @@ WriteLiteral(" type=\"checkbox\"");
 WriteLiteral(" ");
 
             
-            #line 74 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 110 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                                                                      Write(Model.DocumentTemplate.FlattenForm ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
 
             
@@ -182,16 +278,27 @@ WriteLiteral(" ");
             #line hidden
 WriteLiteral("/>\r\n");
 
-WriteLiteral("                ");
-
             
-            #line 75 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 111 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 111 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 111 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -204,7 +311,7 @@ WriteLiteral(@">
                             $.getJSON('");
 
             
-            #line 82 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 118 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                                    Write(Url.Action(MVC.API.DocumentTemplate.UpdateFlattenForm(Model.DocumentTemplate.Id)));
 
             
@@ -221,36 +328,81 @@ WriteLiteral(@"', data, function (response, result) {
                         });
                     });
                 </script>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Scope:
-            </th>
-            <td>
 ");
 
-WriteLiteral("                ");
+            
+            #line 129 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                }
+                else
+                {
 
             
-            #line 100 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line default
+            #line hidden
+WriteLiteral("                <input");
+
+WriteLiteral(" id=\"DocumentTemplate_FlattenForm\"");
+
+WriteLiteral(" type=\"checkbox\"");
+
+WriteLiteral(" ");
+
+            
+            #line 132 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                                                     Write(Model.DocumentTemplate.FlattenForm ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(" disabled=\"disabled\" />\r\n");
+
+            
+            #line 133 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Scope:\r\n         " +
+"   </th>\r\n            <td>");
+
+            
+            #line 139 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 141 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
            Write(Html.DropDownListFor(model => model.DocumentTemplate.Scope, Model.Scopes.ToSelectListItems(null)));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 101 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 141 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                                                                                                  
+                
+            
+            #line default
+            #line hidden
+            
+            #line 142 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 142 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -264,7 +416,7 @@ WriteLiteral(@">
                                 url: '");
 
             
-            #line 109 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 150 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                                  Write(Url.Action(MVC.API.DocumentTemplate.UpdateScope(Model.DocumentTemplate.Id)));
 
             
@@ -312,7 +464,7 @@ WriteLiteral("\',\r\n                                dataType: \'json\',\r\n
 "ax({\r\n                                url: \'");
 
             
-            #line 169 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 210 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                                  Write(Url.Action(MVC.API.DocumentTemplate.UpdateSubTypes(Model.DocumentTemplate.Id)));
 
             
@@ -343,42 +495,43 @@ WriteLiteral(@"',
                         scopeChange();
                     });
                 </script>
-            </td>
-        </tr>
-        <tr");
-
-WriteLiteral(" id=\"trJobTypes\"");
-
-WriteLiteral(">\r\n            <th");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                Types:\r\n            </th>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
+");
 
             
-            #line 201 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-           Write(CommonHelpers.CheckBoxList("Types", Model.JobTypes.ToSelectListItems(Model.Types), 2));
+            #line 235 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                }
+                else
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 238 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+           Write(Model.DocumentTemplate.Scope);
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n");
+            
+            #line 238 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                             
+                }
 
             
-            #line 204 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n");
+
+            
+            #line 242 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
         
             
             #line default
             #line hidden
             
-            #line 204 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-         foreach (var jt in Model.JobTypes)
+            #line 242 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+         if (canConfig || (Model.DocumentTemplate.Scope == DocumentTemplate.DocumentTemplateScopes.Job))
         {
 
             
@@ -386,15 +539,48 @@ WriteLiteral("\r\n            </td>\r\n        </tr>\r\n");
             #line hidden
 WriteLiteral("            <tr");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 10448), Tuple.Create("\"", 10473)
-, Tuple.Create(Tuple.Create("", 10453), Tuple.Create("trJobSubType", 10453), true)
+WriteLiteral(" id=\"trJobTypes\"");
+
+WriteLiteral(">\r\n                <th");
+
+WriteLiteral(" class=\"name\"");
+
+WriteLiteral(">Types:\r\n                </th>\r\n                <td");
+
+WriteLiteral(" class=\"value\"");
+
+WriteLiteral(">\r\n");
+
+WriteLiteral("                    ");
+
             
-            #line 206 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 10465), Tuple.Create<System.Object, System.Int32>(jt.Id
+            #line 248 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+               Write(CommonHelpers.CheckBoxList("Types", Model.JobTypes.ToSelectListItems(Model.Types), 2));
+
             
             #line default
             #line hidden
-, 10465), false)
+WriteLiteral("\r\n                </td>\r\n            </tr>\r\n");
+
+            
+            #line 251 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            foreach (var jt in Model.JobTypes)
+            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <tr");
+
+WriteAttribute("id", Tuple.Create(" id=\"", 12488), Tuple.Create("\"", 12513)
+, Tuple.Create(Tuple.Create("", 12493), Tuple.Create("trJobSubType", 12493), true)
+            
+            #line 253 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+, Tuple.Create(Tuple.Create("", 12505), Tuple.Create<System.Object, System.Int32>(jt.Id
+            
+            #line default
+            #line hidden
+, 12505), false)
 );
 
 WriteLiteral(" class=\"jobSubTypes\"");
@@ -408,7 +594,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                    ");
 
             
-            #line 208 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 255 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                Write(jt.Description);
 
             
@@ -416,16 +602,36 @@ WriteLiteral("                    ");
             #line hidden
 WriteLiteral("<br />\r\n                    Sub Types<br />\r\n");
 
-WriteLiteral("                    ");
-
             
-            #line 210 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-               Write(CommonHelpers.CheckboxBulkSelect(string.Format("CheckboxBulkSelect_{0}", jt.Id)));
+            #line 257 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 257 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                     if (canConfig)
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 259 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                   Write(CommonHelpers.CheckboxBulkSelect(string.Format("CheckboxBulkSelect_{0}", jt.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                </th>\r\n                <td");
+            
+            #line 259 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                                                                                         
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </th>\r\n                <td");
 
 WriteLiteral(" class=\"value\"");
 
@@ -434,7 +640,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                    ");
 
             
-            #line 213 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 263 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                Write(CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.Where(jst => jst.JobTypeId == jt.Id).ToList().ToSelectListItems(Model.SubTypes), 2));
 
             
@@ -443,25 +649,27 @@ WriteLiteral("                    ");
 WriteLiteral("\r\n                </td>\r\n            </tr>   \r\n");
 
             
-            #line 216 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-        }
+            #line 266 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            }
+            if (canConfig)
+            {
 
             
             #line default
             #line hidden
-WriteLiteral("        <tr");
+WriteLiteral("            <tr");
 
 WriteLiteral(" id=\"trJobTypeActions\"");
 
-WriteLiteral(">\r\n            <th");
+WriteLiteral(">\r\n                <th");
 
 WriteLiteral(" class=\"name\"");
 
-WriteLiteral(">\r\n            </th>\r\n            <td");
+WriteLiteral("></th>\r\n                <td");
 
 WriteLiteral(" class=\"value\"");
 
-WriteLiteral(">\r\n                <a");
+WriteLiteral(">\r\n                    <a");
 
 WriteLiteral(" id=\"TypeAction_Save\"");
 
@@ -472,38 +680,77 @@ WriteLiteral(" class=\"button\"");
 WriteLiteral(">Save Job Types</a>");
 
             
-            #line 221 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                                                                             Write(AjaxHelpers.AjaxLoader());
+            #line 272 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                                                                 Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>\r\n             " +
-"   Template PDF\r\n            </th>\r\n            <td>\r\n");
+WriteLiteral("\r\n                </td>\r\n            </tr>\r\n");
+
+            
+            #line 275 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            }
+            else if (Model.DocumentTemplate.Scope == DocumentTemplate.DocumentTemplateScopes.Job)
+            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"            <script>
+                $(function () {
+                    $('.jobSubTypes').hide().find('input[type=""checkbox""]').prop('disabled', true);
+                    $('#trJobTypes').find('input[type=""checkbox""]').prop('disabled', true).filter(':checked').each(function () {
+                        $('#trJobSubType' + $(this).val()).show();
+                    });
+                });
+            </script>
+");
+
+            
+            #line 286 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            }
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        <tr>\r\n            <th>Template PDF\r\n            </th>\r\n            <td>\r\n" +
+"");
 
 WriteLiteral("                ");
 
             
-            #line 229 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 292 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
            Write(Html.ActionLink("Download Template", MVC.API.DocumentTemplate.Template(Model.DocumentTemplate.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <br />\r\n");
+WriteLiteral("\r\n");
 
             
-            #line 231 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 293 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 231 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                 using (Html.BeginForm(MVC.API.DocumentTemplate.Template(Model.DocumentTemplate.Id, true, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
+            #line 293 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                 if (canConfig && Authorization.Has(Claims.Config.DocumentTemplate.Upload))
                 {
 
             
+            #line default
+            #line hidden
+WriteLiteral("                    <br />\r\n");
+
+            
+            #line 296 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                    using (Html.BeginForm(MVC.API.DocumentTemplate.Template(Model.DocumentTemplate.Id, true, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
+                    {
+
+            
             #line default
             #line hidden
 WriteLiteral("                    <input");
@@ -529,65 +776,90 @@ WriteLiteral(" value=\"Upload\"");
 WriteLiteral(" />\r\n");
 
             
-            #line 235 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 300 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <script");
+
+WriteLiteral(" type=\"text/javascript\"");
+
+WriteLiteral(@">
+                        $(function () {
+                            var $template = $('#Template');
+                            $template.closest('form').submit(function () {
+                                if ($template.val() == '') {
+                                    alert('A template file is required to upload.');
+                                    return false;
+                                }
+                            });
+                        });
+                    </script>
+");
+
+            
+            #line 312 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                 }
 
             
             #line default
             #line hidden
-WriteLiteral("                <script");
-
-WriteLiteral(" type=\"text/javascript\"");
-
-WriteLiteral(@">
-                    $(function () {
-                        var $template = $('#Template');
-                        $template.closest('form').submit(function () {
-                            if ($template.val() == '') {
-                                alert('A template file is required to upload.');
-                                return false;
-                            }
-                        });
-                    });
-                </script>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Filter Expression:
-            </th>
-            <td>");
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Filter Expression" +
+":\r\n            </th>\r\n            <td>");
 
             
-            #line 253 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 318 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                 if (canConfig && Authorization.Has(Claims.Config.DocumentTemplate.ConfigureFilterExpression))
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 320 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
            Write(Html.TextBoxFor(model => model.DocumentTemplate.FilterExpression));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 254 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 320 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                                                                  
+                
+            
+            #line default
+            #line hidden
+            
+            #line 321 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
            Write(AjaxHelpers.AjaxRemove());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 255 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 321 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                         
+                
+            
+            #line default
+            #line hidden
+            
+            #line 322 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 322 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -613,7 +885,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 "                     url: \'");
 
             
-            #line 282 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 349 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
                                  Write(Url.Action(MVC.API.DocumentTemplate.UpdateFilterExpression(Model.DocumentTemplate.Id)));
 
             
@@ -640,36 +912,99 @@ WriteLiteral(@"',
                         };
                     });
                 </script>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Bulk Generate
-            </th>
-            <td>
 ");
 
             
-            #line 310 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 310 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                 using (Html.BeginForm(MVC.API.DocumentTemplate.BulkGenerate(Model.DocumentTemplate.Id), FormMethod.Post))
+            #line 370 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                }
+                else
                 {
+                    if (string.IsNullOrWhiteSpace(Model.DocumentTemplate.FilterExpression))
+                    {
 
             
             #line default
             #line hidden
-WriteLiteral("                    <textarea");
+WriteLiteral("                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>\r\n");
+
+            
+            #line 376 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                    }
+                    else
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <div");
+
+WriteLiteral(" class=\"code\"");
+
+WriteLiteral(">\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 380 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+               Write(Model.DocumentTemplate.FilterExpression);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </div>\r\n");
+
+            
+            #line 382 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                    }
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n");
+
+            
+            #line 386 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 386 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+         if (canBulkGenerate)
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <tr>\r\n                <th>Bulk Generate\r\n                </th>\r\n     " +
+"           <td>\r\n");
+
+            
+            #line 392 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 392 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                     using (Html.BeginForm(MVC.API.DocumentTemplate.BulkGenerate(Model.DocumentTemplate.Id), FormMethod.Post))
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <textarea");
 
 WriteLiteral(" name=\"DataIds\"");
 
 WriteLiteral("></textarea>\r\n");
 
-WriteLiteral("                    <input");
+WriteLiteral("                        <input");
 
 WriteLiteral(" class=\"button\"");
 
@@ -680,17 +1015,25 @@ WriteLiteral(" value=\"Generate\"");
 WriteLiteral(" />\r\n");
 
             
-            #line 314 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-                }
+            #line 396 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                    }
 
             
             #line default
             #line hidden
-WriteLiteral("            </td>\r\n        </tr>\r\n    </table>\r\n</div>\r\n<h2>\r\n    Template Expres" +
-"sions</h2>\r\n");
+WriteLiteral("                </td>\r\n            </tr>\r\n");
 
             
-            #line 321 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+            #line 399 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    </table>\r\n</div>\r\n<h2>Template Expressions</h2>\r\n");
+
+            
+            #line 403 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
 Write(Html.Partial(MVC.Config.DocumentTemplate.Views._ExpressionsTable, Model.TemplateExpressions));
 
             
@@ -708,11 +1051,11 @@ WriteLiteral(" class=\"ui-icon ui-icon-alert\"");
 
 WriteLiteral(" style=\"float: left; margin: 0 7px 100px 0;\"");
 
-WriteLiteral(@">
-        </span>This item will be permanently deleted and cannot be recovered.<br />
+WriteLiteral(@"></span>This item will be permanently deleted and cannot be recovered.<br />
         <em>This <strong>will not delete attachments</strong> which have already been imported,
             but any generated documents will no longer be automatically imported.</em><br />
-        Are you sure?</p>
+        Are you sure?
+    </p>
 </div>
 <script");
 
@@ -753,27 +1096,61 @@ WriteLiteral(" class=\"actionBar\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("    ");
-
             
-            #line 360 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-Write(Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser()));
+            #line 442 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 442 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+     if (Authorization.Has(Claims.Config.Show))
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 444 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+   Write(Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
             
-            #line 361 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
-Write(Html.ActionLinkButton("Delete", MVC.API.DocumentTemplate.Delete(Model.DocumentTemplate.Id, true), "buttonDelete"));
+            #line 444 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                                                                                     
+    }
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>\r\n");
+WriteLiteral("    ");
+
+            
+            #line 446 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+     if (Authorization.Has(Claims.Config.DocumentTemplate.Delete))
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 448 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+   Write(Html.ActionLinkButton("Delete", MVC.API.DocumentTemplate.Delete(Model.DocumentTemplate.Id, true), "buttonDelete"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 448 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
+                                                                                                                          
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</div>\r\n");
 
         }
     }
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/UndetectedPages.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/UndetectedPages.cshtml
index 12808a18..05acee8b 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/UndetectedPages.cshtml
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/UndetectedPages.cshtml
@@ -1,39 +1,41 @@
 @model Disco.Web.Areas.Config.Models.DocumentTemplate.UndetectedPagesModel
 @{
+    Authorization.Require(Claims.Config.DocumentTemplate.UndetectedPages);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates", MVC.Config.DocumentTemplate.Index(), "Undetected Pages");
     Html.BundleDeferred("~/ClientScripts/Modules/Knockout");
     Html.BundleDeferred("~/ClientScripts/Modules/jQuery-SignalR");
 }
 <div id="undetectedPagesContainer">
     <div id="noUndetectedPages" data-bind="visible: noUndetectedPages">
-        <h3>
-            No Undetected Pages</h3>
+        <h3>No Undetected Pages</h3>
     </div>
-    <ul id="undetectedPages" class="clearfix" data-bind="visible: !noUndetectedPages(), foreach: {data: undetectedPages}">
-        <li class="undetectedPage" data-bind="style: {backgroundImage: thumbnailUrl}, click: select">
-            <div class="pageDetails" data-bind="text: timestampFuzzy, attr: {title: timestamp}">
+    <ul id="undetectedPages" class="clearfix" data-bind="visible: !noUndetectedPages(), foreach: { data: undetectedPages }">
+        <li class="undetectedPage" data-bind="style: { backgroundImage: thumbnailUrl }, click: select">
+            <div class="pageDetails" data-bind="text: timestampFuzzy, attr: { title: timestamp }">
             </div>
         </li>
     </ul>
 </div>
 <div id="undetectedPageDialog" data-bind="with: selectedUndetectedPage">
-    <div class="pagePreview" data-bind="style: {backgroundImage: previewUrl}">
+    <div class="pagePreview" data-bind="style: { backgroundImage: previewUrl }">
     </div>
     <div class="actions">
-        <a href="#" class="button" target="_blank" data-bind="attr: {href: sourceUrl}">Download</a>
+        <a href="#" class="button" target="_blank" data-bind="attr: { href: sourceUrl }">Download</a>
         <a href="#" class="button" id="dialogDeleteButton" data-bind="click: deletePage">Delete</a>
     </div>
     <div class="actions">
         Type: @Html.DropDownList("dialogDocumentTemplateId", Model.DocumentTemplatesSelectListItems, new Dictionary<string, object> { { "data-bind", "value: dialogTemplateId" } })
         Data:
-        <input id="dialogDataId" type="text" data-bind="value: dialogDataId, autocomplete: {source: dialogDataIdService, minLength: 3, position: {my: 'left bottom', at: 'left top'}}" />
+        <input id="dialogDataId" type="text" data-bind="value: dialogDataId, autocomplete: { source: dialogDataIdService, minLength: 3, position: { my: 'left bottom', at: 'left top' } }" />
         <a href="#" class="button" id="dialogAssignButton" data-bind="click: assignPage">Assign</a>
     </div>
 </div>
 <div id="dialogRemove" title="Delete this Page?">
     <p>
         <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
-        Are you sure?</p>
+        Are you sure?
+    </p>
 </div>
 <script type="text/javascript">
     ko.bindingHandlers.autocomplete = {
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/UndetectedPages.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/UndetectedPages.generated.cs
index 13d04ff6..f695fd49 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/UndetectedPages.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/UndetectedPages.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DocumentTemplate/UndetectedPages.cshtml")]
-    public partial class UndetectedPages : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DocumentTemplate.UndetectedPagesModel>
+    public partial class UndetectedPages : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.DocumentTemplate.UndetectedPagesModel>
     {
         public UndetectedPages()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
             
             #line 2 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
   
+    Authorization.Require(Claims.Config.DocumentTemplate.UndetectedPages);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates", MVC.Config.DocumentTemplate.Index(), "Undetected Pages");
     Html.BundleDeferred("~/ClientScripts/Modules/Knockout");
     Html.BundleDeferred("~/ClientScripts/Modules/jQuery-SignalR");
@@ -60,25 +64,25 @@ WriteLiteral(" id=\"noUndetectedPages\"");
 
 WriteLiteral(" data-bind=\"visible: noUndetectedPages\"");
 
-WriteLiteral(">\r\n        <h3>\r\n            No Undetected Pages</h3>\r\n    </div>\r\n    <ul");
+WriteLiteral(">\r\n        <h3>No Undetected Pages</h3>\r\n    </div>\r\n    <ul");
 
 WriteLiteral(" id=\"undetectedPages\"");
 
 WriteLiteral(" class=\"clearfix\"");
 
-WriteLiteral(" data-bind=\"visible: !noUndetectedPages(), foreach: {data: undetectedPages}\"");
+WriteLiteral(" data-bind=\"visible: !noUndetectedPages(), foreach: { data: undetectedPages }\"");
 
 WriteLiteral(">\r\n        <li");
 
 WriteLiteral(" class=\"undetectedPage\"");
 
-WriteLiteral(" data-bind=\"style: {backgroundImage: thumbnailUrl}, click: select\"");
+WriteLiteral(" data-bind=\"style: { backgroundImage: thumbnailUrl }, click: select\"");
 
 WriteLiteral(">\r\n            <div");
 
 WriteLiteral(" class=\"pageDetails\"");
 
-WriteLiteral(" data-bind=\"text: timestampFuzzy, attr: {title: timestamp}\"");
+WriteLiteral(" data-bind=\"text: timestampFuzzy, attr: { title: timestamp }\"");
 
 WriteLiteral(">\r\n            </div>\r\n        </li>\r\n    </ul>\r\n</div>\r\n<div");
 
@@ -90,7 +94,7 @@ WriteLiteral(">\r\n    <div");
 
 WriteLiteral(" class=\"pagePreview\"");
 
-WriteLiteral(" data-bind=\"style: {backgroundImage: previewUrl}\"");
+WriteLiteral(" data-bind=\"style: { backgroundImage: previewUrl }\"");
 
 WriteLiteral(">\r\n    </div>\r\n    <div");
 
@@ -104,7 +108,7 @@ WriteLiteral(" class=\"button\"");
 
 WriteLiteral(" target=\"_blank\"");
 
-WriteLiteral(" data-bind=\"attr: {href: sourceUrl}\"");
+WriteLiteral(" data-bind=\"attr: { href: sourceUrl }\"");
 
 WriteLiteral(">Download</a>\r\n        <a");
 
@@ -123,7 +127,7 @@ WriteLiteral(" class=\"actions\"");
 WriteLiteral(">\r\n        Type: ");
 
             
-            #line 27 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
+            #line 28 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
          Write(Html.DropDownList("dialogDocumentTemplateId", Model.DocumentTemplatesSelectListItems, new Dictionary<string, object> { { "data-bind", "value: dialogTemplateId" } }));
 
             
@@ -135,8 +139,8 @@ WriteLiteral(" id=\"dialogDataId\"");
 
 WriteLiteral(" type=\"text\"");
 
-WriteLiteral(" data-bind=\"value: dialogDataId, autocomplete: {source: dialogDataIdService, minL" +
-"ength: 3, position: {my: \'left bottom\', at: \'left top\'}}\"");
+WriteLiteral(" data-bind=\"value: dialogDataId, autocomplete: { source: dialogDataIdService, min" +
+"Length: 3, position: { my: \'left bottom\', at: \'left top\' } }\"");
 
 WriteLiteral(" />\r\n        <a");
 
@@ -160,7 +164,7 @@ WriteLiteral(" class=\"ui-icon ui-icon-alert\"");
 
 WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\"");
 
-WriteLiteral("></span>\r\n        Are you sure?</p>\r\n</div>\r\n<script");
+WriteLiteral("></span>\r\n        Are you sure?\r\n    </p>\r\n</div>\r\n<script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -193,7 +197,7 @@ WriteLiteral(">\r\n    $(function () {\r\n\r\n        var vm;\r\n        var url
 " = \'");
 
             
-            #line 63 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
+            #line 65 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
                                       Write(new HtmlString(Url.Action(MVC.API.DocumentTemplate.ImporterUndetectedFile(null, false, true))));
 
             
@@ -202,7 +206,7 @@ WriteLiteral(">\r\n    $(function () {\r\n\r\n        var vm;\r\n        var url
 WriteLiteral("\';\r\n        var urlUndetectedPagePreview = \'");
 
             
-            #line 64 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
+            #line 66 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
                                     Write(new HtmlString(Url.Action(MVC.API.DocumentTemplate.ImporterUndetectedFile(null, false, false))));
 
             
@@ -211,7 +215,7 @@ WriteLiteral("\';\r\n        var urlUndetectedPagePreview = \'");
 WriteLiteral("\';\r\n        var urlUndetectedPageSource = \'");
 
             
-            #line 65 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
+            #line 67 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
                                    Write(new HtmlString(Url.Action(MVC.API.DocumentTemplate.ImporterUndetectedFile(null, true, false))));
 
             
@@ -220,7 +224,7 @@ WriteLiteral("\';\r\n        var urlUndetectedPageSource = \'");
 WriteLiteral("\';\r\n        var urlDataIdLookupService = \'");
 
             
-            #line 66 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
+            #line 68 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
                                   Write(Url.Action(MVC.API.DocumentTemplate.ImporterUndetectedDataIdLookup()));
 
             
@@ -229,7 +233,7 @@ WriteLiteral("\';\r\n        var urlDataIdLookupService = \'");
 WriteLiteral("/\';\r\n        var urlImporterUndetectedAssign = \'");
 
             
-            #line 67 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
+            #line 69 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
                                        Write(Url.Action(MVC.API.DocumentTemplate.ImporterUndetectedAssign()));
 
             
@@ -238,7 +242,7 @@ WriteLiteral("/\';\r\n        var urlImporterUndetectedAssign = \'");
 WriteLiteral("/\';\r\n        var urlImporterUndetectedDelete = \'");
 
             
-            #line 68 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
+            #line 70 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
                                        Write(Url.Action(MVC.API.DocumentTemplate.ImporterUndetectedDelete()));
 
             
@@ -318,7 +322,7 @@ WriteLiteral("/\';\r\n        var $undetectedPageDialog = $(\'#undetectedPageDia
 "m = new pageViewModel();\r\n\r\n            $.ajax({\r\n                url: \'");
 
             
-            #line 202 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
+            #line 204 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
                   Write(Url.Action(MVC.API.DocumentTemplate.ImporterUndetectedFiles()));
 
             
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/_ExpressionsTable.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/_ExpressionsTable.cshtml
index 83b145a3..03745e59 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/_ExpressionsTable.cshtml
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/_ExpressionsTable.cshtml
@@ -1,4 +1,7 @@
 @model IEnumerable<Disco.BI.Expressions.Expression>
+@{
+    Authorization.Require(Claims.Config.DocumentTemplate.Show);
+}
 <div class="expressionsTable">
     @if (Model.Count() > 0)
     { 
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/_ExpressionsTable.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/_ExpressionsTable.generated.cs
index 77b71ef2..0ced5fa0 100644
--- a/Disco.Web/Areas/Config/Views/DocumentTemplate/_ExpressionsTable.generated.cs
+++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/_ExpressionsTable.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,32 +28,42 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DocumentTemplate/_ExpressionsTable.cshtml")]
-    public partial class ExpressionsTable : System.Web.Mvc.WebViewPage<IEnumerable<Disco.BI.Expressions.Expression>>
+    public partial class ExpressionsTable : Disco.Services.Web.WebViewPage<IEnumerable<Disco.BI.Expressions.Expression>>
     {
         public ExpressionsTable()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<div");
+            
+            #line 2 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+  
+    Authorization.Require(Claims.Config.DocumentTemplate.Show);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<div");
 
 WriteLiteral(" class=\"expressionsTable\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 3 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 6 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 3 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 6 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
      if (Model.Count() > 0)
     { 
 
@@ -79,13 +89,13 @@ WriteLiteral(@">
 ");
 
             
-            #line 17 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 20 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
             
             
             #line default
             #line hidden
             
-            #line 17 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 20 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
              foreach (var expression in Model.Where(m => m.IsDynamic))
             {
                 var expressionParts = expression.Where(e => e.IsDynamic).ToArray();
@@ -95,14 +105,14 @@ WriteLiteral(@">
             #line hidden
 WriteLiteral("                <tr>\r\n                    <td");
 
-WriteAttribute("rowspan", Tuple.Create(" rowspan=\"", 647), Tuple.Create("\"", 682)
+WriteAttribute("rowspan", Tuple.Create(" rowspan=\"", 719), Tuple.Create("\"", 754)
             
-            #line 21 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
-, Tuple.Create(Tuple.Create("", 657), Tuple.Create<System.Object, System.Int32>(expressionParts.Length
+            #line 24 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+, Tuple.Create(Tuple.Create("", 729), Tuple.Create<System.Object, System.Int32>(expressionParts.Length
             
             #line default
             #line hidden
-, 657), false)
+, 729), false)
 );
 
 WriteLiteral(">\r\n");
@@ -110,7 +120,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                        ");
 
             
-            #line 22 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 25 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                    Write(expression.Name);
 
             
@@ -119,13 +129,13 @@ WriteLiteral("                        ");
 WriteLiteral("\r\n                    </td>\r\n");
 
             
-            #line 24 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 27 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 24 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 27 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                      if (expressionParts[0].ParseError)
                     {
 
@@ -141,7 +151,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                            ");
 
             
-            #line 27 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 30 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                        Write(expressionParts[0].Source.ToMultilineString());
 
             
@@ -157,7 +167,7 @@ WriteLiteral(">\r\n                                <strong>Expression Compilatio
 WriteLiteral("                                ");
 
             
-            #line 30 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 33 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                            Write(expressionParts[0].ParseErrorMessage);
 
             
@@ -166,7 +176,7 @@ WriteLiteral("                                ");
 WriteLiteral("\r\n                            </div>\r\n                        </td>\r\n");
 
             
-            #line 33 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 36 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                     }
                     else
                     { 
@@ -179,7 +189,7 @@ WriteLiteral("                        <td>\r\n");
 WriteLiteral("                            ");
 
             
-            #line 37 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 40 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                        Write(expressionParts[0].Source.ToMultilineString());
 
             
@@ -188,7 +198,7 @@ WriteLiteral("                            ");
 WriteLiteral("\r\n                        </td>\r\n");
 
             
-            #line 39 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 42 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                     }
 
             
@@ -199,7 +209,7 @@ WriteLiteral("                    <td>\r\n");
 WriteLiteral("                        ");
 
             
-            #line 41 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 44 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                     Write(expressionParts[0].ErrorsAllowed ? "Yes" : "No");
 
             
@@ -208,7 +218,7 @@ WriteLiteral("                        ");
 WriteLiteral("\r\n                    </td>\r\n                </tr>\r\n");
 
             
-            #line 44 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 47 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                     for (int expressionIndex = 1; expressionIndex < expressionParts.Length; expressionIndex++)
                     {
 
@@ -218,13 +228,13 @@ WriteLiteral("\r\n                    </td>\r\n                </tr>\r\n");
 WriteLiteral("                <tr>\r\n");
 
             
-            #line 47 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 50 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 47 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 50 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                      if (expressionParts[expressionIndex].ParseError)
                     {
 
@@ -240,7 +250,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                            ");
 
             
-            #line 50 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 53 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                        Write(expressionParts[expressionIndex].Source.ToMultilineString());
 
             
@@ -256,7 +266,7 @@ WriteLiteral(">\r\n                                <strong>Expression Compilatio
 WriteLiteral("                                ");
 
             
-            #line 53 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 56 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                            Write(expressionParts[expressionIndex].ParseErrorMessage);
 
             
@@ -265,7 +275,7 @@ WriteLiteral("                                ");
 WriteLiteral("\r\n                            </div>\r\n                        </td>\r\n");
 
             
-            #line 56 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 59 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                     }
                     else
                     { 
@@ -278,7 +288,7 @@ WriteLiteral("                        <td>\r\n");
 WriteLiteral("                            ");
 
             
-            #line 60 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 63 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                        Write(expressionParts[expressionIndex].Source.ToMultilineString());
 
             
@@ -287,7 +297,7 @@ WriteLiteral("                            ");
 WriteLiteral("\r\n                        </td>\r\n");
 
             
-            #line 62 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 65 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                     }
 
             
@@ -298,7 +308,7 @@ WriteLiteral("                    <td>\r\n");
 WriteLiteral("                        ");
 
             
-            #line 64 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 67 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                     Write(expressionParts[expressionIndex].ErrorsAllowed ? "Yes" : "No");
 
             
@@ -307,7 +317,7 @@ WriteLiteral("                        ");
 WriteLiteral("\r\n                    </td>\r\n                </tr>\r\n");
 
             
-            #line 67 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 70 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
                     }
             }
 
@@ -317,7 +327,7 @@ WriteLiteral("\r\n                    </td>\r\n                </tr>\r\n");
 WriteLiteral("        </table>\r\n");
 
             
-            #line 70 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 73 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
     }
     else
     { 
@@ -332,7 +342,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Expressions Found</span>\r\n");
 
             
-            #line 74 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
+            #line 77 "..\..\Areas\Config\Views\DocumentTemplate\_ExpressionsTable.cshtml"
     }
 
             
diff --git a/Disco.Web/Areas/Config/Views/Enrolment/Index.cshtml b/Disco.Web/Areas/Config/Views/Enrolment/Index.cshtml
index 8d9a62e8..6f368c79 100644
--- a/Disco.Web/Areas/Config/Views/Enrolment/Index.cshtml
+++ b/Disco.Web/Areas/Config/Views/Enrolment/Index.cshtml
@@ -1,5 +1,10 @@
 @model Disco.Web.Areas.Config.Models.Enrolment.IndexModel
 @{
+    Authorization.Require(Claims.Config.Enrolment.Show);
+
+    var canConfig = Authorization.Has(Claims.Config.Enrolment.Configure);
+    var canShowStatus = Authorization.Has(Claims.Config.Enrolment.ShowStatus);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Enrolment");
 }
 <div class="form" style="width: 530px;">
@@ -8,7 +13,9 @@
         <tr>
             <th>Username:
             </th>
-            <td>@Html.TextBoxFor(model => model.MacSshUsername)
+            <td>@if (canConfig)
+                {
+                @Html.TextBoxFor(model => model.MacSshUsername)
                 @AjaxHelpers.AjaxSave()
                 @AjaxHelpers.AjaxLoader()
                 <script type="text/javascript">
@@ -50,12 +57,26 @@
                     });
                     });
                 </script>
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(Model.MacSshUsername))
+                    {
+                <span class="smallMessage">&lt;None Specified&gt;</span>
+                    }
+                    else
+                    {
+                @Model.MacSshUsername
+                    }
+                }
             </td>
         </tr>
+
         <tr>
             <th>Password:
             </th>
-            <td>
+            <td>@if (canConfig)
+                {
                 <input id="MacSshPassword" type="password" />
                 @AjaxHelpers.AjaxSave()
                 @AjaxHelpers.AjaxLoader()
@@ -98,6 +119,11 @@
                     });
                     });
                 </script>
+                }
+                else
+                {
+                <text>********</text>
+                }
             </td>
         </tr>
         <tr>
@@ -115,8 +141,10 @@
         </tr>
     </table>
 </div>
-<h2>Live Enrolment Logging</h2>
-@Html.Partial(MVC.Config.Shared.Views.LogEvents, new Disco.Web.Areas.Config.Models.Shared.LogEventsModel()
+@if (canShowStatus && Authorization.Has(Claims.Config.Logging.Show))
+{
+    <h2>Live Enrolment Logging</h2>
+    @Html.Partial(MVC.Config.Shared.Views.LogEvents, new Disco.Web.Areas.Config.Models.Shared.LogEventsModel()
 {
     IsLive = true,
     TakeFilter = 100,
@@ -124,7 +152,14 @@
     ModuleFilter = Disco.BI.DeviceBI.EnrolmentLog.Current,
     ViewPortHeight = 250
 })
+}
 <div class="actionBar">
-    @Html.ActionLinkButton("Download Bootstrapper", MVC.Services.Client.Bootstrapper())
-    @Html.ActionLinkButton("Enrolment Status", MVC.Config.Enrolment.Status())
+    @if (Authorization.Has(Claims.Config.Enrolment.DownloadBootstrapper))
+    {
+        @Html.ActionLinkButton("Download Bootstrapper", MVC.Services.Client.Bootstrapper())
+    }
+    @if (canShowStatus)
+    {
+        @Html.ActionLinkButton("Enrolment Status", MVC.Config.Enrolment.Status())
+    }
 </div>
diff --git a/Disco.Web/Areas/Config/Views/Enrolment/Index.generated.cs b/Disco.Web/Areas/Config/Views/Enrolment/Index.generated.cs
index 8940a59d..6dd1f57a 100644
--- a/Disco.Web/Areas/Config/Views/Enrolment/Index.generated.cs
+++ b/Disco.Web/Areas/Config/Views/Enrolment/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.Enrolment
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/Enrolment/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.Enrolment.IndexModel>
+    public partial class Index : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.Enrolment.IndexModel>
     {
         public Index()
         {
@@ -43,6 +45,11 @@ namespace Disco.Web.Areas.Config.Views.Enrolment
             
             #line 2 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
   
+    Authorization.Require(Claims.Config.Enrolment.Show);
+
+    var canConfig = Authorization.Has(Claims.Config.Enrolment.Configure);
+    var canShowStatus = Authorization.Has(Claims.Config.Enrolment.ShowStatus);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Enrolment");
 
             
@@ -58,35 +65,56 @@ WriteLiteral(">\r\n    <h2>Apple Mac Secure Enrol</h2>\r\n    <table>\r\n
 "h>Username:\r\n            </th>\r\n            <td>");
 
             
-            #line 11 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+            #line 16 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                 if (canConfig)
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 18 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
            Write(Html.TextBoxFor(model => model.MacSshUsername));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 12 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+            #line 18 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                                                               
+                
+            
+            #line default
+            #line hidden
+            
+            #line 19 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 13 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+            #line 19 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                                       
+                
+            
+            #line default
+            #line hidden
+            
+            #line 20 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 20 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -113,7 +141,7 @@ WriteLiteral(@">
                             url: '");
 
             
-            #line 34 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+            #line 41 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
                              Write(Url.Action(MVC.API.Bootstrapper.MacSshUsername()));
 
             
@@ -138,13 +166,62 @@ WriteLiteral(@"',
                     });
                     });
                 </script>
-            </td>
-        </tr>
-        <tr>
-            <th>Password:
-            </th>
-            <td>
-                <input");
+");
+
+            
+            #line 60 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(Model.MacSshUsername))
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None Specified&gt;</span>\r\n");
+
+            
+            #line 66 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                    }
+                    else
+                    {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 69 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+           Write(Model.MacSshUsername);
+
+            
+            #line default
+            #line hidden
+            
+            #line 69 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                                     
+                    }
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n\r\n        <tr>\r\n            <th>Password:\r\n    " +
+"        </th>\r\n            <td>");
+
+            
+            #line 78 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                 if (canConfig)
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <input");
 
 WriteLiteral(" id=\"MacSshPassword\"");
 
@@ -152,27 +229,41 @@ WriteLiteral(" type=\"password\"");
 
 WriteLiteral(" />\r\n");
 
-WriteLiteral("                ");
-
             
-            #line 60 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+            #line 81 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 81 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 61 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+            #line 81 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                                       
+                
+            
+            #line default
+            #line hidden
+            
+            #line 82 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 82 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -199,7 +290,7 @@ WriteLiteral(@">
                             url: '");
 
             
-            #line 82 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+            #line 103 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
                              Write(Url.Action(MVC.API.Bootstrapper.MacSshPassword()));
 
             
@@ -224,10 +315,31 @@ WriteLiteral(@"',
                     });
                     });
                 </script>
-            </td>
-        </tr>
-        <tr>
-            <td");
+");
+
+            
+            #line 122 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                }
+                else
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                ");
+
+WriteLiteral("********");
+
+WriteLiteral("\r\n");
+
+            
+            #line 126 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <td");
 
 WriteLiteral(" colspan=\"2\"");
 
@@ -284,11 +396,26 @@ WriteLiteral(">&lt;a&gt;</span>) or <span");
 WriteLiteral(" class=\"code\"");
 
 WriteLiteral(">&lt;script&gt;</span>\r\n                    tag embedded on the organisation\'s in" +
-"tranet.</span>\r\n            </td>\r\n        </tr>\r\n    </table>\r\n</div>\r\n<h2>Live" +
-" Enrolment Logging</h2>\r\n");
+"tranet.</span>\r\n            </td>\r\n        </tr>\r\n    </table>\r\n</div>\r\n");
 
             
-            #line 119 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+            #line 144 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+ if (canShowStatus && Authorization.Has(Claims.Config.Logging.Show))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <h2>Live Enrolment Logging</h2>\r\n");
+
+            
+            #line 147 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 147 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
 Write(Html.Partial(MVC.Config.Shared.Views.LogEvents, new Disco.Web.Areas.Config.Models.Shared.LogEventsModel()
 {
     IsLive = true,
@@ -301,33 +428,75 @@ Write(Html.Partial(MVC.Config.Shared.Views.LogEvents, new Disco.Web.Areas.Config
             
             #line default
             #line hidden
-WriteLiteral("\r\n<div");
+            
+            #line 154 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+  
+}
+
+            
+            #line default
+            #line hidden
+WriteLiteral("<div");
 
 WriteLiteral(" class=\"actionBar\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("    ");
-
             
-            #line 128 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
-Write(Html.ActionLinkButton("Download Bootstrapper", MVC.Services.Client.Bootstrapper()));
+            #line 157 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 157 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+     if (Authorization.Has(Claims.Config.Enrolment.DownloadBootstrapper))
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 159 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+   Write(Html.ActionLinkButton("Download Bootstrapper", MVC.Services.Client.Bootstrapper()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
             
-            #line 129 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
-Write(Html.ActionLinkButton("Enrolment Status", MVC.Config.Enrolment.Status()));
+            #line 159 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                                                                                           
+    }
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>\r\n");
+WriteLiteral("    ");
+
+            
+            #line 161 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+     if (canShowStatus)
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 163 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+   Write(Html.ActionLinkButton("Enrolment Status", MVC.Config.Enrolment.Status()));
+
+            
+            #line default
+            #line hidden
+            
+            #line 163 "..\..\Areas\Config\Views\Enrolment\Index.cshtml"
+                                                                                 
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</div>\r\n");
 
         }
     }
diff --git a/Disco.Web/Areas/Config/Views/Enrolment/Status.cshtml b/Disco.Web/Areas/Config/Views/Enrolment/Status.cshtml
index d2eddb06..d1600454 100644
--- a/Disco.Web/Areas/Config/Views/Enrolment/Status.cshtml
+++ b/Disco.Web/Areas/Config/Views/Enrolment/Status.cshtml
@@ -1,4 +1,6 @@
 @{
+    Authorization.Require(Claims.Config.Enrolment.ShowStatus);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Enrolment", MVC.Config.Enrolment.Index(), "Status");
     Html.BundleDeferred("~/ClientScripts/Modules/Knockout");
     Html.BundleDeferred("~/ClientScripts/Modules/jQuery-SignalR");
diff --git a/Disco.Web/Areas/Config/Views/Enrolment/Status.generated.cs b/Disco.Web/Areas/Config/Views/Enrolment/Status.generated.cs
index 6e54defa..2870ac59 100644
--- a/Disco.Web/Areas/Config/Views/Enrolment/Status.generated.cs
+++ b/Disco.Web/Areas/Config/Views/Enrolment/Status.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.Enrolment
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/Enrolment/Status.cshtml")]
-    public partial class Status : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class Status : Disco.Services.Web.WebViewPage<dynamic>
     {
         public Status()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Areas.Config.Views.Enrolment
             
             #line 1 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
   
+    Authorization.Require(Claims.Config.Enrolment.ShowStatus);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Enrolment", MVC.Config.Enrolment.Index(), "Status");
     Html.BundleDeferred("~/ClientScripts/Modules/Knockout");
     Html.BundleDeferred("~/ClientScripts/Modules/jQuery-SignalR");
@@ -313,7 +317,7 @@ WriteLiteral(@">
         var deviceBaseUrl = '");
 
             
-            #line 141 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
+            #line 143 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
                          Write(Url.Action(MVC.Device.Show()));
 
             
@@ -322,7 +326,7 @@ WriteLiteral(@">
 WriteLiteral("/\'\r\n        var deviceModelImageUrl = \'");
 
             
-            #line 142 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
+            #line 144 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
                                Write(Url.Action(MVC.API.DeviceModel.Image()));
 
             
@@ -331,7 +335,7 @@ WriteLiteral("/\'\r\n        var deviceModelImageUrl = \'");
 WriteLiteral("/\'\r\n        var iconWarningUrl = \'url(");
 
             
-            #line 143 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
+            #line 145 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
                               Write(Links.ClientSource.Style.Images.Status.warning32_png);
 
             
@@ -340,7 +344,7 @@ WriteLiteral("/\'\r\n        var iconWarningUrl = \'url(");
 WriteLiteral(")\';\r\n        var iconErrorUrl = \'url(");
 
             
-            #line 144 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
+            #line 146 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
                             Write(Links.ClientSource.Style.Images.Status.fail32_png);
 
             
@@ -443,7 +447,7 @@ WriteLiteral(")\';\r\n\r\n        function pageViewModel() {\r\n            var
 " vm = new pageViewModel();\r\n            $.ajax({\r\n                url: \'");
 
             
-            #line 308 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
+            #line 310 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
                   Write(Url.Action(MVC.API.DeviceModel.Index()));
 
             
@@ -477,7 +481,7 @@ WriteLiteral(@"',
                 url: '");
 
             
-            #line 333 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
+            #line 335 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
                   Write(Url.Action(MVC.API.Logging.RetrieveEvents()));
 
             
@@ -513,7 +517,7 @@ WriteLiteral(@"',
             liveConnection = $.connection('");
 
             
-            #line 360 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
+            #line 362 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
                                        Write(Url.Content("~/API/Logging/Notifications"));
 
             
@@ -522,7 +526,7 @@ WriteLiteral(@"',
 WriteLiteral("\', { addToGroups: \'");
 
             
-            #line 360 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
+            #line 362 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
                                                                                                        Write(Disco.BI.DeviceBI.EnrolmentLog.Current.LiveLogGroupName);
 
             
diff --git a/Disco.Web/Areas/Config/Views/Expressions/Editor.cshtml b/Disco.Web/Areas/Config/Views/Expressions/Editor.cshtml
index d169b56b..f1cfb8d3 100644
--- a/Disco.Web/Areas/Config/Views/Expressions/Editor.cshtml
+++ b/Disco.Web/Areas/Config/Views/Expressions/Editor.cshtml
@@ -1,5 +1,9 @@
 @model Disco.Web.Areas.Config.Models.Expressions.EditorModel
 @{
+    // Under Construction - Not In Production
+    
+    Authorization.Require(Claims.DiscoAdminAccount);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Expressions");
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-ExpressionEditor");
 }
diff --git a/Disco.Web/Areas/Config/Views/Expressions/Editor.generated.cs b/Disco.Web/Areas/Config/Views/Expressions/Editor.generated.cs
index 6da9368e..8a7b0643 100644
--- a/Disco.Web/Areas/Config/Views/Expressions/Editor.generated.cs
+++ b/Disco.Web/Areas/Config/Views/Expressions/Editor.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.Expressions
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/Expressions/Editor.cshtml")]
-    public partial class Editor : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.Expressions.EditorModel>
+    public partial class Editor : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.Expressions.EditorModel>
     {
         public Editor()
         {
@@ -43,6 +45,10 @@ namespace Disco.Web.Areas.Config.Views.Expressions
             
             #line 2 "..\..\Areas\Config\Views\Expressions\Editor.cshtml"
   
+    // Under Construction - Not In Production
+    
+    Authorization.Require(Claims.DiscoAdminAccount);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Expressions");
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-ExpressionEditor");
 
@@ -78,7 +84,7 @@ WriteLiteral(" type=\"text/javascript\"");
 WriteLiteral(">\r\n        $(function () {\r\n            var initExpression = \'");
 
             
-            #line 21 "..\..\Areas\Config\Views\Expressions\Editor.cshtml"
+            #line 25 "..\..\Areas\Config\Views\Expressions\Editor.cshtml"
                               Write(Model.Expression);
 
             
@@ -87,7 +93,7 @@ WriteLiteral(">\r\n        $(function () {\r\n            var initExpression = \
 WriteLiteral("\';\r\n            var hostSrcUrl = \'");
 
             
-            #line 22 "..\..\Areas\Config\Views\Expressions\Editor.cshtml"
+            #line 26 "..\..\Areas\Config\Views\Expressions\Editor.cshtml"
                           Write(Links.ClientSource.Style.ExpressionEditor_htm);
 
             
@@ -103,7 +109,7 @@ WriteLiteral(@"';
             var editor = new DiscoExpressionEditor(host, '");
 
             
-            #line 29 "..\..\Areas\Config\Views\Expressions\Editor.cshtml"
+            #line 33 "..\..\Areas\Config\Views\Expressions\Editor.cshtml"
                                                       Write(Url.Action(MVC.API.Expressions.ValidateExpression()));
 
             
diff --git a/Disco.Web/Areas/Config/Views/Logging/Index.cshtml b/Disco.Web/Areas/Config/Views/Logging/Index.cshtml
index 45190e8d..da25d551 100644
--- a/Disco.Web/Areas/Config/Views/Logging/Index.cshtml
+++ b/Disco.Web/Areas/Config/Views/Logging/Index.cshtml
@@ -1,18 +1,18 @@
 @model Disco.Web.Areas.Config.Models.Logging.IndexModel
 @using Disco.Services.Logging
 @{
+    Authorization.Require(Claims.Config.Logging.Show);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Logging");
     Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-TimePicker");
 }
 @using (Html.BeginForm(MVC.API.Logging.RetrieveEvents()))
 { 
     <div class="form" style="width: 520px;">
-        <h2>
-            Export Logs</h2>
+        <h2>Export Logs</h2>
         <table>
             <tr>
-                <th style="width: 105px;">
-                    Start Filter
+                <th style="width: 105px;">Start Filter
                 </th>
                 <td>
                     <input id="filterStart" type="text" name="Start" />
@@ -20,8 +20,7 @@
                 </td>
             </tr>
             <tr>
-                <th>
-                    End Filter
+                <th>End Filter
                 </th>
                 <td>
                     <input id="filterEnd" type="text" name="End" />
@@ -29,8 +28,7 @@
                 </td>
             </tr>
             <tr>
-                <th>
-                    Limit Filter
+                <th>Limit Filter
                 </th>
                 <td>
                     <select name="Take">
@@ -44,8 +42,7 @@
                 </td>
             </tr>
             <tr>
-                <th>
-                    Module Filter
+                <th>Module Filter
                 </th>
                 <td>
                     <select id="moduleId" name="ModuleId">
@@ -58,10 +55,8 @@
                 </td>
             </tr>
             <tr id="trLogModuleEventTypes" style="display: none">
-                <th>
-                    Event Type Filter <span style="display: block;" class="checkboxBulkSelectContainer">
-                        Select: <a id="eventTypesSelectAll" href="#">ALL</a> | <a id="eventTypesSelectNone"
-                            href="#">NONE</a></span>
+                <th>Event Type Filter <span style="display: block;" class="checkboxBulkSelectContainer">Select: <a id="eventTypesSelectAll" href="#">ALL</a> | <a id="eventTypesSelectNone"
+                    href="#">NONE</a></span>
                 </th>
                 <td>
                     @{int uniqueIdSeed = 0;
@@ -76,8 +71,7 @@
                 </td>
             </tr>
             <tr>
-                <th>
-                </th>
+                <th></th>
                 <td>
                     @Html.Hidden("Format", "CSV")
                     <input type="submit" class="button" value="Download CSV" />
@@ -153,8 +147,7 @@
         </script>
     </div>
 }
-<h2>
-    Live Logging</h2>
+<h2>Live Logging</h2>
 @Html.Partial(MVC.Config.Shared.Views.LogEvents, new Disco.Web.Areas.Config.Models.Shared.LogEventsModel()
 {
     IsLive = true,
diff --git a/Disco.Web/Areas/Config/Views/Logging/Index.generated.cs b/Disco.Web/Areas/Config/Views/Logging/Index.generated.cs
index bd6685a3..9b011110 100644
--- a/Disco.Web/Areas/Config/Views/Logging/Index.generated.cs
+++ b/Disco.Web/Areas/Config/Views/Logging/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,18 +28,20 @@ namespace Disco.Web.Areas.Config.Views.Logging
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
     
     #line 2 "..\..\Areas\Config\Views\Logging\Index.cshtml"
     using Disco.Services.Logging;
     
     #line default
     #line hidden
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/Logging/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.Logging.IndexModel>
+    public partial class Index : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.Logging.IndexModel>
     {
         public Index()
         {
@@ -49,6 +51,8 @@ namespace Disco.Web.Areas.Config.Views.Logging
             
             #line 3 "..\..\Areas\Config\Views\Logging\Index.cshtml"
   
+    Authorization.Require(Claims.Config.Logging.Show);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Logging");
     Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-TimePicker");
 
@@ -58,7 +62,7 @@ namespace Disco.Web.Areas.Config.Views.Logging
 WriteLiteral("\r\n");
 
             
-            #line 7 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 9 "..\..\Areas\Config\Views\Logging\Index.cshtml"
  using (Html.BeginForm(MVC.API.Logging.RetrieveEvents()))
 { 
 
@@ -71,13 +75,13 @@ WriteLiteral(" class=\"form\"");
 
 WriteLiteral(" style=\"width: 520px;\"");
 
-WriteLiteral(">\r\n        <h2>\r\n            Export Logs</h2>\r\n        <table>\r\n            <tr>\r" +
-"\n                <th");
+WriteLiteral(">\r\n        <h2>Export Logs</h2>\r\n        <table>\r\n            <tr>\r\n             " +
+"   <th");
 
 WriteLiteral(" style=\"width: 105px;\"");
 
-WriteLiteral(">\r\n                    Start Filter\r\n                </th>\r\n                <td>\r" +
-"\n                    <input");
+WriteLiteral(">Start Filter\r\n                </th>\r\n                <td>\r\n                    <" +
+"input");
 
 WriteLiteral(" id=\"filterStart\"");
 
@@ -90,8 +94,8 @@ WriteLiteral(" />\r\n                    <span");
 WriteLiteral(" class=\"smallMessage\"");
 
 WriteLiteral(">* Optional</span>\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n " +
-"               <th>\r\n                    End Filter\r\n                </th>\r\n    " +
-"            <td>\r\n                    <input");
+"               <th>End Filter\r\n                </th>\r\n                <td>\r\n    " +
+"                <input");
 
 WriteLiteral(" id=\"filterEnd\"");
 
@@ -104,8 +108,8 @@ WriteLiteral(" />\r\n                    <span");
 WriteLiteral(" class=\"smallMessage\"");
 
 WriteLiteral(">* Optional</span>\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n " +
-"               <th>\r\n                    Limit Filter\r\n                </th>\r\n  " +
-"              <td>\r\n                    <select");
+"               <th>Limit Filter\r\n                </th>\r\n                <td>\r\n  " +
+"                  <select");
 
 WriteLiteral(" name=\"Take\"");
 
@@ -136,9 +140,8 @@ WriteLiteral(">50 Events</option>\r\n                        <option");
 WriteLiteral(" value=\"10\"");
 
 WriteLiteral(">10 Events</option>\r\n                    </select>\r\n                </td>\r\n      " +
-"      </tr>\r\n            <tr>\r\n                <th>\r\n                    Module " +
-"Filter\r\n                </th>\r\n                <td>\r\n                    <select" +
-"");
+"      </tr>\r\n            <tr>\r\n                <th>Module Filter\r\n              " +
+"  </th>\r\n                <td>\r\n                    <select");
 
 WriteLiteral(" id=\"moduleId\"");
 
@@ -153,13 +156,13 @@ WriteLiteral(" selected=\"selected\"");
 WriteLiteral(">- All Modules -</option>\r\n");
 
             
-            #line 53 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 50 "..\..\Areas\Config\Views\Logging\Index.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 53 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 50 "..\..\Areas\Config\Views\Logging\Index.cshtml"
                          foreach (var lm in Model.LogModules.Keys.OrderBy(lm => lm.ModuleDescription))
                         {
 
@@ -168,20 +171,20 @@ WriteLiteral(">- All Modules -</option>\r\n");
             #line hidden
 WriteLiteral("                            <option");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 2126), Tuple.Create("\"", 2146)
+WriteAttribute("value", Tuple.Create(" value=\"", 2082), Tuple.Create("\"", 2102)
             
-            #line 55 "..\..\Areas\Config\Views\Logging\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 2134), Tuple.Create<System.Object, System.Int32>(lm.ModuleId
+            #line 52 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+, Tuple.Create(Tuple.Create("", 2090), Tuple.Create<System.Object, System.Int32>(lm.ModuleId
             
             #line default
             #line hidden
-, 2134), false)
+, 2090), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 55 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 52 "..\..\Areas\Config\Views\Logging\Index.cshtml"
                                                     Write(lm.ModuleDescription);
 
             
@@ -190,7 +193,7 @@ WriteLiteral(">");
 WriteLiteral("</option>    \r\n");
 
             
-            #line 56 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 53 "..\..\Areas\Config\Views\Logging\Index.cshtml"
                         }
 
             
@@ -203,13 +206,13 @@ WriteLiteral(" id=\"trLogModuleEventTypes\"");
 
 WriteLiteral(" style=\"display: none\"");
 
-WriteLiteral(">\r\n                <th>\r\n                    Event Type Filter <span");
+WriteLiteral(">\r\n                <th>Event Type Filter <span");
 
 WriteLiteral(" style=\"display: block;\"");
 
 WriteLiteral(" class=\"checkboxBulkSelectContainer\"");
 
-WriteLiteral(">\r\n                        Select: <a");
+WriteLiteral(">Select: <a");
 
 WriteLiteral(" id=\"eventTypesSelectAll\"");
 
@@ -219,18 +222,18 @@ WriteLiteral(">ALL</a> | <a");
 
 WriteLiteral(" id=\"eventTypesSelectNone\"");
 
-WriteLiteral("\r\n                            href=\"#\"");
+WriteLiteral("\r\n                    href=\"#\"");
 
 WriteLiteral(">NONE</a></span>\r\n                </th>\r\n                <td>\r\n");
 
             
-            #line 67 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 62 "..\..\Areas\Config\Views\Logging\Index.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 67 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 62 "..\..\Areas\Config\Views\Logging\Index.cshtml"
                       int uniqueIdSeed = 0;
                     
             
@@ -239,13 +242,13 @@ WriteLiteral(">NONE</a></span>\r\n                </th>\r\n                <td>\
 WriteLiteral("\r\n");
 
             
-            #line 69 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 64 "..\..\Areas\Config\Views\Logging\Index.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 69 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 64 "..\..\Areas\Config\Views\Logging\Index.cshtml"
                      foreach (var lm in Model.LogModules)
                     {
 
@@ -257,7 +260,7 @@ WriteLiteral("                        <div");
 WriteLiteral(" data-logmoduleid=\"");
 
             
-            #line 71 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 66 "..\..\Areas\Config\Views\Logging\Index.cshtml"
                                           Write(lm.Key.ModuleId);
 
             
@@ -272,7 +275,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                            ");
 
             
-            #line 72 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 67 "..\..\Areas\Config\Views\Logging\Index.cshtml"
                        Write(CommonHelpers.CheckBoxList("EventTypeIds", lm.Value.ToSelectListItems(), 2, false, uniqueIdSeed));
 
             
@@ -281,20 +284,20 @@ WriteLiteral("                            ");
 WriteLiteral("\r\n                        </div>\r\n");
 
             
-            #line 74 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 69 "..\..\Areas\Config\Views\Logging\Index.cshtml"
                         uniqueIdSeed += lm.Value.Count;
                     }
 
             
             #line default
             #line hidden
-WriteLiteral("                </td>\r\n            </tr>\r\n            <tr>\r\n                <th>\r" +
-"\n                </th>\r\n                <td>\r\n");
+WriteLiteral("                </td>\r\n            </tr>\r\n            <tr>\r\n                <th><" +
+"/th>\r\n                <td>\r\n");
 
 WriteLiteral("                    ");
 
             
-            #line 82 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 76 "..\..\Areas\Config\Views\Logging\Index.cshtml"
                Write(Html.Hidden("Format", "CSV"));
 
             
@@ -359,16 +362,16 @@ WriteLiteral(">\r\n            $(function () {\r\n                var filterStar
 "   </script>\r\n    </div>\r\n");
 
             
-            #line 155 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 149 "..\..\Areas\Config\Views\Logging\Index.cshtml"
 }
 
             
             #line default
             #line hidden
-WriteLiteral("<h2>\r\n    Live Logging</h2>\r\n");
+WriteLiteral("<h2>Live Logging</h2>\r\n");
 
             
-            #line 158 "..\..\Areas\Config\Views\Logging\Index.cshtml"
+            #line 151 "..\..\Areas\Config\Views\Logging\Index.cshtml"
 Write(Html.Partial(MVC.Config.Shared.Views.LogEvents, new Disco.Web.Areas.Config.Models.Shared.LogEventsModel()
 {
     IsLive = true,
diff --git a/Disco.Web/Areas/Config/Views/Logging/TaskStatus.generated.cs b/Disco.Web/Areas/Config/Views/Logging/TaskStatus.generated.cs
index fecae69c..88ff85fa 100644
--- a/Disco.Web/Areas/Config/Views/Logging/TaskStatus.generated.cs
+++ b/Disco.Web/Areas/Config/Views/Logging/TaskStatus.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.Logging
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/Logging/TaskStatus.cshtml")]
-    public partial class TaskStatus : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.Logging.TaskStatusModel>
+    public partial class TaskStatus : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.Logging.TaskStatusModel>
     {
         public TaskStatus()
         {
diff --git a/Disco.Web/Areas/Config/Views/Organisation/Index.cshtml b/Disco.Web/Areas/Config/Views/Organisation/Index.cshtml
index abb68a10..1c048fb1 100644
--- a/Disco.Web/Areas/Config/Views/Organisation/Index.cshtml
+++ b/Disco.Web/Areas/Config/Views/Organisation/Index.cshtml
@@ -1,5 +1,9 @@
 @model Disco.Web.Areas.Config.Models.Organisation.IndexModel
 @{
+    Authorization.Require(Claims.Config.Organisation.Show);
+
+    var canConfigAddresses = Authorization.Has(Claims.Config.Organisation.ConfigureAddresses);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Organisation Details");
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
@@ -10,7 +14,8 @@
         <tr>
             <th style="width: 160px">Name:
             </th>
-            <td>
+            <td>@if (Authorization.Has(Claims.Config.Organisation.ConfigureName))
+                {
                 @Html.EditorFor(m => m.OrganisationName)
                 @AjaxHelpers.AjaxLoader()
                 <script type="text/javascript">
@@ -24,13 +29,21 @@
                         );
                     });
                 </script>
+                }
+                else
+                {
+                <h3>@Model.OrganisationName</h3>
+                }
             </td>
         </tr>
         <tr>
             <th style="width: 160px">Logo:
-                <br />
-                <br />
-                <a id="buttonUpdateOrganisationLogo" href="#" class="button">Update</a>
+                @if (Authorization.Has(Claims.Config.Organisation.ConfigureLogo))
+                {
+                    <br />
+                    <br />
+                    <a id="buttonUpdateOrganisationLogo" href="#" class="button">Update</a>
+                }
             </th>
             <td>
                 <div style="text-align: center;">
@@ -41,13 +54,10 @@
         <tr>
             <th style="width: 160px">Multi-Site Mode:
             </th>
-            <td>
+            <td>@if (Authorization.Has(Claims.Config.Organisation.ConfigureMultiSiteMode))
+                {
                 @Html.EditorFor(m => m.MultiSiteMode) @Html.LabelFor(m => m.MultiSiteMode)
                 @AjaxHelpers.AjaxLoader()
-                <div id="messageMultiSiteMode" style="display: none; padding: 0.7em 0.7em; margin-top: 20px;" class="ui-state-highlight ui-corner-all">
-                    <span style="margin-right: 0.3em; float: left;" class="ui-icon ui-icon-info"></span>
-                    Multi-Site mode is recommended where multiple addresses are configured.
-                </div>
                 <script type="text/javascript">
                     $(function () {
                         var field = $('#MultiSiteMode');
@@ -57,19 +67,30 @@
                         '@(Url.Action(MVC.API.System.UpdateMultiSiteMode()))',
                         'MultiSiteMode'
                         );
-
-                        var $orgAddresses = $('#organisationAddresses');
-                        if ($orgAddresses.length > 0 && $orgAddresses.find('tr').length > 2)
-                            $('#messageMultiSiteMode').show();
                     });
                 </script>
+                }
+                else
+                {
+                <input name="MultiSiteMode" class="check-box" id="MultiSiteMode" type="checkbox" @(Model.MultiSiteMode ? new HtmlString("checked=\"checked\" ") : new HtmlString(string.Empty))disabled="disabled">  @Html.LabelFor(m => m.MultiSiteMode)
+                }
+                @if (Model.OrganisationAddresses.Count > 1)
+                {
+                    <div id="messageMultiSiteMode" style="padding: 0.7em 0.7em; margin-top: 20px;" class="ui-state-highlight ui-corner-all">
+                        <span style="margin-right: 0.3em; float: left;" class="ui-icon ui-icon-info"></span>
+                        Multi-Site mode is recommended where multiple addresses are configured.
+                    </div>
+                }
             </td>
         </tr>
         <tr>
             <th style="width: 160px">Addresses:
-                <br />
-                <br />
-                <a href="#" id="createAddress" class="button">Create</a>
+                @if (canConfigAddresses)
+                {
+                    <br />
+                    <br />
+                    <a href="#" id="createAddress" class="button">Create</a>
+                }
             </th>
             <td>
                 @if (Model.OrganisationAddresses.Count > 0)
@@ -96,7 +117,10 @@
                                     <span class="smallMessage">Fax:</span> <span class="faxNumber">@Html.DisplayFor(modelItem => item.FaxNumber)</span>
                                 </td>
                                 <td>
-                                    <span class="edit" title="Edit Address"></span><span class="delete" title="Delete Address"></span>
+                                    @if (canConfigAddresses)
+                                    {
+                                        <span class="edit" title="Edit Address"></span><span class="delete" title="Delete Address"></span>
+                                    }
                                 </td>
                             </tr>
                         }
@@ -110,165 +134,170 @@
         </tr>
     </table>
 </div>
-<div id="dialogUpdateOrganisationLogo" title="Update Organisation Logo">
-    @using (Html.BeginForm(MVC.API.System.OrganisationLogo(true, null, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
-    {
-        <h3>Update Action</h3>
-        <div style="margin-top: 10px; padding-bottom: 5px;">
-            <input id="updateOrganisationLogoResetLogo" type="radio" name="ResetLogo" value="true"
-                checked="checked" /><label for="updateOrganisationLogoResetLogo">Remove Logo</label>
-        </div>
-        <div style="margin-top: 5px; border-top: 1px dashed #aaa; padding-top: 5px;">
-            <input id="updateOrganisationLogoUploadLogo" type="radio" name="ResetLogo" value="false" /><label
-                for="updateOrganisationLogoUploadLogo">Upload Logo</label>
-            <div id="updateOrganisationLogoUploadLogoContainer" style="display: none; padding-left: 10px;">
-                <input id="updateOrganisationLogoUploadLogoImage" type="file" name="Image" />
-                <span id="updateOrganisationLogoUploadLogoImageRequired" class="field-validation-valid field-validation-error">* Required</span>
+@if (Authorization.Has(Claims.Config.Organisation.ConfigureLogo))
+{
+    <div id="dialogUpdateOrganisationLogo" title="Update Organisation Logo">
+        @using (Html.BeginForm(MVC.API.System.OrganisationLogo(true, null, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
+        {
+            <h3>Update Action</h3>
+            <div style="margin-top: 10px; padding-bottom: 5px;">
+                <input id="updateOrganisationLogoResetLogo" type="radio" name="ResetLogo" value="true"
+                    checked="checked" /><label for="updateOrganisationLogoResetLogo">Remove Logo</label>
             </div>
-        </div>
-    }
-</div>
-<script type="text/javascript">
-    $(function () {
-        var button = $('#buttonUpdateOrganisationLogo');
-        var buttonDialog = $('#dialogUpdateOrganisationLogo');
-        button.click(function () {
-            buttonDialog.dialog('open');
-            return false;
-        });
-        buttonDialog.find('input[type="radio"]').click(function () {
-            if ($('#updateOrganisationLogoUploadLogo').is(':checked')) {
-                $('#updateOrganisationLogoUploadLogoImage').removeAttr('disabled');
-                $('#updateOrganisationLogoUploadLogoContainer').slideDown();
-            }
-            else {
-                $('#updateOrganisationLogoUploadLogoContainer').slideUp();
-                $('#updateOrganisationLogoUploadLogoImage').attr('disabled', 'disabled');
-            }
-        });
-        buttonDialog.dialog({
-            resizable: false,
-            height: 200,
-            modal: true,
-            autoOpen: false,
-            buttons: {
-                "Save": function () {
-                    var $this = $(this);
+            <div style="margin-top: 5px; border-top: 1px dashed #aaa; padding-top: 5px;">
+                <input id="updateOrganisationLogoUploadLogo" type="radio" name="ResetLogo" value="false" /><label
+                    for="updateOrganisationLogoUploadLogo">Upload Logo</label>
+                <div id="updateOrganisationLogoUploadLogoContainer" style="display: none; padding-left: 10px;">
+                    <input id="updateOrganisationLogoUploadLogoImage" type="file" name="Image" />
+                    <span id="updateOrganisationLogoUploadLogoImageRequired" class="field-validation-valid field-validation-error">* Required</span>
+                </div>
+            </div>
+        }
+    </div>
+    <script type="text/javascript">
+        $(function () {
+            var button = $('#buttonUpdateOrganisationLogo');
+            var buttonDialog = $('#dialogUpdateOrganisationLogo');
+            button.click(function () {
+                buttonDialog.dialog('open');
+                return false;
+            });
+            buttonDialog.find('input[type="radio"]').click(function () {
+                if ($('#updateOrganisationLogoUploadLogo').is(':checked')) {
+                    $('#updateOrganisationLogoUploadLogoImage').removeAttr('disabled');
+                    $('#updateOrganisationLogoUploadLogoContainer').slideDown();
+                }
+                else {
+                    $('#updateOrganisationLogoUploadLogoContainer').slideUp();
+                    $('#updateOrganisationLogoUploadLogoImage').attr('disabled', 'disabled');
+                }
+            });
+            buttonDialog.dialog({
+                resizable: false,
+                height: 200,
+                modal: true,
+                autoOpen: false,
+                buttons: {
+                    "Save": function () {
+                        var $this = $(this);
 
-                    var $image = $('#updateOrganisationLogoUploadLogoImage');
-                    if ($('#updateOrganisationLogoUploadLogo').is(':checked') && $image.val() == '') {
-                        $image.addClass('input-validation-error');
-                        $('#updateOrganisationLogoUploadLogoImageRequired').removeClass('field-validation-valid');
-                    } else {
-                        $image.removeClass('input-validation-error');
-                        $('#updateOrganisationLogoUploadLogoImageRequired').addClass('field-validation-valid');
-                        $this.dialog("disable");
-                        $this.dialog("option", "buttons", null);
-                        $this.find('form').submit();
+                        var $image = $('#updateOrganisationLogoUploadLogoImage');
+                        if ($('#updateOrganisationLogoUploadLogo').is(':checked') && $image.val() == '') {
+                            $image.addClass('input-validation-error');
+                            $('#updateOrganisationLogoUploadLogoImageRequired').removeClass('field-validation-valid');
+                        } else {
+                            $image.removeClass('input-validation-error');
+                            $('#updateOrganisationLogoUploadLogoImageRequired').addClass('field-validation-valid');
+                            $this.dialog("disable");
+                            $this.dialog("option", "buttons", null);
+                            $this.find('form').submit();
+                        }
+                    },
+                    Cancel: function () {
+                        $(this).dialog("close");
                     }
-                },
-                Cancel: function () {
-                    $(this).dialog("close");
                 }
-            }
+            });
         });
-    });
-</script>
-<div id="dialogConfirmRemove" title="Delete this Component?">
-    <p>
-        <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
-        This item will be permanently deleted and cannot be recovered. Are you sure?
-    </p>
-</div>
-<div id="dialogEdit" title="Edit/Create Address">
-    <table>
-        <tr>
-            <td>Short&nbsp;Name
-            </td>
-            <td>
-                <input id="editShortName" type="text" />
-            </td>
-        </tr>
-        <tr>
-            <td>Name
-            </td>
-            <td>
-                <input id="editName" type="text" />
-            </td>
-        </tr>
-        <tr>
-            <td>Address
-            </td>
-            <td>
-                <input id="editAddress" type="text" />
-            </td>
-        </tr>
-        <tr>
-            <td>Suburb
-            </td>
-            <td>
-                <input id="editSuburb" type="text" />
-            </td>
-        </tr>
-        <tr>
-            <td>Postcode
-            </td>
-            <td>
-                <input id="editPostcode" type="text" />
-            </td>
-        </tr>
-        <tr>
-            <td>State
-            </td>
-            <td>
-                <input id="editState" type="text" />
-            </td>
-        </tr>
-        <tr>
-            <td>Country
-            </td>
-            <td>
-                <input id="editCountry" type="text" />
-            </td>
-        </tr>
-        <tr>
-            <td>Phone Number
-            </td>
-            <td>
-                <input id="editPhoneNumber" type="text" />
-            </td>
-        </tr>
-        <tr>
-            <td>Fax Number
-            </td>
-            <td>
-                <input id="editFaxNumber" type="text" />
-            </td>
-        </tr>
-    </table>
-</div>
-<script type="text/javascript">
-    $(function () {
-        $("#dialogConfirmRemove").dialog({
-            resizable: false,
-            modal: true,
-            autoOpen: false,
-            buttons: {
-                "Delete": function () {
-                    return null;
-                },
-                Cancel: function () {
-                    $(this).dialog("close");
+    </script>
+}
+@if (canConfigAddresses)
+{
+    <div id="dialogConfirmRemove" title="Delete this Address?">
+        <p>
+            <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
+            This item will be permanently deleted and cannot be recovered. Are you sure?
+        </p>
+    </div>
+    <div id="dialogEdit" title="Edit/Create Address">
+        <table>
+            <tr>
+                <td>Short&nbsp;Name
+                </td>
+                <td>
+                    <input id="editShortName" type="text" />
+                </td>
+            </tr>
+            <tr>
+                <td>Name
+                </td>
+                <td>
+                    <input id="editName" type="text" />
+                </td>
+            </tr>
+            <tr>
+                <td>Address
+                </td>
+                <td>
+                    <input id="editAddress" type="text" />
+                </td>
+            </tr>
+            <tr>
+                <td>Suburb
+                </td>
+                <td>
+                    <input id="editSuburb" type="text" />
+                </td>
+            </tr>
+            <tr>
+                <td>Postcode
+                </td>
+                <td>
+                    <input id="editPostcode" type="text" />
+                </td>
+            </tr>
+            <tr>
+                <td>State
+                </td>
+                <td>
+                    <input id="editState" type="text" />
+                </td>
+            </tr>
+            <tr>
+                <td>Country
+                </td>
+                <td>
+                    <input id="editCountry" type="text" />
+                </td>
+            </tr>
+            <tr>
+                <td>Phone Number
+                </td>
+                <td>
+                    <input id="editPhoneNumber" type="text" />
+                </td>
+            </tr>
+            <tr>
+                <td>Fax Number
+                </td>
+                <td>
+                    <input id="editFaxNumber" type="text" />
+                </td>
+            </tr>
+        </table>
+    </div>
+    <script type="text/javascript">
+        $(function () {
+            $("#dialogConfirmRemove").dialog({
+                resizable: false,
+                modal: true,
+                autoOpen: false,
+                buttons: {
+                    "Delete": function () {
+                        return null;
+                    },
+                    Cancel: function () {
+                        $(this).dialog("close");
+                    }
                 }
-            }
-        });
-        $('#organisationAddresses').find('span.delete').click(function () {
-            var componentRow = $(this).closest('tr');
-            var id = componentRow.attr('data-addressid');
-            if (id) {
-                var dialog = $("#dialogConfirmRemove");
-                var buttons = dialog.dialog("option", "buttons");
-                buttons['Delete'] = function () { $(this).dialog("disable"); window.location.href = '@(Url.Action(MVC.API.System.DeleteOrganisationAddress()))' + '?redirect=true&id=' + id; };
+            });
+            $('#organisationAddresses').find('span.delete').click(function () {
+                var componentRow = $(this).closest('tr');
+                var id = componentRow.attr('data-addressid');
+                if (id) {
+                    var dialog = $("#dialogConfirmRemove");
+                    var buttons = dialog.dialog("option", "buttons");
+                    buttons['Delete'] = function () { $(this).dialog("disable"); window.location.href = '@(Url.Action(MVC.API.System.DeleteOrganisationAddress()))' + '?redirect=true&id=' + id; };
                 var buttons = dialog.dialog("option", "buttons", buttons);
                 dialog.dialog('open');
             }
@@ -368,4 +397,5 @@
         });
 
     });
-</script>
\ No newline at end of file
+    </script>
+}
\ No newline at end of file
diff --git a/Disco.Web/Areas/Config/Views/Organisation/Index.generated.cs b/Disco.Web/Areas/Config/Views/Organisation/Index.generated.cs
index c190eec1..1454f100 100644
--- a/Disco.Web/Areas/Config/Views/Organisation/Index.generated.cs
+++ b/Disco.Web/Areas/Config/Views/Organisation/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.Organisation
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/Organisation/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.Organisation.IndexModel>
+    public partial class Index : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.Organisation.IndexModel>
     {
         public Index()
         {
@@ -43,6 +45,10 @@ namespace Disco.Web.Areas.Config.Views.Organisation
             
             #line 2 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
   
+    Authorization.Require(Claims.Config.Organisation.Show);
+
+    var canConfigAddresses = Authorization.Has(Claims.Config.Organisation.ConfigureAddresses);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Organisation Details");
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
@@ -60,29 +66,45 @@ WriteLiteral(">\r\n    <h2>Details</h2>\r\n    <table>\r\n        <tr>\r\n
 
 WriteLiteral(" style=\"width: 160px\"");
 
-WriteLiteral(">Name:\r\n            </th>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
+WriteLiteral(">Name:\r\n            </th>\r\n            <td>");
 
             
-            #line 14 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 17 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                 if (Authorization.Has(Claims.Config.Organisation.ConfigureName))
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 19 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
            Write(Html.EditorFor(m => m.OrganisationName));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 15 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 19 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                                                        
+                
+            
+            #line default
+            #line hidden
+            
+            #line 20 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 20 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -95,19 +117,67 @@ WriteLiteral(@">
                         '");
 
             
-            #line 22 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 27 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                      Write(Url.Action(MVC.API.System.UpdateOrganisationName()));
 
             
             #line default
             #line hidden
 WriteLiteral("\',\r\n                        \'OrganisationName\'\r\n                        );\r\n     " +
-"               });\r\n                </script>\r\n            </td>\r\n        </tr>\r" +
-"\n        <tr>\r\n            <th");
+"               });\r\n                </script>\r\n");
+
+            
+            #line 32 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                }
+                else
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <h3>");
+
+            
+            #line 35 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+               Write(Model.OrganisationName);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</h3>\r\n");
+
+            
+            #line 36 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th");
 
 WriteLiteral(" style=\"width: 160px\"");
 
-WriteLiteral(">Logo:\r\n                <br />\r\n                <br />\r\n                <a");
+WriteLiteral(">Logo:\r\n");
+
+            
+            #line 41 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 41 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                 if (Authorization.Has(Claims.Config.Organisation.ConfigureLogo))
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <br />\r\n");
+
+WriteLiteral("                    <br />\r\n");
+
+WriteLiteral("                    <a");
 
 WriteLiteral(" id=\"buttonUpdateOrganisationLogo\"");
 
@@ -115,7 +185,16 @@ WriteLiteral(" href=\"#\"");
 
 WriteLiteral(" class=\"button\"");
 
-WriteLiteral(">Update</a>\r\n            </th>\r\n            <td>\r\n                <div");
+WriteLiteral(">Update</a>\r\n");
+
+            
+            #line 46 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </th>\r\n            <td>\r\n                <div");
 
 WriteLiteral(" style=\"text-align: center;\"");
 
@@ -125,14 +204,14 @@ WriteLiteral(" style=\"height: 256px; width: 256px;\"");
 
 WriteLiteral(" alt=\"Organisation Logo\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 1500), Tuple.Create("\"", 1534)
+WriteAttribute("src", Tuple.Create(" src=\"", 2007), Tuple.Create("\"", 2041)
             
-            #line 37 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
-            , Tuple.Create(Tuple.Create("", 1506), Tuple.Create<System.Object, System.Int32>(Url.OrganisationLogoUrl()
+            #line 50 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            , Tuple.Create(Tuple.Create("", 2013), Tuple.Create<System.Object, System.Int32>(Url.OrganisationLogoUrl()
             
             #line default
             #line hidden
-, 1506), false)
+, 2013), false)
 );
 
 WriteLiteral(" />\r\n                </div>\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n    " +
@@ -140,53 +219,58 @@ WriteLiteral(" />\r\n                </div>\r\n            </td>\r\n        </tr
 
 WriteLiteral(" style=\"width: 160px\"");
 
-WriteLiteral(">Multi-Site Mode:\r\n            </th>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
+WriteLiteral(">Multi-Site Mode:\r\n            </th>\r\n            <td>");
 
             
-            #line 45 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 57 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                 if (Authorization.Has(Claims.Config.Organisation.ConfigureMultiSiteMode))
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 59 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
            Write(Html.EditorFor(m => m.MultiSiteMode));
 
             
             #line default
             #line hidden
-WriteLiteral(" ");
-
             
-            #line 45 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 59 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                                                      
+            
+            #line default
+            #line hidden
+            
+            #line 59 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                                                  Write(Html.LabelFor(m => m.MultiSiteMode));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 46 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 59 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                                                                                          
+                
+            
+            #line default
+            #line hidden
+            
+            #line 60 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <div");
+            
+            #line 60 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                                         
 
-WriteLiteral(" id=\"messageMultiSiteMode\"");
-
-WriteLiteral(" style=\"display: none; padding: 0.7em 0.7em; margin-top: 20px;\"");
-
-WriteLiteral(" class=\"ui-state-highlight ui-corner-all\"");
-
-WriteLiteral(">\r\n                    <span");
-
-WriteLiteral(" style=\"margin-right: 0.3em; float: left;\"");
-
-WriteLiteral(" class=\"ui-icon ui-icon-info\"");
-
-WriteLiteral("></span>\r\n                    Multi-Site mode is recommended where multiple addre" +
-"sses are configured.\r\n                </div>\r\n                <script");
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -199,29 +283,125 @@ WriteLiteral(@">
                         '");
 
             
-            #line 57 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 67 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                      Write(Url.Action(MVC.API.System.UpdateMultiSiteMode()));
 
             
             #line default
             #line hidden
-WriteLiteral(@"',
-                        'MultiSiteMode'
-                        );
+WriteLiteral("\',\r\n                        \'MultiSiteMode\'\r\n                        );\r\n        " +
+"            });\r\n                </script>\r\n");
 
-                        var $orgAddresses = $('#organisationAddresses');
-                        if ($orgAddresses.length > 0 && $orgAddresses.find('tr').length > 2)
-                            $('#messageMultiSiteMode').show();
-                    });
-                </script>
-            </td>
-        </tr>
-        <tr>
-            <th");
+            
+            #line 72 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                }
+                else
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <input");
+
+WriteLiteral(" name=\"MultiSiteMode\"");
+
+WriteLiteral(" class=\"check-box\"");
+
+WriteLiteral(" id=\"MultiSiteMode\"");
+
+WriteLiteral(" type=\"checkbox\"");
+
+WriteLiteral(" ");
+
+            
+            #line 75 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                                                                                             Write(Model.MultiSiteMode ? new HtmlString("checked=\"checked\" ") : new HtmlString(string.Empty));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("disabled=\"disabled\">  ");
+
+            
+            #line 75 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                                                                                                                                                                                                                     
+            
+            #line default
+            #line hidden
+            
+            #line 75 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                                                                                                                                                                                                                Write(Html.LabelFor(m => m.MultiSiteMode));
+
+            
+            #line default
+            #line hidden
+            
+            #line 75 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                                                                                                                                                                                                                                                         
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                ");
+
+            
+            #line 77 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                 if (Model.OrganisationAddresses.Count > 1)
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <div");
+
+WriteLiteral(" id=\"messageMultiSiteMode\"");
+
+WriteLiteral(" style=\"padding: 0.7em 0.7em; margin-top: 20px;\"");
+
+WriteLiteral(" class=\"ui-state-highlight ui-corner-all\"");
+
+WriteLiteral(">\r\n                        <span");
+
+WriteLiteral(" style=\"margin-right: 0.3em; float: left;\"");
+
+WriteLiteral(" class=\"ui-icon ui-icon-info\"");
+
+WriteLiteral("></span>\r\n                        Multi-Site mode is recommended where multiple a" +
+"ddresses are configured.\r\n                    </div>\r\n");
+
+            
+            #line 83 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th");
 
 WriteLiteral(" style=\"width: 160px\"");
 
-WriteLiteral(">Addresses:\r\n                <br />\r\n                <br />\r\n                <a");
+WriteLiteral(">Addresses:\r\n");
+
+            
+            #line 88 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 88 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                 if (canConfigAddresses)
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <br />\r\n");
+
+WriteLiteral("                    <br />\r\n");
+
+WriteLiteral("                    <a");
 
 WriteLiteral(" href=\"#\"");
 
@@ -229,16 +409,25 @@ WriteLiteral(" id=\"createAddress\"");
 
 WriteLiteral(" class=\"button\"");
 
-WriteLiteral(">Create</a>\r\n            </th>\r\n            <td>\r\n");
+WriteLiteral(">Create</a>\r\n");
 
             
-            #line 75 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 93 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </th>\r\n            <td>\r\n");
+
+            
+            #line 96 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 75 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 96 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                  if (Model.OrganisationAddresses.Count > 0)
                 { 
 
@@ -255,13 +444,13 @@ WriteLiteral(">\r\n                        <tr>\r\n                            <
 "    </tr>\r\n");
 
             
-            #line 85 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 106 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 85 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 106 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                          foreach (var item in Model.OrganisationAddresses)
                         {
 
@@ -273,7 +462,7 @@ WriteLiteral("                            <tr");
 WriteLiteral(" data-addressid=\"");
 
             
-            #line 87 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 108 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                                            Write(item.Id);
 
             
@@ -289,7 +478,7 @@ WriteLiteral(" class=\"name\"");
 WriteLiteral(">");
 
             
-            #line 89 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 110 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                                                   Write(Html.DisplayFor(modelItem => item.Name));
 
             
@@ -302,7 +491,7 @@ WriteLiteral(" class=\"shortName\"");
 WriteLiteral(">");
 
             
-            #line 89 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 110 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                                                                                                                            Write(Html.DisplayFor(modelItem => item.ShortName));
 
             
@@ -316,7 +505,7 @@ WriteLiteral(" class=\"address\"");
 WriteLiteral(">");
 
             
-            #line 92 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 113 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                                                      Write(Html.DisplayFor(modelItem => item.Address));
 
             
@@ -329,7 +518,7 @@ WriteLiteral(" class=\"suburb\"");
 WriteLiteral(">");
 
             
-            #line 93 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 114 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                                                     Write(Html.DisplayFor(modelItem => item.Suburb));
 
             
@@ -342,7 +531,7 @@ WriteLiteral(" class=\"postcode\"");
 WriteLiteral(">");
 
             
-            #line 93 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 114 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                                                                                                                              Write(Html.DisplayFor(modelItem => item.Postcode));
 
             
@@ -355,7 +544,7 @@ WriteLiteral(" class=\"state\"");
 WriteLiteral(">");
 
             
-            #line 94 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 115 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                                                    Write(Html.DisplayFor(modelItem => item.State));
 
             
@@ -368,7 +557,7 @@ WriteLiteral(" class=\"country\"");
 WriteLiteral(">");
 
             
-            #line 94 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 115 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                                                                                                                           Write(Html.DisplayFor(modelItem => item.Country));
 
             
@@ -385,7 +574,7 @@ WriteLiteral(" class=\"phoneNumber\"");
 WriteLiteral(">");
 
             
-            #line 95 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 116 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                                                                                                   Write(Html.DisplayFor(modelItem => item.PhoneNumber));
 
             
@@ -402,30 +591,56 @@ WriteLiteral(" class=\"faxNumber\"");
 WriteLiteral(">");
 
             
-            #line 96 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 117 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                                                                                               Write(Html.DisplayFor(modelItem => item.FaxNumber));
 
             
             #line default
             #line hidden
 WriteLiteral("</span>\r\n                                </td>\r\n                                <" +
-"td>\r\n                                    <span");
+"td>\r\n");
+
+            
+            #line 120 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                                    
+            
+            #line default
+            #line hidden
+            
+            #line 120 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                                     if (canConfigAddresses)
+                                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                        <span");
 
 WriteLiteral(" class=\"edit\"");
 
 WriteLiteral(" title=\"Edit Address\"");
 
-WriteLiteral("></span><span");
+WriteLiteral("></span>");
+
+WriteLiteral("<span");
 
 WriteLiteral(" class=\"delete\"");
 
 WriteLiteral(" title=\"Delete Address\"");
 
-WriteLiteral("></span>\r\n                                </td>\r\n                            </tr" +
-">\r\n");
+WriteLiteral("></span>\r\n");
 
             
-            #line 102 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 123 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                </td>\r\n                            </tr>\r\n");
+
+            
+            #line 126 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                         }
 
             
@@ -434,7 +649,7 @@ WriteLiteral("></span>\r\n                                </td>\r\n
 WriteLiteral("                    </table>\r\n");
 
             
-            #line 104 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 128 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                 }
                 else
                 { 
@@ -449,13 +664,23 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Addresses Stored</span>\r\n");
 
             
-            #line 108 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 132 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                 }
 
             
             #line default
             #line hidden
-WriteLiteral("            </td>\r\n        </tr>\r\n    </table>\r\n</div>\r\n<div");
+WriteLiteral("            </td>\r\n        </tr>\r\n    </table>\r\n</div>\r\n");
+
+            
+            #line 137 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+ if (Authorization.Has(Claims.Config.Organisation.ConfigureLogo))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"dialogUpdateOrganisationLogo\"");
 
@@ -464,26 +689,26 @@ WriteLiteral(" title=\"Update Organisation Logo\"");
 WriteLiteral(">\r\n");
 
             
-            #line 114 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
-    
+            #line 140 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+        
             
             #line default
             #line hidden
             
-            #line 114 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
-     using (Html.BeginForm(MVC.API.System.OrganisationLogo(true, null, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
-    {
+            #line 140 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+         using (Html.BeginForm(MVC.API.System.OrganisationLogo(true, null, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
+        {
 
             
             #line default
             #line hidden
-WriteLiteral("        <h3>Update Action</h3>\r\n");
+WriteLiteral("            <h3>Update Action</h3>\r\n");
 
-WriteLiteral("        <div");
+WriteLiteral("            <div");
 
 WriteLiteral(" style=\"margin-top: 10px; padding-bottom: 5px;\"");
 
-WriteLiteral(">\r\n            <input");
+WriteLiteral(">\r\n                <input");
 
 WriteLiteral(" id=\"updateOrganisationLogoResetLogo\"");
 
@@ -493,19 +718,19 @@ WriteLiteral(" name=\"ResetLogo\"");
 
 WriteLiteral(" value=\"true\"");
 
-WriteLiteral("\r\n                checked=\"checked\"");
+WriteLiteral("\r\n                    checked=\"checked\"");
 
 WriteLiteral(" /><label");
 
 WriteLiteral(" for=\"updateOrganisationLogoResetLogo\"");
 
-WriteLiteral(">Remove Logo</label>\r\n        </div>\r\n");
+WriteLiteral(">Remove Logo</label>\r\n            </div>\r\n");
 
-WriteLiteral("        <div");
+WriteLiteral("            <div");
 
 WriteLiteral(" style=\"margin-top: 5px; border-top: 1px dashed #aaa; padding-top: 5px;\"");
 
-WriteLiteral(">\r\n            <input");
+WriteLiteral(">\r\n                <input");
 
 WriteLiteral(" id=\"updateOrganisationLogoUploadLogo\"");
 
@@ -515,14 +740,14 @@ WriteLiteral(" name=\"ResetLogo\"");
 
 WriteLiteral(" value=\"false\"");
 
-WriteLiteral(" /><label\r\n                for=\"updateOrganisationLogoUploadLogo\">Upload Logo</la" +
-"bel>\r\n            <div");
+WriteLiteral(" /><label\r\n                    for=\"updateOrganisationLogoUploadLogo\">Upload Logo" +
+"</label>\r\n                <div");
 
 WriteLiteral(" id=\"updateOrganisationLogoUploadLogoContainer\"");
 
 WriteLiteral(" style=\"display: none; padding-left: 10px;\"");
 
-WriteLiteral(">\r\n                <input");
+WriteLiteral(">\r\n                    <input");
 
 WriteLiteral(" id=\"updateOrganisationLogoUploadLogoImage\"");
 
@@ -530,162 +755,195 @@ WriteLiteral(" type=\"file\"");
 
 WriteLiteral(" name=\"Image\"");
 
-WriteLiteral(" />\r\n                <span");
+WriteLiteral(" />\r\n                    <span");
 
 WriteLiteral(" id=\"updateOrganisationLogoUploadLogoImageRequired\"");
 
 WriteLiteral(" class=\"field-validation-valid field-validation-error\"");
 
-WriteLiteral(">* Required</span>\r\n            </div>\r\n        </div>\r\n");
+WriteLiteral(">* Required</span>\r\n                </div>\r\n            </div>\r\n");
 
             
-            #line 129 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
-    }
+            #line 155 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+        }
 
             
             #line default
             #line hidden
-WriteLiteral("</div>\r\n<script");
+WriteLiteral("    </div>\r\n");
+
+WriteLiteral("    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n    $(function () {\r\n        var button = $(\'#buttonUpdateOrganisationLogo\');\r" +
-"\n        var buttonDialog = $(\'#dialogUpdateOrganisationLogo\');\r\n        button." +
-"click(function () {\r\n            buttonDialog.dialog(\'open\');\r\n            retur" +
-"n false;\r\n        });\r\n        buttonDialog.find(\'input[type=\"radio\"]\').click(fu" +
-"nction () {\r\n            if ($(\'#updateOrganisationLogoUploadLogo\').is(\':checked" +
-"\')) {\r\n                $(\'#updateOrganisationLogoUploadLogoImage\').removeAttr(\'d" +
-"isabled\');\r\n                $(\'#updateOrganisationLogoUploadLogoContainer\').slid" +
-"eDown();\r\n            }\r\n            else {\r\n                $(\'#updateOrganisat" +
-"ionLogoUploadLogoContainer\').slideUp();\r\n                $(\'#updateOrganisationL" +
-"ogoUploadLogoImage\').attr(\'disabled\', \'disabled\');\r\n            }\r\n        });\r\n" +
-"        buttonDialog.dialog({\r\n            resizable: false,\r\n            height" +
-": 200,\r\n            modal: true,\r\n            autoOpen: false,\r\n            butt" +
-"ons: {\r\n                \"Save\": function () {\r\n                    var $this = $" +
-"(this);\r\n\r\n                    var $image = $(\'#updateOrganisationLogoUploadLogo" +
-"Image\');\r\n                    if ($(\'#updateOrganisationLogoUploadLogo\').is(\':ch" +
-"ecked\') && $image.val() == \'\') {\r\n                        $image.addClass(\'input" +
-"-validation-error\');\r\n                        $(\'#updateOrganisationLogoUploadLo" +
-"goImageRequired\').removeClass(\'field-validation-valid\');\r\n                    } " +
-"else {\r\n                        $image.removeClass(\'input-validation-error\');\r\n " +
-"                       $(\'#updateOrganisationLogoUploadLogoImageRequired\').addCl" +
-"ass(\'field-validation-valid\');\r\n                        $this.dialog(\"disable\");" +
-"\r\n                        $this.dialog(\"option\", \"buttons\", null);\r\n            " +
-"            $this.find(\'form\').submit();\r\n                    }\r\n               " +
-" },\r\n                Cancel: function () {\r\n                    $(this).dialog(\"" +
-"close\");\r\n                }\r\n            }\r\n        });\r\n    });\r\n</script>\r\n<di" +
-"v");
+WriteLiteral(">\r\n        $(function () {\r\n            var button = $(\'#buttonUpdateOrganisation" +
+"Logo\');\r\n            var buttonDialog = $(\'#dialogUpdateOrganisationLogo\');\r\n   " +
+"         button.click(function () {\r\n                buttonDialog.dialog(\'open\')" +
+";\r\n                return false;\r\n            });\r\n            buttonDialog.find" +
+"(\'input[type=\"radio\"]\').click(function () {\r\n                if ($(\'#updateOrgan" +
+"isationLogoUploadLogo\').is(\':checked\')) {\r\n                    $(\'#updateOrganis" +
+"ationLogoUploadLogoImage\').removeAttr(\'disabled\');\r\n                    $(\'#upda" +
+"teOrganisationLogoUploadLogoContainer\').slideDown();\r\n                }\r\n       " +
+"         else {\r\n                    $(\'#updateOrganisationLogoUploadLogoContain" +
+"er\').slideUp();\r\n                    $(\'#updateOrganisationLogoUploadLogoImage\')" +
+".attr(\'disabled\', \'disabled\');\r\n                }\r\n            });\r\n            " +
+"buttonDialog.dialog({\r\n                resizable: false,\r\n                height" +
+": 200,\r\n                modal: true,\r\n                autoOpen: false,\r\n        " +
+"        buttons: {\r\n                    \"Save\": function () {\r\n                 " +
+"       var $this = $(this);\r\n\r\n                        var $image = $(\'#updateOr" +
+"ganisationLogoUploadLogoImage\');\r\n                        if ($(\'#updateOrganisa" +
+"tionLogoUploadLogo\').is(\':checked\') && $image.val() == \'\') {\r\n                  " +
+"          $image.addClass(\'input-validation-error\');\r\n                          " +
+"  $(\'#updateOrganisationLogoUploadLogoImageRequired\').removeClass(\'field-validat" +
+"ion-valid\');\r\n                        } else {\r\n                            $ima" +
+"ge.removeClass(\'input-validation-error\');\r\n                            $(\'#updat" +
+"eOrganisationLogoUploadLogoImageRequired\').addClass(\'field-validation-valid\');\r\n" +
+"                            $this.dialog(\"disable\");\r\n                          " +
+"  $this.dialog(\"option\", \"buttons\", null);\r\n                            $this.fi" +
+"nd(\'form\').submit();\r\n                        }\r\n                    },\r\n       " +
+"             Cancel: function () {\r\n                        $(this).dialog(\"clos" +
+"e\");\r\n                    }\r\n                }\r\n            });\r\n        });\r\n  " +
+"  </script>\r\n");
+
+            
+            #line 203 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+            
+            #line 204 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+ if (canConfigAddresses)
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"dialogConfirmRemove\"");
 
-WriteLiteral(" title=\"Delete this Component?\"");
+WriteLiteral(" title=\"Delete this Address?\"");
 
-WriteLiteral(">\r\n    <p>\r\n        <span");
+WriteLiteral(">\r\n        <p>\r\n            <span");
 
 WriteLiteral(" class=\"ui-icon ui-icon-alert\"");
 
 WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\"");
 
-WriteLiteral("></span>\r\n        This item will be permanently deleted and cannot be recovered. " +
-"Are you sure?\r\n    </p>\r\n</div>\r\n<div");
+WriteLiteral("></span>\r\n            This item will be permanently deleted and cannot be recover" +
+"ed. Are you sure?\r\n        </p>\r\n    </div>\r\n");
+
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"dialogEdit\"");
 
 WriteLiteral(" title=\"Edit/Create Address\"");
 
-WriteLiteral(">\r\n    <table>\r\n        <tr>\r\n            <td>Short&nbsp;Name\r\n            </td>\r" +
-"\n            <td>\r\n                <input");
+WriteLiteral(">\r\n        <table>\r\n            <tr>\r\n                <td>Short&nbsp;Name\r\n      " +
+"          </td>\r\n                <td>\r\n                    <input");
 
 WriteLiteral(" id=\"editShortName\"");
 
 WriteLiteral(" type=\"text\"");
 
-WriteLiteral(" />\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <td>Name\r\n      " +
-"      </td>\r\n            <td>\r\n                <input");
+WriteLiteral(" />\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                " +
+"<td>Name\r\n                </td>\r\n                <td>\r\n                    <inpu" +
+"t");
 
 WriteLiteral(" id=\"editName\"");
 
 WriteLiteral(" type=\"text\"");
 
-WriteLiteral(" />\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <td>Address\r\n   " +
-"         </td>\r\n            <td>\r\n                <input");
+WriteLiteral(" />\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                " +
+"<td>Address\r\n                </td>\r\n                <td>\r\n                    <i" +
+"nput");
 
 WriteLiteral(" id=\"editAddress\"");
 
 WriteLiteral(" type=\"text\"");
 
-WriteLiteral(" />\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <td>Suburb\r\n    " +
-"        </td>\r\n            <td>\r\n                <input");
+WriteLiteral(" />\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                " +
+"<td>Suburb\r\n                </td>\r\n                <td>\r\n                    <in" +
+"put");
 
 WriteLiteral(" id=\"editSuburb\"");
 
 WriteLiteral(" type=\"text\"");
 
-WriteLiteral(" />\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <td>Postcode\r\n  " +
-"          </td>\r\n            <td>\r\n                <input");
+WriteLiteral(" />\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                " +
+"<td>Postcode\r\n                </td>\r\n                <td>\r\n                    <" +
+"input");
 
 WriteLiteral(" id=\"editPostcode\"");
 
 WriteLiteral(" type=\"text\"");
 
-WriteLiteral(" />\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <td>State\r\n     " +
-"       </td>\r\n            <td>\r\n                <input");
+WriteLiteral(" />\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                " +
+"<td>State\r\n                </td>\r\n                <td>\r\n                    <inp" +
+"ut");
 
 WriteLiteral(" id=\"editState\"");
 
 WriteLiteral(" type=\"text\"");
 
-WriteLiteral(" />\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <td>Country\r\n   " +
-"         </td>\r\n            <td>\r\n                <input");
+WriteLiteral(" />\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                " +
+"<td>Country\r\n                </td>\r\n                <td>\r\n                    <i" +
+"nput");
 
 WriteLiteral(" id=\"editCountry\"");
 
 WriteLiteral(" type=\"text\"");
 
-WriteLiteral(" />\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <td>Phone Number" +
-"\r\n            </td>\r\n            <td>\r\n                <input");
+WriteLiteral(" />\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                " +
+"<td>Phone Number\r\n                </td>\r\n                <td>\r\n                 " +
+"   <input");
 
 WriteLiteral(" id=\"editPhoneNumber\"");
 
 WriteLiteral(" type=\"text\"");
 
-WriteLiteral(" />\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <td>Fax Number\r\n" +
-"            </td>\r\n            <td>\r\n                <input");
+WriteLiteral(" />\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                " +
+"<td>Fax Number\r\n                </td>\r\n                <td>\r\n                   " +
+" <input");
 
 WriteLiteral(" id=\"editFaxNumber\"");
 
 WriteLiteral(" type=\"text\"");
 
-WriteLiteral(" />\r\n            </td>\r\n        </tr>\r\n    </table>\r\n</div>\r\n<script");
+WriteLiteral(" />\r\n                </td>\r\n            </tr>\r\n        </table>\r\n    </div>\r\n");
+
+WriteLiteral("    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-    $(function () {
-        $(""#dialogConfirmRemove"").dialog({
-            resizable: false,
-            modal: true,
-            autoOpen: false,
-            buttons: {
-                ""Delete"": function () {
-                    return null;
-                },
-                Cancel: function () {
-                    $(this).dialog(""close"");
+        $(function () {
+            $(""#dialogConfirmRemove"").dialog({
+                resizable: false,
+                modal: true,
+                autoOpen: false,
+                buttons: {
+                    ""Delete"": function () {
+                        return null;
+                    },
+                    Cancel: function () {
+                        $(this).dialog(""close"");
+                    }
                 }
-            }
-        });
-        $('#organisationAddresses').find('span.delete').click(function () {
-            var componentRow = $(this).closest('tr');
-            var id = componentRow.attr('data-addressid');
-            if (id) {
-                var dialog = $(""#dialogConfirmRemove"");
-                var buttons = dialog.dialog(""option"", ""buttons"");
-                buttons['Delete'] = function () { $(this).dialog(""disable""); window.location.href = '");
+            });
+            $('#organisationAddresses').find('span.delete').click(function () {
+                var componentRow = $(this).closest('tr');
+                var id = componentRow.attr('data-addressid');
+                if (id) {
+                    var dialog = $(""#dialogConfirmRemove"");
+                    var buttons = dialog.dialog(""option"", ""buttons"");
+                    buttons['Delete'] = function () { $(this).dialog(""disable""); window.location.href = '");
 
             
-            #line 271 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
-                                                                                                 Write(Url.Action(MVC.API.System.DeleteOrganisationAddress()));
+            #line 300 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+                                                                                                     Write(Url.Action(MVC.API.System.DeleteOrganisationAddress()));
 
             
             #line default
@@ -728,7 +986,7 @@ WriteLiteral("\' + \'?redirect=true&id=\' + id; };\r\n                var button
 "");
 
             
-            #line 336 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 365 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                   Write(Url.Action(MVC.API.System.UpdateOrganisationAddress()));
 
             
@@ -739,7 +997,7 @@ WriteLiteral("\',\r\n                dataType: \'json\',\r\n                data
 "f (d == \'OK\') {\r\n                        window.location.href = \'");
 
             
-            #line 342 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+            #line 371 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
                                             Write(Url.Action(MVC.Config.Organisation.Index()));
 
             
@@ -774,8 +1032,15 @@ WriteLiteral(@"';
         });
 
     });
-</script>");
+    </script>
+");
 
+            
+            #line 401 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
+}
+            
+            #line default
+            #line hidden
         }
     }
 }
diff --git a/Disco.Web/Areas/Config/Views/Plugins/Configure.cshtml b/Disco.Web/Areas/Config/Views/Plugins/Configure.cshtml
index 5887a7b3..6d9b29df 100644
--- a/Disco.Web/Areas/Config/Views/Plugins/Configure.cshtml
+++ b/Disco.Web/Areas/Config/Views/Plugins/Configure.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Areas.Config.Models.Plugins.PluginConfigurationViewModel
 @{
+    Authorization.Require(Claims.Config.Plugin.Configure);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Plugins", MVC.Config.Plugins.Index(), Model.Manifest.Name);
 }
 @using (Html.BeginForm())
diff --git a/Disco.Web/Areas/Config/Views/Plugins/Index.cshtml b/Disco.Web/Areas/Config/Views/Plugins/Index.cshtml
index 64087680..49a3b760 100644
--- a/Disco.Web/Areas/Config/Views/Plugins/Index.cshtml
+++ b/Disco.Web/Areas/Config/Views/Plugins/Index.cshtml
@@ -1,6 +1,12 @@
 @model Disco.Web.Areas.Config.Models.Plugins.IndexViewModel
 @using Disco.Services.Plugins;
 @{
+    Authorization.Require(Claims.Config.Plugin.Show);
+
+    var canConfig = Authorization.Has(Claims.Config.Plugin.Configure);
+    var canUninstall = Authorization.Has(Claims.Config.Plugin.Uninstall);
+    var canInstall = Authorization.Has(Claims.Config.Plugin.Install);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Plugins");
 }
 <div id="plugins">
@@ -34,9 +40,16 @@
                                 <h2>@Plugins.PluginFeatureCategoryDisplayName(pluginGroup.Item1)</h2>
                                 @foreach (var pluginDefinition in pluginGroup.Item2)
                                 {
+                                    if (canConfig)
+                                    {
                                     <a href="@Url.Action(MVC.Config.Plugins.Configure(pluginDefinition.Id))">
                                         <h3>@pluginDefinition.Name</h3>
                                     </a>
+                                    }
+                                    else
+                                    {
+                                    <h3>@pluginDefinition.Name</h3>
+                                    }
                                     <div class="pageMenuBlurb">
                                         <span class="pluginVersion">v@(pluginDefinition.VersionFormatted)</span> | @pluginDefinition.Author | <a href="@pluginDefinition.Url" target="_blank">More Information</a>
                                     </div>
@@ -48,6 +61,8 @@
                 }
             </tr>
         </table>
+                if (canUninstall)
+                {
         <div id="dialogUninstallPlugins" title="Uninstall Plugin">
             <div>
                 @Html.DropDownList("uninstallPlugin", Model.PluginManifests.ToSelectListItems(null, true, "Select a Plugin to Uninstall"))
@@ -72,91 +87,98 @@
             $(function () {
                 // Uninstall
                 var uninstallUrl = '@(Url.Action(MVC.API.Plugin.Uninstall()))/';
-                var uninstallPlugin, uninstallPluginData, $dialogConfirm, uninstallPluginConfirm, uninstallPluginDataConfirm;
+        var uninstallPlugin, uninstallPluginData, $dialogConfirm, uninstallPluginConfirm, uninstallPluginDataConfirm;
 
-                var pluginId, pluginName, pluginUninstallData;
+        var pluginId, pluginName, pluginUninstallData;
 
-                var $dialog = $('#dialogUninstallPlugins').dialog({
-                    resizable: false,
-                    modal: true,
-                    width: 350,
-                    autoOpen: false,
-                    buttons: {
-                        "Uninstall": function () {
-                            pluginId = uninstallPlugin.val();
-                            pluginName = uninstallPlugin.find('option:selected').text();
-                            pluginUninstallData = uninstallPluginData.is(':checked');
+        var $dialog = $('#dialogUninstallPlugins').dialog({
+            resizable: false,
+            modal: true,
+            width: 350,
+            autoOpen: false,
+            buttons: {
+                "Uninstall": function () {
+                    pluginId = uninstallPlugin.val();
+                    pluginName = uninstallPlugin.find('option:selected').text();
+                    pluginUninstallData = uninstallPluginData.is(':checked');
 
-                            if (!pluginId) {
-                                alert('Select a plugin to uninstall');
-                            } else {
-                                uninstallPluginConfirm.text(pluginName + ' [' + pluginId + ']');
-                                if (pluginUninstallData)
-                                    uninstallPluginDataConfirm.show();
-                                else
-                                    uninstallPluginDataConfirm.hide();
-
-                                $dialogConfirm.dialog('open');
-                                $(this).dialog("close");
-                            }
-                        },
-                        Cancel: function () {
-                            uninstallPluginData.prop('checked', false);
-                            $('#uninstallPluginDataAlert').hide();
-                            $(this).dialog("close");
-                        }
-                    }
-                });
-
-                $dialogConfirm = $('#dialogUninstallPluginConfirm').dialog({
-                    resizable: false,
-                    modal: true,
-                    width: 350,
-                    autoOpen: false,
-                    buttons: {
-                        "Confirm Uninstall": function () {
-                            var url = uninstallUrl + pluginId;
-                            if (pluginUninstallData)
-                                url += '?UninstallData=true'
-                            else
-                                url += '?UninstallData=false'
-
-                            window.location.href = url;
-                            $(this).dialog("disable");
-                        },
-                        Cancel: function () {
-                            uninstallPluginData.prop('checked', false);
-                            $('#uninstallPluginDataAlert').hide();
-                            $(this).dialog("close");
-                        }
-                    }
-                });
-
-                uninstallPlugin = $('#uninstallPlugin');
-                uninstallPluginData = $('#uninstallPluginData');
-                uninstallPluginConfirm = $('#uninstallPluginConfirm');
-                uninstallPluginDataConfirm = $('#uninstallPluginDataConfirm');
-
-                $('#buttonUninstall').click(function () {
-                    $dialog.dialog('open');
-                    return false;
-                });
-
-                $('#uninstallPluginData').change(function () {
-                    if ($(this).is(':checked')) {
-                        $('#uninstallPluginDataAlert').slideDown();
+                    if (!pluginId) {
+                        alert('Select a plugin to uninstall');
                     } else {
-                        $('#uninstallPluginDataAlert').slideUp();
+                        uninstallPluginConfirm.text(pluginName + ' [' + pluginId + ']');
+                        if (pluginUninstallData)
+                            uninstallPluginDataConfirm.show();
+                        else
+                            uninstallPluginDataConfirm.hide();
+
+                        $dialogConfirm.dialog('open');
+                        $(this).dialog("close");
                     }
-                });
-            });
+                },
+                Cancel: function () {
+                    uninstallPluginData.prop('checked', false);
+                    $('#uninstallPluginDataAlert').hide();
+                    $(this).dialog("close");
+                }
+            }
+        });
+
+        $dialogConfirm = $('#dialogUninstallPluginConfirm').dialog({
+            resizable: false,
+            modal: true,
+            width: 350,
+            autoOpen: false,
+            buttons: {
+                "Confirm Uninstall": function () {
+                    var url = uninstallUrl + pluginId;
+                    if (pluginUninstallData)
+                        url += '?UninstallData=true'
+                    else
+                        url += '?UninstallData=false'
+
+                    window.location.href = url;
+                    $(this).dialog("disable");
+                },
+                Cancel: function () {
+                    uninstallPluginData.prop('checked', false);
+                    $('#uninstallPluginDataAlert').hide();
+                    $(this).dialog("close");
+                }
+            }
+        });
+
+        uninstallPlugin = $('#uninstallPlugin');
+        uninstallPluginData = $('#uninstallPluginData');
+        uninstallPluginConfirm = $('#uninstallPluginConfirm');
+        uninstallPluginDataConfirm = $('#uninstallPluginDataConfirm');
+
+        $('#buttonUninstall').click(function () {
+            $dialog.dialog('open');
+            return false;
+        });
+
+        $('#uninstallPluginData').change(function () {
+            if ($(this).is(':checked')) {
+                $('#uninstallPluginDataAlert').slideDown();
+            } else {
+                $('#uninstallPluginDataAlert').slideUp();
+            }
+        });
+    });
         </script>
-        
+                }
                 if (Model.PluginUpdates.Count > 0)
                 {
         <div id="updateAvailableContainer">
             <div>@(Model.PluginUpdates.Count) plugin update@(Model.PluginUpdates.Count == 1 ? " is" : "s are") available</div>
-            @Html.ActionLinkButton("Update Now", MVC.API.Plugin.UpdateAll())
+            @if (canInstall)
+            {
+                @Html.ActionLinkButton("Update Now", MVC.API.Plugin.UpdateAll())
+            }
+            else
+            {
+                <div class="smallMessage">You do not have sufficient permission to install these updates.</div>
+            }
         </div>
         <script>
             (function () {
@@ -172,9 +194,12 @@
     }
 </div>
 <div class="actionBar">
-    @if (Model.PluginManifests.Count > 0)
+    @if (canUninstall && Model.PluginManifests.Count > 0)
     { 
         @Html.ActionLinkButton("Uninstall Plugins", MVC.Config.Plugins.Index(), "buttonUninstall")
     }
-    @Html.ActionLinkButton("Install Plugins", MVC.Config.Plugins.Install())
+    @if (canInstall)
+    {
+        @Html.ActionLinkButton("Install Plugins", MVC.Config.Plugins.Install())
+    }
 </div>
diff --git a/Disco.Web/Areas/Config/Views/Plugins/Index.generated.cs b/Disco.Web/Areas/Config/Views/Plugins/Index.generated.cs
index e3de0f01..fe307a69 100644
--- a/Disco.Web/Areas/Config/Views/Plugins/Index.generated.cs
+++ b/Disco.Web/Areas/Config/Views/Plugins/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,18 +28,20 @@ namespace Disco.Web.Areas.Config.Views.Plugins
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
     
     #line 2 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
     using Disco.Services.Plugins;
     
     #line default
     #line hidden
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/Plugins/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.Plugins.IndexViewModel>
+    public partial class Index : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.Plugins.IndexViewModel>
     {
         public Index()
         {
@@ -49,6 +51,12 @@ namespace Disco.Web.Areas.Config.Views.Plugins
             
             #line 3 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
   
+    Authorization.Require(Claims.Config.Plugin.Show);
+
+    var canConfig = Authorization.Has(Claims.Config.Plugin.Configure);
+    var canUninstall = Authorization.Has(Claims.Config.Plugin.Uninstall);
+    var canInstall = Authorization.Has(Claims.Config.Plugin.Install);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Plugins");
 
             
@@ -61,13 +69,13 @@ WriteLiteral(" id=\"plugins\"");
 WriteLiteral(">\r\n");
 
             
-            #line 7 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 13 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 7 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 13 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
       
         if (Model.PluginManifests.Count == 0)
         { 
@@ -84,7 +92,7 @@ WriteLiteral(" style=\"width: 450px; padding: 100px 0;\"");
 WriteLiteral(">\r\n            <h2>No Plugins are Installed</h2>\r\n        </div>  \r\n");
 
             
-            #line 13 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 19 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
         }
         else
         {
@@ -105,13 +113,13 @@ WriteLiteral(" id=\"pageMenu\"");
 WriteLiteral(">\r\n            <tr>\r\n");
 
             
-            #line 24 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 30 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 24 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 30 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                  for (int i = 0; i < 3; i++)
                 {
 
@@ -121,13 +129,13 @@ WriteLiteral(">\r\n            <tr>\r\n");
 WriteLiteral("                    <td>\r\n");
 
             
-            #line 27 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 33 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 27 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 33 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                           
                     int itemsForThisColumn = itemsPerColumn + (pluginGroups.Count % 3 > i ? 1 : 0);
                     for (int i2 = 0; i2 < itemsForThisColumn && itemNextId < pluginGroups.Count; i2++)
@@ -145,7 +153,7 @@ WriteLiteral(" class=\"pageMenuArea\"");
 WriteLiteral(">\r\n                                <h2>");
 
             
-            #line 34 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 40 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                                Write(Plugins.PluginFeatureCategoryDisplayName(pluginGroup.Item1));
 
             
@@ -154,35 +162,37 @@ WriteLiteral(">\r\n                                <h2>");
 WriteLiteral("</h2>\r\n");
 
             
-            #line 35 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 41 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                                 
             
             #line default
             #line hidden
             
-            #line 35 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 41 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                                  foreach (var pluginDefinition in pluginGroup.Item2)
                                 {
+                                    if (canConfig)
+                                    {
 
             
             #line default
             #line hidden
 WriteLiteral("                                    <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 1439), Tuple.Create("\"", 1508)
+WriteAttribute("href", Tuple.Create(" href=\"", 1807), Tuple.Create("\"", 1876)
             
-            #line 37 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 1446), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.Plugins.Configure(pluginDefinition.Id))
+            #line 45 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+, Tuple.Create(Tuple.Create("", 1814), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.Plugins.Configure(pluginDefinition.Id))
             
             #line default
             #line hidden
-, 1446), false)
+, 1814), false)
 );
 
 WriteLiteral(">\r\n                                        <h3>");
 
             
-            #line 38 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 46 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                                        Write(pluginDefinition.Name);
 
             
@@ -190,6 +200,33 @@ WriteLiteral(">\r\n                                        <h3>");
             #line hidden
 WriteLiteral("</h3>\r\n                                    </a>\r\n");
 
+            
+            #line 48 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+                                    }
+                                    else
+                                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                    <h3>");
+
+            
+            #line 51 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+                                   Write(pluginDefinition.Name);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</h3>\r\n");
+
+            
+            #line 52 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+                                    }
+
+            
+            #line default
+            #line hidden
 WriteLiteral("                                    <div");
 
 WriteLiteral(" class=\"pageMenuBlurb\"");
@@ -201,7 +238,7 @@ WriteLiteral(" class=\"pluginVersion\"");
 WriteLiteral(">v");
 
             
-            #line 41 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 54 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                                                                  Write(pluginDefinition.VersionFormatted);
 
             
@@ -210,7 +247,7 @@ WriteLiteral(">v");
 WriteLiteral("</span> | ");
 
             
-            #line 41 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 54 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                                                                                                               Write(pluginDefinition.Author);
 
             
@@ -218,14 +255,14 @@ WriteLiteral("</span> | ");
             #line hidden
 WriteLiteral(" | <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 1836), Tuple.Create("\"", 1864)
+WriteAttribute("href", Tuple.Create(" href=\"", 2432), Tuple.Create("\"", 2460)
             
-            #line 41 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
-                                                                       , Tuple.Create(Tuple.Create("", 1843), Tuple.Create<System.Object, System.Int32>(pluginDefinition.Url
+            #line 54 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+                                                                       , Tuple.Create(Tuple.Create("", 2439), Tuple.Create<System.Object, System.Int32>(pluginDefinition.Url
             
             #line default
             #line hidden
-, 1843), false)
+, 2439), false)
 );
 
 WriteLiteral(" target=\"_blank\"");
@@ -233,7 +270,7 @@ WriteLiteral(" target=\"_blank\"");
 WriteLiteral(">More Information</a>\r\n                                    </div>\r\n");
 
             
-            #line 43 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 56 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                                 }
 
             
@@ -242,7 +279,7 @@ WriteLiteral(">More Information</a>\r\n                                    </div
 WriteLiteral("                            </div>\r\n");
 
             
-            #line 45 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 58 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                     }
                         
             
@@ -251,7 +288,7 @@ WriteLiteral("                            </div>\r\n");
 WriteLiteral("\r\n                    </td>\r\n");
 
             
-            #line 48 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 61 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                 }
 
             
@@ -259,6 +296,14 @@ WriteLiteral("\r\n                    </td>\r\n");
             #line hidden
 WriteLiteral("            </tr>\r\n        </table>\r\n");
 
+            
+            #line 64 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+                if (canUninstall)
+                {
+
+            
+            #line default
+            #line hidden
 WriteLiteral("        <div");
 
 WriteLiteral(" id=\"dialogUninstallPlugins\"");
@@ -270,7 +315,7 @@ WriteLiteral(">\r\n            <div>\r\n");
 WriteLiteral("                ");
 
             
-            #line 53 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 68 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
            Write(Html.DropDownList("uninstallPlugin", Model.PluginManifests.ToSelectListItems(null, true, "Select a Plugin to Uninstall")));
 
             
@@ -346,61 +391,54 @@ WriteLiteral("        <script>\r\n            $(function () {\r\n
 "            var uninstallUrl = \'");
 
             
-            #line 74 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 89 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                                 Write(Url.Action(MVC.API.Plugin.Uninstall()));
 
             
             #line default
             #line hidden
-WriteLiteral("/\';\r\n                var uninstallPlugin, uninstallPluginData, $dialogConfirm, un" +
-"installPluginConfirm, uninstallPluginDataConfirm;\r\n\r\n                var pluginI" +
-"d, pluginName, pluginUninstallData;\r\n\r\n                var $dialog = $(\'#dialogU" +
-"ninstallPlugins\').dialog({\r\n                    resizable: false,\r\n             " +
-"       modal: true,\r\n                    width: 350,\r\n                    autoOp" +
-"en: false,\r\n                    buttons: {\r\n                        \"Uninstall\":" +
-" function () {\r\n                            pluginId = uninstallPlugin.val();\r\n " +
-"                           pluginName = uninstallPlugin.find(\'option:selected\')." +
-"text();\r\n                            pluginUninstallData = uninstallPluginData.i" +
-"s(\':checked\');\r\n\r\n                            if (!pluginId) {\r\n                " +
-"                alert(\'Select a plugin to uninstall\');\r\n                        " +
-"    } else {\r\n                                uninstallPluginConfirm.text(plugin" +
-"Name + \' [\' + pluginId + \']\');\r\n                                if (pluginUninst" +
-"allData)\r\n                                    uninstallPluginDataConfirm.show();" +
-"\r\n                                else\r\n                                    unin" +
-"stallPluginDataConfirm.hide();\r\n\r\n                                $dialogConfirm" +
-".dialog(\'open\');\r\n                                $(this).dialog(\"close\");\r\n    " +
-"                        }\r\n                        },\r\n                        C" +
-"ancel: function () {\r\n                            uninstallPluginData.prop(\'chec" +
-"ked\', false);\r\n                            $(\'#uninstallPluginDataAlert\').hide()" +
-";\r\n                            $(this).dialog(\"close\");\r\n                       " +
-" }\r\n                    }\r\n                });\r\n\r\n                $dialogConfirm" +
-" = $(\'#dialogUninstallPluginConfirm\').dialog({\r\n                    resizable: f" +
-"alse,\r\n                    modal: true,\r\n                    width: 350,\r\n      " +
-"              autoOpen: false,\r\n                    buttons: {\r\n                " +
-"        \"Confirm Uninstall\": function () {\r\n                            var url " +
-"= uninstallUrl + pluginId;\r\n                            if (pluginUninstallData)" +
-"\r\n                                url += \'?UninstallData=true\'\r\n                " +
-"            else\r\n                                url += \'?UninstallData=false\'\r" +
-"\n\r\n                            window.location.href = url;\r\n                    " +
-"        $(this).dialog(\"disable\");\r\n                        },\r\n                " +
-"        Cancel: function () {\r\n                            uninstallPluginData.p" +
-"rop(\'checked\', false);\r\n                            $(\'#uninstallPluginDataAlert" +
-"\').hide();\r\n                            $(this).dialog(\"close\");\r\n              " +
-"          }\r\n                    }\r\n                });\r\n\r\n                unins" +
-"tallPlugin = $(\'#uninstallPlugin\');\r\n                uninstallPluginData = $(\'#u" +
-"ninstallPluginData\');\r\n                uninstallPluginConfirm = $(\'#uninstallPlu" +
-"ginConfirm\');\r\n                uninstallPluginDataConfirm = $(\'#uninstallPluginD" +
-"ataConfirm\');\r\n\r\n                $(\'#buttonUninstall\').click(function () {\r\n    " +
-"                $dialog.dialog(\'open\');\r\n                    return false;\r\n    " +
-"            });\r\n\r\n                $(\'#uninstallPluginData\').change(function () " +
-"{\r\n                    if ($(this).is(\':checked\')) {\r\n                        $(" +
-"\'#uninstallPluginDataAlert\').slideDown();\r\n                    } else {\r\n       " +
-"                 $(\'#uninstallPluginDataAlert\').slideUp();\r\n                    " +
-"}\r\n                });\r\n            });\r\n        </script>\r\n");
+WriteLiteral("/\';\r\n        var uninstallPlugin, uninstallPluginData, $dialogConfirm, uninstallP" +
+"luginConfirm, uninstallPluginDataConfirm;\r\n\r\n        var pluginId, pluginName, p" +
+"luginUninstallData;\r\n\r\n        var $dialog = $(\'#dialogUninstallPlugins\').dialog" +
+"({\r\n            resizable: false,\r\n            modal: true,\r\n            width: " +
+"350,\r\n            autoOpen: false,\r\n            buttons: {\r\n                \"Uni" +
+"nstall\": function () {\r\n                    pluginId = uninstallPlugin.val();\r\n " +
+"                   pluginName = uninstallPlugin.find(\'option:selected\').text();\r" +
+"\n                    pluginUninstallData = uninstallPluginData.is(\':checked\');\r\n" +
+"\r\n                    if (!pluginId) {\r\n                        alert(\'Select a " +
+"plugin to uninstall\');\r\n                    } else {\r\n                        un" +
+"installPluginConfirm.text(pluginName + \' [\' + pluginId + \']\');\r\n                " +
+"        if (pluginUninstallData)\r\n                            uninstallPluginDat" +
+"aConfirm.show();\r\n                        else\r\n                            unin" +
+"stallPluginDataConfirm.hide();\r\n\r\n                        $dialogConfirm.dialog(" +
+"\'open\');\r\n                        $(this).dialog(\"close\");\r\n                    " +
+"}\r\n                },\r\n                Cancel: function () {\r\n                  " +
+"  uninstallPluginData.prop(\'checked\', false);\r\n                    $(\'#uninstall" +
+"PluginDataAlert\').hide();\r\n                    $(this).dialog(\"close\");\r\n       " +
+"         }\r\n            }\r\n        });\r\n\r\n        $dialogConfirm = $(\'#dialogUni" +
+"nstallPluginConfirm\').dialog({\r\n            resizable: false,\r\n            modal" +
+": true,\r\n            width: 350,\r\n            autoOpen: false,\r\n            butt" +
+"ons: {\r\n                \"Confirm Uninstall\": function () {\r\n                    " +
+"var url = uninstallUrl + pluginId;\r\n                    if (pluginUninstallData)" +
+"\r\n                        url += \'?UninstallData=true\'\r\n                    else" +
+"\r\n                        url += \'?UninstallData=false\'\r\n\r\n                    w" +
+"indow.location.href = url;\r\n                    $(this).dialog(\"disable\");\r\n    " +
+"            },\r\n                Cancel: function () {\r\n                    unins" +
+"tallPluginData.prop(\'checked\', false);\r\n                    $(\'#uninstallPluginD" +
+"ataAlert\').hide();\r\n                    $(this).dialog(\"close\");\r\n              " +
+"  }\r\n            }\r\n        });\r\n\r\n        uninstallPlugin = $(\'#uninstallPlugin" +
+"\');\r\n        uninstallPluginData = $(\'#uninstallPluginData\');\r\n        uninstall" +
+"PluginConfirm = $(\'#uninstallPluginConfirm\');\r\n        uninstallPluginDataConfir" +
+"m = $(\'#uninstallPluginDataConfirm\');\r\n\r\n        $(\'#buttonUninstall\').click(fun" +
+"ction () {\r\n            $dialog.dialog(\'open\');\r\n            return false;\r\n    " +
+"    });\r\n\r\n        $(\'#uninstallPluginData\').change(function () {\r\n            i" +
+"f ($(this).is(\':checked\')) {\r\n                $(\'#uninstallPluginDataAlert\').sli" +
+"deDown();\r\n            } else {\r\n                $(\'#uninstallPluginDataAlert\')." +
+"slideUp();\r\n            }\r\n        });\r\n    });\r\n        </script>\r\n");
 
             
-            #line 154 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
-        
+            #line 169 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+                }
                 if (Model.PluginUpdates.Count > 0)
                 {
 
@@ -414,7 +452,7 @@ WriteLiteral(" id=\"updateAvailableContainer\"");
 WriteLiteral(">\r\n            <div>");
 
             
-            #line 158 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 173 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
              Write(Model.PluginUpdates.Count);
 
             
@@ -423,7 +461,7 @@ WriteLiteral(">\r\n            <div>");
 WriteLiteral(" plugin update");
 
             
-            #line 158 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 173 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                                                        Write(Model.PluginUpdates.Count == 1 ? " is" : "s are");
 
             
@@ -431,16 +469,51 @@ WriteLiteral(" plugin update");
             #line hidden
 WriteLiteral(" available</div>\r\n");
 
-WriteLiteral("            ");
-
             
-            #line 159 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
-       Write(Html.ActionLinkButton("Update Now", MVC.API.Plugin.UpdateAll()));
+            #line 174 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            
+            
+            #line default
+            #line hidden
+            
+            #line 174 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+             if (canInstall)
+            {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 176 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+           Write(Html.ActionLinkButton("Update Now", MVC.API.Plugin.UpdateAll()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n        </div>\r\n");
+            
+            #line 176 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+                                                                                
+            }
+            else
+            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <div");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">You do not have sufficient permission to install these updates.</div>\r\n");
+
+            
+            #line 181 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        </div>\r\n");
 
 WriteLiteral(@"        <script>
             (function () {
@@ -454,7 +527,7 @@ WriteLiteral(@"        <script>
 ");
 
             
-            #line 170 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 192 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                 }
         }
     
@@ -468,28 +541,28 @@ WriteLiteral(" class=\"actionBar\"");
 WriteLiteral(">\r\n");
 
             
-            #line 175 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 197 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 175 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
-     if (Model.PluginManifests.Count > 0)
+            #line 197 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+     if (canUninstall && Model.PluginManifests.Count > 0)
     { 
         
             
             #line default
             #line hidden
             
-            #line 177 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 199 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
    Write(Html.ActionLinkButton("Uninstall Plugins", MVC.Config.Plugins.Index(), "buttonUninstall"));
 
             
             #line default
             #line hidden
             
-            #line 177 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+            #line 199 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
                                                                                                   
     }
 
@@ -499,13 +572,29 @@ WriteLiteral(">\r\n");
 WriteLiteral("    ");
 
             
-            #line 179 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
-Write(Html.ActionLinkButton("Install Plugins", MVC.Config.Plugins.Install()));
+            #line 201 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+     if (canInstall)
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 203 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+   Write(Html.ActionLinkButton("Install Plugins", MVC.Config.Plugins.Install()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>\r\n");
+            
+            #line 203 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
+                                                                               
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</div>\r\n");
 
         }
     }
diff --git a/Disco.Web/Areas/Config/Views/Plugins/Install.cshtml b/Disco.Web/Areas/Config/Views/Plugins/Install.cshtml
index 01115d47..b2a9aec9 100644
--- a/Disco.Web/Areas/Config/Views/Plugins/Install.cshtml
+++ b/Disco.Web/Areas/Config/Views/Plugins/Install.cshtml
@@ -1,6 +1,10 @@
 @model Disco.Web.Areas.Config.Models.Plugins.InstallModel
 @using Disco.Services.Plugins;
 @{
+    Authorization.Require(Claims.Config.Plugin.Install);
+
+    var canInstallLocal = Authorization.Has(Claims.Config.Plugin.InstallLocal);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Plugins", MVC.Config.Plugins.Index(), "Install Plugin");
 }
 <div id="pluginCatalog">
@@ -31,14 +35,20 @@
                         var installedPlugin = Plugins.PluginInstalled(plugin.Id) ? Plugins.GetPlugin(plugin.Id) : null;
                             <div class="pageMenuArea pluginItem@(installedPlugin != null ? " pluginInstalled" : string.Empty)">
                                 <h2 class="pluginName">@plugin.Name
-                                    @if (installedPlugin == null){
-                                    <a class="pluginInstallLink button" href="@(Url.Action(MVC.API.Plugin.Install(plugin.Id)))">Install</a>
-                                    }else{
-                                    if (Version.Parse(plugin.LatestVersion) > installedPlugin.Version){
-                                        <a class="pluginUpdateLink button" href="@(Url.Action(MVC.API.Plugin.Update(plugin.Id)))">Update</a>    
-                                    }else{
-                                        <a class="pluginInstalledLink button disabled" href="#">Installed</a>    
+                                    @if (installedPlugin == null)
+                                    {
+                                        <a class="pluginInstallLink button" href="@(Url.Action(MVC.API.Plugin.Install(plugin.Id)))">Install</a>
                                     }
+                                    else
+                                    {
+                                        if (Version.Parse(plugin.LatestVersion) > installedPlugin.Version)
+                                        {
+                                        <a class="pluginUpdateLink button" href="@(Url.Action(MVC.API.Plugin.Update(plugin.Id)))">Update</a>    
+                                        }
+                                        else
+                                        {
+                                        <a class="pluginInstalledLink button disabled" href="#">Installed</a>    
+                                        }
                                     }
                                 </h2>
                                 <div class="pluginItemBlurb">@(new HtmlString(plugin.Blurb))</div>
@@ -63,19 +73,22 @@
         <strong>Only Install plugins from a trusted source.</strong>
     </div>
 </div>
-<div id="dialogUploadPlugin" title="Install Plugin Package">
-    <div style="padding-bottom: 10px;">
-        @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" />
-        }
+@if (canInstallLocal)
+{
+    <div id="dialogUploadPlugin" title="Install Plugin Package">
+        <div style="padding-bottom: 10px;">
+            @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" />
+            }
+        </div>
+        <div style="padding: 0.7em 0.7em; margin-top: 8px;" class="ui-state-error ui-corner-all">
+            <span style="margin-right: 0.3em; margin-bottom: 2em; float: left;" class="ui-icon ui-icon-alert"></span>Warning: All plugins run with the same level of network privileges as the Disco Web App.<br />
+            <strong>Only install plugins from a trusted source.</strong>
+        </div>
     </div>
-    <div style="padding: 0.7em 0.7em; margin-top: 8px;" class="ui-state-error ui-corner-all">
-        <span style="margin-right: 0.3em; margin-bottom: 2em; float: left;" class="ui-icon ui-icon-alert"></span>Warning: All plugins run with the same level of network privileges as the Disco Web App.<br />
-        <strong>Only install plugins from a trusted source.</strong>
-    </div>
-</div>
+}
 <script>
     $(function () {
         var $selectedPlugin;
@@ -132,6 +145,8 @@
             return false;
         });
 
+        @if (canInstallLocal)
+        {<text>
         // Upload
         var $dialogUpload = $('#dialogUploadPlugin').dialog({
             resizable: false,
@@ -157,9 +172,13 @@
             $dialogUpload.dialog('open');
             return false;
         });
+        </text>}
     });
 </script>
 <div class="actionBar">
     @Html.ActionLinkButton("Update Catalogue", MVC.API.Plugin.UpdateLibraryCatalogue())
-    @Html.ActionLinkButton("Install Plugin Package", MVC.API.Plugin.InstallLocal(), "buttonUpload")
+    @if (canInstallLocal)
+    {
+        @Html.ActionLinkButton("Install Plugin Package", MVC.API.Plugin.InstallLocal(), "buttonUpload")
+    }
 </div>
diff --git a/Disco.Web/Areas/Config/Views/Plugins/Install.generated.cs b/Disco.Web/Areas/Config/Views/Plugins/Install.generated.cs
index f1c5adad..3695ef63 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.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,18 +28,20 @@ namespace Disco.Web.Areas.Config.Views.Plugins
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
     
     #line 2 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
     using Disco.Services.Plugins;
     
     #line default
     #line hidden
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/Plugins/Install.cshtml")]
-    public partial class Install : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.Plugins.InstallModel>
+    public partial class Install : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.Plugins.InstallModel>
     {
         public Install()
         {
@@ -49,6 +51,10 @@ namespace Disco.Web.Areas.Config.Views.Plugins
             
             #line 3 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
   
+    Authorization.Require(Claims.Config.Plugin.Install);
+
+    var canInstallLocal = Authorization.Has(Claims.Config.Plugin.InstallLocal);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Plugins", MVC.Config.Plugins.Index(), "Install Plugin");
 
             
@@ -69,7 +75,7 @@ WriteLiteral(" href=\"http://discoict.com.au/\"");
 WriteLiteral(">http://discoict.com.au</a>] was last updated ");
 
             
-            #line 7 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 11 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                                                                                                                   Write(CommonHelpers.FriendlyDate(Model.Catalogue.ResponseTimestamp));
 
             
@@ -78,13 +84,13 @@ WriteLiteral(">http://discoict.com.au</a>] was last updated ");
 WriteLiteral("\r\n    </h4>\r\n");
 
             
-            #line 9 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 13 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 9 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 13 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
      if (Model.Catalogue.Plugins.Count == 0)
     { 
 
@@ -100,7 +106,7 @@ WriteLiteral(" style=\"width: 450px; padding: 100px 0;\"");
 WriteLiteral(">\r\n            <h2>No Plugins are Available</h2>\r\n        </div>  \r\n");
 
             
-            #line 14 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 18 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
     }
     else
     {
@@ -118,13 +124,13 @@ WriteLiteral(" id=\"pageMenu\"");
 WriteLiteral(">\r\n            <tr>\r\n");
 
             
-            #line 22 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 26 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 22 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 26 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                  for (int i = 0; i < 3; i++)
                 {
 
@@ -134,13 +140,13 @@ WriteLiteral(">\r\n            <tr>\r\n");
 WriteLiteral("                    <td>\r\n");
 
             
-            #line 25 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 29 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 25 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 29 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                           
                     int itemsForThisColumn = itemsPerColumn + (plugins.Count % 3 > i ? 1 : 0);
                     for (int i2 = 0; i2 < itemsForThisColumn && itemNextId < plugins.Count; i2++)
@@ -154,16 +160,16 @@ WriteLiteral("                    <td>\r\n");
             #line hidden
 WriteLiteral("                            <div");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 1449), Tuple.Create("\"", 1542)
-, Tuple.Create(Tuple.Create("", 1457), Tuple.Create("pageMenuArea", 1457), true)
-, Tuple.Create(Tuple.Create(" ", 1469), Tuple.Create("pluginItem", 1470), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 1592), Tuple.Create("\"", 1685)
+, Tuple.Create(Tuple.Create("", 1600), Tuple.Create("pageMenuArea", 1600), true)
+, Tuple.Create(Tuple.Create(" ", 1612), Tuple.Create("pluginItem", 1613), true)
             
-            #line 32 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-, Tuple.Create(Tuple.Create("", 1480), Tuple.Create<System.Object, System.Int32>(installedPlugin != null ? " pluginInstalled" : string.Empty
+            #line 36 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+, Tuple.Create(Tuple.Create("", 1623), Tuple.Create<System.Object, System.Int32>(installedPlugin != null ? " pluginInstalled" : string.Empty
             
             #line default
             #line hidden
-, 1480), false)
+, 1623), false)
 );
 
 WriteLiteral(">\r\n                                <h2");
@@ -173,7 +179,7 @@ WriteLiteral(" class=\"pluginName\"");
 WriteLiteral(">");
 
             
-            #line 33 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 37 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                                   Write(plugin.Name);
 
             
@@ -182,38 +188,42 @@ WriteLiteral(">");
 WriteLiteral("\r\n");
 
             
-            #line 34 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 38 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                     
             
             #line default
             #line hidden
             
-            #line 34 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-                                     if (installedPlugin == null){
+            #line 38 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+                                     if (installedPlugin == null)
+                                    {
 
             
             #line default
             #line hidden
-WriteLiteral("                                    <a");
+WriteLiteral("                                        <a");
 
 WriteLiteral(" class=\"pluginInstallLink button\"");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 1754), Tuple.Create("\"", 1809)
+WriteAttribute("href", Tuple.Create(" href=\"", 1939), Tuple.Create("\"", 1994)
             
-            #line 35 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-, Tuple.Create(Tuple.Create("", 1761), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Plugin.Install(plugin.Id))
+            #line 40 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+   , Tuple.Create(Tuple.Create("", 1946), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Plugin.Install(plugin.Id))
             
             #line default
             #line hidden
-, 1761), false)
+, 1946), false)
 );
 
 WriteLiteral(">Install</a>\r\n");
 
             
-            #line 36 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-                                    }else{
-                                    if (Version.Parse(plugin.LatestVersion) > installedPlugin.Version){
+            #line 41 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+                                    }
+                                    else
+                                    {
+                                        if (Version.Parse(plugin.LatestVersion) > installedPlugin.Version)
+                                        {
 
             
             #line default
@@ -222,21 +232,23 @@ WriteLiteral("                                        <a");
 
 WriteLiteral(" class=\"pluginUpdateLink button\"");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 2047), Tuple.Create("\"", 2101)
+WriteAttribute("href", Tuple.Create(" href=\"", 2354), Tuple.Create("\"", 2408)
             
-            #line 38 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-  , Tuple.Create(Tuple.Create("", 2054), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Plugin.Update(plugin.Id))
+            #line 46 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+  , Tuple.Create(Tuple.Create("", 2361), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Plugin.Update(plugin.Id))
             
             #line default
             #line hidden
-, 2054), false)
+, 2361), false)
 );
 
 WriteLiteral(">Update</a>    \r\n");
 
             
-            #line 39 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-                                    }else{
+            #line 47 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+                                        }
+                                        else
+                                        {
 
             
             #line default
@@ -250,8 +262,8 @@ WriteLiteral(" href=\"#\"");
 WriteLiteral(">Installed</a>    \r\n");
 
             
-            #line 41 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-                                    }
+            #line 51 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+                                        }
                                     }
 
             
@@ -264,7 +276,7 @@ WriteLiteral(" class=\"pluginItemBlurb\"");
 WriteLiteral(">");
 
             
-            #line 44 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 54 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                                          Write(new HtmlString(plugin.Blurb));
 
             
@@ -281,7 +293,7 @@ WriteLiteral(" class=\"pluginId\"");
 WriteLiteral(">");
 
             
-            #line 46 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 56 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                                       Write(plugin.Id);
 
             
@@ -294,7 +306,7 @@ WriteLiteral(" class=\"pluginVersion\"");
 WriteLiteral(">v");
 
             
-            #line 46 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 56 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                                                                                         Write(plugin.LatestVersion);
 
             
@@ -303,7 +315,7 @@ WriteLiteral(">v");
 WriteLiteral("</span> | ");
 
             
-            #line 46 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 56 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                                                                                                                                         Write(plugin.Author);
 
             
@@ -311,14 +323,14 @@ WriteLiteral("</span> | ");
             #line hidden
 WriteLiteral(" | <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 2716), Tuple.Create("\"", 2734)
+WriteAttribute("href", Tuple.Create(" href=\"", 3115), Tuple.Create("\"", 3133)
             
-            #line 46 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-                                                                                       , Tuple.Create(Tuple.Create("", 2723), Tuple.Create<System.Object, System.Int32>(plugin.Url
+            #line 56 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+                                                                                       , Tuple.Create(Tuple.Create("", 3122), Tuple.Create<System.Object, System.Int32>(plugin.Url
             
             #line default
             #line hidden
-, 2723), false)
+, 3122), false)
 );
 
 WriteLiteral(" target=\"_blank\"");
@@ -327,7 +339,7 @@ WriteLiteral(">More Information</a>\r\n                                </div>\r\
 "          </div>\r\n");
 
             
-            #line 49 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 59 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                     }
                         
             
@@ -336,7 +348,7 @@ WriteLiteral(">More Information</a>\r\n                                </div>\r\
 WriteLiteral("\r\n                    </td>\r\n");
 
             
-            #line 52 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 62 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
                 }
 
             
@@ -345,7 +357,7 @@ WriteLiteral("\r\n                    </td>\r\n");
 WriteLiteral("            </tr>\r\n        </table>\r\n");
 
             
-            #line 55 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 65 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
     }
 
             
@@ -379,39 +391,49 @@ WriteLiteral(" class=\"ui-icon ui-icon-alert\"");
 
 WriteLiteral("></span>Warning: All plugins run with the same level of network privileges as the" +
 " Disco Web App.<br />\r\n        <strong>Only Install plugins from a trusted sourc" +
-"e.</strong>\r\n    </div>\r\n</div>\r\n<div");
+"e.</strong>\r\n    </div>\r\n</div>\r\n");
+
+            
+            #line 76 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+ if (canInstallLocal)
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"dialogUploadPlugin\"");
 
 WriteLiteral(" title=\"Install Plugin Package\"");
 
-WriteLiteral(">\r\n    <div");
+WriteLiteral(">\r\n        <div");
 
 WriteLiteral(" style=\"padding-bottom: 10px;\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 68 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-        
+            #line 80 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            
             
             #line default
             #line hidden
             
-            #line 68 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-         using (Html.BeginForm(MVC.API.Plugin.InstallLocal(), FormMethod.Post, new { enctype = "multipart/form-data" }))
-        {
+            #line 80 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+             using (Html.BeginForm(MVC.API.Plugin.InstallLocal(), FormMethod.Post, new { enctype = "multipart/form-data" }))
+            {
 
             
             #line default
             #line hidden
-WriteLiteral("            <label");
+WriteLiteral("                <label");
 
 WriteLiteral(" for=\"pluginFile\"");
 
 WriteLiteral(">Plugin Package: </label>\r\n");
 
-WriteLiteral("            <input");
+WriteLiteral("                <input");
 
 WriteLiteral(" id=\"pluginFile\"");
 
@@ -422,65 +444,112 @@ WriteLiteral(" type=\"file\"");
 WriteLiteral(" />\r\n");
 
             
-            #line 72 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-        }
+            #line 84 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            }
 
             
             #line default
             #line hidden
-WriteLiteral("    </div>\r\n    <div");
+WriteLiteral("        </div>\r\n        <div");
 
 WriteLiteral(" style=\"padding: 0.7em 0.7em; margin-top: 8px;\"");
 
 WriteLiteral(" class=\"ui-state-error ui-corner-all\"");
 
-WriteLiteral(">\r\n        <span");
+WriteLiteral(">\r\n            <span");
 
 WriteLiteral(" style=\"margin-right: 0.3em; margin-bottom: 2em; float: left;\"");
 
 WriteLiteral(" class=\"ui-icon ui-icon-alert\"");
 
 WriteLiteral("></span>Warning: All plugins run with the same level of network privileges as the" +
-" Disco Web App.<br />\r\n        <strong>Only install plugins from a trusted sourc" +
-"e.</strong>\r\n    </div>\r\n</div>\r\n<script>\r\n    $(function () {\r\n        var $sel" +
-"ectedPlugin;\r\n        var $selectedPluginUrl;\r\n\r\n        // Install\r\n        var" +
-" $dialogInstall = $(\'#dialogInstallPlugin\').dialog({\r\n            resizable: fal" +
-"se,\r\n            modal: true,\r\n            width: 350,\r\n            autoOpen: fa" +
-"lse,\r\n            buttons: {\r\n                \"Install\": function () {\r\n        " +
-"            if ($selectedPlugin == null || !$selectedPluginUrl) {\r\n             " +
-"           $(this).dialog(\"close\");\r\n                        return;\r\n          " +
-"          }\r\n                    $(this).dialog(\"disable\");\r\n\r\n                 " +
-"   window.location.href = $selectedPluginUrl;\r\n                },\r\n             " +
-"   Cancel: function () {\r\n                    $selectedPlugin = null;\r\n         " +
-"           $(this).dialog(\"close\");\r\n                }\r\n            }\r\n        }" +
-");\r\n        $(\'#pageMenu\').find(\'a.pluginInstallLink\').click(function () {\r\n    " +
-"        $this = $(this);\r\n\r\n            $selectedPlugin = $this.closest(\'.plugin" +
-"Item\');\r\n            $selectedPluginUrl = $this.attr(\'href\');\r\n\r\n            $(\'" +
-"#dialogInstallPluginName\').text($selectedPlugin.find(\'.pluginName\').text());\r\n  " +
-"          $(\'#dialogInstallPluginDetails\').text($selectedPlugin.find(\'.pluginId\'" +
-").text() + \' | \' + $selectedPlugin.find(\'.pluginVersion\').text());\r\n\r\n          " +
-"  $dialogInstall.dialog(\'option\', \'title\', \'Install this Plugin?\');\r\n           " +
-" $dialogInstall.dialog(\'open\');\r\n\r\n            return false;\r\n        });\r\n     " +
-"   $(\'#pageMenu\').find(\'a.pluginUpdateLink\').click(function () {\r\n            $t" +
-"his = $(this);\r\n\r\n            $selectedPlugin = $this.closest(\'.pluginItem\');\r\n " +
-"           $selectedPluginUrl = $this.attr(\'href\');\r\n\r\n            $(\'#dialogIns" +
-"tallPluginName\').text($selectedPlugin.find(\'.pluginName\').text());\r\n            " +
-"$(\'#dialogInstallPluginDetails\').text($selectedPlugin.find(\'.pluginId\').text() +" +
-" \' | \' + $selectedPlugin.find(\'.pluginVersion\').text());\r\n\r\n            $dialogI" +
-"nstall.dialog(\'option\', \'title\', \'Update this Plugin?\');\r\n            $dialogIns" +
-"tall.dialog(\'open\');\r\n\r\n            return false;\r\n        });\r\n\r\n        // Upl" +
-"oad\r\n        var $dialogUpload = $(\'#dialogUploadPlugin\').dialog({\r\n            " +
-"resizable: false,\r\n            modal: true,\r\n            width: 350,\r\n          " +
-"  autoOpen: false,\r\n            buttons: {\r\n                \"Upload & Install\": " +
-"function () {\r\n                    var pluginFile = $(\'#pluginFile\');\r\n         " +
-"           if (pluginFile.val()) {\r\n                        pluginFile.closest(\'" +
-"form\').submit();\r\n                        $(this).dialog(\'disable\');\r\n          " +
-"          } else {\r\n                        alert(\'Choose a Plugin Package to Up" +
-"load\');\r\n                    }\r\n                },\r\n                Cancel: func" +
-"tion () {\r\n                    $(this).dialog(\"close\");\r\n                }\r\n    " +
-"        }\r\n        });\r\n        $(\'#buttonUpload\').click(function () {\r\n        " +
-"    $dialogUpload.dialog(\'open\');\r\n            return false;\r\n        });\r\n    }" +
-");\r\n</script>\r\n<div");
+" Disco Web App.<br />\r\n            <strong>Only install plugins from a trusted s" +
+"ource.</strong>\r\n        </div>\r\n    </div>\r\n");
+
+            
+            #line 91 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+WriteLiteral("<script>\r\n    $(function () {\r\n        var $selectedPlugin;\r\n        var $selecte" +
+"dPluginUrl;\r\n\r\n        // Install\r\n        var $dialogInstall = $(\'#dialogInstal" +
+"lPlugin\').dialog({\r\n            resizable: false,\r\n            modal: true,\r\n   " +
+"         width: 350,\r\n            autoOpen: false,\r\n            buttons: {\r\n    " +
+"            \"Install\": function () {\r\n                    if ($selectedPlugin ==" +
+" null || !$selectedPluginUrl) {\r\n                        $(this).dialog(\"close\")" +
+";\r\n                        return;\r\n                    }\r\n                    $" +
+"(this).dialog(\"disable\");\r\n\r\n                    window.location.href = $selecte" +
+"dPluginUrl;\r\n                },\r\n                Cancel: function () {\r\n        " +
+"            $selectedPlugin = null;\r\n                    $(this).dialog(\"close\")" +
+";\r\n                }\r\n            }\r\n        });\r\n        $(\'#pageMenu\').find(\'a" +
+".pluginInstallLink\').click(function () {\r\n            $this = $(this);\r\n\r\n      " +
+"      $selectedPlugin = $this.closest(\'.pluginItem\');\r\n            $selectedPlug" +
+"inUrl = $this.attr(\'href\');\r\n\r\n            $(\'#dialogInstallPluginName\').text($s" +
+"electedPlugin.find(\'.pluginName\').text());\r\n            $(\'#dialogInstallPluginD" +
+"etails\').text($selectedPlugin.find(\'.pluginId\').text() + \' | \' + $selectedPlugin" +
+".find(\'.pluginVersion\').text());\r\n\r\n            $dialogInstall.dialog(\'option\', " +
+"\'title\', \'Install this Plugin?\');\r\n            $dialogInstall.dialog(\'open\');\r\n\r" +
+"\n            return false;\r\n        });\r\n        $(\'#pageMenu\').find(\'a.pluginUp" +
+"dateLink\').click(function () {\r\n            $this = $(this);\r\n\r\n            $sel" +
+"ectedPlugin = $this.closest(\'.pluginItem\');\r\n            $selectedPluginUrl = $t" +
+"his.attr(\'href\');\r\n\r\n            $(\'#dialogInstallPluginName\').text($selectedPlu" +
+"gin.find(\'.pluginName\').text());\r\n            $(\'#dialogInstallPluginDetails\').t" +
+"ext($selectedPlugin.find(\'.pluginId\').text() + \' | \' + $selectedPlugin.find(\'.pl" +
+"uginVersion\').text());\r\n\r\n            $dialogInstall.dialog(\'option\', \'title\', \'" +
+"Update this Plugin?\');\r\n            $dialogInstall.dialog(\'open\');\r\n\r\n          " +
+"  return false;\r\n        });\r\n\r\n");
+
+            
+            #line 148 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 148 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+         if (canInstallLocal)
+        {
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+        // Upload
+        var $dialogUpload = $('#dialogUploadPlugin').dialog({
+            resizable: false,
+            modal: true,
+            width: 350,
+            autoOpen: false,
+            buttons: {
+                ""Upload & Install"": function () {
+                    var pluginFile = $('#pluginFile');
+                    if (pluginFile.val()) {
+                        pluginFile.closest('form').submit();
+                        $(this).dialog('disable');
+                    } else {
+                        alert('Choose a Plugin Package to Upload');
+                    }
+                },
+                Cancel: function () {
+                    $(this).dialog(""close"");
+                }
+            }
+        });
+        $('#buttonUpload').click(function () {
+            $dialogUpload.dialog('open');
+            return false;
+        });
+        ");
+
+            
+            #line 175 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+               }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    });\r\n</script>\r\n<div");
 
 WriteLiteral(" class=\"actionBar\"");
 
@@ -489,7 +558,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("    ");
 
             
-            #line 163 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+            #line 179 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
 Write(Html.ActionLinkButton("Update Catalogue", MVC.API.Plugin.UpdateLibraryCatalogue()));
 
             
@@ -497,16 +566,36 @@ Write(Html.ActionLinkButton("Update Catalogue", MVC.API.Plugin.UpdateLibraryCata
             #line hidden
 WriteLiteral("\r\n");
 
-WriteLiteral("    ");
-
             
-            #line 164 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
-Write(Html.ActionLinkButton("Install Plugin Package", MVC.API.Plugin.InstallLocal(), "buttonUpload"));
+            #line 180 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 180 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+     if (canInstallLocal)
+    {
+        
+            
+            #line default
+            #line hidden
+            
+            #line 182 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+   Write(Html.ActionLinkButton("Install Plugin Package", MVC.API.Plugin.InstallLocal(), "buttonUpload"));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>\r\n");
+            
+            #line 182 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
+                                                                                                       
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</div>\r\n");
 
         }
     }
diff --git a/Disco.Web/Areas/Config/Views/Plugins/ProviderConfiguration.generated.cs b/Disco.Web/Areas/Config/Views/Plugins/ProviderConfiguration.generated.cs
index f13f9c77..969c1eb6 100644
--- a/Disco.Web/Areas/Config/Views/Plugins/ProviderConfiguration.generated.cs
+++ b/Disco.Web/Areas/Config/Views/Plugins/ProviderConfiguration.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.Plugins
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/Plugins/Configure.cshtml")]
-    public partial class Configure : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.Plugins.PluginConfigurationViewModel>
+    public partial class Configure : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.Plugins.PluginConfigurationViewModel>
     {
         public Configure()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Areas.Config.Views.Plugins
             
             #line 2 "..\..\Areas\Config\Views\Plugins\Configure.cshtml"
   
+    Authorization.Require(Claims.Config.Plugin.Configure);
+    
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Plugins", MVC.Config.Plugins.Index(), Model.Manifest.Name);
 
             
@@ -51,7 +55,7 @@ namespace Disco.Web.Areas.Config.Views.Plugins
 WriteLiteral("\r\n");
 
             
-            #line 5 "..\..\Areas\Config\Views\Plugins\Configure.cshtml"
+            #line 7 "..\..\Areas\Config\Views\Plugins\Configure.cshtml"
  using (Html.BeginForm())
 { 
     
@@ -59,14 +63,14 @@ WriteLiteral("\r\n");
             #line default
             #line hidden
             
-            #line 7 "..\..\Areas\Config\Views\Plugins\Configure.cshtml"
+            #line 9 "..\..\Areas\Config\Views\Plugins\Configure.cshtml"
 Write(Html.ValidationSummary(false));
 
             
             #line default
             #line hidden
             
-            #line 7 "..\..\Areas\Config\Views\Plugins\Configure.cshtml"
+            #line 9 "..\..\Areas\Config\Views\Plugins\Configure.cshtml"
                                   
 
             
@@ -81,7 +85,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("        ");
 
             
-            #line 9 "..\..\Areas\Config\Views\Plugins\Configure.cshtml"
+            #line 11 "..\..\Areas\Config\Views\Plugins\Configure.cshtml"
    Write(Html.PartialCompiled(Model.PluginViewType, Model.PluginViewModel));
 
             
@@ -104,7 +108,7 @@ WriteLiteral(" value=\"Save Configuration\"");
 WriteLiteral(" />\r\n    </div>\r\n");
 
             
-            #line 14 "..\..\Areas\Config\Views\Plugins\Configure.cshtml"
+            #line 16 "..\..\Areas\Config\Views\Plugins\Configure.cshtml"
 }
             
             #line default
diff --git a/Disco.Web/Areas/Config/Views/Shared/LogEvents.cshtml b/Disco.Web/Areas/Config/Views/Shared/LogEvents.cshtml
index 86116d78..b9b61f2a 100644
--- a/Disco.Web/Areas/Config/Views/Shared/LogEvents.cshtml
+++ b/Disco.Web/Areas/Config/Views/Shared/LogEvents.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Areas.Config.Models.Shared.LogEventsModel
 @{
+    Authorization.Require(Claims.Config.Logging.Show);
+    
     Html.BundleDeferred("~/ClientScripts/Modules/Knockout");
     Html.BundleDeferred("~/ClientScripts/Modules/jQuery-SignalR");
     var uniqueId = Guid.NewGuid().ToString("N");
diff --git a/Disco.Web/Areas/Config/Views/Shared/LogEvents.generated.cs b/Disco.Web/Areas/Config/Views/Shared/LogEvents.generated.cs
index 3d646ab0..632caa65 100644
--- a/Disco.Web/Areas/Config/Views/Shared/LogEvents.generated.cs
+++ b/Disco.Web/Areas/Config/Views/Shared/LogEvents.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.Shared
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/Shared/LogEvents.cshtml")]
-    public partial class LogEvents : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.Shared.LogEventsModel>
+    public partial class LogEvents : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.Shared.LogEventsModel>
     {
         public LogEvents()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Areas.Config.Views.Shared
             
             #line 2 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
   
+    Authorization.Require(Claims.Config.Logging.Show);
+    
     Html.BundleDeferred("~/ClientScripts/Modules/Knockout");
     Html.BundleDeferred("~/ClientScripts/Modules/jQuery-SignalR");
     var uniqueId = Guid.NewGuid().ToString("N");
@@ -52,15 +56,15 @@ namespace Disco.Web.Areas.Config.Views.Shared
             #line hidden
 WriteLiteral("\r\n<div");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 251), Tuple.Create("\"", 277)
-, Tuple.Create(Tuple.Create("", 256), Tuple.Create("LogEvents_", 256), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 313), Tuple.Create("\"", 339)
+, Tuple.Create(Tuple.Create("", 318), Tuple.Create("LogEvents_", 318), true)
             
-            #line 7 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
-, Tuple.Create(Tuple.Create("", 266), Tuple.Create<System.Object, System.Int32>(uniqueId
+            #line 9 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+, Tuple.Create(Tuple.Create("", 328), Tuple.Create<System.Object, System.Int32>(uniqueId
             
             #line default
             #line hidden
-, 266), false)
+, 328), false)
 );
 
 WriteLiteral(" class=\"logEventsViewport\"");
@@ -90,21 +94,21 @@ WriteLiteral(">Message\r\n                </th>\r\n            </tr>\r\n
 
 WriteLiteral(" class=\"logEventsViewportContainer\"");
 
-WriteAttribute("style", Tuple.Create(" style=\"", 752), Tuple.Create("\"", 962)
+WriteAttribute("style", Tuple.Create(" style=\"", 814), Tuple.Create("\"", 1024)
             
-            #line 22 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
-, Tuple.Create(Tuple.Create("", 760), Tuple.Create<System.Object, System.Int32>(Model.ViewPortWidth.HasValue ? string.Format("width:{0}px;", Model.ViewPortWidth.Value) : null
+            #line 24 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+, Tuple.Create(Tuple.Create("", 822), Tuple.Create<System.Object, System.Int32>(Model.ViewPortWidth.HasValue ? string.Format("width:{0}px;", Model.ViewPortWidth.Value) : null
             
             #line default
             #line hidden
-, 760), false)
+, 822), false)
             
-            #line 22 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
-                                                                      , Tuple.Create(Tuple.Create("", 857), Tuple.Create<System.Object, System.Int32>(Model.ViewPortHeight.HasValue ? string.Format("height:{0}px;", Model.ViewPortHeight.Value - 18) : null
+            #line 24 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+                                                                      , Tuple.Create(Tuple.Create("", 919), Tuple.Create<System.Object, System.Int32>(Model.ViewPortHeight.HasValue ? string.Format("height:{0}px;", Model.ViewPortHeight.Value - 18) : null
             
             #line default
             #line hidden
-, 857), false)
+, 919), false)
 );
 
 WriteLiteral(">\r\n        <div");
@@ -156,13 +160,13 @@ WriteLiteral("></td>\r\n                </tr>\r\n            </tbody>\r\n
 "\r\n");
 
             
-            #line 39 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 41 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 39 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 41 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
       
         var eventTypesFilterJson = (Model.EventTypesFilter != null) ? Newtonsoft.Json.JsonConvert.SerializeObject(Model.EventTypesFilter.Select(et => et.Id).ToArray()) : "null";
     
@@ -176,7 +180,7 @@ WriteLiteral(" type=\"text/javascript\"");
 WriteLiteral(">\r\n        $(function () {\r\n            var logEventsHost = $(\'LogEvents_");
 
             
-            #line 44 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 46 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                          Write(uniqueId);
 
             
@@ -185,7 +189,7 @@ WriteLiteral(">\r\n        $(function () {\r\n            var logEventsHost = $(
 WriteLiteral("\');\r\n            var logModuleId = \'");
 
             
-            #line 45 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 47 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                            Write(Model.ModuleFilter != null ? Model.ModuleFilter.ModuleId.ToString() : null);
 
             
@@ -194,7 +198,7 @@ WriteLiteral("\');\r\n            var logModuleId = \'");
 WriteLiteral("\';\r\n            var logModuleLiveGroupName = \'");
 
             
-            #line 46 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 48 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                       Write(Model.ModuleFilter != null ? Model.ModuleFilter.LiveLogGroupName : Disco.BI.Interop.SignalRHandlers.LogNotifications.AllNotifications);
 
             
@@ -203,7 +207,7 @@ WriteLiteral("\';\r\n            var logModuleLiveGroupName = \'");
 WriteLiteral("\';\r\n            var logEventTypeFiltered = ");
 
             
-            #line 47 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 49 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                    Write(eventTypesFilterJson);
 
             
@@ -212,7 +216,7 @@ WriteLiteral("\';\r\n            var logEventTypeFiltered = ");
 WriteLiteral(";\r\n            var logStartFiler = ");
 
             
-            #line 48 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 50 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                             Write(AjaxHelpers.JsonDate(Model.StartFilter));
 
             
@@ -221,7 +225,7 @@ WriteLiteral(";\r\n            var logStartFiler = ");
 WriteLiteral(";\r\n            var logEndFiler = ");
 
             
-            #line 49 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 51 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                           Write(AjaxHelpers.JsonDate(Model.EndFilter));
 
             
@@ -230,7 +234,7 @@ WriteLiteral(";\r\n            var logEndFiler = ");
 WriteLiteral(";\r\n            var logTakeFiler = \'");
 
             
-            #line 50 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 52 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                             Write(Model.TakeFilter);
 
             
@@ -240,7 +244,7 @@ WriteLiteral("\';\r\n            var liveConnection = null;\r\n            var l
 "tion = \'");
 
             
-            #line 52 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 54 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                          Write(Model.JavascriptLiveEventFunctionName);
 
             
@@ -249,7 +253,7 @@ WriteLiteral("\';\r\n            var liveConnection = null;\r\n            var l
 WriteLiteral("\';\r\n            var useLive = (\'True\'===\'");
 
             
-            #line 53 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 55 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                  Write(Model.IsLive);
 
             
@@ -292,7 +296,7 @@ WriteLiteral(@"');
                     url: '");
 
             
-            #line 87 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 89 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                       Write(Url.Action(MVC.API.Logging.RetrieveEvents()));
 
             
@@ -329,7 +333,7 @@ WriteLiteral(@"',
                     liveConnection = $.connection('");
 
             
-            #line 115 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 117 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                                Write(Url.Content("~/API/Logging/Notifications"));
 
             
diff --git a/Disco.Web/Areas/Config/Views/SystemConfig/Index.cshtml b/Disco.Web/Areas/Config/Views/SystemConfig/Index.cshtml
index 7e4fc010..73d09a0f 100644
--- a/Disco.Web/Areas/Config/Views/SystemConfig/Index.cshtml
+++ b/Disco.Web/Areas/Config/Views/SystemConfig/Index.cshtml
@@ -1,140 +1,146 @@
 @model Disco.Web.Areas.Config.Models.SystemConfig.IndexModel
 @{
+    Authorization.Require(Claims.Config.System.Show);
+
+    var canConfigProxy = Authorization.Has(Claims.Config.System.ConfigureProxy);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "System");
 }
-@using (Html.BeginForm())
-{ 
-    <div class="form" style="width: 450px">
-        <table>
+<div class="form" style="width: 450px">
+    <table>
+        <tr>
+            <th style="width: 135px">Disco Version:
+            </th>
+            <td>
+                <div>
+                    <code>@Model.DiscoVersion.ToString(4)</code>
+                </div>
+                <div class="smallMessage" title="@Model.DiscoVersionBuilt.ToFullDateTime()">
+                    Built @Model.DiscoVersionBuilt.ToFuzzy("Unknown")
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <th style="width: 135px">Database Connection:
+            </th>
+            <td>
+                <table class="sub">
+                    <tr>
+                        <th>Server:</th>
+                        <td><span class="code">@Model.DatabaseServer</span></td>
+                    </tr>
+                    <tr>
+                        <th>Database:</th>
+                        <td><span class="code">@Model.DatabaseName</span></td>
+                    </tr>
+                    <tr>
+                        <th>Authentication:</th>
+                        <td>@Model.DatabaseAuthentication</td>
+                    </tr>
+                    @{if (Model.DatabaseSqlAuthUsername != null)
+                      {
+                        <tr>
+                            <th>SQL&nbsp;User:</th>
+                            <td><span class="code">@Model.DatabaseSqlAuthUsername</span></td>
+                        </tr>      
+                      }
+                    }
+                </table>
+            </td>
+        </tr>
+        <tr>
+            <th style="width: 135px">Data Store Location:
+            </th>
+            <td>
+                <span class="code">@Model.DataStoreLocation</span>
+                @*                    @Html.EditorFor(m => m.DataStoreLocation)<br />
+                    @Html.ValidationMessageFor(m => m.DataStoreLocation)*@
+            </td>
+        </tr>
+    </table>
+</div>
+<div class="form" style="width: 450px; margin-top: 15px;">
+    <h2>Updates</h2>
+    <table>
+        @{
+            if (Model.UpdateLatestResponse == null)
+            {
             <tr>
-                <th style="width: 135px">Disco Version:
+                <th style="width: 135px">Last Check:
+                </th>
+                <td>
+                    <div class="error"><span class="icon error" style="margin-right: 6px;"></span>Never</div>
+                </td>
+            </tr>
+            }
+            else
+            {
+            <tr>
+                <th style="width: 135px">Last Run:
+                </th>
+                <td>
+                    <span>@CommonHelpers.FriendlyDate(Model.UpdateLatestResponse.ResponseTimestamp)</span>
+                </td>
+            </tr>
+                if (Model.UpdateLatestResponse.IsUpdatable(typeof(DiscoApplication).Assembly.GetName().Version))
+                {
+            <tr>
+                <th style="width: 135px">Update Available:
                 </th>
                 <td>
                     <div>
-                        <code>@Model.DiscoVersion.ToString(4)</code>
+                        <span class="icon warning" style="margin-right: 6px;"></span>Version @(Model.UpdateLatestResponse.Version) is available
                     </div>
-                    <div class="smallMessage" title="@Model.DiscoVersionBuilt.ToFullDateTime()">
-                        Built @Model.DiscoVersionBuilt.ToFuzzy("Unknown")
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <th style="width: 135px">Database Connection:
-                </th>
-                <td>
-                    <table class="sub">
-                        <tr>
-                            <th>Server:</th>
-                            <td><span class="code">@Model.DatabaseServer</span></td>
-                        </tr>
-                        <tr>
-                            <th>Database:</th>
-                            <td><span class="code">@Model.DatabaseName</span></td>
-                        </tr>
-                        <tr>
-                            <th>Authentication:</th>
-                            <td>@Model.DatabaseAuthentication</td>
-                        </tr>
-                        @{if (Model.DatabaseSqlAuthUsername != null)
-                          {
-                            <tr>
-                                <th>SQL&nbsp;User:</th>
-                                <td><span class="code">@Model.DatabaseSqlAuthUsername</span></td>
-                            </tr>      
-                          }
-                        }
-                    </table>
-                </td>
-            </tr>
-            <tr>
-                <th style="width: 135px">Data Store Location:
-                </th>
-                <td>
-                    <span class="code">@Model.DataStoreLocation</span>
-                    @*                    @Html.EditorFor(m => m.DataStoreLocation)<br />
-                    @Html.ValidationMessageFor(m => m.DataStoreLocation)*@
-                </td>
-            </tr>
-        </table>
-    </div>
-    <div class="form" style="width: 450px; margin-top: 15px;">
-        <h2>Updates</h2>
-        <table>
-            @{
-                          if (Model.UpdateLatestResponse == null)
-                          {
-                <tr>
-                    <th style="width: 135px">Last Check:
-                    </th>
-                    <td>
-                        <div class="error"><span class="icon error" style="margin-right: 6px;"></span>Never</div>
-                    </td>
-                </tr>
-                          }
-                          else
-                          {
-                <tr>
-                    <th style="width: 135px">Last Run:
-                    </th>
-                    <td>
-                        <span>@CommonHelpers.FriendlyDate(Model.UpdateLatestResponse.ResponseTimestamp)</span>
-                    </td>
-                </tr>
-                              if (Model.UpdateLatestResponse.IsUpdatable(typeof(DiscoApplication).Assembly.GetName().Version))
-                              {
-                <tr>
-                    <th style="width: 135px">Update Available:
-                    </th>
-                    <td>
-                        <div>
-                            <span class="icon warning" style="margin-right: 6px;"></span>Version @(Model.UpdateLatestResponse.Version) is available
-                        </div>
-                        <div class="smallMessage">
-                            [Released @(CommonHelpers.FriendlyDate(Model.UpdateLatestResponse.VersionReleasedTimestamp))]
-                        </div>
-                        <div class="smallMessage">@(new HtmlString(Model.UpdateLatestResponse.Blurb))</div>
-                        <a href="@(Model.UpdateLatestResponse.UrlLink)" target="_blank">Download Now</a>
-                    </td>
-                </tr>
-                              }
-                              else
-                              {
-                <tr>
-                    <th style="width: 135px">Status:
-                    </th>
-                    <td>
-                        <span class="icon success" style="margin-right: 6px;"></span><span>The latest version is installed</span>
-                    </td>
-                </tr>
-                              }
-                          }
-            }
-            <tr>
-                <th style="width: 135px">Check for Update:@{
-                          if (Model.UpdateBetaDeployment)
-                          {
-                    <div class="alert"><span class="icon warning" style="margin-right: 6px;"></span>Beta Deployment</div>
-                          }
-                }
-                </th>
-                <td>
-                    @{
-                          if (Model.UpdateRunningStatus == null)
-                          {
-                        <div>@Html.ActionLink("Check Now", MVC.API.System.UpdateCheck())</div>
-                          }
-                          else
-                          {
-                        <div>Running now - @Html.ActionLink("Check Status", MVC.Config.Logging.TaskStatus(Model.UpdateRunningStatus.SessionId))</div>
-                          }
-                    }
                     <div class="smallMessage">
-                        Next Scheduled: @CommonHelpers.FriendlyDate(Model.UpdateNextScheduled, "Unknown")
+                        [Released @(CommonHelpers.FriendlyDate(Model.UpdateLatestResponse.VersionReleasedTimestamp))]
                     </div>
+                    <div class="smallMessage">@(new HtmlString(Model.UpdateLatestResponse.Blurb))</div>
+                    <a href="@(Model.UpdateLatestResponse.UrlLink)" target="_blank">Download Now</a>
                 </td>
             </tr>
-        </table>
-    </div>
+                }
+                else
+                {
+            <tr>
+                <th style="width: 135px">Status:
+                </th>
+                <td>
+                    <span class="icon success" style="margin-right: 6px;"></span><span>The latest version is installed</span>
+                </td>
+            </tr>
+                }
+            }
+        }
+        <tr>
+            <th style="width: 135px">Check for Update:@{
+                if (Model.UpdateBetaDeployment)
+                {
+                <div class="alert"><span class="icon warning" style="margin-right: 6px;"></span>Beta Deployment</div>
+                }
+            }
+            </th>
+            <td>
+                @{
+                    if (Model.UpdateRunningStatus == null)
+                    {
+                    <div>@Html.ActionLink("Check Now", MVC.API.System.UpdateCheck())</div>
+                    }
+                    else
+                    {
+                    <div>Running now - @Html.ActionLink("Check Status", MVC.Config.Logging.TaskStatus(Model.UpdateRunningStatus.SessionId))</div>
+                    }
+                }
+                <div class="smallMessage">
+                    Next Scheduled: @CommonHelpers.FriendlyDate(Model.UpdateNextScheduled, "Unknown")
+                </div>
+            </td>
+        </tr>
+    </table>
+</div>
+@if (canConfigProxy)
+{
+    using (Html.BeginForm())
+    { 
     <div class="form" style="width: 450px; margin-top: 15px;">
         <h2>Proxy Settings</h2>
         <table>
@@ -170,10 +176,52 @@
                     @Html.ValidationMessageFor(m => m.ProxyPassword)
                 </td>
             </tr>
+            <tr>
+                <th style="width: 135px">&nbsp;
+                </th>
+                <td>
+                    <input type="submit" class="button small" value="Save Proxy Settings" />
+                </td>
+            </tr>
         </table>
     </div>
-    <div class="actionBar">
-        @Html.ActionLinkButton("Update Device Last Network Logons", MVC.API.System.UpdateLastNetworkLogonDates())
-        <input type="submit" class="button" value="Save Configuration" />
+    }
+}
+else
+{
+    <div class="form" style="width: 450px; margin-top: 15px;">
+        <h2>Proxy Settings</h2>
+        <table>
+            <tr>
+                <th style="width: 135px">Address:
+                </th>
+                <td>
+                    @Html.DisplayFor(m => m.ProxyAddress)
+                </td>
+            </tr>
+            <tr>
+                <th style="width: 135px">Port:
+                </th>
+                <td>
+                    @Html.DisplayFor(m => m.ProxyPort)
+                </td>
+            </tr>
+            <tr>
+                <th style="width: 135px">Username:
+                </th>
+                <td>
+                    @Html.DisplayFor(m => m.ProxyUsername)
+                </td>
+            </tr>
+            <tr>
+                <th style="width: 135px">Password:
+                </th>
+                <td>********
+                </td>
+            </tr>
+        </table>
     </div>
 }
+<div class="actionBar">
+    @Html.ActionLinkButton("Update Device Last Network Logons", MVC.API.System.UpdateLastNetworkLogonDates())
+</div>
diff --git a/Disco.Web/Areas/Config/Views/SystemConfig/Index.generated.cs b/Disco.Web/Areas/Config/Views/SystemConfig/Index.generated.cs
index 0e96b038..d5f1923a 100644
--- a/Disco.Web/Areas/Config/Views/SystemConfig/Index.generated.cs
+++ b/Disco.Web/Areas/Config/Views/SystemConfig/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Config.Views.SystemConfig
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/SystemConfig/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.SystemConfig.IndexModel>
+    public partial class Index : Disco.Services.Web.WebViewPage<Disco.Web.Areas.Config.Models.SystemConfig.IndexModel>
     {
         public Index()
         {
@@ -43,204 +45,195 @@ namespace Disco.Web.Areas.Config.Views.SystemConfig
             
             #line 2 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
   
+    Authorization.Require(Claims.Config.System.Show);
+
+    var canConfigProxy = Authorization.Has(Claims.Config.System.ConfigureProxy);
+
     ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "System");
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 5 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
- using (Html.BeginForm())
-{ 
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <div");
+WriteLiteral("\r\n<div");
 
 WriteLiteral(" class=\"form\"");
 
 WriteLiteral(" style=\"width: 450px\"");
 
-WriteLiteral(">\r\n        <table>\r\n            <tr>\r\n                <th");
+WriteLiteral(">\r\n    <table>\r\n        <tr>\r\n            <th");
 
 WriteLiteral(" style=\"width: 135px\"");
 
-WriteLiteral(">Disco Version:\r\n                </th>\r\n                <td>\r\n                   " +
-" <div>\r\n                        <code>");
+WriteLiteral(">Disco Version:\r\n            </th>\r\n            <td>\r\n                <div>\r\n    " +
+"                <code>");
 
             
-            #line 14 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                         Write(Model.DiscoVersion.ToString(4));
+            #line 16 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                     Write(Model.DiscoVersion.ToString(4));
 
             
             #line default
             #line hidden
-WriteLiteral("</code>\r\n                    </div>\r\n                    <div");
+WriteLiteral("</code>\r\n                </div>\r\n                <div");
 
 WriteLiteral(" class=\"smallMessage\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 546), Tuple.Create("\"", 595)
+WriteAttribute("title", Tuple.Create(" title=\"", 616), Tuple.Create("\"", 665)
             
-            #line 16 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 554), Tuple.Create<System.Object, System.Int32>(Model.DiscoVersionBuilt.ToFullDateTime()
+            #line 18 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+, Tuple.Create(Tuple.Create("", 624), Tuple.Create<System.Object, System.Int32>(Model.DiscoVersionBuilt.ToFullDateTime()
             
             #line default
             #line hidden
-, 554), false)
+, 624), false)
 );
 
-WriteLiteral(">\r\n                        Built ");
+WriteLiteral(">\r\n                    Built ");
 
             
-            #line 17 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                         Write(Model.DiscoVersionBuilt.ToFuzzy("Unknown"));
+            #line 19 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                     Write(Model.DiscoVersionBuilt.ToFuzzy("Unknown"));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    </div>\r\n                </td>\r\n            </tr>\r\n         " +
-"   <tr>\r\n                <th");
+WriteLiteral("\r\n                </div>\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n       " +
+"     <th");
 
 WriteLiteral(" style=\"width: 135px\"");
 
-WriteLiteral(">Database Connection:\r\n                </th>\r\n                <td>\r\n             " +
-"       <table");
+WriteLiteral(">Database Connection:\r\n            </th>\r\n            <td>\r\n                <tabl" +
+"e");
 
 WriteLiteral(" class=\"sub\"");
 
-WriteLiteral(">\r\n                        <tr>\r\n                            <th>Server:</th>\r\n  " +
-"                          <td><span");
+WriteLiteral(">\r\n                    <tr>\r\n                        <th>Server:</th>\r\n          " +
+"              <td><span");
 
 WriteLiteral(" class=\"code\"");
 
 WriteLiteral(">");
 
             
-            #line 28 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                                              Write(Model.DatabaseServer);
+            #line 30 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                                          Write(Model.DatabaseServer);
 
             
             #line default
             #line hidden
-WriteLiteral("</span></td>\r\n                        </tr>\r\n                        <tr>\r\n      " +
-"                      <th>Database:</th>\r\n                            <td><span");
+WriteLiteral("</span></td>\r\n                    </tr>\r\n                    <tr>\r\n              " +
+"          <th>Database:</th>\r\n                        <td><span");
 
 WriteLiteral(" class=\"code\"");
 
 WriteLiteral(">");
 
             
-            #line 32 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                                              Write(Model.DatabaseName);
+            #line 34 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                                          Write(Model.DatabaseName);
 
             
             #line default
             #line hidden
-WriteLiteral("</span></td>\r\n                        </tr>\r\n                        <tr>\r\n      " +
-"                      <th>Authentication:</th>\r\n                            <td>" +
-"");
-
-            
-            #line 36 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                           Write(Model.DatabaseAuthentication);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                        </tr>\r\n");
+WriteLiteral("</span></td>\r\n                    </tr>\r\n                    <tr>\r\n              " +
+"          <th>Authentication:</th>\r\n                        <td>");
 
             
             #line 38 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                        
-            
-            #line default
-            #line hidden
-            
-            #line 38 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                          if (Model.DatabaseSqlAuthUsername != null)
-                          {
+                       Write(Model.DatabaseAuthentication);
 
             
             #line default
             #line hidden
-WriteLiteral("                            <tr>\r\n                                <th>SQL&nbsp;Us" +
-"er:</th>\r\n                                <td><span");
+WriteLiteral("</td>\r\n                    </tr>\r\n");
+
+            
+            #line 40 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 40 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                      if (Model.DatabaseSqlAuthUsername != null)
+                      {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <tr>\r\n                            <th>SQL&nbsp;User:</th>" +
+"\r\n                            <td><span");
 
 WriteLiteral(" class=\"code\"");
 
 WriteLiteral(">");
 
             
-            #line 42 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                                                  Write(Model.DatabaseSqlAuthUsername);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span></td>\r\n                            </tr>      \r\n");
-
-            
             #line 44 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                          }
-                        
+                                              Write(Model.DatabaseSqlAuthUsername);
+
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    </table>\r\n                </td>\r\n            </tr>\r\n       " +
-"     <tr>\r\n                <th");
+WriteLiteral("</span></td>\r\n                        </tr>      \r\n");
+
+            
+            #line 46 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                      }
+                    
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </table>\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n     " +
+"       <th");
 
 WriteLiteral(" style=\"width: 135px\"");
 
-WriteLiteral(">Data Store Location:\r\n                </th>\r\n                <td>\r\n             " +
-"       <span");
+WriteLiteral(">Data Store Location:\r\n            </th>\r\n            <td>\r\n                <span" +
+"");
 
 WriteLiteral(" class=\"code\"");
 
 WriteLiteral(">");
 
             
-            #line 53 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                                  Write(Model.DataStoreLocation);
+            #line 55 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                              Write(Model.DataStoreLocation);
 
             
             #line default
             #line hidden
-WriteLiteral("</span>\r\n                    ");
+WriteLiteral("</span>\r\n                ");
 
-WriteLiteral("\r\n                </td>\r\n            </tr>\r\n        </table>\r\n    </div>\r\n");
-
-WriteLiteral("    <div");
+WriteLiteral("\r\n            </td>\r\n        </tr>\r\n    </table>\r\n</div>\r\n<div");
 
 WriteLiteral(" class=\"form\"");
 
 WriteLiteral(" style=\"width: 450px; margin-top: 15px;\"");
 
-WriteLiteral(">\r\n        <h2>Updates</h2>\r\n        <table>\r\n");
+WriteLiteral(">\r\n    <h2>Updates</h2>\r\n    <table>\r\n");
 
             
-            #line 63 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-            
+            #line 65 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+        
             
             #line default
             #line hidden
             
-            #line 63 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-              
-                          if (Model.UpdateLatestResponse == null)
-                          {
+            #line 65 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+          
+            if (Model.UpdateLatestResponse == null)
+            {
 
             
             #line default
             #line hidden
-WriteLiteral("                <tr>\r\n                    <th");
+WriteLiteral("            <tr>\r\n                <th");
 
 WriteLiteral(" style=\"width: 135px\"");
 
-WriteLiteral(">Last Check:\r\n                    </th>\r\n                    <td>\r\n              " +
-"          <div");
+WriteLiteral(">Last Check:\r\n                </th>\r\n                <td>\r\n                    <d" +
+"iv");
 
 WriteLiteral(" class=\"error\"");
 
@@ -250,47 +243,47 @@ WriteLiteral(" class=\"icon error\"");
 
 WriteLiteral(" style=\"margin-right: 6px;\"");
 
-WriteLiteral("></span>Never</div>\r\n                    </td>\r\n                </tr>\r\n");
+WriteLiteral("></span>Never</div>\r\n                </td>\r\n            </tr>\r\n");
 
             
-            #line 73 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                          }
-                          else
-                          {
+            #line 75 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            }
+            else
+            {
 
             
             #line default
             #line hidden
-WriteLiteral("                <tr>\r\n                    <th");
+WriteLiteral("            <tr>\r\n                <th");
 
 WriteLiteral(" style=\"width: 135px\"");
 
-WriteLiteral(">Last Run:\r\n                    </th>\r\n                    <td>\r\n                " +
-"        <span>");
+WriteLiteral(">Last Run:\r\n                </th>\r\n                <td>\r\n                    <spa" +
+"n>");
 
             
-            #line 80 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                         Write(CommonHelpers.FriendlyDate(Model.UpdateLatestResponse.ResponseTimestamp));
+            #line 82 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                     Write(CommonHelpers.FriendlyDate(Model.UpdateLatestResponse.ResponseTimestamp));
 
             
             #line default
             #line hidden
-WriteLiteral("</span>\r\n                    </td>\r\n                </tr>\r\n");
+WriteLiteral("</span>\r\n                </td>\r\n            </tr>\r\n");
 
             
-            #line 83 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                              if (Model.UpdateLatestResponse.IsUpdatable(typeof(DiscoApplication).Assembly.GetName().Version))
-                              {
+            #line 85 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                if (Model.UpdateLatestResponse.IsUpdatable(typeof(DiscoApplication).Assembly.GetName().Version))
+                {
 
             
             #line default
             #line hidden
-WriteLiteral("                <tr>\r\n                    <th");
+WriteLiteral("            <tr>\r\n                <th");
 
 WriteLiteral(" style=\"width: 135px\"");
 
-WriteLiteral(">Update Available:\r\n                    </th>\r\n                    <td>\r\n        " +
-"                <div>\r\n                            <span");
+WriteLiteral(">Update Available:\r\n                </th>\r\n                <td>\r\n                " +
+"    <div>\r\n                        <span");
 
 WriteLiteral(" class=\"icon warning\"");
 
@@ -299,101 +292,100 @@ WriteLiteral(" style=\"margin-right: 6px;\"");
 WriteLiteral("></span>Version ");
 
             
-            #line 90 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                                                                                             Write(Model.UpdateLatestResponse.Version);
+            #line 92 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                                                                                         Write(Model.UpdateLatestResponse.Version);
 
             
             #line default
             #line hidden
-WriteLiteral(" is available\r\n                        </div>\r\n                        <div");
+WriteLiteral(" is available\r\n                    </div>\r\n                    <div");
 
 WriteLiteral(" class=\"smallMessage\"");
 
-WriteLiteral(">\r\n                            [Released ");
+WriteLiteral(">\r\n                        [Released ");
 
             
-            #line 93 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                                  Write(CommonHelpers.FriendlyDate(Model.UpdateLatestResponse.VersionReleasedTimestamp));
+            #line 95 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                              Write(CommonHelpers.FriendlyDate(Model.UpdateLatestResponse.VersionReleasedTimestamp));
 
             
             #line default
             #line hidden
-WriteLiteral("]\r\n                        </div>\r\n                        <div");
+WriteLiteral("]\r\n                    </div>\r\n                    <div");
 
 WriteLiteral(" class=\"smallMessage\"");
 
 WriteLiteral(">");
 
             
-            #line 95 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                                              Write(new HtmlString(Model.UpdateLatestResponse.Blurb));
+            #line 97 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                                          Write(new HtmlString(Model.UpdateLatestResponse.Blurb));
 
             
             #line default
             #line hidden
-WriteLiteral("</div>\r\n                        <a");
+WriteLiteral("</div>\r\n                    <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 4129), Tuple.Create("\"", 4173)
+WriteAttribute("href", Tuple.Create(" href=\"", 3813), Tuple.Create("\"", 3857)
             
-            #line 96 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 4136), Tuple.Create<System.Object, System.Int32>(Model.UpdateLatestResponse.UrlLink
+            #line 98 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+, Tuple.Create(Tuple.Create("", 3820), Tuple.Create<System.Object, System.Int32>(Model.UpdateLatestResponse.UrlLink
             
             #line default
             #line hidden
-, 4136), false)
+, 3820), false)
 );
 
 WriteLiteral(" target=\"_blank\"");
 
-WriteLiteral(">Download Now</a>\r\n                    </td>\r\n                </tr>\r\n");
+WriteLiteral(">Download Now</a>\r\n                </td>\r\n            </tr>\r\n");
 
             
-            #line 99 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                              }
-                              else
-                              {
+            #line 101 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                }
+                else
+                {
 
             
             #line default
             #line hidden
-WriteLiteral("                <tr>\r\n                    <th");
+WriteLiteral("            <tr>\r\n                <th");
 
 WriteLiteral(" style=\"width: 135px\"");
 
-WriteLiteral(">Status:\r\n                    </th>\r\n                    <td>\r\n                  " +
-"      <span");
+WriteLiteral(">Status:\r\n                </th>\r\n                <td>\r\n                    <span");
 
 WriteLiteral(" class=\"icon success\"");
 
 WriteLiteral(" style=\"margin-right: 6px;\"");
 
-WriteLiteral("></span><span>The latest version is installed</span>\r\n                    </td>\r\n" +
-"                </tr>\r\n");
+WriteLiteral("></span><span>The latest version is installed</span>\r\n                </td>\r\n    " +
+"        </tr>\r\n");
 
             
-            #line 109 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                              }
-                          }
-            
+            #line 111 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                }
+            }
+        
             
             #line default
             #line hidden
-WriteLiteral("\r\n            <tr>\r\n                <th");
+WriteLiteral("\r\n        <tr>\r\n            <th");
 
 WriteLiteral(" style=\"width: 135px\"");
 
 WriteLiteral(">Check for Update:");
 
             
-            #line 113 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                                                            
-                          if (Model.UpdateBetaDeployment)
-                          {
+            #line 115 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                                                        
+                if (Model.UpdateBetaDeployment)
+                {
 
             
             #line default
             #line hidden
-WriteLiteral("                    <div");
+WriteLiteral("                <div");
 
 WriteLiteral(" class=\"alert\"");
 
@@ -406,34 +398,34 @@ WriteLiteral(" style=\"margin-right: 6px;\"");
 WriteLiteral("></span>Beta Deployment</div>\r\n");
 
             
-            #line 117 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                          }
+            #line 119 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                }
+            
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n            </th>\r\n            <td>\r\n");
+
+            
+            #line 123 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                </th>\r\n                <td>\r\n");
-
             
-            #line 121 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                    
-            
-            #line default
-            #line hidden
-            
-            #line 121 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                      
-                          if (Model.UpdateRunningStatus == null)
-                          {
+            #line 123 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                  
+                    if (Model.UpdateRunningStatus == null)
+                    {
 
             
             #line default
             #line hidden
-WriteLiteral("                        <div>");
+WriteLiteral("                    <div>");
 
             
-            #line 124 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                        Write(Html.ActionLink("Check Now", MVC.API.System.UpdateCheck()));
+            #line 126 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                    Write(Html.ActionLink("Check Now", MVC.API.System.UpdateCheck()));
 
             
             #line default
@@ -441,19 +433,19 @@ WriteLiteral("                        <div>");
 WriteLiteral("</div>\r\n");
 
             
-            #line 125 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                          }
-                          else
-                          {
+            #line 127 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                    }
+                    else
+                    {
 
             
             #line default
             #line hidden
-WriteLiteral("                        <div>Running now - ");
+WriteLiteral("                    <div>Running now - ");
 
             
-            #line 128 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                                      Write(Html.ActionLink("Check Status", MVC.Config.Logging.TaskStatus(Model.UpdateRunningStatus.SessionId)));
+            #line 130 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                                  Write(Html.ActionLink("Check Status", MVC.Config.Logging.TaskStatus(Model.UpdateRunningStatus.SessionId)));
 
             
             #line default
@@ -461,28 +453,38 @@ WriteLiteral("                        <div>Running now - ");
 WriteLiteral("</div>\r\n");
 
             
-            #line 129 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                          }
-                    
+            #line 131 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                    }
+                
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    <div");
+WriteLiteral("\r\n                <div");
 
 WriteLiteral(" class=\"smallMessage\"");
 
-WriteLiteral(">\r\n                        Next Scheduled: ");
+WriteLiteral(">\r\n                    Next Scheduled: ");
 
             
-            #line 132 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                                   Write(CommonHelpers.FriendlyDate(Model.UpdateNextScheduled, "Unknown"));
+            #line 134 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+                               Write(CommonHelpers.FriendlyDate(Model.UpdateNextScheduled, "Unknown"));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    </div>\r\n                </td>\r\n            </tr>\r\n        <" +
-"/table>\r\n    </div>\r\n");
+WriteLiteral("\r\n                </div>\r\n            </td>\r\n        </tr>\r\n    </table>\r\n</div>\r" +
+"\n");
 
+            
+            #line 140 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ if (canConfigProxy)
+{
+    using (Html.BeginForm())
+    { 
+
+            
+            #line default
+            #line hidden
 WriteLiteral("    <div");
 
 WriteLiteral(" class=\"form\"");
@@ -499,7 +501,7 @@ WriteLiteral(">Address:\r\n                </th>\r\n                <td>\r\n");
 WriteLiteral("                    ");
 
             
-            #line 145 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 151 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.EditorFor(m => m.ProxyAddress));
 
             
@@ -510,7 +512,7 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 146 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 152 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.ValidationMessageFor(m => m.ProxyAddress));
 
             
@@ -526,7 +528,7 @@ WriteLiteral(">Port:\r\n                </th>\r\n                <td>\r\n");
 WriteLiteral("                    ");
 
             
-            #line 153 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 159 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.EditorFor(m => m.ProxyPort));
 
             
@@ -537,7 +539,7 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 154 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 160 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.ValidationMessageFor(m => m.ProxyPort));
 
             
@@ -553,7 +555,7 @@ WriteLiteral(">Username:\r\n                </th>\r\n                <td>\r\n");
 WriteLiteral("                    ");
 
             
-            #line 161 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 167 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.EditorFor(m => m.ProxyUsername));
 
             
@@ -564,7 +566,7 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 162 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 168 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.ValidationMessageFor(m => m.ProxyUsername));
 
             
@@ -580,7 +582,7 @@ WriteLiteral(">Password:\r\n                </th>\r\n                <td>\r\n");
 WriteLiteral("                    ");
 
             
-            #line 169 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 175 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.EditorFor(m => m.ProxyPassword));
 
             
@@ -591,46 +593,123 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 170 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 176 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.ValidationMessageFor(m => m.ProxyPassword));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                </td>\r\n            </tr>\r\n        </table>\r\n    </div>\r\n");
+WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                <th" +
+"");
 
+WriteLiteral(" style=\"width: 135px\"");
+
+WriteLiteral(">&nbsp;\r\n                </th>\r\n                <td>\r\n                    <input");
+
+WriteLiteral(" type=\"submit\"");
+
+WriteLiteral(" class=\"button small\"");
+
+WriteLiteral(" value=\"Save Proxy Settings\"");
+
+WriteLiteral(" />\r\n                </td>\r\n            </tr>\r\n        </table>\r\n    </div>\r\n");
+
+            
+            #line 188 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+    }
+}
+else
+{
+
+            
+            #line default
+            #line hidden
 WriteLiteral("    <div");
 
+WriteLiteral(" class=\"form\"");
+
+WriteLiteral(" style=\"width: 450px; margin-top: 15px;\"");
+
+WriteLiteral(">\r\n        <h2>Proxy Settings</h2>\r\n        <table>\r\n            <tr>\r\n          " +
+"      <th");
+
+WriteLiteral(" style=\"width: 135px\"");
+
+WriteLiteral(">Address:\r\n                </th>\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 199 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+               Write(Html.DisplayFor(m => m.ProxyAddress));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                <th" +
+"");
+
+WriteLiteral(" style=\"width: 135px\"");
+
+WriteLiteral(">Port:\r\n                </th>\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 206 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+               Write(Html.DisplayFor(m => m.ProxyPort));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                <th" +
+"");
+
+WriteLiteral(" style=\"width: 135px\"");
+
+WriteLiteral(">Username:\r\n                </th>\r\n                <td>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 213 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+               Write(Html.DisplayFor(m => m.ProxyUsername));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                <th" +
+"");
+
+WriteLiteral(" style=\"width: 135px\"");
+
+WriteLiteral(">Password:\r\n                </th>\r\n                <td>********\r\n                " +
+"</td>\r\n            </tr>\r\n        </table>\r\n    </div>\r\n");
+
+            
+            #line 224 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+WriteLiteral("<div");
+
 WriteLiteral(" class=\"actionBar\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("        ");
+WriteLiteral("    ");
 
             
-            #line 176 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-   Write(Html.ActionLinkButton("Update Device Last Network Logons", MVC.API.System.UpdateLastNetworkLogonDates()));
+            #line 226 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+Write(Html.ActionLinkButton("Update Device Last Network Logons", MVC.API.System.UpdateLastNetworkLogonDates()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n        <input");
+WriteLiteral("\r\n</div>\r\n");
 
-WriteLiteral(" type=\"submit\"");
-
-WriteLiteral(" class=\"button\"");
-
-WriteLiteral(" value=\"Save Configuration\"");
-
-WriteLiteral(" />\r\n    </div>\r\n");
-
-            
-            #line 179 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-}
-
-            
-            #line default
-            #line hidden
         }
     }
 }
diff --git a/Disco.Web/Areas/Config/Views/Web.config b/Disco.Web/Areas/Config/Views/Web.config
index 04f640a4..4d7bc926 100644
--- a/Disco.Web/Areas/Config/Views/Web.config
+++ b/Disco.Web/Areas/Config/Views/Web.config
@@ -10,10 +10,12 @@
 
   <system.web.webPages.razor>
     <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
+    <pages pageBaseType="Disco.Services.Web.WebViewPage">
       <namespaces>
-        <add namespace="Disco.Models.Repository" />
         <add namespace="Disco.BI.Extensions" />
+        <add namespace="Disco.Models.Repository" />
+        <add namespace="Disco.Services.Authorization" />
+        <add namespace="Disco.Services.Web" />
         <add namespace="Disco.Web" />
         <add namespace="Disco.Web.Extensions" />
         <add namespace="System.Web.Mvc" />
diff --git a/Disco.Web/Areas/Config/Views/_ViewStart.generated.cs b/Disco.Web/Areas/Config/Views/_ViewStart.generated.cs
index 66885703..59747e27 100644
--- a/Disco.Web/Areas/Config/Views/_ViewStart.generated.cs
+++ b/Disco.Web/Areas/Config/Views/_ViewStart.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,6 +28,8 @@ namespace Disco.Web.Areas.Config.Views
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
diff --git a/Disco.Web/Areas/Public/Controllers/HeldDevicesController.cs b/Disco.Web/Areas/Public/Controllers/HeldDevicesController.cs
index 60cf7f8d..ce43e8ad 100644
--- a/Disco.Web/Areas/Public/Controllers/HeldDevicesController.cs
+++ b/Disco.Web/Areas/Public/Controllers/HeldDevicesController.cs
@@ -1,14 +1,12 @@
-using Disco.Data.Repository;
-using Disco.Models.Repository;
-using System;
+using Disco.Models.Repository;
+using Disco.Services.Web;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
 using System.Web.Mvc;
 
 namespace Disco.Web.Areas.Public.Controllers
 {
-    public partial class HeldDevicesController : dbController
+    public partial class HeldDevicesController : DatabaseController
     {
         #region Helpers
 
@@ -40,17 +38,17 @@ namespace Disco.Web.Areas.Public.Controllers
             {
                 if (job.Any(j => j.WaitingForUserAction))
                 {
-                    thd.Add(job.Where(j => j.WaitingForUserAction).OrderBy(j => j.WaitingForUserActionSince).FirstOrDefault().ToUserHeldDeviceModel(dbContext));
+                    thd.Add(job.Where(j => j.WaitingForUserAction).OrderBy(j => j.WaitingForUserActionSince).FirstOrDefault().ToUserHeldDeviceModel(Database));
                 }
                 else
                 {
                     if (job.All(j => j.ReadyForReturn))
                     {
-                        thd.Add(job.FirstOrDefault().ToUserHeldDeviceModel(dbContext));
+                        thd.Add(job.FirstOrDefault().ToUserHeldDeviceModel(Database));
                     }
                     else
                     {
-                        thd.Add(job.Where(j => !j.ReadyForReturn).OrderByDescending(j => j.EstimatedReturnTime).FirstOrDefault().ToUserHeldDeviceModel(dbContext));
+                        thd.Add(job.Where(j => !j.ReadyForReturn).OrderByDescending(j => j.EstimatedReturnTime).FirstOrDefault().ToUserHeldDeviceModel(Database));
                     }
                 }
             }
@@ -59,11 +57,11 @@ namespace Disco.Web.Areas.Public.Controllers
         
         private List<Models.HeldDevices.HeldDeviceModel> GetHeldDevices()
         {
-            return GetHeldDevices(dbContext.Jobs);
+            return GetHeldDevices(Database.Jobs);
         }
         private Models.HeldDevices.HeldDeviceModel GetHeldDevice(string DeviceSerialNumber)
         {
-            return GetHeldDevices(dbContext.Jobs.Where(j => j.DeviceSerialNumber == DeviceSerialNumber)).FirstOrDefault();
+            return GetHeldDevices(Database.Jobs.Where(j => j.DeviceSerialNumber == DeviceSerialNumber)).FirstOrDefault();
         }
         #endregion
 
diff --git a/Disco.Web/Areas/Public/Controllers/UserHeldDevicesController.cs b/Disco.Web/Areas/Public/Controllers/UserHeldDevicesController.cs
index 6234d347..b7d1624b 100644
--- a/Disco.Web/Areas/Public/Controllers/UserHeldDevicesController.cs
+++ b/Disco.Web/Areas/Public/Controllers/UserHeldDevicesController.cs
@@ -1,15 +1,12 @@
-using System;
+using Disco.Models.Repository;
+using Disco.Services.Web;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
 using System.Web.Mvc;
-using Disco.BI;
-using Disco.BI.Extensions;
-using Disco.Models.Repository;
 
 namespace Disco.Web.Areas.Public.Controllers
 {
-    public partial class UserHeldDevicesController : dbController
+    public partial class UserHeldDevicesController : DatabaseController
     {
         #region Helpers
 
@@ -38,17 +35,17 @@ namespace Disco.Web.Areas.Public.Controllers
             {
                 if (job.Any(j => j.WaitingForUserAction))
                 {
-                    thd.Add(job.Where(j => j.WaitingForUserAction).OrderBy(j => j.WaitingForUserActionSince).FirstOrDefault().ToUserHeldDeviceModel(dbContext));
+                    thd.Add(job.Where(j => j.WaitingForUserAction).OrderBy(j => j.WaitingForUserActionSince).FirstOrDefault().ToUserHeldDeviceModel(Database));
                 }
                 else
                 {
                     if (job.All(j => j.ReadyForReturn))
                     {
-                        thd.Add(job.FirstOrDefault().ToUserHeldDeviceModel(dbContext));
+                        thd.Add(job.FirstOrDefault().ToUserHeldDeviceModel(Database));
                     }
                     else
                     {
-                        thd.Add(job.Where(j => !j.ReadyForReturn).OrderByDescending(j => j.EstimatedReturnTime).FirstOrDefault().ToUserHeldDeviceModel(dbContext));
+                        thd.Add(job.Where(j => !j.ReadyForReturn).OrderByDescending(j => j.EstimatedReturnTime).FirstOrDefault().ToUserHeldDeviceModel(Database));
                     }
                 }
             }
@@ -59,11 +56,11 @@ namespace Disco.Web.Areas.Public.Controllers
 
         private List<Models.UserHeldDevices.UserHeldDeviceModel> GetUserHeldDevices()
         {
-            return GetUserHeldDevices(dbContext.Jobs);
+            return GetUserHeldDevices(Database.Jobs);
         }
         private Models.UserHeldDevices.UserHeldDeviceModel GetUserHeldDevice(string UserId)
         {
-            return GetUserHeldDevices(dbContext.Jobs.Where(j => j.Device.AssignedUserId == UserId)).FirstOrDefault();
+            return GetUserHeldDevices(Database.Jobs.Where(j => j.Device.AssignedUserId == UserId)).FirstOrDefault();
         }
 
         public virtual ActionResult Index()
diff --git a/Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceQueryModel.cs b/Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceQueryModel.cs
index a3759333..03344b8d 100644
--- a/Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceQueryModel.cs
+++ b/Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceQueryModel.cs
@@ -26,7 +26,7 @@ namespace Disco.Web.Areas.Public.Models.HeldDevices
         public DateTime? ReadyForReturnSince { get; set; }
         public DateTime? WaitingForUserActionSince { get; set; }
 
-        public HeldDeviceModel ToUserHeldDeviceModel(DiscoDataContext dbContext)
+        public HeldDeviceModel ToUserHeldDeviceModel(DiscoDataContext Database)
         {
             var uhdm = new HeldDeviceModel()
             {
@@ -34,7 +34,7 @@ namespace Disco.Web.Areas.Public.Models.HeldDevices
                 DeviceComputerName = this.DeviceComputerName,
                 DeviceLocation = this.DeviceLocation,
                 DeviceProfileId = this.DeviceProfileId,
-                DeviceAddress = (this.DeviceAddressId.HasValue ? dbContext.DiscoConfiguration.OrganisationAddresses.GetAddress(this.DeviceAddressId.Value).ShortName : string.Empty),
+                DeviceAddress = (this.DeviceAddressId.HasValue ? Database.DiscoConfiguration.OrganisationAddresses.GetAddress(this.DeviceAddressId.Value).ShortName : string.Empty),
                 UserId = this.UserId,
                 UserDisplayName = this.UserDisplayName,
                 ReadyForReturn = this.ReadyForReturn,
diff --git a/Disco.Web/Areas/Public/Models/UserHeldDevices/HeldJobDeviceModel.cs b/Disco.Web/Areas/Public/Models/UserHeldDevices/HeldJobDeviceModel.cs
index ba3751bd..9cdae6f8 100644
--- a/Disco.Web/Areas/Public/Models/UserHeldDevices/HeldJobDeviceModel.cs
+++ b/Disco.Web/Areas/Public/Models/UserHeldDevices/HeldJobDeviceModel.cs
@@ -22,7 +22,7 @@ namespace Disco.Web.Areas.Public.Models.UserHeldDevices
         public DateTime? ReadyForReturnSince { get; set; }
         public DateTime? WaitingForUserActionSince { get; set; }
 
-        public UserHeldDeviceModel ToUserHeldDeviceModel(DiscoDataContext dbContext)
+        public UserHeldDeviceModel ToUserHeldDeviceModel(DiscoDataContext Database)
         {
             var uhdm = new UserHeldDeviceModel()
                 {
@@ -31,7 +31,7 @@ namespace Disco.Web.Areas.Public.Models.UserHeldDevices
                     ReadyForReturn = this.ReadyForReturn,
                     WaitingForUserAction = this.WaitingForUserAction,
                     DeviceProfileId = this.DeviceProfileId,
-                    DeviceAddress = (this.DeviceAddressId.HasValue ? dbContext.DiscoConfiguration.OrganisationAddresses.GetAddress(this.DeviceAddressId.Value).ShortName : string.Empty)
+                    DeviceAddress = (this.DeviceAddressId.HasValue ? Database.DiscoConfiguration.OrganisationAddresses.GetAddress(this.DeviceAddressId.Value).ShortName : string.Empty)
                 };
             var n = DateTime.Now;
             if (!this.ReadyForReturn && this.EstimatedReturnTime.HasValue && this.EstimatedReturnTime.Value > n)
diff --git a/Disco.Web/Areas/Public/Views/HeldDevices/Index.generated.cs b/Disco.Web/Areas/Public/Views/HeldDevices/Index.generated.cs
index 2f44294c..12246b64 100644
--- a/Disco.Web/Areas/Public/Views/HeldDevices/Index.generated.cs
+++ b/Disco.Web/Areas/Public/Views/HeldDevices/Index.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Public.Views.HeldDevices
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Public/Views/HeldDevices/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<IEnumerable<Disco.Web.Areas.Public.Models.HeldDevices.HeldDeviceModel>>
+    public partial class Index : Disco.Services.Web.WebViewPage<IEnumerable<Disco.Web.Areas.Public.Models.HeldDevices.HeldDeviceModel>>
     {
         public Index()
         {
diff --git a/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs b/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs
index b29700f6..c1e8a34c 100644
--- a/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs
+++ b/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Public.Views.HeldDevices
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Public/Views/HeldDevices/Noticeboard.cshtml")]
-    public partial class Noticeboard : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class Noticeboard : Disco.Services.Web.WebViewPage<dynamic>
     {
         public Noticeboard()
         {
diff --git a/Disco.Web/Areas/Public/Views/Public/Credits.generated.cs b/Disco.Web/Areas/Public/Views/Public/Credits.generated.cs
index ece71970..59e90292 100644
--- a/Disco.Web/Areas/Public/Views/Public/Credits.generated.cs
+++ b/Disco.Web/Areas/Public/Views/Public/Credits.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Public.Views.Public
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Public/Views/Public/Credits.cshtml")]
-    public partial class Credits : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class Credits : Disco.Services.Web.WebViewPage<dynamic>
     {
         public Credits()
         {
diff --git a/Disco.Web/Areas/Public/Views/Public/Index.generated.cs b/Disco.Web/Areas/Public/Views/Public/Index.generated.cs
index bcc79ad0..0ce71102 100644
--- a/Disco.Web/Areas/Public/Views/Public/Index.generated.cs
+++ b/Disco.Web/Areas/Public/Views/Public/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Public.Views.Public
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Public/Views/Public/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class Index : Disco.Services.Web.WebViewPage<dynamic>
     {
         public Index()
         {
diff --git a/Disco.Web/Areas/Public/Views/Public/Licence.generated.cs b/Disco.Web/Areas/Public/Views/Public/Licence.generated.cs
index 1776f149..669dec22 100644
--- a/Disco.Web/Areas/Public/Views/Public/Licence.generated.cs
+++ b/Disco.Web/Areas/Public/Views/Public/Licence.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Public.Views.Public
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Public/Views/Public/Licence.cshtml")]
-    public partial class Licence : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class Licence : Disco.Services.Web.WebViewPage<dynamic>
     {
         public Licence()
         {
diff --git a/Disco.Web/Areas/Public/Views/Shared/_Layout.generated.cs b/Disco.Web/Areas/Public/Views/Shared/_Layout.generated.cs
index b07bc806..e7823fbe 100644
--- a/Disco.Web/Areas/Public/Views/Shared/_Layout.generated.cs
+++ b/Disco.Web/Areas/Public/Views/Shared/_Layout.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Public.Views.Shared
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Public/Views/Shared/_Layout.cshtml")]
-    public partial class Layout : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class Layout : Disco.Services.Web.WebViewPage<dynamic>
     {
         public Layout()
         {
diff --git a/Disco.Web/Areas/Public/Views/UserHeldDevices/Index.generated.cs b/Disco.Web/Areas/Public/Views/UserHeldDevices/Index.generated.cs
index a4d4149e..45811d94 100644
--- a/Disco.Web/Areas/Public/Views/UserHeldDevices/Index.generated.cs
+++ b/Disco.Web/Areas/Public/Views/UserHeldDevices/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Public.Views.UserHeldDevices
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Public/Views/UserHeldDevices/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<IEnumerable<Disco.Web.Areas.Public.Models.UserHeldDevices.UserHeldDeviceModel>>
+    public partial class Index : Disco.Services.Web.WebViewPage<IEnumerable<Disco.Web.Areas.Public.Models.UserHeldDevices.UserHeldDeviceModel>>
     {
         public Index()
         {
diff --git a/Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.generated.cs b/Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.generated.cs
index a3bbdeb1..4d568704 100644
--- a/Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.generated.cs
+++ b/Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Areas.Public.Views.UserHeldDevices
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Public/Views/UserHeldDevices/Noticeboard.cshtml")]
-    public partial class Noticeboard : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class Noticeboard : Disco.Services.Web.WebViewPage<dynamic>
     {
         public Noticeboard()
         {
diff --git a/Disco.Web/Areas/Public/Views/Web.config b/Disco.Web/Areas/Public/Views/Web.config
index 04f640a4..4d7bc926 100644
--- a/Disco.Web/Areas/Public/Views/Web.config
+++ b/Disco.Web/Areas/Public/Views/Web.config
@@ -10,10 +10,12 @@
 
   <system.web.webPages.razor>
     <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
+    <pages pageBaseType="Disco.Services.Web.WebViewPage">
       <namespaces>
-        <add namespace="Disco.Models.Repository" />
         <add namespace="Disco.BI.Extensions" />
+        <add namespace="Disco.Models.Repository" />
+        <add namespace="Disco.Services.Authorization" />
+        <add namespace="Disco.Services.Web" />
         <add namespace="Disco.Web" />
         <add namespace="Disco.Web.Extensions" />
         <add namespace="System.Web.Mvc" />
diff --git a/Disco.Web/Areas/Public/Views/_ViewStart.generated.cs b/Disco.Web/Areas/Public/Views/_ViewStart.generated.cs
index 52834d8e..06f0b3af 100644
--- a/Disco.Web/Areas/Public/Views/_ViewStart.generated.cs
+++ b/Disco.Web/Areas/Public/Views/_ViewStart.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,6 +28,8 @@ namespace Disco.Web.Areas.Public.Views
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
diff --git a/Disco.Web/Areas/Services/Controllers/ClientController.cs b/Disco.Web/Areas/Services/Controllers/ClientController.cs
index 5388d7f3..5132e82e 100644
--- a/Disco.Web/Areas/Services/Controllers/ClientController.cs
+++ b/Disco.Web/Areas/Services/Controllers/ClientController.cs
@@ -9,12 +9,14 @@ using Disco.BI.Extensions;
 using Disco.Data.Repository;
 using System.Web.Script.Serialization;
 using Newtonsoft.Json;
+using Disco.Services.Authorization;
 
 namespace Disco.Web.Areas.Services.Controllers
 {
     [OutputCache(Duration = 0)]
     public partial class ClientController : Controller
     {
+        [DiscoAuthorize(Claims.Config.Enrolment.DownloadBootstrapper)]
         public virtual ActionResult Bootstrapper()
         {
             return File(Links.ClientBin.Disco_ClientBootstrapper_exe, "application/x-msdownload", "Disco.ClientBootstrapper.exe");
@@ -56,11 +58,11 @@ namespace Disco.Web.Areas.Services.Controllers
                     }
                 case "macsecureenrol":
                     {
-                        using (var dbContext = new DiscoDataContext())
+                        using (var database = new DiscoDataContext())
                         {
                             var host = HttpContext.Request.UserHostAddress;
-                            MacSecureEnrolResponse enrolResponse = BI.DeviceBI.DeviceEnrol.MacSecureEnrol(dbContext, host);
-                            dbContext.SaveChanges();
+                            MacSecureEnrolResponse enrolResponse = BI.DeviceBI.DeviceEnrol.MacSecureEnrol(database, host);
+                            database.SaveChanges();
                             return Json(enrolResponse, JsonRequestBehavior.AllowGet);
                         }
                     }
diff --git a/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree.js b/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree.js
new file mode 100644
index 00000000..121037d9
--- /dev/null
+++ b/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree.js
@@ -0,0 +1,5284 @@
+///#source 1 1 /ClientSource/Scripts/Modules/jQuery-Fancytree/jquery.fancytree-all.js
+/*!
+ * jquery.fancytree.js
+ * Dynamic tree view control, with support for lazy loading of branches.
+ * https://github.com/mar10/fancytree/
+ *
+ * Copyright (c) 2006-2013, Martin Wendt (http://wwWendt.de)
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version 2.0.0-2
+ * @date 2013-09-15T18:55
+ */
+
+// Start of local namespace
+;(function($, window, document, undefined) {
+// relax some jslint checks:
+/*globals alert */
+
+"use strict";
+
+// prevent duplicate loading
+if ( $.ui.fancytree && $.ui.fancytree.version ) {
+	$.ui.fancytree.warn("Fancytree: ignored duplicate include");
+	return;
+}
+
+
+/* *****************************************************************************
+ * Private functions and variables
+ */
+
+function _raiseNotImplemented(msg){
+	msg = msg || "";
+	$.error("Not implemented: " + msg);
+}
+
+function _assert(cond, msg){
+	// TODO: see qunit.js extractStacktrace()
+	msg = ": " + msg || "";
+	if(!cond){
+		$.error("Assertion failed" + msg);
+	}
+}
+
+function consoleApply(method, args){
+	var i, s,
+		fn = window.console ? window.console[method] : null;
+
+	if(fn){
+		if(fn.apply){
+			fn.apply(window.console, args);
+		}else{
+			// IE?
+			s = "";
+			for( i=0; i<args.length; i++){
+				s += args[i];
+			}
+			fn(s);
+		}
+	}
+}
+
+/** Return true if dotted version string is equal or higher than requested version.
+ *
+ * See http://jsfiddle.net/mar10/FjSAN/
+ */
+function isVersionAtLeast(dottedVersion, major, minor, patch){
+	var i, v, t,
+		verParts = $.map($.trim(dottedVersion).split("."), function(e){ return parseInt(e, 10); }),
+		testParts = $.map(Array.prototype.slice.call(arguments, 1), function(e){ return parseInt(e, 10); });
+
+	for( i = 0; i < testParts.length; i++ ){
+		v = verParts[i] || 0;
+		t = testParts[i] || 0;
+		if( v !== t ){
+			return ( v > t );
+		}
+	}
+	return true;
+}
+
+/** Return a wrapper that calls sub.fn() and exposes base.fn() as _super(). */
+function _makeVirtualFunction(methodName, base, sub){
+	var _super = base[methodName],
+		func = sub[methodName];
+	// if(rexTestSuper && !rexTestSuper.test(func)){
+	//     // sub.methodName() doesn't call _super(), so no wrapper required
+	//     return func;
+	// }
+	return function(){
+		try{
+			base._super = function(){
+				return _super.apply(base, arguments);
+			};
+//			sub._base = base;
+			return  func.apply(base, arguments);
+		}finally{
+			base._super = null;
+		}
+	};
+}
+
+/**
+ * Subclass `base` by creating proxy functions
+ */
+function _subclassObject(tree, base, extension, extName){
+//	$.ui.fancytree.debug("_subclassObject", base, extension, extName);
+	for(var attrName in extension){
+		if(typeof extension[attrName] === "function"){
+			if(typeof tree[attrName] === "function"){
+				// override existing method
+				tree[attrName] = _makeVirtualFunction(attrName, tree, extension);
+			}else if(attrName.charAt(0) === "_"){
+				// Create private methods in tree.EXTENSION namespace
+				tree[extName][attrName] = $.proxy(extension[attrName], tree);
+			}else{
+				$.error("Could not override tree." + attrName + ". Use prefix '_' to create tree." + extName + "._" + attrName);
+			}
+		}else{
+			// Create member variables in tree.EXTENSION namespace
+			if(attrName !== "options"){
+				tree[extName][attrName] = base[attrName];
+			}
+		}
+	}
+}
+
+
+function _getResolvedPromise(context, argArray){
+	if(context === undefined){
+		return $.Deferred(function(){this.resolve();}).promise();
+	}else{
+		return $.Deferred(function(){this.resolveWith(context, argArray);}).promise();
+	}
+}
+
+
+function _getRejectedPromise(context, argArray){
+	if(context === undefined){
+		return $.Deferred(function(){this.reject();}).promise();
+	}else{
+		return $.Deferred(function(){this.rejectWith(context, argArray);}).promise();
+	}
+}
+
+
+function _makeResolveFunc(deferred, context){
+	return function(){
+		deferred.resolveWith(context);
+	};
+}
+
+
+// TODO: use currying
+function _makeNodeTitleMatcher(s){
+	s = s.toLowerCase();
+	return function(node){
+		return node.title.toLowerCase().indexOf(s) >= 0;
+	};
+}
+
+var i,
+	FT = null, // initialized below
+	//Boolean attributes that can be set with equivalent class names in the LI tags
+	CLASS_ATTRS = "active expanded focus folder lazy selected unselectable".split(" "),
+	CLASS_ATTR_MAP = {},
+	//	Top-level Fancytree node attributes, that can be set by dict
+	NODE_ATTRS = "expanded extraClasses folder hideCheckbox key lazy selected title tooltip unselectable".split(" "),
+	NODE_ATTR_MAP = {},
+	// Attribute names that should NOT be added to node.data
+	NONE_NODE_DATA_MAP = {"active": true, "children": true, "data": true, "focus": true};
+
+for(i=0; i<CLASS_ATTRS.length; i++){ CLASS_ATTR_MAP[CLASS_ATTRS[i]] = true; }
+for(i=0; i<NODE_ATTRS.length; i++){ NODE_ATTR_MAP[NODE_ATTRS[i]] = true; }
+
+
+/* *****************************************************************************
+ * FancytreeNode
+ */
+
+
+/**
+ * Creates a new node
+ * @class Represents the hierarchical data model and operations.
+ * @name FancytreeNode
+ * @constructor
+ * @param {FancytreeNode} parent
+ * @param {NodeData} data
+ *
+ * @property {Fancytree} tree
+ * @property {FancytreeNode} parent Parent node
+ * @property {String} key
+ * @property {String} title
+ * @property {object} data Contains all extra data that was passed on node creation
+ * @property {FancytreeNode[] | null | undefined} children list of child nodes
+ * @property {Boolean} isStatusNode
+ * @property {Boolean} expanded
+ * @property {Boolean} folder
+ * @property {Boolean} href
+ * @property {String} extraClasses
+ * @property {Boolean} lazy
+ * @property {Boolean} nolink OBSOLETE
+ * @property {Boolean} selected
+ * @property {String} target
+ * @property {String} tooltip
+ */
+function FancytreeNode(parent, obj){
+	var i, l, name, cl;
+
+	this.parent = parent;
+	this.tree = parent.tree;
+	this.ul = null;
+	this.li = null;  // <li id='key' ftnode=this> tag
+	this.isStatusNode = false;
+	this.data = {};
+
+	// TODO: merge this code with node.toDict()
+	// copy attributes from obj object
+	for(i=0, l=NODE_ATTRS.length; i<l; i++){
+		name = NODE_ATTRS[i];
+		this[name] = obj[name];
+	}
+	// node.data += obj.data
+	if(obj.data){
+		$.extend(this.data, obj.data);
+	}
+	// copy all other attributes to this.data.NAME
+	for(name in obj){
+		if(!NODE_ATTR_MAP[name] && !$.isFunction(obj[name]) && !NONE_NODE_DATA_MAP[name]){
+			// node.data.NAME = obj.NAME
+			this.data[name] = obj[name];
+		}
+	}
+
+	// Fix missing key
+	if( this.key == null ){ // test for null OR undefined
+		this.key = "_" + (FT._nextNodeKey++);
+	}
+	// Fix tree.activeNode
+	// TODO: not elegant: we use obj.active as marker to set tree.activeNode
+	// when loading from a dictionary.
+	if(obj.active){
+		_assert(this.tree.activeNode === null, "only one active node allowed");
+		this.tree.activeNode = this;
+	}
+	// TODO: handle obj.focus = true
+	// Create child nodes
+	this.children = null;
+	cl = obj.children;
+	if(cl && cl.length){
+		this._setChildren(cl);
+	}
+}
+
+
+FancytreeNode.prototype = /**@lends FancytreeNode*/{
+	/* Return the direct child FancytreeNode with a given key, index. */
+	_findDirectChild: function(ptr){
+		var i, l,
+			cl = this.children;
+
+		if(cl){
+			if(typeof ptr === "string"){
+				for(i=0, l=cl.length; i<l; i++){
+					if(cl[i].key === ptr){
+						return cl[i];
+					}
+				}
+			}else if(typeof ptr === "number"){
+				return this.children[ptr];
+			}else if(ptr.parent === this){
+				return ptr;
+			}
+		}
+		return null;
+	},
+	// TODO: activate()
+	// TODO: activateSilently()
+	/* Internal helper called in recursive addChildren sequence.*/
+	_setChildren: function(children){
+		_assert(children && (!this.children || this.children.length === 0), "only init supported");
+		this.children = [];
+		for(var i=0, l=children.length; i<l; i++){
+			this.children.push(new FancytreeNode(this, children[i]));
+		}
+	},
+	/**
+	 * Append (or insert) a list of child nodes.
+	 *
+	 * @param {NodeData[]} children array of child node definitions (also single child accepted)
+	 * @param {FancytreeNode | String | Integer} [insertBefore] child node (or key or index of such).
+	 *     If omitted, the new children are appended.
+	 * @returns {FancytreeNode} first child added
+	 *
+	 * @see applyPatch to modify existing child nodes.
+	 * @see FanctreeNode.applyPatch to modify existing child nodes.
+	 * @see FanctreeNode#applyPatch to modify existing child nodes.
+	 * @see applyPatch
+	 * @see FanctreeNode.applyPatch
+	 * @see FanctreeNode#applyPatch
+	 */
+	addChildren: function(children, insertBefore){
+		var i, l, pos,
+			firstNode = null,
+			nodeList = [];
+
+		if($.isPlainObject(children) ){
+			children = [children];
+		}
+		if(!this.children){
+			this.children = [];
+		}
+		for(i=0, l=children.length; i<l; i++){
+			nodeList.push(new FancytreeNode(this, children[i]));
+		}
+		firstNode = nodeList[0];
+		if(insertBefore == null){
+			this.children = this.children.concat(nodeList);
+		}else{
+			insertBefore = this._findDirectChild(insertBefore);
+			pos = $.inArray(insertBefore, this.children);
+			_assert(pos >= 0, "insertBefore must be an existing child");
+			// insert nodeList after children[pos]
+			this.children.splice.apply(this.children, [pos, 0].concat(nodeList));
+		}
+		if(!this.parent || this.parent.ul){
+			// render if the parent was rendered (or this is a root node)
+			this.render();
+		}
+		if( this.tree.options.selectMode === 3 ){
+			this.fixSelection3FromEndNodes();
+		}
+		return firstNode;
+	},
+	/**
+	 * Append or prepend a node, or append a child node.
+	 *
+	 * @param {NodeData} node node definition
+	 * @param {String} [mode] 'before', 'after', or 'child'
+	 * @returns {FancytreeNode} new node
+	 */
+	addNode: function(node, mode){
+		if(mode === undefined || mode === "over"){
+			mode = "child";
+		}
+		switch(mode){
+		case "after":
+			return this.getParent().addChildren(node, this.getNextSibling());
+		case "before":
+			return this.getParent().addChildren(node, this);
+		case "child":
+		case "over":
+			return this.addChildren(node);
+		}
+		_assert(false, "Invalid mode: " + mode);
+	},
+	/**
+	 *
+	 * @param {NodePatch} patch
+	 * @returns {$.Promise}
+	 * @see {@link applyPatch} to modify existing child nodes.
+	 * @see FancytreeNode#addChildren
+	 */
+	applyPatch: function(patch) {
+		// patch [key, null] means 'remove'
+		if(patch === null){
+			this.remove();
+			return _getResolvedPromise(this);
+		}
+		// TODO: make sure that root node is not collapsed or modified
+		// copy (most) attributes to node.ATTR or node.data.ATTR
+		var name, promise, v,
+			IGNORE_MAP = { children: true, expanded: true, parent: true }; // TODO: should be global
+
+		for(name in patch){
+			v = patch[name];
+			if( !IGNORE_MAP[name] && !$.isFunction(v)){
+				if(NODE_ATTR_MAP[name]){
+					this[name] = v;
+				}else{
+					this.data[name] = v;
+				}
+			}
+		}
+		// Remove and/or create children
+		if(patch.hasOwnProperty("children")){
+			this.removeChildren();
+			if(patch.children){ // only if not null and not empty list
+				// TODO: addChildren instead?
+				this._setChildren(patch.children);
+			}
+			// TODO: how can we APPEND or INSERT child nodes?
+		}
+		if(this.isVisible()){
+			this.renderTitle();
+			this.renderStatus();
+		}
+		// Expand collapse (final step, since this may be async)
+		if(patch.hasOwnProperty("expanded")){
+			promise = this.setExpanded(patch.expanded);
+		}else{
+			promise = _getResolvedPromise(this);
+		}
+		return promise;
+	},
+	/**
+	 * @returns {$.Promise}
+	 */
+	collapseSiblings: function() {
+		return this.tree._callHook("nodeCollapseSiblings", this);
+	},
+	/** Copy this node as sibling or child of `node`.
+	 *
+	 * @param {FancytreeNode} node source node
+	 * @param {String} mode 'before' | 'after' | 'child'
+	 * @param {Function} [map] callback function(NodeData) that could modify the new node
+	 * @returns {FancytreeNode} new
+	 */
+	copyTo: function(node, mode, map) {
+		return node.addNode(this.toDict(true, map), mode);
+	},
+	/** Count direct and indirect children.
+	 *
+	 * @param {Boolean} [deep=true] pass 'false' to only count direct children
+	 * @returns {int} number of child nodes
+	 */
+	countChildren: function(deep) {
+		var cl = this.children, i, l, n;
+		if( !cl ){
+			return 0;
+		}
+		n = cl.length;
+		if(deep !== false){
+			for(i=0, l=n; i<l; i++){
+				n += cl[i].countChildren();
+			}
+		}
+		return n;
+	},
+	// TODO: deactivate()
+	/** Write to browser console if debugLevel >= 2 (prepending node info)
+	 *
+	 * @param {*} msg string or object or array of such
+	 */
+	debug: function(msg){
+		if( this.tree.options.debugLevel >= 2 ) {
+			Array.prototype.unshift.call(arguments, this.toString());
+			consoleApply("debug", arguments);
+		}
+	},
+	/** Remove all children of a lazy node and collapse.*/
+	discard: function(){
+		if(this.lazy && $.isArray(this.children)){
+			this.removeChildren();
+			return this.setExpanded(false);
+		}
+	},
+	// TODO: expand(flag)
+	/**Find all nodes that contain `match` in the title.
+	 *
+	 * @param {String | function(node)} match string to search for, of a function that
+	 * returns `true` if a node is matched.
+	 * @returns {FancytreeNode[]} array of nodes (may be empty)
+	 * @see FancytreeNode#findAll
+	 */
+	findAll: function(match) {
+		match = $.isFunction(match) ? match : _makeNodeTitleMatcher(match);
+		var res = [];
+		this.visit(function(n){
+			if(match(n)){
+				res.push(n);
+			}
+		});
+		return res;
+	},
+	/**Find first node that contains `match` in the title (not including self).
+	 *
+	 * @param {String | function(node)} match string to search for, of a function that
+	 * returns `true` if a node is matched.
+	 * @returns {FancytreeNode} matching node or null
+	 * @example
+	 * <b>fat</b> text
+	 */
+	findFirst: function(match) {
+		match = $.isFunction(match) ? match : _makeNodeTitleMatcher(match);
+		var res = null;
+		this.visit(function(n){
+			if(match(n)){
+				res = n;
+				return false;
+			}
+		});
+		return res;
+	},
+	/* Apply selection state (internal use only) */
+	_changeSelectStatusAttrs: function (state) {
+		var changed = false;
+
+		switch(state){
+		case false:
+			changed = ( this.selected || this.partsel );
+			this.selected = false;
+			this.partsel = false;
+			break;
+		case true:
+			changed = ( !this.selected || !this.partsel );
+			this.selected = true;
+			this.partsel = true;
+			break;
+		case undefined:
+			changed = ( this.selected || !this.partsel );
+			this.selected = false;
+			this.partsel = true;
+			break;
+		default:
+			_assert(false, "invalid state: " + state);
+		}
+		this.debug("fixSelection3AfterLoad() _changeSelectStatusAttrs()", state, changed);
+		if( changed ){
+			this.renderStatus();
+		}
+		return changed;
+	},
+	/**
+	 * Fix selection status, after this node was (de)selected in multi-hier mode.
+	 * This includes (de)selecting all children.
+	 */
+	fixSelection3AfterClick: function() {
+		var flag = this.isSelected();
+
+//		this.debug("fixSelection3AfterClick()");
+
+		this.visit(function(node){
+			node._changeSelectStatusAttrs(flag);
+		});
+		this.fixSelection3FromEndNodes();
+	},
+	/**
+	 * Fix selection status for multi-hier mode.
+	 * Only end-nodes are considered to update the descendants branch and parents.
+	 * Should be called after this node has loaded new children or after
+	 * children have been modified using the API.
+	 */
+	fixSelection3FromEndNodes: function() {
+//		this.debug("fixSelection3FromEndNodes()");
+		_assert(this.tree.options.selectMode === 3, "expected selectMode 3");
+
+		// Visit all end nodes and adjust their parent's `selected` and `partsel`
+		// attributes. Return selection state true, false, or undefined.
+		function _walk(node){
+			var i, l, child, s, state, allSelected,someSelected,
+				children = node.children;
+
+			if( children ){
+				// check all children recursively
+				allSelected = true;
+				someSelected = false;
+
+				for( i=0, l=children.length; i<l; i++ ){
+					child = children[i];
+					// the selection state of a node is not relevant; we need the end-nodes
+					s = _walk(child);
+					if( s !== false ) {
+						someSelected = true;
+					}
+					if( s !== true ) {
+						allSelected = false;
+					}
+				}
+				state = allSelected ? true : (someSelected ? undefined : false);
+			}else{
+				// This is an end-node: simply report the status
+//				state = ( node.unselectable ) ? undefined : !!node.selected;
+				state = !!node.selected;
+			}
+			node._changeSelectStatusAttrs(state);
+			return state;
+		}
+		_walk(this);
+
+		// Update parent's state
+		this.visitParents(function(node){
+			var i, l, child, state,
+				children = node.children,
+				allSelected = true,
+				someSelected = false;
+
+			for( i=0, l=children.length; i<l; i++ ){
+				child = children[i];
+				// When fixing the parents, we trust the sibling status (i.e.
+				// we don't recurse)
+				if( child.selected || child.partsel ) {
+					someSelected = true;
+				}
+				if( !child.unselectable && !child.selected ) {
+					allSelected = false;
+				}
+			}
+			state = allSelected ? true : (someSelected ? undefined : false);
+			node._changeSelectStatusAttrs(state);
+		});
+	},
+	// TODO: focus()
+	/**
+	 * Update node data. If dict contains 'children', then also replace
+	 * the hole sub tree.
+	 * @param {NodeData} dict
+	 *
+	 * @see FancytreeNode#addChildren
+	 * @see FancytreeNode#applyPatch
+	 */
+	fromDict: function(dict) {
+		// copy all other attributes to this.data.xxx
+		for(var name in dict){
+			if(NODE_ATTR_MAP[name]){
+				// node.NAME = dict.NAME
+				this[name] = dict[name];
+			}else if(name === "data"){
+				// node.data += dict.data
+				$.extend(this.data, dict.data);
+			}else if(!$.isFunction(dict[name]) && !NONE_NODE_DATA_MAP[name]){
+				// node.data.NAME = dict.NAME
+				this.data[name] = dict[name];
+			}
+		}
+		if(dict.children){
+			// recursively set children and render
+			this.removeChildren();
+			this.addChildren(dict.children);
+		}else{
+			this.renderTitle();
+		}
+/*
+		var children = dict.children;
+		if(children === undefined){
+			this.data = $.extend(this.data, dict);
+			this.render();
+			return;
+		}
+		dict = $.extend({}, dict);
+		dict.children = undefined;
+		this.data = $.extend(this.data, dict);
+		this.removeChildren();
+		this.addChild(children);
+*/
+	},
+	/** @returns {FancytreeNode[] | undefined} list of child nodes (undefined for unexpanded lazy nodes).*/
+	getChildren: function() {
+		if(this.hasChildren() === undefined){ // TODO: only required for lazy nodes?
+			return undefined; // Lazy node: unloaded, currently loading, or load error
+		}
+		return this.children;
+	},
+	/** @returns {FancytreeNode | null}*/
+	getFirstChild: function() {
+		return this.children ? this.children[0] : null;
+	},
+	/** @returns {int} 0-based child index.*/
+	getIndex: function() {
+//		return this.parent.children.indexOf(this);
+		return $.inArray(this, this.parent.children); // indexOf doesn't work in IE7
+	},
+	/**@returns {String} hierarchical child index (1-based: '3.2.4').*/
+	getIndexHier: function(separator) {
+		separator = separator || ".";
+		var res = [];
+		$.each(this.getParentList(false, true), function(i, o){
+			res.push(o.getIndex() + 1);
+		});
+		return res.join(separator);
+	},
+	/**
+	 * @param {Boolean} [excludeSelf=false]
+	 * @returns {String} parent keys separated by options.keyPathSeparator
+	 */
+	getKeyPath: function(excludeSelf) {
+		var path = [],
+			sep = this.tree.options.keyPathSeparator;
+		this.visitParents(function(n){
+			if(n.parent){
+				path.unshift(n.key);
+			}
+		}, !excludeSelf);
+		return sep + path.join(sep);
+	},
+	/**@returns {FancytreeNode | null} last child of this node.*/
+	getLastChild: function() {
+		return this.children ? this.children[this.children.length - 1] : null;
+	},
+	/** @returns {int} node depth. 0: System root node, 1: visible top-level node, 2: first sub-level, .... */
+	getLevel: function() {
+		var level = 0,
+			dtn = this.parent;
+		while( dtn ) {
+			level++;
+			dtn = dtn.parent;
+		}
+		return level;
+	},
+	/** @returns {FancytreeNode | null} */
+	getNextSibling: function() {
+		// TODO: use indexOf, if available: (not in IE6)
+		if( this.parent ){
+			var i, l,
+				ac = this.parent.children;
+
+			for(i=0, l=ac.length-1; i<l; i++){ // up to length-2, so next(last) = null
+				if( ac[i] === this ){
+					return ac[i+1];
+				}
+			}
+		}
+		return null;
+	},
+	/** @returns {FancytreeNode | null} returns null for the system root node*/
+	getParent: function() {
+		// TODO: return null for top-level nodes?
+		return this.parent;
+	},
+	/**
+	 * @param {Boolean} [includeRoot=false]
+	 * @param {Boolean} [includeSelf=false]
+	 * @returns {FancytreeNode[]}
+	 */
+	getParentList: function(includeRoot, includeSelf) {
+		var l = [],
+			dtn = includeSelf ? this : this.parent;
+		while( dtn ) {
+			if( includeRoot || dtn.parent ){
+				l.unshift(dtn);
+			}
+			dtn = dtn.parent;
+		}
+		return l;
+	},
+	/** @returns {FancytreeNode | null} */
+	getPrevSibling: function() {
+		if( this.parent ){
+			var i, l,
+				ac = this.parent.children;
+
+			for(i=1, l=ac.length; i<l; i++){ // start with 1, so prev(first) = null
+				if( ac[i] === this ){
+					return ac[i-1];
+				}
+			}
+		}
+		return null;
+	},
+	/** @returns {boolean | undefined} Check if node has children (returns undefined, if not sure). */
+	hasChildren: function() {
+		if(this.lazy){
+			if(this.children === null || this.children === undefined){
+				// Not yet loaded
+				return undefined;
+			}else if(this.children.length === 0){
+				// Loaded, but response was empty
+				return false;
+			}else if(this.children.length === 1 && this.children[0].isStatusNode ){
+				// Currently loading or load error
+				return undefined;
+			}
+			return true;
+		}
+		return !!this.children;
+	},
+	/**@returns {Boolean} true, if node has keyboard focus*/
+	hasFocus: function() {
+		return (this.tree.hasFocus() && this.tree.focusNode === this);
+	},
+	/**@returns {Boolean} true, if node is active*/
+	isActive: function() {
+		return (this.tree.activeNode === this);
+	},
+	/**
+	 * @param {FancytreeNode} otherNode
+	 * @returns {Boolean} true, if node is a direct child of otherNode
+	 */
+	isChildOf: function(otherNode) {
+		return (this.parent && this.parent === otherNode);
+	},
+	/**
+	 * @param {FancytreeNode} otherNode
+	 * @returns {Boolean} true, if node is a sub node of otherNode
+	 */
+	isDescendantOf: function(otherNode) {
+		if(!otherNode || otherNode.tree !== this.tree){
+			return false;
+		}
+		var p = this.parent;
+		while( p ) {
+			if( p === otherNode ){
+				return true;
+			}
+			p = p.parent;
+		}
+		return false;
+	},
+	/** @returns {Boolean} true, if node is expanded*/
+	isExpanded: function() {
+		return !!this.expanded;
+	},
+	/** @returns {Boolean}*/
+	isFirstSibling: function() {
+		var p = this.parent;
+		return !p || p.children[0] === this;
+	},
+	/** @returns {Boolean}*/
+	isFolder: function() {
+		return !!this.folder;
+	},
+	/** @returns {Boolean}*/
+	isLastSibling: function() {
+		var p = this.parent;
+		return !p || p.children[p.children.length-1] === this;
+	},
+	/** @returns {Boolean} true, if node is lazy (even if data was already loaded)*/
+	isLazy: function() {
+		return !!this.lazy;
+	},
+	/** @returns {Boolean} true, if children are currently beeing loaded*/
+	isLoading: function() {
+		_raiseNotImplemented(); // TODO: implement
+	},
+	/**@returns {Boolean} true, if node is the (invisible) system root node*/
+	isRoot: function() {
+		return (this.tree.rootNode === this);
+	},
+	/** @returns {Boolean} true, if node is selected (e.g. has a checkmark set)*/
+	isSelected: function() {
+		return !!this.selected;
+	},
+	// TODO: use _isStatusNode as class attribute name
+//  isStatusNode: function() {
+//      return (this.data.isStatusNode === true);
+//  },
+	/** Return true, if all parents are expanded. */
+	isVisible: function() {
+		var i, l,
+			parents = this.getParentList(false, false);
+
+		for(i=0, l=parents.length; i<l; i++){
+			if( ! parents[i].expanded ){ return false; }
+		}
+		return true;
+	},
+	/** Expand all parents and optionally scroll into visible area as neccessary (async).
+	 *
+	 */
+	makeVisible: function() {
+		// TODO: implement scolling (http://www.w3.org/TR/wai-aria-practices/#visualfocus)
+		// TODO: return $.promise
+		var i, l,
+			parents = this.getParentList(false, false);
+
+		for(i=0, l=parents.length; i<l; i++){
+			parents[i].setExpanded(true);
+		}
+	},
+	/** Move this node to targetNode.
+	 *  @param {FancytreeNode} targetNode
+	 *  @param {String} mode
+	 *      'child': append this node as last child of targetNode.
+	 *               This is the default. To be compatble with the D'n'd
+	 *               hitMode, we also accept 'over'.
+	 *      'before': add this node as sibling before targetNode.
+	 *      'after': add this node as sibling after targetNode.
+	 *  @param	[map] optional callback(FancytreeNode) to allow modifcations
+	 */
+	moveTo: function(targetNode, mode, map) {
+		if(mode === undefined || mode === "over"){
+			mode = "child";
+		}
+		var pos,
+			prevParent = this.parent,
+			targetParent = (mode === "child") ? targetNode : targetNode.parent;
+
+		if(this === targetNode){
+			return;
+		}else if( !this.parent  ){
+			throw "Cannot move system root";
+		}else if( targetParent.isDescendantOf(this) ){
+			throw "Cannot move a node to it's own descendant";
+		}
+		// Unlink this node from current parent
+		if( this.parent.children.length === 1 ) {
+			this.parent.children = this.parent.lazy ? [] : null;
+			this.parent.expanded = false;
+		} else {
+			pos = $.inArray(this, this.parent.children);
+			_assert(pos >= 0);
+			this.parent.children.splice(pos, 1);
+		}
+		// Remove from source DOM parent
+//		if(this.parent.ul){
+//			this.parent.ul.removeChild(this.li);
+//		}
+
+		// Insert this node to target parent's child list
+		this.parent = targetParent;
+		if( targetParent.hasChildren() ) {
+			switch(mode) {
+			case "child":
+				// Append to existing target children
+				targetParent.children.push(this);
+				break;
+			case "before":
+				// Insert this node before target node
+				pos = $.inArray(targetNode, targetParent.children);
+				_assert(pos >= 0);
+				targetParent.children.splice(pos, 0, this);
+				break;
+			case "after":
+				// Insert this node after target node
+				pos = $.inArray(targetNode, targetParent.children);
+				_assert(pos >= 0);
+				targetParent.children.splice(pos+1, 0, this);
+				break;
+			default:
+				throw "Invalid mode " + mode;
+			}
+		} else {
+			targetParent.children = [ this ];
+		}
+		// Parent has no <ul> tag yet:
+//		if( !targetParent.ul ) {
+//			// This is the parent's first child: create UL tag
+//			// (Hidden, because it will be
+//			targetParent.ul = document.createElement("ul");
+//			targetParent.ul.style.display = "none";
+//			targetParent.li.appendChild(targetParent.ul);
+//		}
+//		// Issue 319: Add to target DOM parent (only if node was already rendered(expanded))
+//		if(this.li){
+//			targetParent.ul.appendChild(this.li);
+//		}^
+
+		// Let caller modify the nodes
+		if( map ){
+			targetNode.visit(map, true);
+		}
+		// Handle cross-tree moves
+		if( this.tree !== targetNode.tree ) {
+			// Fix node.tree for all source nodes
+//			_assert(false, "Cross-tree move is not yet implemented.");
+			this.warn("Cross-tree moveTo is experimantal!");
+			this.visit(function(n){
+				// TODO: fix selection state and activation, ...
+				n.tree = targetNode.tree;
+			}, true);
+		}
+		// Update HTML markup
+		if( !prevParent.isDescendantOf(targetParent)) {
+			prevParent.render();
+		}
+		if( !targetParent.isDescendantOf(prevParent) && targetParent !== prevParent) {
+			targetParent.render();
+		}
+		// TODO: fix selection state
+		// TODO: fix active state
+
+/*
+		var tree = this.tree;
+		var opts = tree.options;
+		var pers = tree.persistence;
+
+
+		// Always expand, if it's below minExpandLevel
+//		tree.logDebug ("%s._addChildNode(%o), l=%o", this, ftnode, ftnode.getLevel());
+		if ( opts.minExpandLevel >= ftnode.getLevel() ) {
+//			tree.logDebug ("Force expand for %o", ftnode);
+			this.bExpanded = true;
+		}
+
+		// In multi-hier mode, update the parents selection state
+		// issue #82: only if not initializing, because the children may not exist yet
+//		if( !ftnode.data.isStatusNode && opts.selectMode==3 && !isInitializing )
+//			ftnode._fixSelectionState();
+
+		// In multi-hier mode, update the parents selection state
+		if( ftnode.bSelected && opts.selectMode==3 ) {
+			var p = this;
+			while( p ) {
+				if( !p.hasSubSel )
+					p._setSubSel(true);
+				p = p.parent;
+			}
+		}
+		// render this node and the new child
+		if ( tree.bEnableUpdate )
+			this.render();
+
+		return ftnode;
+
+*/
+	},
+	/**
+	 * Discard and reload all children of a lazy node.
+	 * @param {Boolean} [discard=false]
+	 * @returns $.Promise
+	 */
+	lazyLoad: function(discard) {
+		if(discard){
+			this.discard();
+		}else{
+			_assert(!$.isArray(this.children));
+		}
+		var source = this.tree._triggerNodeEvent("lazyload", this);
+		_assert(typeof source !== "boolean", "lazyload event must return source in data.result");
+		return this.tree._callHook("nodeLoadChildren", this, source);
+	},
+	/**
+	 * @see Fancytree#nodeRender
+	 */
+	render: function(force, deep) {
+		return this.tree._callHook("nodeRender", this, force, deep);
+	},
+	/**
+	 * @see Fancytree#nodeRenderTitle
+	 */
+	renderTitle: function() {
+		return this.tree._callHook("nodeRenderTitle", this);
+	},
+	/**
+	 * @see Fancytree#nodeRenderStatus
+	 */
+	renderStatus: function() {
+		return this.tree._callHook("nodeRenderStatus", this);
+	},
+	/** Remove this node (not allowed for root).*/
+	remove: function() {
+		return this.parent.removeChild(this);
+	},
+	/**Remove childNode from list of direct children.*/
+	removeChild: function(childNode) {
+		return this.tree._callHook("nodeRemoveChild", this, childNode);
+	},
+	/**Remove all child nodes (and descendents).*/
+	removeChildren: function() {
+		return this.tree._callHook("nodeRemoveChildren", this);
+	},
+	// TODO: resetLazy()
+	/** Schedule activity for delayed execution (cancel any pending request).
+	 *  scheduleAction('cancel') will cancel the request.
+	 */
+	scheduleAction: function(mode, ms) {
+		if( this.tree.timer ) {
+			clearTimeout(this.tree.timer);
+//            this.tree.debug("clearTimeout(%o)", this.tree.timer);
+		}
+		this.tree.timer = null;
+		var self = this; // required for closures
+		switch (mode) {
+		case "cancel":
+			// Simply made sure that timer was cleared
+			break;
+		case "expand":
+			this.tree.timer = setTimeout(function(){
+				self.tree.debug("setTimeout: trigger expand");
+				self.setExpanded(true);
+			}, ms);
+			break;
+		case "activate":
+			this.tree.timer = setTimeout(function(){
+				self.tree.debug("setTimeout: trigger activate");
+				self.setActive(true);
+			}, ms);
+			break;
+		default:
+			throw "Invalid mode " + mode;
+		}
+//        this.tree.debug("setTimeout(%s, %s): %s", mode, ms, this.tree.timer);
+	},
+	/**
+	 *
+	 * @param {Boolean | PlainObject} [effects=false] animation options.
+	 * @param {FancytreeNode} [topNode=null] this node will remain visible in
+	 *     any case, even if `this` is outside the scroll pane.
+	 * @returns $.Promise
+	 */
+	scrollIntoView: function(effects, topNode) {
+		effects = (effects === true) ? {duration: 200, queue: false} : effects;
+		var topNodeY,
+			dfd = new $.Deferred(),
+			nodeY = $(this.span).position().top,
+			nodeHeight = $(this.span).height(),
+			$container = this.tree.$container,
+			scrollTop = $container[0].scrollTop,
+			horzScrollHeight = Math.max(0, ($container.innerHeight() - $container[0].clientHeight)),
+//			containerHeight = $container.height(),
+			containerHeight = $container.height() - horzScrollHeight,
+			newScrollTop = null;
+
+//		console.log("horzScrollHeight: " + horzScrollHeight);
+//		console.log("$container[0].scrollTop: " + $container[0].scrollTop);
+//		console.log("$container[0].scrollHeight: " + $container[0].scrollHeight);
+//		console.log("$container[0].clientHeight: " + $container[0].clientHeight);
+//		console.log("$container.innerHeight(): " + $container.innerHeight());
+//		console.log("$container.height(): " + $container.height());
+
+		if(nodeY < 0){
+			newScrollTop = scrollTop + nodeY;
+		}else if((nodeY + nodeHeight) > containerHeight){
+			newScrollTop = scrollTop + nodeY - containerHeight + nodeHeight;
+			// If a topNode was passed, make sure that it is never scrolled
+			// outside the upper border
+			if(topNode){
+				topNodeY = topNode ? $(topNode.span).position().top : 0;
+				if((nodeY - topNodeY) > containerHeight){
+					newScrollTop = scrollTop + nodeY;
+				}
+			}
+		}
+		if(newScrollTop !== null){
+			if(effects){
+				// TODO: resolve dfd after animation
+//				var that = this;
+				$container.animate({scrollTop: newScrollTop}, effects);
+			}else{
+				$container[0].scrollTop = newScrollTop;
+				dfd.resolveWith(this);
+			}
+		}else{
+			dfd.resolveWith(this);
+		}
+		return dfd.promise();
+/* from jQuery.menu:
+		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
+		if ( this._hasScroll() ) {
+			borderTop = parseFloat( $.css( this.activeMenu[0], "borderTopWidth" ) ) || 0;
+			paddingTop = parseFloat( $.css( this.activeMenu[0], "paddingTop" ) ) || 0;
+			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
+			scroll = this.activeMenu.scrollTop();
+			elementHeight = this.activeMenu.height();
+			itemHeight = item.height();
+
+			if ( offset < 0 ) {
+				this.activeMenu.scrollTop( scroll + offset );
+			} else if ( offset + itemHeight > elementHeight ) {
+				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
+			}
+		}
+		*/
+	},
+
+	/**Activate this node.
+	 * @param {Boolean} [flag=true] pass false to deactivate
+	 */
+	setActive: function(flag){
+		return this.tree._callHook("nodeSetActive", this, flag);
+	},
+	/**Expand this node.
+	 * @param {Boolean} [flag=true] pass false to collapse
+	 */
+	setExpanded: function(flag){
+		return this.tree._callHook("nodeSetExpanded", this, flag);
+	},
+	/**Set keyboard focus to this node.
+	 * @param {Boolean} [flag=true] pass false to blur
+	 * @see Fancytree#setFocus
+	 */
+	setFocus: function(flag){
+		return this.tree._callHook("nodeSetFocus", this, flag);
+	},
+	// TODO: setLazyNodeStatus
+	/**Select this node.
+	 * @param {Boolean} [flag=true] pass false to deselect
+	 */
+	setSelected: function(flag){
+		return this.tree._callHook("nodeSetSelected", this, flag);
+	},
+	setTitle: function(title){
+		this.title = title;
+		this.renderTitle();
+	},
+	/**Sort child list by title.
+	 * @param {function} [cmd] custom compare function.
+	 * @param {Boolean} [deep] pass true to sort all descendant nodes
+	 */
+	sortChildren: function(cmp, deep) {
+		var i,l,
+			cl = this.children;
+
+		if( !cl ){
+			return;
+		}
+		cmp = cmp || function(a, b) {
+			var x = a.title.toLowerCase(),
+				y = b.title.toLowerCase();
+			return x === y ? 0 : x > y ? 1 : -1;
+			};
+		cl.sort(cmp);
+		if( deep ){
+			for(i=0, l=cl.length; i<l; i++){
+				if( cl[i].children ){
+					cl[i].sortChildren(cmp, "$norender$");
+				}
+			}
+		}
+		if( deep !== "$norender$" ){
+			this.render();
+		}
+	},
+	/** Convert node (or whole branch) into a dictionary.
+	 *
+	 * The result is compatible with node.addChildren().
+	 *
+	 * @param {Boolean} recursive
+	 * @param {function} callback callback(dict) is called for every dict (), in order to allow modifications
+	 * @returns {NodePatch}
+	 */
+	toDict: function(recursive, callback) {
+		var i, l, node,
+			dict = {},
+			self = this;
+
+		$.each(NODE_ATTRS, function(i, a){
+//			if(self[a] !== undefined && self[a] !== null){
+			if(self[a] || self[a] === false){
+				dict[a] = self[a];
+			}
+		});
+		if(!$.isEmptyObject(this.data)){
+			dict.data = $.extend({}, this.data);
+			if($.isEmptyObject(dict.data)){
+				delete dict.data;
+			}
+		}
+		if( callback ){
+			callback(dict);
+		}
+		if( recursive ) {
+			if(this.hasChildren()){
+				dict.children = [];
+				for(i=0, l=this.children.length; i<l; i++ ){
+					node = this.children[i];
+					if( !node.isStatusNode ){
+						dict.children.push(node.toDict(true, callback));
+					}
+				}
+			}else{
+//                dict.children = null;
+			}
+		}
+		return dict;
+	},
+	/** Flip expanded status.  */
+	toggleExpanded: function(){
+		return this.tree._callHook("nodeToggleExpanded", this);
+	},
+	/** Flip selection status.  */
+	toggleSelected: function(){
+		return this.tree._callHook("nodeToggleSelected", this);
+	},
+	toString: function() {
+		return "<FancytreeNode(#" + this.key + ", '" + this.title + "')>";
+	},
+	/** Call fn(node) for all child nodes. Stop iteration, if fn() returns false.
+	 * Skip current branch, if fn() returns 'skip'.
+	 * @param {function} fn the callback function.
+	 *     Return false to stop iteration, return "skip" to skip this node and children only.
+	 * @param {Boolean} [includeSelf=false]
+	 * @returns {Boolean} false, if the iterator was stopped.
+	 */
+	visit: function(fn, includeSelf) {
+		var i, l,
+			res = true,
+			children = this.children;
+
+		if( includeSelf === true ) {
+			res = fn(this);
+			if( res === false || res === "skip" ){
+				return res;
+			}
+		}
+		if(children){
+			for(i=0, l=children.length; i<l; i++){
+				res = children[i].visit(fn, true);
+				if( res === false ){
+					break;
+				}
+			}
+		}
+		return res;
+	},
+	/**
+	 *
+	 * @param fn
+	 * @param includeSelf
+	 * @returns {Boolean}
+	 */
+	visitParents: function(fn, includeSelf) {
+		// Visit parent nodes (bottom up)
+		if(includeSelf && fn(this) === false){
+			return false;
+		}
+		var p = this.parent;
+		while( p ) {
+			if(fn(p) === false){
+				return false;
+			}
+			p = p.parent;
+		}
+		return true;
+	},
+	/** Write warning to browser console (prepending node info)
+	 *
+	 * @param {*} msg string or object or array of such
+	 */
+	warn: function(msg){
+		Array.prototype.unshift.call(arguments, this.toString());
+		consoleApply("warn", arguments);
+	}
+};
+
+
+/* *****************************************************************************
+ * Fancytree
+ */
+/**
+ * Construct a new tree.
+ * @class The controller behind a fancytree.
+ * @name Fancytree
+ * @constructor
+ * @param {Widget} widget
+ *
+ * @property {FancytreeOptions} options
+ * @property {FancytreeNode} rootNode
+ * @property {FancytreeNode} activeNode
+ * @property {FancytreeNode} focusNode
+ * @property {jQueryObject} $div
+ * @property {object} widget
+ * @property {String} _id
+ * @property {String} statusClassPropName
+ * @property {String} ariaPropName
+ * @property {String} nodeContainerAttrName
+ * @property {FancytreeNode} lastSelectedNode
+ */
+function Fancytree(widget){
+	// TODO: rename widget to widget (it's not a jQuery object)
+	this.widget = widget;
+	this.$div = widget.element;
+	this.options = widget.options;
+	this._id = $.ui.fancytree._nextId++;
+	this._ns = ".fancytree-" + this._id; // append for namespaced events
+	this.activeNode = null;
+	this.focusNode = null;
+	this.lastSelectedNode = null;
+	this.systemFocusElement = null,
+
+	this.statusClassPropName = "span";
+	this.ariaPropName = "li";
+	this.nodeContainerAttrName = "li";
+
+	// Remove previous markup if any
+	this.$div.find(">ul.fancytree-container").remove();
+
+	// Create a node without parent.
+	var fakeParent = { tree: this },
+		$ul;
+	this.rootNode = new FancytreeNode(fakeParent, {
+		title: "root",
+		key: "root_" + this._id,
+		children: null
+	});
+	this.rootNode.parent = null;
+
+	// Create root markup
+	$ul = $("<ul>", {
+		"class": "ui-fancytree fancytree-container"
+	}).appendTo(this.$div);
+	this.$container = $ul;
+	this.rootNode.ul = $ul[0];
+
+	if(this.options.debugLevel == null){
+		this.options.debugLevel = FT.debugLevel;
+	}
+	// Add container to the TAB chain
+	// See http://www.w3.org/TR/wai-aria-practices/#focus_activedescendant
+	if(this.options.tabbable){
+		this.$container.attr("tabindex", "0");
+	}
+	if(this.options.aria){
+		this.$container.attr("role", "tree")
+			.attr("aria-multiselectable", true);
+	}
+}
+
+
+Fancytree.prototype = /**@lends Fancytree*/{
+	/** Return a context object that can be re-used for _callHook().
+	 * @param {Fancytree | FancytreeNode | EventData} obj
+	 * @param {Event} originalEvent
+	 * @returns {EventData}
+	 */
+	_makeHookContext: function(obj, originalEvent) {
+		if(obj.node !== undefined){
+			// obj is already a context object
+			if(originalEvent && obj.originalEvent !== originalEvent){
+				$.error("invalid args");
+			}
+			return obj;
+		}else if(obj.tree){
+			// obj is a FancytreeNode
+			var tree = obj.tree;
+			return { node: obj, tree: tree, widget: tree.widget, options: tree.widget.options, originalEvent: originalEvent };
+		}else if(obj.widget){
+			// obj is a Fancytree
+			return { node: null, tree: obj, widget: obj.widget, options: obj.widget.options, originalEvent: originalEvent };
+		}
+		$.error("invalid args");
+	},
+	/** Trigger a hook function: funcName(ctx, [...]).
+	 *
+	 * @param {String} funcName
+	 * @param {Fancytree|FancytreeNode|EventData} contextObject
+	 * @param {any, ...}  [_extraArgs] optional additional arguments
+	 * @returns {any}
+	 */
+	_callHook: function(funcName, contextObject, _extraArgs) {
+		var ctx = this._makeHookContext(contextObject),
+			fn = this[funcName],
+			args = Array.prototype.slice.call(arguments, 2);
+		if(!$.isFunction(fn)){
+			$.error("_callHook('" + funcName + "') is not a function");
+		}
+		args.unshift(ctx);
+//		this.debug("_hook", funcName, ctx.node && ctx.node.toString() || ctx.tree.toString(), args);
+		return fn.apply(this, args);
+	},
+	/** Activate node with a given key.
+	 *
+	 * A prevously activated node will be deactivated.
+	 * Pass key = false, to deactivate the current node only.
+	 * @param {String} key
+	 * @returns {FancytreeNode} activated node (null, if not found)
+	 */
+	activateKey: function(key) {
+		var node = this.getNodeByKey(key);
+		if(node){
+			node.setActive();
+		}else if(this.activeNode){
+			this.activeNode.setActive(false);
+		}
+		return node;
+	},
+	/**
+	 *
+	 * @param {Array} patchList array of [key, NodePatch] arrays
+	 * @returns {$.Promise} resolved, when all patches have been applied
+	 * @see TreePatch
+	 */
+	applyPatch: function(patchList) {
+		var dfd, i, p2, key, patch, node,
+			patchCount = patchList.length,
+			deferredList = [];
+
+		for(i=0; i<patchCount; i++){
+			p2 = patchList[i];
+			_assert(p2.length === 2, "patchList must be an array of length-2-arrays");
+			key = p2[0];
+			patch = p2[1];
+			node = (key === null) ? this.rootNode : this.getNodeByKey(key);
+			if(node){
+				dfd = new $.Deferred();
+				deferredList.push(dfd);
+				node.applyPatch(patch).always(_makeResolveFunc(dfd, node));
+			}else{
+				this.warn("could not find node with key '" + key + "'");
+			}
+		}
+		// Return a promise that is resovled, when ALL patches were applied
+		return $.when.apply($, deferredList).promise();
+	},
+	/* TODO: implement in dnd extension
+	cancelDrag: function() {
+		var dd = $.ui.ddmanager.current;
+		if(dd){
+			dd.cancel();
+		}
+	},
+   */
+	count: function() {
+		return this.rootNode.countChildren();
+	},
+	/** Write to browser console if debugLevel >= 2 (prepending tree info)
+	 *
+	 * @param {*} msg string or object or array of such
+	 */
+	debug: function(msg){
+		if( this.options.debugLevel >= 2 ) {
+			Array.prototype.unshift.call(arguments, this.toString());
+			consoleApply("debug", arguments);
+		}
+	},
+	// TODO: disable()
+	// TODO: enable()
+	// TODO: enableUpdate()
+	// TODO: fromDict
+	/**
+	 * Generate INPUT elements that can be submitted with html forms.
+	 *
+	 * In selectMode 3 only the topmost selected nodes are considered.
+	 *
+	 * @param {Boolean | String} [selected=true]
+	 * @param {Boolean | String} [active=true]
+	 */
+	generateFormElements: function(selected, active) {
+		// TODO: test case
+		var nodeList,
+			selectedName = (selected !== false) ? "ft_" + this._id : selected,
+			activeName = (active !== false) ? "ft_" + this._id + "_active" : active,
+			id = "fancytree_result_" + this._id,
+			$result = this.$container.find("div#" + id);
+
+		if($result.length){
+			$result.empty();
+		}else{
+			$result = $("<div>", {
+				id: id
+			}).hide().appendTo(this.$container);
+		}
+		if(selectedName){
+			nodeList = this.getSelectedNodes( this.options.selectMode === 3 );
+			$.each(nodeList, function(idx, node){
+				$result.append($("<input>", {
+					type: "checkbox",
+					name: selectedName,
+					value: node.key,
+					checked: true
+				}));
+			});
+		}
+		if(activeName && this.activeNode){
+			$result.append($("<input>", {
+				type: "radio",
+				name: activeName,
+				value: this.activeNode.key,
+				checked: true
+			}));
+		}
+	},
+	/**
+	 * Return node that is active.
+	 * @returns {FancytreeNode}
+	 */
+	getActiveNode: function() {
+		return this.activeNode;
+	},
+	/** @returns {FancytreeNode | null}*/
+	getFirstChild: function() {
+		return this.rootNode.getFirstChild();
+	},
+	/**
+	 * Return node that has keyboard focus.
+	 * @param {Boolean} [ifTreeHasFocus=false]
+	 * @returns {FancytreeNode}
+	 */
+	getFocusNode: function(ifTreeHasFocus) {
+		// TODO: implement ifTreeHasFocus
+		return this.focusNode;
+	},
+	getNodeByKey: function(key, searchRoot) {
+		// Search the DOM by element ID (assuming this is faster than traversing all nodes).
+		// $("#...") has problems, if the key contains '.', so we use getElementById()
+		var el, match;
+		if(!searchRoot){
+			el = document.getElementById(this.options.idPrefix + key);
+			if( el ){
+				return el.ftnode ? el.ftnode : null;
+			}
+		}
+		// Not found in the DOM, but still may be in an unrendered part of tree
+		// TODO: optimize with specialized loop
+		// TODO: consider keyMap?
+		searchRoot = searchRoot || this.rootNode;
+		match = null;
+		searchRoot.visit(function(node){
+//            window.console.log("getNodeByKey(" + key + "): ", node.key);
+			if(node.key === key) {
+				match = node;
+				return false;
+			}
+		}, true);
+		return match;
+	},
+	// TODO: getRoot()
+	/**
+	 * Return a list of selected nodes.
+	 * @param {Boolean} [stopOnParents=false] only return the topmost selected
+	 *     node (useful with selectMode 3)
+	 * @returns {FancytreeNode[]}
+	 */
+	getSelectedNodes: function(stopOnParents) {
+		var nodeList = [];
+		this.rootNode.visit(function(node){
+			if( node.selected ) {
+				nodeList.push(node);
+				if( stopOnParents === true ){
+					return "skip"; // stop processing this branch
+				}
+			}
+		});
+		return nodeList;
+	},
+	/**
+	 * @returns {Boolean} true if the tree control has keyboard focus
+	 */
+	hasFocus: function(){
+		return FT.focusTree === this;
+	},
+	/** Write to browser console if debugLevel >= 1 (prepending tree info)
+	 *
+	 * @param {*} msg string or object or array of such
+	 */
+	info: function(msg){
+		if( this.options.debugLevel >= 1 ) {
+			Array.prototype.unshift.call(arguments, this.toString());
+			consoleApply("info", arguments);
+		}
+	},
+/*
+	TODO: isInitializing: function() {
+		return ( this.phase=="init" || this.phase=="postInit" );
+	},
+	TODO: isReloading: function() {
+		return ( this.phase=="init" || this.phase=="postInit" ) && this.options.persist && this.persistence.cookiesFound;
+	},
+	TODO: isUserEvent: function() {
+		return ( this.phase=="userEvent" );
+	},
+*/
+	/**
+	 * Expand all parents of one or more nodes.
+	 * Calls
+	 * @param {String | String[]} keyPath one or more key paths (e.g. '/3/2_1/7')
+	 * @param {function} callback callbeck(mode) is called for every visited node
+	 * @returns {$.Promise}
+	 */
+	/*
+	_loadKeyPath: function(keyPath, callback) {
+		var tree = this.tree;
+		tree.logDebug("%s._loadKeyPath(%s)", this, keyPath);
+		if(keyPath === ""){
+			throw "Key path must not be empty";
+		}
+		var segList = keyPath.split(tree.options.keyPathSeparator);
+		if(segList[0] === ""){
+			throw "Key path must be relative (don't start with '/')";
+		}
+		var seg = segList.shift();
+
+		for(var i=0, l=this.childList.length; i < l; i++){
+			var child = this.childList[i];
+			if( child.data.key === seg ){
+				if(segList.length === 0) {
+					// Found the end node
+					callback.call(tree, child, "ok");
+
+				}else if(child.data.isLazy && (child.childList === null || child.childList === undefined)){
+					tree.logDebug("%s._loadKeyPath(%s) -> reloading %s...", this, keyPath, child);
+					var self = this;
+					child.reloadChildren(function(node, isOk){
+						// After loading, look for direct child with that key
+						if(isOk){
+							tree.logDebug("%s._loadKeyPath(%s) -> reloaded %s.", node, keyPath, node);
+							callback.call(tree, child, "loaded");
+							node._loadKeyPath(segList.join(tree.options.keyPathSeparator), callback);
+						}else{
+							tree.logWarning("%s._loadKeyPath(%s) -> reloadChildren() failed.", self, keyPath);
+							callback.call(tree, child, "error");
+						}
+					}); // Note: this line gives a JSLint warning (Don't make functions within a loop)
+					// we can ignore it, since it will only be exectuted once, the the loop is ended
+					// See also http://stackoverflow.com/questions/3037598/how-to-get-around-the-jslint-error-dont-make-functions-within-a-loop
+				} else {
+					callback.call(tree, child, "loaded");
+					// Look for direct child with that key
+					child._loadKeyPath(segList.join(tree.options.keyPathSeparator), callback);
+				}
+				return;
+			}
+		}
+		// Could not find key
+		tree.logWarning("Node not found: " + seg);
+		return;
+	},
+
+	 */
+	loadKeyPath: function(keyPathList, callback, _rootNode) {
+		var deferredList, dfd, i, path, key, loadMap, node, segList,
+			root = _rootNode || this.rootNode,
+			sep = this.options.keyPathSeparator,
+			self = this;
+
+		if(!$.isArray(keyPathList)){
+			keyPathList = [keyPathList];
+		}
+		// Pass 1: handle all path segments for nodes that are already loaded
+		// Collect distinct top-most lazy nodes in a map
+		loadMap = {};
+
+		for(i=0; i<keyPathList.length; i++){
+			path = keyPathList[i];
+			// strip leading slash
+			if(path.charAt(0) === sep){
+				path = path.substr(1);
+			}
+			// traverse and strip keys, until we hit a lazy, unloaded node
+			segList = path.split(sep);
+			while(segList.length){
+				key = segList.shift();
+//                node = _findDirectChild(root, key);
+				node = root._findDirectChild(key);
+				if(!node){
+					this.warn("loadKeyPath: key not found: " + key + " (parent: " + root + ")");
+					callback.call(this, key, "error");
+					break;
+				}else if(segList.length === 0){
+					callback.call(this, node, "ok");
+					break;
+				}else if(!node.lazy || (node.hasChildren() !== undefined )){
+					callback.call(this, node, "loaded");
+					root = node;
+				}else{
+					callback.call(this, node, "loaded");
+//                    segList.unshift(key);
+					if(loadMap[key]){
+						loadMap[key].push(segList.join(sep));
+					}else{
+						loadMap[key] = [segList.join(sep)];
+					}
+					break;
+				}
+			}
+		}
+//        alert("loadKeyPath: loadMap=" + JSON.stringify(loadMap));
+		// Now load all lazy nodes and continue itearation for remaining paths
+		deferredList = [];
+		// Avoid jshint warning 'Don't make functions within a loop.':
+		function __lazyload(key, node, dfd){
+			callback.call(self, node, "loading");
+			node.lazyLoad().done(function(){
+			  self.loadKeyPath.call(self, loadMap[key], callback, node).always(_makeResolveFunc(dfd, self));
+		  }).fail(function(errMsg){
+			  self.warn("loadKeyPath: error loading: " + key + " (parent: " + root + ")");
+			  callback.call(self, node, "error");
+			  dfd.reject();
+		  });
+		}
+		for(key in loadMap){
+			node = root._findDirectChild(key);
+//            alert("loadKeyPath: lazy node(" + key + ") = " + node);
+			dfd = new $.Deferred();
+			deferredList.push(dfd);
+			__lazyload(key, node, dfd);
+		}
+		// Return a promise that is resovled, when ALL paths were loaded
+		return $.when.apply($, deferredList).promise();
+	},
+	/** _Default handling for mouse click events. */
+	nodeClick: function(ctx) {
+//      this.tree.logDebug("ftnode.onClick(" + event.type + "): ftnode:" + this + ", button:" + event.button + ", which: " + event.which);
+		var activate, expand,
+			event = ctx.originalEvent,
+			targetType = ctx.targetType,
+			node = ctx.node;
+
+		// TODO: use switch
+		// TODO: make sure clicks on embedded <input> doesn't steal focus (see table sample)
+		if( targetType === "expander" ) {
+			// Clicking the expander icon always expands/collapses
+			this._callHook("nodeToggleExpanded", ctx);
+//            this._callHook("nodeSetFocus", ctx, true); // issue 95
+		} else if( targetType === "checkbox" ) {
+			// Clicking the checkbox always (de)selects
+			this._callHook("nodeToggleSelected", ctx);
+			this._callHook("nodeSetFocus", ctx, true); // issue 95
+		} else {
+			// Honor `clickFolderMode` for
+			expand = false;
+			activate = true;
+			if( node.folder ) {
+				switch( ctx.options.clickFolderMode ) {
+				case 2: // expand only
+					expand = true;
+					activate = false;
+					break;
+				case 3: // expand and activate
+					activate = true;
+					expand = true; //!node.isExpanded();
+					break;
+				// else 1 or 4: just activate
+				}
+			}
+			if( activate ) {
+				this.nodeSetFocus(ctx);
+				this._callHook("nodeSetActive", ctx, true);
+			}
+			if( expand ) {
+				if(!activate){
+//                    this._callHook("nodeSetFocus", ctx);
+				}
+//				this._callHook("nodeSetExpanded", ctx, true);
+				this._callHook("nodeToggleExpanded", ctx);
+			}
+		}
+		// Make sure that clicks stop, otherwise <a href='#'> jumps to the top
+		if(event.target.localName === "a" && event.target.className === "fancytree-title"){
+			event.preventDefault();
+		}
+		// TODO: return promise?
+	},
+	nodeCollapseSiblings: function(ctx) {
+		// TODO: return promise?
+		var ac, i, l,
+			node = ctx.node;
+
+		if( node.parent ){
+			ac = node.parent.children;
+			for (i=0, l=ac.length; i<l; i++) {
+				if ( ac[i] !== node && ac[i].expanded ){
+					this._callHook("nodeSetExpanded", ac[i], false);
+				}
+			}
+		}
+	},
+	nodeDblclick: function(ctx) {
+		// TODO: return promise?
+		if( ctx.targetType === "title" && ctx.options.clickFolderMode === 4) {
+//			this.nodeSetFocus(ctx);
+//			this._callHook("nodeSetActive", ctx, true);
+			this._callHook("nodeToggleExpanded", ctx);
+		}
+		// TODO: prevent text selection on dblclicks
+		if( ctx.targetType === "title" ) {
+			ctx.originalEvent.preventDefault();
+		}
+	},
+	/** Default handling for mouse keydown events.
+	 *
+	 * NOTE: this may be called with node == null if tree (but no node) has focus.
+	 */
+	nodeKeydown: function(ctx) {
+		// TODO: return promise?
+		var i, parents,
+			event = ctx.originalEvent,
+			node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options,
+			handled = true,
+			KC = $.ui.keyCode,
+			sib = null;
+
+//		node.debug("ftnode.nodeKeydown(" + event.type + "): ftnode:" + this + ", charCode:" + event.charCode + ", keyCode: " + event.keyCode + ", which: " + event.which);
+
+		// Set focus to first node, if no other node has the focus yet
+		if( !node ){
+			this.rootNode.getFirstChild().setFocus();
+			node = ctx.node = this.focusNode;
+			node.debug("Keydown force focus on first node");
+		}
+		// Navigate to node
+		function _goto(n){
+			if( n ){
+				n.makeVisible();
+				return (event.ctrlKey || !opts.autoActivate ) ? n.setFocus() : n.setActive();
+			}
+		}
+
+		switch( event.which ) {
+			// charCodes:
+			case KC.NUMPAD_ADD: //107: // '+'
+			case 187: // '+' @ Chrome, Safari
+				tree.nodeSetExpanded(ctx, true);
+				break;
+			case KC.NUMPAD_SUBTRACT: // '-'
+			case 189: // '-' @ Chrome, Safari
+				tree.nodeSetExpanded(ctx, false);
+				break;
+			case KC.SPACE:
+				if(opts.checkbox){
+					tree.nodeToggleSelected(ctx);
+				}else{
+					tree.nodeSetActive(ctx, true);
+				}
+				break;
+			case KC.ENTER:
+				tree.nodeSetActive(ctx, true);
+				break;
+			case KC.BACKSPACE:
+				_goto(node.parent);
+				break;
+			case KC.LEFT:
+				if( node.expanded ) {
+					tree.nodeSetExpanded(ctx, false);
+//					tree.nodeSetFocus(ctx);
+					_goto(node);
+				} else if( node.parent && node.parent.parent ) {
+//					node.parent.setFocus();
+					_goto(node.parent);
+				}
+				break;
+			case KC.RIGHT:
+				if( !node.expanded && (node.children || node.lazy) ) {
+					tree.nodeSetExpanded(ctx, true);
+//					tree.nodeSetFocus(ctx);
+					_goto(node);
+				} else if( node.children ) {
+//					node.children[0].setFocus();
+					_goto(node.children[0]);
+				}
+				break;
+			case KC.UP:
+				sib = node.getPrevSibling();
+				while( sib && sib.expanded && sib.children ){
+					sib = sib.children[sib.children.length - 1];
+				}
+				if( !sib && node.parent && node.parent.parent ){
+					sib = node.parent;
+				}
+				_goto(sib);
+				break;
+			case KC.DOWN:
+				if( node.expanded && node.children ) {
+					sib = node.children[0];
+				} else {
+					parents = node.getParentList(false, true);
+					for(i=parents.length-1; i>=0; i--) {
+						sib = parents[i].getNextSibling();
+						if( sib ){ break; }
+					}
+				}
+				_goto(sib);
+				break;
+			default:
+				handled = false;
+		}
+		if(handled){
+			event.preventDefault();
+		}
+	},
+
+	// /** Default handling for mouse keypress events. */
+	// nodeKeypress: function(ctx) {
+	//     var event = ctx.originalEvent;
+	// },
+
+	// /** Trigger lazyload event (async). */
+	// nodeLazyLoad: function(ctx) {
+	//     var node = ctx.node;
+	//     if(this._triggerNodeEvent())
+	// },
+	/** Load children (async).
+	 *  source may be
+	 *    - an array of children
+	 *    - a node object
+	 *    - an Ajax options object
+	 *    - an Ajax.promise
+	 *
+	 * @param {object} ctx
+	 * @param {object[]|object|string|$.Promise|function} source
+	 * @returns {$.Promise} The deferred will be resolved as soon as the (ajax)
+	 *     data was rendered.
+	 */
+	nodeLoadChildren: function(ctx, source) {
+		var ajax, children, delay, dfd,
+			tree = ctx.tree,
+			node = ctx.node,
+			self = this;
+
+		if($.isFunction(source)){
+			source = source();
+		}
+		if(source.url || $.isFunction(source.done)){
+			tree.nodeSetStatus(ctx, "loading");
+			if(source.url){
+				// `source` is an Ajax options object
+				ajax = $.extend({}, ctx.options.ajax, source);
+				if(ajax.debugLazyDelay){
+					// simulate a slow server
+					delay = ajax.debugLazyDelay;
+					if($.isArray(delay)){ // random delay range [min..max]
+						delay = delay[0] + Math.random() * (delay[1] - delay[0]);
+					}
+					node.debug("nodeLoadChildren waiting debug delay " + Math.round(delay) + "ms");
+					dfd = $.Deferred();
+					setTimeout(function(){
+						ajax.debugLazyDelay = false;
+						self.nodeLoadChildren(ctx, ajax).complete(function(){
+							dfd.resolve.apply(this, arguments);
+						});
+					}, delay);
+					return dfd;
+				}else{
+					dfd = $.ajax(ajax);
+				}
+			}else{
+				// `source` is a promise, as returned by a $.ajax call
+				dfd = source;
+			}
+			dfd.done(function(data, textStatus, jqXHR){
+				var res;
+				tree.nodeSetStatus(ctx, "ok");
+				if(typeof data === "string"){ $.error("Ajax request returned a string (did you get the JSON dataType wrong?)."); }
+				// postProcess is similar to the standard dataFilter hook,
+				// but it is also called for JSONP
+				if( ctx.options.postProcess ){
+					res = tree._triggerNodeEvent("postProcess", ctx, ctx.originalEvent, {response: data, dataType: this.dataType});
+					data = $.isArray(res) ? res : data;
+				} else if (data && data.hasOwnProperty("d") && ctx.options.enableAspx ) {
+					// Process ASPX WebMethod JSON object inside "d" property
+					data = (typeof data.d === "string") ? $.parseJSON(data.d) : data.d;
+				}
+				children = data;
+
+			}).fail(function(jqXHR, textStatus, errorThrown){
+				tree.nodeSetStatus(ctx, "error", textStatus, jqXHR.status + ": " + errorThrown);
+				alert("error: " + textStatus + " (" + jqXHR.status + ": " + (errorThrown.message || errorThrown) + ")");
+			});
+		}else{
+			// `source` is an array of child objects
+			dfd = $.Deferred();
+			children = source;
+			dfd.resolve();
+		}
+		dfd.done(function(){
+			_assert($.isArray(children), "expected array of children");
+			node._setChildren(children);
+			if(node.parent){
+				// if nodeLoadChildren was called for rootNode, the caller must
+				// use tree.render() instead
+				if(node.isVisible()){
+					tree.nodeRender(ctx);
+				}
+				// trigger fancytreeloadchildren (except for tree-reload)
+				tree._triggerNodeEvent("loadChildren", node);
+			}
+		}).fail(function(){
+			tree.nodeRender(ctx);
+		});
+		return dfd;
+	},
+	// isVisible: function() {
+	//     // Return true, if all parents are expanded.
+	//     var parents = ctx.node.getParentList(false, false);
+	//     for(var i=0, l=parents.length; i<l; i++){
+	//         if( ! parents[i].expanded ){ return false; }
+	//     }
+	//     return true;
+	// },
+	/** Expand all keys that */
+	nodeLoadKeyPath: function(ctx, keyPathList) {
+		// TODO: implement and improve
+		// http://code.google.com/p/fancytree/issues/detail?id=222
+	},
+	/** Expand all parents.*/
+	nodeMakeVisible: function(ctx) {
+		// TODO: also scroll as neccessary: http://stackoverflow.com/questions/8938352/fancytree-how-to-scroll-to-active-node
+		// Do we need an extra parameter?
+		var i, l,
+			parents = ctx.node.getParentList(false, false);
+		for(i=0, l=parents.length; i<l; i++){
+			parents[i].setExpanded(true);
+		}
+	},
+//	/** Handle focusin/focusout events.*/
+//	nodeOnFocusInOut: function(ctx) {
+//		if(ctx.originalEvent.type === "focusin"){
+//			this.nodeSetFocus(ctx);
+//			// if(ctx.tree.focusNode){
+//			//     $(ctx.tree.focusNode.li).removeClass("fancytree-focused");
+//			// }
+//			// ctx.tree.focusNode = ctx.node;
+//			// $(ctx.node.li).addClass("fancytree-focused");
+//		}else{
+//			_assert(ctx.originalEvent.type === "focusout");
+//			// ctx.tree.focusNode = null;
+//			// $(ctx.node.li).removeClass("fancytree-focused");
+//		}
+//		// $(ctx.node.li).toggleClass("fancytree-focused", ctx.originalEvent.type === "focus");
+//	},
+	/**
+	 * Remove a single direct child of ctx.node.
+	 * @param ctx
+	 * @param {FancytreeNode} childNode dircect child of ctx.node
+	 */
+	nodeRemoveChild: function(ctx, childNode) {
+		var idx,
+			node = ctx.node,
+			opts = ctx.options,
+			subCtx = $.extend({}, ctx, {node: childNode}),
+			children = node.children;
+
+		FT.debug("nodeRemoveChild()", node.toString(), childNode.toString());
+
+		if( children.length === 1 ) {
+			_assert(childNode === children[0]);
+			return this.nodeRemoveChildren(ctx);
+		}
+		if( this.activeNode && (childNode === this.activeNode || this.activeNode.isDescendantOf(childNode))){
+			this.activeNode.setActive(false); // TODO: don't fire events
+		}
+		if( this.focusNode && (childNode === this.focusNode || this.focusNode.isDescendantOf(childNode))){
+			this.focusNode = null;
+		}
+		// TODO: persist must take care to clear select and expand cookies
+		this.nodeRemoveMarkup(subCtx);
+		this.nodeRemoveChildren(subCtx);
+		idx = $.inArray(childNode, children);
+		_assert(idx >= 0);
+		// Unlink to support GC
+		childNode.visit(function(n){
+			n.parent = null;
+		}, true);
+		if ( opts.removeNode ){
+			opts.removeNode.call(ctx.tree, {type: "removeNode"}, subCtx);
+		}
+		// remove from child list
+		children.splice(idx, 1);
+	},
+	/**Remove HTML markup for all descendents of ctx.node.
+	 * @param {EventData} ctx
+	 */
+	nodeRemoveChildMarkup: function(ctx) {
+		var node = ctx.node;
+
+		FT.debug("nodeRemoveChildMarkup()", node.toString());
+		// TODO: Unlink attr.ftnode to support GC
+		if(node.ul){
+			$(node.ul).remove();
+			node.visit(function(n){
+				n.li = n.ul = null;
+			});
+			node.ul = null;
+		}
+	},
+	/**Remove all descendants of ctx.node.
+	* @param {EventData} ctx
+	*/
+	nodeRemoveChildren: function(ctx) {
+		var subCtx,
+			node = ctx.node,
+			children = node.children,
+			opts = ctx.options;
+
+		FT.debug("nodeRemoveChildren()", node.toString());
+		if(!children){
+			return;
+		}
+		if( this.activeNode && this.activeNode.isDescendantOf(node)){
+			this.activeNode.setActive(false); // TODO: don't fire events
+		}
+		if( this.focusNode && this.focusNode.isDescendantOf(node)){
+			this.focusNode = null;
+		}
+		// TODO: persist must take care to clear select and expand cookies
+		this.nodeRemoveChildMarkup(ctx);
+		// Unlink children to support GC
+		// TODO: also delete this.children (not possible using visit())
+		subCtx = $.extend({}, ctx);
+		node.visit(function(n){
+			n.parent = null;
+			if ( opts.removeNode ){
+				subCtx.node = n;
+				opts.removeNode.call(ctx.tree, {type: "removeNode"}, subCtx);
+			}
+		});
+		// Set to 'undefined' which is interpreted as 'not yet loaded' for lazy nodes
+		node.children = undefined;
+		// TODO: ? this._isLoading = false;
+		this.nodeRenderStatus(ctx);
+	},
+	/**Remove HTML markup for ctx.node and all its descendents.
+	 * @param {EventData} ctx
+	 */
+	nodeRemoveMarkup: function(ctx) {
+		var node = ctx.node;
+		FT.debug("nodeRemoveMarkup()", node.toString());
+		// TODO: Unlink attr.ftnode to support GC
+		if(node.li){
+			$(node.li).remove();
+			node.li = null;
+		}
+		this.nodeRemoveChildMarkup(ctx);
+	},
+	/**
+	 * Create `<li><span>..</span> .. </li>` tags for this node.
+	 *
+	 * This method takes care that all HTML markup is created that is required
+	 * to display this node in it's current state.
+	 *
+	 * Call this method to create new nodes, or after the strucuture
+	 * was changed (e.g. after moving this node or adding/removing children)
+	 * nodeRenderTitle() and nodeRenderStatus() are implied.
+	 *
+	 * Note: if a node was created/removed, nodeRender() must be called for the
+	 *       parent!
+	 * <code>
+	 * <li id='KEY' ftnode=NODE>
+	 *     <span class='fancytree-node fancytree-expanded fancytree-has-children fancytree-lastsib fancytree-exp-el fancytree-ico-e'>
+	 *         <span class="fancytree-expander"></span>
+	 *         <span class="fancytree-checkbox"></span> // only present in checkbox mode
+	 *         <span class="fancytree-icon"></span>
+	 *         <a href="#" class="fancytree-title"> Node 1 </a>
+	 *     </span>
+	 *     <ul> // only present if node has children
+	 *         <li id='KEY' ftnode=NODE> child1 ... </li>
+	 *         <li id='KEY' ftnode=NODE> child2 ... </li>
+	 *     </ul>
+	 * </li>
+	 * </code>
+	 *
+	 * @param: {EventData} ctx
+	 * @param: {Boolean} [force=false] re-render, even if html markup was already created
+	 * @param: {Boolean} [deep=false] also render all descendants, even if parent is collapsed
+	 * @param: {Boolean} [collapsed=false] force root node to be collapsed, so we can apply animated expand later
+	 */
+	nodeRender: function(ctx, force, deep, collapsed, _recursive) {
+		/* This method must take care of all cases where the current data mode
+		 * (i.e. node hierarchy) does not match the current markup.
+		 *
+		 * - node was not yet rendered:
+		 *   create markup
+		 * - node was rendered: exit fast
+		 * - children have been added
+		 * - childern have been removed
+		 */
+		var childLI, childNode1, childNode2, i, l, subCtx,
+			node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options,
+			aria = opts.aria,
+			firstTime = false,
+			parent = node.parent,
+			isRootNode = !parent,
+			children = node.children;
+//		FT.debug("nodeRender(" + !!force + ", " + !!deep + ")", node.toString());
+
+		_assert(isRootNode || parent.ul, "parent UL must exist");
+
+		// Render the node
+		if( !isRootNode ){
+			// Discard markup on force-mode, or if it is not linked to parent <ul>
+			if(node.li && (force || (node.li.parentNode !== node.parent.ul) ) ){
+				if(node.li.parentNode !== node.parent.ul){
+//					alert("unlink " + node + " (must be child of " + node.parent + ")");
+					this.warn("unlink " + node + " (must be child of " + node.parent + ")");
+				}
+//	            this.debug("nodeRemoveMarkup...");
+				this.nodeRemoveMarkup(ctx);
+			}
+			// Create <li><span /> </li>
+//			node.debug("render...");
+			if( !node.li ) {
+//	            node.debug("render... really");
+				firstTime = true;
+				node.li = document.createElement("li");
+				node.li.ftnode = node;
+				if(aria){
+					// TODO: why doesn't this work:
+//					node.li.role = "treeitem";
+//                    $(node.li).attr("role", "treeitem")
+//                    .attr("aria-labelledby", "ftal_" + node.key);
+				}
+				if( node.key && opts.generateIds ){
+					node.li.id = opts.idPrefix + node.key;
+				}
+				node.span = document.createElement("span");
+				node.span.className = "fancytree-node";
+				if(aria){
+					$(node.span).attr("aria-labelledby", "ftal_" + node.key);
+				}
+				node.li.appendChild(node.span);
+				// Note: we don't add the LI to the DOM know, but only after we
+				// added all sub elements (hoping that this performs better since
+				// the browser only have to render once)
+				// TODO: benchmarks to prove this
+//                parent.ul.appendChild(node.li);
+
+				// Create inner HTML for the <span> (expander, checkbox, icon, and title)
+				this.nodeRenderTitle(ctx);
+
+				// Allow tweaking and binding, after node was created for the first time
+//				tree._triggerNodeEvent("createNode", ctx);
+				if ( opts.createNode ){
+					opts.createNode.call(tree, {type: "createNode"}, ctx);
+				}
+			}else{
+//				this.nodeRenderTitle(ctx);
+			}
+			// Allow tweaking after node state was rendered
+//			tree._triggerNodeEvent("renderNode", ctx);
+			if ( opts.renderNode ){
+				opts.renderNode.call(tree, {type: "renderNode"}, ctx);
+			}
+		}
+
+		// Visit child nodes
+		if( children ){
+			if( isRootNode || node.expanded || deep === true ) {
+				// Create a UL to hold the children
+				if( !node.ul ){
+					node.ul = document.createElement("ul");
+					if((collapsed === true && !_recursive) || !node.expanded){
+						// hide top UL, so we can use an animation to show it later
+						node.ul.style.display = "none";
+					}
+					if(aria){
+						$(node.ul).attr("role", "group");
+					}
+					node.li.appendChild(node.ul);
+				}
+				// Add child markup
+				for(i=0, l=children.length; i<l; i++) {
+					subCtx = $.extend({}, ctx, {node: children[i]});
+					this.nodeRender(subCtx, force, deep, false, true);
+				}
+				// Make sure, that <li> order matches node.children order.
+//                this.nodeFixOrder(ctx);
+				childLI = node.ul.firstChild;
+				for(i=0, l=children.length-1; i<l; i++) {
+					childNode1 = children[i];
+					childNode2 = childLI.ftnode;
+					if( childNode1 !== childNode2 ) {
+						node.debug("_fixOrder: mismatch at index " + i + ": " + childNode1 + " != " + childNode2);
+						node.ul.insertBefore(childNode1.li, childNode2.li);
+					} else {
+						childLI = childLI.nextSibling;
+					}
+				}
+				// TODO: need to check, if node.ul has <li>s, that are not in node.children[] ?
+			}
+		}else{
+			// No children: remove markup if any
+			if( node.ul ){
+//				alert("remove child markup for " + node);
+				this.warn("remove child markup for " + node);
+				this.nodeRemoveChildMarkup(ctx);
+			}
+		}
+		if( !isRootNode ){
+			// Update element classes according to node state
+			this.nodeRenderStatus(ctx);
+			// Finally add the whole structure to the DOM, so the browser can render
+			if(firstTime){
+				parent.ul.appendChild(node.li);
+			}
+		}
+		return;
+	},
+	/** Create HTML for the node's outer <span> (expander, checkbox, icon, and title).
+	 * @param {EventData} ctx
+	 */
+	nodeRenderTitle: function(ctx, title) {
+		// set node connector images, links and text
+		var id, imageSrc, nodeTitle, role, tooltip,
+			node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options,
+			aria = opts.aria,
+			level = node.getLevel(),
+			ares = [],
+			icon = node.data.icon;
+
+		if(title !== undefined){
+			node.title = title;
+		}
+		if(!node.span){
+			// Silently bail out if node was not rendered yet, assuming
+			// node.render() will be called as the node becomes visible
+			return;
+		}
+		// connector (expanded, expandable or simple)
+		// TODO: optiimize this if clause
+		if( level < opts.minExpandLevel ) {
+			if(level > 1){
+				if(aria){
+					ares.push("<span role='button' class='fancytree-expander'></span>");
+				}else{
+					ares.push("<span class='fancytree-expander'></span>");
+				}
+			}
+			// .. else (i.e. for root level) skip expander/connector alltogether
+		} else {
+			if(aria){
+				ares.push("<span role='button' class='fancytree-expander'></span>");
+			}else{
+				ares.push("<span class='fancytree-expander'></span>");
+			}
+		}
+		// Checkbox mode
+		if( opts.checkbox && node.hideCheckbox !== true && !node.isStatusNode ) {
+			if(aria){
+				ares.push("<span role='checkbox' class='fancytree-checkbox'></span>");
+			}else{
+				ares.push("<span class='fancytree-checkbox'></span>");
+			}
+		}
+		// folder or doctype icon
+		role = aria ? " role='img'" : "";
+		if ( icon && typeof icon === "string" ) {
+			imageSrc = (icon.charAt(0) === "/") ? icon : (opts.imagePath + icon);
+			ares.push("<img src='" + imageSrc + "' alt='' />");
+		} else if ( node.data.iconclass ) {
+			// TODO: review and test and document
+			ares.push("<span " + role + " class='fancytree-custom-icon" + " " + node.data.iconclass +  "'></span>");
+		} else if ( icon === true || (icon !== false && opts.icons !== false) ) {
+			// opts.icons defines the default behavior.
+			// node.icon == true/false can override this
+			ares.push("<span " + role + " class='fancytree-icon'></span>");
+		}
+		// node title
+		nodeTitle = "";
+		// TODO: currently undocumented; may be removed?
+		if ( opts.renderTitle ){
+			nodeTitle = opts.renderTitle.call(tree, {type: "renderTitle"}, ctx) || "";
+		}
+		if(!nodeTitle){
+			// TODO: escape tooltip string
+			tooltip = node.tooltip ? " title='" + node.tooltip.replace(/\"/g, "&quot;") + "'" : "";
+			id = aria ? " id='ftal_" + node.key + "'" : "";
+			role = aria ? " role='treeitem'" : "";
+//				href = node.data.href || "#";
+//			if( opts.nolink || node.nolink ) {
+//            nodeTitle = "<span role='treeitem' tabindex='-1' class='fancytree-title'" + id + tooltip + ">" + node.title + "</span>";
+			nodeTitle = "<span " + role + " class='fancytree-title'" + id + tooltip + ">" + node.title + "</span>";
+//			} else {
+//				nodeTitle = "<a href='" + href + "' tabindex='-1' class='fancytree-title'" + tooltip + ">" + node.title + "</a>";
+//			}
+		}
+		ares.push(nodeTitle);
+		// Note: this will trigger focusout, if node had the focus
+		node.span.innerHTML = ares.join("");
+	},
+	/** Update element classes according to node state.
+	 * @param {EventData} ctx
+	 */
+	nodeRenderStatus: function(ctx) {
+		// Set classes for current status
+		var node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options,
+//			nodeContainer = node[tree.nodeContainerAttrName],
+			hasChildren = node.hasChildren(),
+			isLastSib = node.isLastSibling(),
+			aria = opts.aria,
+//            $ariaElem = aria ? $(node[tree.ariaPropName]) : null,
+			$ariaElem = $(node.span).find(".fancytree-title"),
+			cn = opts._classNames,
+			cnList = [],
+			statusElem = node[tree.statusClassPropName];
+
+		if( !statusElem ){
+			// if this function is called for an unrendered node, ignore it (will be updated on nect render anyway)
+			return;
+		}
+		// Build a list of class names that we will add to the node <span>
+		cnList.push(cn.node);
+		if( tree.activeNode === node ){
+			cnList.push(cn.active);
+//			$(">span.fancytree-title", statusElem).attr("tabindex", "0");
+//			tree.$container.removeAttr("tabindex");
+		}else{
+//			$(">span.fancytree-title", statusElem).removeAttr("tabindex");
+//			tree.$container.attr("tabindex", "0");
+		}
+		if( tree.focusNode === node ){
+			cnList.push(cn.focused);
+			if(aria){
+//              $(">span.fancytree-title", statusElem).attr("tabindex", "0");
+//                $(">span.fancytree-title", statusElem).attr("tabindex", "-1");
+				// TODO: is this the right element for this attribute?
+				$ariaElem
+					.attr("aria-activedescendant", true);
+//					.attr("tabindex", "-1");
+			}
+		}else if(aria){
+//			$(">span.fancytree-title", statusElem).attr("tabindex", "-1");
+			$ariaElem
+				.removeAttr("aria-activedescendant");
+//				.removeAttr("tabindex");
+		}
+		if( node.expanded ){
+			cnList.push(cn.expanded);
+			if(aria){
+				$ariaElem.attr("aria-expanded", true);
+			}
+		}else if(aria){
+			$ariaElem.removeAttr("aria-expanded");
+		}
+		if( node.folder ){
+			cnList.push(cn.folder);
+		}
+		if( hasChildren !== false ){
+			cnList.push(cn.hasChildren);
+		}
+		// TODO: required?
+		if( isLastSib ){
+			cnList.push(cn.lastsib);
+		}
+		if( node.lazy && node.children === null ){
+			cnList.push(cn.lazy);
+		}
+		if( node.partsel ){
+			cnList.push(cn.partsel);
+		}
+		if( node.selected ){
+			cnList.push(cn.selected);
+			if(aria){
+				$ariaElem.attr("aria-selected", true);
+			}
+		}else if(aria){
+			$ariaElem.attr("aria-selected", false);
+		}
+		if( node.extraClasses ){
+			cnList.push(node.extraClasses);
+		}
+		// IE6 doesn't correctly evaluate multiple class names,
+		// so we create combined class names that can be used in the CSS
+		if( hasChildren === false ){
+			cnList.push(cn.combinedExpanderPrefix + "n" +
+					(isLastSib ? "l" : "")
+					);
+		}else{
+			cnList.push(cn.combinedExpanderPrefix +
+					(node.expanded ? "e" : "c") +
+					(node.lazy && node.children === null ? "d" : "") +
+					(isLastSib ? "l" : "")
+					);
+		}
+		cnList.push(cn.combinedIconPrefix +
+				(node.expanded ? "e" : "c") +
+				(node.folder ? "f" : "")
+				);
+//        node.span.className = cnList.join(" ");
+		node[tree.statusClassPropName].className = cnList.join(" ");
+
+		// TODO: we should not set this in the <span> tag also, if we set it here:
+		// Maybe most (all) of the classes should be set in LI instead of SPAN?
+		if(node.li){
+			node.li.className = isLastSib ? cn.lastsib : "";
+		}
+	},
+	/** Activate node.
+	 * flag defaults to true.
+	 * If flag is true, the node is activated (must be a synchronous operation)
+	 * If flag is false, the node is deactivated (must be a synchronous operation)
+	 * @param {EventData} ctx
+	 * @param {Boolean} [flag=true]
+	 */
+	nodeSetActive: function(ctx, flag) {
+		// Handle user click / [space] / [enter], according to clickFolderMode.
+		var subCtx,
+			node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options,
+//			userEvent = !!ctx.originalEvent,
+			isActive = (node === tree.activeNode);
+		// flag defaults to true
+		flag = (flag !== false);
+		node.debug("nodeSetActive", flag);
+
+		if(isActive === flag){
+			// Nothing to do
+			return _getResolvedPromise(node);
+		}else if(flag && this._triggerNodeEvent("beforeActivate", node, ctx.originalEvent) === false ){
+			// Callback returned false
+			return _getRejectedPromise(node, ["rejected"]);
+		}
+		if(flag){
+			if(tree.activeNode){
+				_assert(tree.activeNode !== node, "node was active (inconsistency)");
+				subCtx = $.extend({}, ctx, {node: tree.activeNode});
+				tree.nodeSetActive(subCtx, false);
+				_assert(tree.activeNode === null, "deactivate was out of sync?");
+			}
+			if(opts.activeVisible){
+				tree.nodeMakeVisible(ctx);
+			}
+			tree.activeNode = node;
+			tree.nodeRenderStatus(ctx);
+			tree.nodeSetFocus(ctx);
+			tree._triggerNodeEvent("activate", node);
+		}else{
+			_assert(tree.activeNode === node, "node was not active (inconsistency)");
+			tree.activeNode = null;
+			this.nodeRenderStatus(ctx);
+			ctx.tree._triggerNodeEvent("deactivate", node);
+		}
+	},
+	/** Expand or collapse node, return Deferred.promise.
+	 *
+	 * @param {EventData} ctx
+	 * @param {Boolean} [flag=true]
+	 * @returns {$.Promise} The deferred will be resolved as soon as the (lazy)
+	 *     data was retrieved, rendered, and the expand animation finshed.
+	 */
+	nodeSetExpanded: function(ctx, flag) {
+		var _afterLoad, dfd, i, l, parents, prevAC,
+			node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options;
+		// flag defaults to true
+		flag = (flag !== false);
+
+		node.debug("nodeSetExpanded(" + flag + ")");
+		// TODO: !!node.expanded is nicer, but doesn't pass jshint
+		// https://github.com/jshint/jshint/issues/455
+//        if( !!node.expanded === !!flag){
+		if((node.expanded && flag) || (!node.expanded && !flag)){
+			// Nothing to do
+			node.debug("nodeSetExpanded(" + flag + "): nothing to do");
+			return _getResolvedPromise(node);
+		}else if(flag && !node.lazy && !node.hasChildren() ){
+			// Prevent expanding of empty nodes
+			return _getRejectedPromise(node, ["empty"]);
+		}else if( !flag && node.getLevel() < opts.minExpandLevel ) {
+			// Prevent collapsing locked levels
+			return _getRejectedPromise(node, ["locked"]);
+		}else if ( this._triggerNodeEvent("beforeExpand", node, ctx.originalEvent) === false ){
+			// Callback returned false
+			return _getRejectedPromise(node, ["rejected"]);
+		}
+		//
+		dfd = new $.Deferred();
+
+		// Auto-collapse mode: collapse all siblings
+		if( flag && !node.expanded && opts.autoCollapse ) {
+			parents = node.getParentList(false, true);
+			prevAC = opts.autoCollapse;
+			try{
+				opts.autoCollapse = false;
+				for(i=0, l=parents.length; i<l; i++){
+					// TODO: should return promise?
+					this._callHook("nodeCollapseSiblings", parents[i]);
+				}
+			}finally{
+				opts.autoCollapse = prevAC;
+			}
+		}
+		// Trigger expand/collapse after expanding
+		dfd.done(function(){
+			ctx.tree._triggerNodeEvent(flag ? "expand" : "collapse", ctx);
+			if(opts.autoScroll){
+				// Scroll down to last child, but keep current node visible
+				node.getLastChild().scrollIntoView(true, node);
+			}
+		});
+
+		// vvv Code below is executed after loading finished:
+		_afterLoad = function(){
+			var duration, easing, isVisible, isExpanded;
+
+			node.expanded = flag;
+			// Create required markup, but make sure the top UL is hidden, so we
+			// can animate later
+			tree._callHook("nodeRender", ctx, false, false, true);
+
+			// If the currently active node is now hidden, deactivate it
+			// if( opts.activeVisible && this.activeNode && ! this.activeNode.isVisible() ) {
+			//     this.activeNode.deactivate();
+			// }
+
+			// Expanding a lazy node: set 'loading...' and call callback
+			// if( bExpand && this.data.isLazy && this.childList === null && !this._isLoading ) {
+			//     this._loadContent();
+			//     return;
+			// }
+			// Hide children, if node is collapsed
+			if( node.ul ) {
+				isVisible = (node.ul.style.display !== "none");
+				isExpanded = !!node.expanded;
+	//            _assert(isVisible !== isExpanded);
+				if( isVisible === isExpanded ) {
+					node.warn("nodeSetExpanded: UL.style.display already set");
+					dfd.resolveWith(node);
+				} else if( opts.fx ) {
+					duration = opts.fx.duration || 200;
+					easing = opts.fx.easing;
+					node.debug("nodeSetExpanded: animate start...");
+					$(node.ul).animate(opts.fx, duration, easing, function(){
+						node.debug("nodeSetExpanded: animate done");
+						dfd.resolveWith(node);
+					});
+				} else {
+					node.ul.style.display = ( node.expanded || !parent ) ? "" : "none";
+					dfd.resolveWith(node);
+				}
+			}else{
+				dfd.resolveWith(node);
+			}
+		};
+		// ^^^ Code above is executed after loading finshed.
+
+		// Load lazy nodes, if any. Then continue with _afterLoad()
+		if(flag && node.lazy && node.hasChildren() === undefined){
+			node.debug("nodeSetExpanded: load start...");
+			node.lazyLoad().done(function(){
+				node.debug("nodeSetExpanded: load done");
+				if(dfd.notifyWith){ // requires jQuery 1.6+
+					dfd.notifyWith(node, ["loaded"]);
+				}
+				_afterLoad.call(tree);
+			}).fail(function(errMsg){
+				dfd.rejectWith(node, ["load failed (" + errMsg + ")"]);
+			});
+/*
+			var source = tree._triggerNodeEvent("lazyload", node, ctx.originalEvent);
+			_assert(typeof source !== "boolean", "lazyload event must return source in data.result");
+			node.debug("nodeSetExpanded: load start...");
+			this._callHook("nodeLoadChildren", ctx, source).done(function(){
+				node.debug("nodeSetExpanded: load done");
+				if(dfd.notifyWith){ // requires jQuery 1.6+
+					dfd.notifyWith(node, ["loaded"]);
+				}
+				_afterLoad.call(tree);
+			}).fail(function(errMsg){
+				dfd.rejectWith(node, ["load failed (" + errMsg + ")"]);
+			});
+*/
+		}else{
+			_afterLoad();
+		}
+		node.debug("nodeSetExpanded: returns");
+		return dfd.promise();
+	},
+	/**
+	 * @param {EventData} ctx
+	 * @param {Boolean} [flag=true]
+	 */
+	nodeSetFocus: function(ctx, flag) {
+		ctx.node.debug("nodeSetFocus(" + flag + ")");
+		var ctx2,
+			tree = ctx.tree,
+			node = ctx.node;
+
+		flag = (flag !== false);
+
+		// Blur previous node if any
+		if(tree.focusNode){
+			if(tree.focusNode === node && flag){
+				node.debug("nodeSetFocus(" + flag + "): nothing to do");
+				return;
+			}
+			ctx2 = $.extend({}, ctx, {node: tree.focusNode});
+			tree.focusNode = null;
+			this._triggerNodeEvent("blur", ctx2);
+			this._callHook("nodeRenderStatus", ctx2);
+		}
+		// Set focus to container and node
+		if(flag){
+			if(FT.focusTree !== tree){
+				node.debug("nodeSetFocus: forcing container focus");
+				// Note: we pass _calledByNodeSetFocus=true
+				this._callHook("treeSetFocus", ctx, true, true);
+			}
+			this.nodeMakeVisible(ctx);
+			tree.focusNode = node;
+//			node.debug("FOCUS...");
+//			$(node.span).find(".fancytree-title").focus();
+			this._triggerNodeEvent("focus", ctx);
+//          if(ctx.options.autoActivate){
+//              tree.nodeSetActive(ctx, true);
+//          }
+			if(ctx.options.autoScroll){
+				node.scrollIntoView();
+			}
+			this._callHook("nodeRenderStatus", ctx);
+		}
+	},
+	/** (De)Select node, return new status (sync).
+	 *
+	 * @param {EventData} ctx
+	 * @param {Boolean} [flag=true]
+	 */
+	nodeSetSelected: function(ctx, flag) {
+		var node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options;
+		// flag defaults to true
+		flag = (flag !== false);
+
+		node.debug("nodeSetSelected(" + flag + ")", ctx);
+		if( node.unselectable){
+			return;
+		}
+		// TODO: !!node.expanded is nicer, but doesn't pass jshint
+		// https://github.com/jshint/jshint/issues/455
+//        if( !!node.expanded === !!flag){
+		if((node.selected && flag) || (!node.selected && !flag)){
+			return !!node.selected;
+		}else if ( this._triggerNodeEvent("beforeSelect", node, ctx.originalEvent) === false ){
+			return !!node.selected;
+		}
+		if(flag && opts.selectMode === 1){
+			// single selection mode
+			if(tree.lastSelectedNode){
+				tree.lastSelectedNode.setSelected(false);
+			}
+		}else if(opts.selectMode === 3){
+			// multi.hier selection mode
+			node.selected = flag;
+//			this._fixSelectionState(node);
+			node.fixSelection3AfterClick();
+		}
+		node.selected = flag;
+		this.nodeRenderStatus(ctx);
+		tree.lastSelectedNode = flag ? node : null;
+		tree._triggerNodeEvent("select", ctx);
+	},
+	/** Show node status (ok, loading, error) using styles and a dummy child node.
+	 *
+	 * @param {EventData} ctx
+	 * @param status
+	 * @param message
+	 * @param details
+	 */
+	nodeSetStatus: function(ctx, status, message, details) {
+		var _clearStatusNode, _setStatusNode,
+			node = ctx.node,
+			tree = ctx.tree;
+
+		_clearStatusNode = function() {
+			var firstChild = ( node.children ? node.children[0] : null );
+			if ( firstChild && firstChild.isStatusNode ) {
+				try{
+					// I've seen exceptions here with loadKeyPath...
+					if(node.ul){
+						node.ul.removeChild(firstChild.li);
+						firstChild.li = null; // avoid leaks (issue 215)
+					}
+				}catch(e){}
+				if( node.children.length === 1 ){
+					node.children = [];
+				}else{
+					node.children.shift();
+				}
+			}
+			return;
+		};
+		_setStatusNode = function(data) {
+			var firstChild = ( node.children ? node.children[0] : null );
+			if ( firstChild && firstChild.isStatusNode ) {
+				$.extend(firstChild, data);
+				tree._callHook("nodeRender", firstChild);
+			} else {
+				data.key = "_statusNode";
+				node._setChildren([data]);
+				node.children[0].isStatusNode = true;
+				tree.render();
+			}
+			return node.children[0];
+		};
+		switch(status){
+		case "ok":
+		  _clearStatusNode();
+		  $(node.span).removeClass("fancytree-loading");
+		  break;
+		case "loading":
+			$(node.span).addClass("fancytree-loading");
+			if(!node.parent){
+				_setStatusNode({
+					title: tree.options.strings.loading +
+						(message ? " (" + message + ") " : ""),
+					tooltip: details,
+					extraClasses: "fancytree-statusnode-wait"
+				});
+			}
+			break;
+		case "error":
+			$(node.span).addClass("fancytree-error");
+			_setStatusNode({
+				title: tree.options.strings.loadError + " (" + message + ")",
+				tooltip: details,
+				extraClasses: "fancytree-statusnode-error"
+			});
+			break;
+		default:
+			$.error("invalid status " + status);
+		}
+	},
+	/**
+	 *
+	 * @param {EventData} ctx
+	 */
+	nodeToggleExpanded: function(ctx) {
+		return this.nodeSetExpanded(ctx, !ctx.node.expanded);
+	},
+	/**
+	 * @param {EventData} ctx
+	 */
+	nodeToggleSelected: function(ctx) {
+		return this.nodeSetSelected(ctx, !ctx.node.selected);
+	},
+	/** Remove all nodes.
+	 * @param {EventData} ctx
+	 */
+	treeClear: function(ctx) {
+		var tree = ctx.tree;
+		tree.activeNode = null;
+		tree.focusNode = null;
+		tree.$div.find(">ul.fancytree-container").empty();
+		// TODO: call destructors and remove reference loops
+		tree.rootNode.children = null;
+	},
+	/** Widget was created (called only once, even it re-initialized).
+	 * @param {EventData} ctx
+	 */
+	treeCreate: function(ctx) {
+	},
+	/** Widget was destroyed.
+	 * @param {EventData} ctx
+	 */
+	treeDestroy: function(ctx) {
+	},
+	/** Widget was (re-)initialized.
+	 * @param {EventData} ctx
+	 */
+	treeInit: function(ctx) {
+		this.treeLoad(ctx);
+	},
+	/** Parse Fancytree from source, as configured in the options.
+	 * @param {EventData} ctx
+	 * @param {object} [source] new source
+	 */
+	treeLoad: function(ctx, source) {
+		var type, $ul,
+			tree = ctx.tree,
+			$container = ctx.widget.element,
+			dfd,
+			// calling context for root node
+			rootCtx = $.extend({}, ctx, {node: this.rootNode});
+
+		if(tree.rootNode.children){
+			this.treeClear(ctx);
+		}
+		source = source || this.options.source;
+
+		if(!source){
+			type = $container.data("type") || "html";
+			switch(type){
+			case "html":
+				$ul = $container.find(">ul:first");
+				$ul.addClass("ui-fancytree-source ui-helper-hidden");
+				source = $.ui.fancytree.parseHtml($ul);
+				break;
+			case "json":
+	//            $().addClass("ui-helper-hidden");
+				source = $.parseJSON($container.text());
+				if(source.children){
+					if(source.title){tree.title = source.title;}
+					source = source.children;
+				}
+				break;
+			default:
+				$.error("Invalid data-type: " + type);
+			}
+		}else if(typeof source === "string"){
+			// TODO: source is an element ID
+			_raiseNotImplemented();
+		}
+
+		// $container.addClass("ui-widget ui-widget-content ui-corner-all");
+		// Trigger fancytreeinit after nodes have been loaded
+		dfd = this.nodeLoadChildren(rootCtx, source).done(function(){
+			tree.render();
+			if( ctx.options.selectMode === 3 ){
+				tree.rootNode.fixSelection3FromEndNodes();
+			}
+			tree._triggerTreeEvent("init", true);
+		}).fail(function(){
+			tree.render();
+			tree._triggerTreeEvent("init", false);
+		});
+		return dfd;
+	},
+	/* Handle focus and blur events for the container (also fired for child elements). */
+	treeOnFocusInOut: function(event) {
+		var flag = (event.type === "focusin"),
+			node = $.ui.fancytree.getNode(event);
+
+		try{
+			this.debug("treeOnFocusInOut(" + flag + "), node=", node);
+			_assert(!this._inFocusHandler, "Focus handler recursion");
+			this.systemFocusElement = flag ? event.target : null;
+			this._inFocusHandler = true;
+			if(node){
+				// For example clicking into an <input> that is part of a node
+				this._callHook("nodeSetFocus", node, flag);
+			}else{
+				this._callHook("treeSetFocus", this, flag);
+			}
+		}finally{
+			this._inFocusHandler = false;
+		}
+	},
+	/* */
+	treeSetFocus: function(ctx, flag, _calledByNodeSetFocus) {
+		flag = (flag !== false);
+
+		this.debug("treeSetFocus(" + flag + "), _calledByNodeSetFocus: " + _calledByNodeSetFocus);
+		this.debug("    focusNode: " + this.focusNode);
+		this.debug("    activeNode: " + this.activeNode);
+		// Blur previous tree if any
+		if(FT.focusTree){
+			if(this !== FT.focusTree || !flag ){
+				// prev. node looses focus, if prev. tree blurs
+				if(FT.focusTree.focusNode){
+					FT.focusTree.focusNode.setFocus(false);
+				}
+				FT.focusTree.$container.removeClass("fancytree-focused");
+				this._triggerTreeEvent("blurTree");
+				FT.focusTree = null;
+			}
+		}
+		//
+		if( flag && FT.focusTree !== this ){
+			FT.focusTree = this;
+			this.$container.addClass("fancytree-focused");
+			// Make sure container gets `:focus` when we clicked inside
+			if( !this.systemFocusElement ){
+				this.debug("Set `:focus` to container");
+				this.$container.focus();
+			}
+			// Set focus to a node
+			if( ! this.focusNode && !_calledByNodeSetFocus){
+				if( this.activeNode ){
+					this.activeNode.setFocus();
+				}else if( this.rootNode.hasChildren()){
+					this.warn("NOT setting focus to first child");
+//					this.rootNode.getFirstChild().setFocus();
+				}
+			}
+			this._triggerTreeEvent("focusTree");
+		}else{
+			FT.focusTree = null;
+		}
+
+	},
+	/** Re-fire beforeActivate and activate events. */
+	reactivate: function(setFocus) {
+		var node = this.activeNode;
+		if( node ) {
+			this.activeNode = null; // Force re-activating
+			node.setActive();
+			if( setFocus ){
+				node.setFocus();
+			}
+		}
+	},
+	// TODO: redraw()
+	/** Reload tree from source and return a promise.
+	 * @param source
+	 * @returns {$.Promise}
+	 */
+	reload: function(source) {
+		this._callHook("treeClear", this);
+		return this._callHook("treeLoad", this, source);
+	},
+	/**Render tree (i.e. all top-level nodes).
+	 * @param {Boolean} [force=false]
+	 * @param {Boolean} [deep=false]
+	 */
+	render: function(force, deep) {
+		return this.rootNode.render(force, deep);
+	},
+	// TODO: selectKey: function(key, select)
+	// TODO: serializeArray: function(stopOnParents)
+	/**
+	 * @param {Boolean} [flag=true]
+	 */
+	setFocus: function(flag) {
+//        _assert(false, "Not implemented");
+		return this._callHook("treeSetFocus", this, flag);
+	},
+	/**
+	 * Return all nodes as nested list of {@link NodeData}.
+	 *
+	 * @param {Boolean} [includeRoot=false] Returns the hidden system root node (and it's children)
+	 * @param {function} [callback] Called for every node
+	 * @returns {Array | object}
+	 * @see FancytreeNode#toDict
+	 */
+	toDict: function(includeRoot, callback){
+		var res = this.rootNode.toDict(true, callback);
+		return includeRoot ? res : res.children;
+	},
+	/**Implicitly called for string conversions.
+	 * @returns {String}
+	 */
+	toString: function(){
+		return "<Fancytree(#" + this._id + ")>";
+	},
+	/** _trigger a widget event with additional node ctx.
+	 * @see EventData
+	 */
+	_triggerNodeEvent: function(type, node, originalEvent, extra) {
+//		this.debug("_trigger(" + type + "): '" + ctx.node.title + "'", ctx);
+		var res,
+			ctx = this._makeHookContext(node, originalEvent);
+		if( extra ) {
+			$.extend(ctx, extra);
+		}
+		res = this.widget._trigger(type, originalEvent, ctx);
+
+		if(res !== false && ctx.result !== undefined){
+			return ctx.result;
+		}
+		return res;
+	},
+	/** _trigger a widget event with additional tree data. */
+	_triggerTreeEvent: function(type, originalEvent) {
+//		this.debug("_trigger(" + type + ")", ctx);
+		var ctx = this._makeHookContext(this, originalEvent),
+			res = this.widget._trigger(type, originalEvent, ctx);
+
+		if(res !== false && ctx.result !== undefined){
+			return ctx.result;
+		}
+		return res;
+	},
+	/**
+	 *
+	 * @param {function} fn
+	 */
+	visit: function(fn) {
+		return this.rootNode.visit(fn, false);
+	},
+	/** Write warning to browser console (prepending tree info)
+	 *
+	 * @param {*} msg string or object or array of such
+	 */
+	warn: function(msg){
+		Array.prototype.unshift.call(arguments, this.toString());
+		consoleApply("warn", arguments);
+	}
+};
+
+
+/* ******************************************************************************
+ * jQuery UI widget boilerplate
+ * @  name ui_fancytree
+ * @  class The jQuery.ui.fancytree widget
+ */
+/* * @namespace ui */
+/* * @namespace ui.fancytree */
+/** @namespace $.ui.fancytree */
+$.widget("ui.fancytree",
+	/** @lends $.ui.fancytree.prototype */
+	{
+	/**These options will be used as defaults
+	 * @type {FancytreeOptions}
+	 */
+	options:
+	{
+		/** @type {Boolean}  Make sure, active nodes are visible (expanded). */
+		activeVisible: true,
+		ajax: {
+			type: "GET",
+			cache: false, // false: Append random '_' argument to the request url to prevent caching.
+//          timeout: 0, // >0: Make sure we get an ajax error if server is unreachable
+			dataType: "json" // Expect json format and pass json object to callbacks.
+		},  //
+		aria: false, // TODO: default to true
+		autoActivate: true,
+		autoCollapse: false,
+//      autoFocus: false,
+		autoScroll: false,
+		checkbox: false,
+		/**defines click behavior*/
+		clickFolderMode: 4,
+		debugLevel: null, // 0..2 (null: use global setting $.ui.fancytree.debugInfo)
+		disabled: false, // TODO: required anymore?
+		enableAspx: true, // TODO: document
+		extensions: [],
+		fx: { height: "toggle", duration: 200 },
+		generateIds: false,
+		icons: true,
+		idPrefix: "ft_",
+		keyboard: true,
+		keyPathSeparator: "/",
+		minExpandLevel: 1,
+		selectMode: 2,
+		strings: {
+			loading: "Loading&#8230;",
+			loadError: "Load error!"
+		},
+		tabbable: true,
+		_classNames: {
+//			container: "fancytree-container",
+			node: "fancytree-node",
+			folder: "fancytree-folder",
+//			empty: "fancytree-empty",
+//			vline: "fancytree-vline",
+//			expander: "fancytree-expander",
+//            connector: "fancytree-connector",
+//			checkbox: "fancytree-checkbox",
+//			icon: "fancytree-icon",
+//			title: "fancytree-title",
+//			noConnector: "fancytree-no-connector",
+//			statusnodeError: "fancytree-statusnode-error",
+//			statusnodeWait: "fancytree-statusnode-wait",
+//			hidden: "fancytree-hidden",
+			combinedExpanderPrefix: "fancytree-exp-",
+			combinedIconPrefix: "fancytree-ico-",
+//			loading: "fancytree-loading",
+			hasChildren: "fancytree-has-children",
+			active: "fancytree-active",
+			selected: "fancytree-selected",
+			expanded: "fancytree-expanded",
+			lazy: "fancytree-lazy",
+			focused: "fancytree-focused ui-state-focus",
+			partsel: "fancytree-partsel",
+			lastsib: "fancytree-lastsib"
+		},
+		// events
+		lazyload: null,
+		postProcess: null
+	},
+	/* Set up the widget, Called on first $().fancytree() */
+	_create: function() {
+		this.tree = new Fancytree(this);
+
+		this.$source = this.source || this.element.data("type") === "json" ? this.element
+			: this.element.find(">ul:first");
+		// Subclass Fancytree instance with all enabled extensions
+		var extension, extName, i,
+			extensions = this.options.extensions,
+			base = this.tree;
+
+		for(i=0; i<extensions.length; i++){
+			extName = extensions[i];
+			extension = $.ui.fancytree._extensions[extName];
+			if(!extension){
+				$.error("Could not apply extension '" + extName + "' (it is not registered, did you forget to include it?)");
+			}
+			// Add extension options as tree.options.EXTENSION
+//			_assert(!this.tree.options[extName], "Extension name must not exist as option name: " + extName);
+			this.tree.options[extName] = $.extend(true, {}, extension.options, this.tree.options[extName]);
+			// Add a namespace tree.EXTENSION, to hold instance data
+			_assert(!this.tree[extName], "Extension name must not exist as Fancytree attribute: " + extName);
+//			this.tree[extName] = extension;
+			this.tree[extName] = {};
+			// Subclass Fancytree methods using proxies.
+			_subclassObject(this.tree, base, extension, extName);
+			// current extension becomes base for the next extension
+			base = extension;
+		}
+		//
+		this.tree._callHook("treeCreate", this.tree);
+		// Note: 'fancytreecreate' event is fired by widget base class
+//        this.tree._triggerTreeEvent("create");
+	},
+
+	/* Called on every $().fancytree() */
+	_init: function() {
+		this.tree._callHook("treeInit", this.tree);
+		// TODO: currently we call bind after treeInit, because treeInit
+		// might change tree.$container.
+		// It would be better, to move ebent binding into hooks altogether
+		this._bind();
+	},
+
+	/* Use the _setOption method to respond to changes to options */
+	_setOption: function(key, value) {
+		var callDefault = true,
+			rerender = false;
+		switch( key ) {
+		case "aria":
+		case "checkbox":
+		case "icons":
+		case "minExpandLevel":
+		case "tabbable":
+//		case "nolink":
+			this.tree._callHook("treeCreate", this.tree);
+			rerender = true;
+			break;
+		case "source":
+			callDefault = false;
+			this.tree._callHook("treeLoad", this.tree, value);
+			break;
+		}
+		this.tree.debug("set option " + key + "=" + value + " <" + typeof(value) + ">");
+		if(callDefault){
+			// In jQuery UI 1.8, you have to manually invoke the _setOption method from the base widget
+			$.Widget.prototype._setOption.apply(this, arguments);
+			// TODO: In jQuery UI 1.9 and above, you use the _super method instead
+//          this._super( "_setOption", key, value );
+		}
+		if(rerender){
+			this.tree.render(true, false);  // force, not-deep
+		}
+	},
+
+	/** Use the destroy method to clean up any modifications your widget has made to the DOM */
+	destroy: function() {
+		this._unbind();
+		this.tree._callHook("treeDestroy", this.tree);
+		// this.element.removeClass("ui-widget ui-widget-content ui-corner-all");
+		this.tree.$div.find(">ul.fancytree-container").remove();
+		this.$source && this.$source.removeClass("ui-helper-hidden");
+		// In jQuery UI 1.8, you must invoke the destroy method from the base widget
+		$.Widget.prototype.destroy.call(this);
+		// TODO: delete tree and nodes to make garbage collect easier?
+		// TODO: In jQuery UI 1.9 and above, you would define _destroy instead of destroy and not call the base method
+	},
+
+	// -------------------------------------------------------------------------
+
+	/* Remove all event handlers for our namespace */
+	_unbind: function() {
+		var ns = this.tree._ns;
+		this.element.unbind(ns);
+		this.tree.$container.unbind(ns);
+		$(document).unbind(ns);
+	},
+	/* Add mouse and kyboard handlers to the container */
+	_bind: function() {
+		var that = this,
+			opts = this.options,
+			tree = this.tree,
+			ns = tree._ns,
+			selstartEvent = ( $.support.selectstart ? "selectstart" : "mousedown" );
+
+		// Remove all previuous handlers for this tree
+		this._unbind();
+
+		//alert("keydown" + ns + "foc=" + tree.hasFocus() + tree.$container);
+		tree.debug("bind events; container: ", tree.$container);
+		tree.$container.bind("focusin" + ns + " focusout" + ns, function(event){
+			tree.debug("Tree container got event " + event.type);
+			tree.treeOnFocusInOut.call(tree, event);
+		}).delegate("span.fancytree-title", selstartEvent + ns, function(event){
+			// prevent mouse-drags to select text ranges
+			tree.debug("<span> got event " + event.type);
+			event.preventDefault();
+		});
+		// keydown must be bound to document, because $container might not
+		// receive these events
+		$(document).bind("keydown" + ns, function(event){
+			// TODO: also bind keyup and keypress
+			tree.debug("doc got event " + event.type + ", hasFocus:" + tree.hasFocus());
+			if(opts.disabled || opts.keyboard === false || !tree.hasFocus()){
+				return true;
+			}
+			var node = tree.focusNode,
+				// node may be null
+				ctx = tree._makeHookContext(node || tree, event),
+				prevPhase = tree.phase;
+			try {
+				tree.phase = "userEvent";
+				if(node){
+					return ( tree._triggerNodeEvent("keydown", node, event) === false ) ? false : tree._callHook("nodeKeydown", ctx);
+				}else{
+					return ( tree._triggerTreeEvent("keydown", event) === false ) ? false : tree._callHook("nodeKeydown", ctx);
+				}
+			} finally {
+				tree.phase = prevPhase;
+			}
+		});
+		this.element.bind("click" + ns + " dblclick" + ns, function(event){
+			if(opts.disabled){
+				return true;
+			}
+			var ctx,
+				et = FT.getEventTarget(event),
+				node = et.node,
+				tree = that.tree,
+				prevPhase = tree.phase;
+
+			if( !node ){
+				return true;  // Allow bubbling of other events
+			}
+			ctx = tree._makeHookContext(node, event);
+//			that.tree.debug("event(" + event.type + "): node: ", node);
+			try {
+				tree.phase = "userEvent";
+				switch(event.type) {
+				case "click":
+					ctx.targetType = et.type;
+					return ( tree._triggerNodeEvent("click", ctx, event) === false ) ? false : tree._callHook("nodeClick", ctx);
+				case "dblclick":
+					ctx.targetType = et.type;
+					return ( tree._triggerNodeEvent("dblclick", ctx, event) === false ) ? false : tree._callHook("nodeDblclick", ctx);
+				}
+//             } catch(e) {
+// //                var _ = null; // issue 117 // TODO
+//                 $.error(e);
+			} finally {
+				tree.phase = prevPhase;
+			}
+		});
+	},
+	/** @returns {FancytreeNode} the active node or null */
+	getActiveNode: function() {
+		return this.tree.activeNode;
+	},
+	/**
+	 * @param {String} key
+	 * @returns {FancytreeNode} the matching node or null
+	 */
+	getNodeByKey: function(key) {
+		return this.tree.getNodeByKey(key);
+	},
+	/** @returns {FancytreeNode} the invisible system root node */
+	getRootNode: function() {
+		return this.tree.rootNode;
+	},
+	/** @returns {Fancytree} the current tree instance */
+	getTree: function() {
+		return this.tree;
+	}
+});
+
+// $.ui.fancytree was created by the widget factory. Create a local shortcut:
+FT = $.ui.fancytree;
+
+/**
+ * Static members in the `$.ui.fancytree` namespace.
+ * @  name $.ui.fancytree
+ * @example:
+ * alert(""version: " + $.ui.fancytree.version);
+ * var node = $.ui.fancytree.()
+ */
+$.extend($.ui.fancytree,
+	/** @lends $.ui.fancytree */
+	{
+	/** @type {String} */
+	version: "development",
+	/** @type {String} */
+	buildType: "release",
+	/** @type {int} */
+	debugLevel: 1,  // used by $.ui.fancytree.debug() and as default for tree.options.debugLevel
+
+	_nextId: 1,
+	_nextNodeKey: 1,
+	_extensions: {},
+	focusTree: null,
+
+	/** Expose class object as $.ui.fancytree._FancytreeClass */
+	_FancytreeClass: Fancytree,
+	/** Expose class object as $.ui.fancytree._FancytreeNodeClass */
+	_FancytreeNodeClass: FancytreeNode,
+	/* Feature checks to provide backwards compatibility */
+	jquerySupports: {
+		// http://jqueryui.com/upgrade-guide/1.9/#deprecated-offset-option-merged-into-my-and-at
+		positionMyOfs: isVersionAtLeast($.ui.version, 1, 9)
+		},
+	debug: function(msg){
+		/*jshint expr:true */
+		($.ui.fancytree.debugLevel >= 2) && consoleApply("log", arguments);
+	},
+	error: function(msg){
+		consoleApply("error", arguments);
+	},
+	/** Return a {node: FancytreeNode, type: TYPE} object for a mouse event.
+	 *
+	 * @static
+	 * @param {Event} event Mouse event, e.g. click, ...
+	 * @returns {String} 'title' | 'prefix' | 'expander' | 'checkbox' | 'icon' | undefined
+	 */
+	getEventTargetType: function(event){
+		return this.getEventTarget(event).type;
+	},
+	/** Return a {node: FancytreeNode, type: TYPE} object for a mouse event.
+	 *
+	 * @param {Event} event Mouse event, e.g. click, ...
+	 * @returns {object} Return a {node: FancytreeNode, type: TYPE} object
+	 *     TYPE: 'title' | 'prefix' | 'expander' | 'checkbox' | 'icon' | undefined
+	 */
+	getEventTarget: function(event){
+		var tcn = event && event.target ? event.target.className : "",
+			res = {node: this.getNode(event.target), type: undefined};
+		// TODO: use map for fast lookup
+		// FIXME: cannot work, when tcn also contains UI themeroller classes
+		//        Use $(res.node).hasClass() instead
+		if( tcn === "fancytree-title" ){
+			res.type = "title";
+		}else if( tcn === "fancytree-expander" ){
+			res.type = (res.node.hasChildren() === false ? "prefix" : "expander");
+		}else if( tcn === "fancytree-checkbox" ){
+			res.type = "checkbox";
+		}else if( tcn === "fancytree-icon" ){
+			res.type = "icon";
+		}else if( tcn.indexOf("fancytree-node") >= 0 ){
+			// TODO: issue #93 (http://code.google.com/p/fancytree/issues/detail?id=93)
+//			res.type = this._getTypeForOuterNodeEvent(event);
+			res.type = "title";
+		}
+		return res;
+	},
+	/** Return a FancytreeNode instance from element.
+	 *
+	 * @param {Element | jQueryObject | Event} el
+	 * @returns {FancytreeNode} matching node or null
+	 */
+	getNode: function(el){
+		if(el instanceof FancytreeNode){
+			return el; // el already was a FancytreeNode
+		}else if(el.selector !== undefined){
+			el = el[0]; // el was a jQuery object: use the DOM element
+		}else if(el.originalEvent !== undefined){
+			el = el.target; // el was an Event
+		}
+		while( el ) {
+			if(el.ftnode) {
+				return el.ftnode;
+			}
+			el = el.parentNode;
+		}
+		return null;
+	},
+	/* Return a Fancytree instance from element.
+	* TODO: this function could help to get around the data('fancytree') / data('ui-fancytree') problem
+	* @param {Element | jQueryObject | Event} el
+	* @returns {Fancytree} matching tree or null
+	* /
+	getTree: function(el){
+		if(el instanceof Fancytree){
+			return el; // el already was a Fancytree
+		}else if(el.selector !== undefined){
+			el = el[0]; // el was a jQuery object: use the DOM element
+		}else if(el.originalEvent !== undefined){
+			el = el.target; // el was an Event
+		}
+		...
+		return null;
+	},
+	*/
+	info: function(msg){
+		/*jshint expr:true */
+		($.ui.fancytree.debugLevel >= 1) && consoleApply("info", arguments);
+	},
+	/**
+	 * Parse tree data from HTML <ul> markup
+	 *
+	 * @param {jQueryObject} $ul
+	 * @returns {NodeData[]}
+	 */
+	parseHtml: function($ul) {
+		// TODO: understand this:
+		/*jshint validthis:true */
+		var $children = $ul.find(">li"),
+			extraClasses, i, l, iPos, tmp, classes, className,
+			children = [];
+//			that = this;
+
+		$children.each(function() {
+			var allData, jsonData,
+				$li = $(this),
+				$liSpan = $li.find(">span:first", this),
+				$liA = $liSpan.length ? null : $li.find(">a:first"),
+				d = { tooltip: null, data: {} };
+
+			if( $liSpan.length ) {
+				d.title = $liSpan.html();
+
+			} else if( $liA && $liA.length ) {
+				// If a <li><a> tag is specified, use it literally and extract href/target.
+				d.title = $liA.html();
+				d.data.href = $liA.attr("href");
+				d.data.target = $liA.attr("target");
+				d.tooltip = $liA.attr("title");
+
+			} else {
+				// If only a <li> tag is specified, use the trimmed string up to
+				// the next child <ul> tag.
+				d.title = $li.html();
+				iPos = d.title.search(/<ul/i);
+				if( iPos >= 0 ){
+					d.title = d.title.substring(0, iPos);
+				}
+			}
+			d.title = $.trim(d.title);
+
+			// Make sure all fields exist
+			for(i=0, l=CLASS_ATTRS.length; i<l; i++){
+				d[CLASS_ATTRS[i]] = undefined;
+			}
+			// Initialize to `true`, if class is set and collect extraClasses
+			classes = this.className.split(" ");
+			extraClasses = [];
+			for(i=0, l=classes.length; i<l; i++){
+				className = classes[i];
+				if(CLASS_ATTR_MAP[className]){
+					d[className] = true;
+				}else{
+					extraClasses.push(className);
+				}
+			}
+			d.extraClasses = extraClasses.join(" ");
+
+			// Parse node options from ID, title and class attributes
+			tmp = $li.attr("title");
+			if( tmp ){
+				d.tooltip = tmp; // overrides <a title='...'>
+			}
+			tmp = $li.attr("id");
+			if( tmp ){
+				d.key = tmp;
+			}
+			// Add <li data-NAME='...'> as node.data.NAME
+			// See http://api.jquery.com/data/#data-html5
+			allData = $li.data();
+//            alert("d: " + JSON.stringify(allData));
+			if(allData && !$.isEmptyObject(allData)) {
+				// Special handling for <li data-json='...'>
+				jsonData = allData.json;
+				delete allData.json;
+				$.extend(d.data, allData);
+				// If a 'data-json' attribute is present, evaluate and add to node.data
+				if(jsonData) {
+//	              alert("$li.data()" + JSON.stringify(jsonData));
+					// <li data-json='...'> is already returned as object
+					// see http://api.jquery.com/data/#data-html5
+					$.extend(d.data, jsonData);
+				}
+			}
+//	        that.debug("parse ", d);
+//	        var childNode = parentTreeNode.addChild(data);
+			// Recursive reading of child nodes, if LI tag contains an UL tag
+			$ul = $li.find(">ul:first");
+			if( $ul.length ) {
+				d.children = $.ui.fancytree.parseHtml($ul);
+			}else{
+				d.children = d.lazy ? undefined : null;
+			}
+			children.push(d);
+//            FT.debug("parse ", d, children);
+		});
+		return children;
+	},
+	/** Add Fancytree extension definition to the list of globally available extensions.
+	 *
+	 * @param name
+	 * @param definition
+	 */
+	registerExtension: function(name, definition){
+		$.ui.fancytree._extensions[name] = definition;
+	},
+	warn: function(msg){
+		consoleApply("warn", arguments);
+	}
+});
+
+// Use $.ui.fancytree.debugLevel as default for tree.options.debugLevel
+//$.ui.fancytree.debug($.ui.fancytree.prototype);
+//$.ui.fancytree.prototype.options.debugLevel = $.ui.fancytree.debugLevel;
+
+
+/* *****************************************************************************
+ * Register AMD
+ */
+// http://stackoverflow.com/questions/10918063/how-to-make-a-jquery-plugin-loadable-with-requirejs
+
+// if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
+//     define( "jquery", [], function () { return jQuery; } );
+// }
+
+// TODO: maybe like so:?
+// https://raw.github.com/malsup/blockui/master/jquery.blockUI.js
+/*
+if( typeof define === "function" && define.amd ) {
+	define( ["jquery"], function () {
+		return jQuery.ui.fancytree;
+	});
+}
+*/
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.columnview.js
+ *
+ * Render tree like a Mac Finder's column view.
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+// prevent duplicate loading
+// if ( $.ui.fancytree && $.ui.fancytree.version ) {
+//     $.ui.fancytree.warn("Fancytree: duplicate include");
+//     return;
+// }
+
+
+/*******************************************************************************
+ * Private functions and variables
+ */
+/*
+function _assert(cond, msg){
+	msg = msg || "";
+	if(!cond){
+		$.error("Assertion failed " + msg);
+	}
+}
+*/
+
+/*******************************************************************************
+ * Private functions and variables
+ */
+$.ui.fancytree.registerExtension("columnview", {
+	// Default options for this extension.
+	options: {
+	},
+	// Overide virtual methods for this extension.
+	// `this`       : is this extension object
+	// `this._base` : the Fancytree instance
+	// `this._super`: the virtual function that was overriden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		var $tdFirst, $ul,
+			tree = ctx.tree,
+			$table = tree.widget.element;
+
+		tree.tr = $("tbody tr", $table)[0];
+		tree.columnCount = $(">td", tree.tr).length;
+		// Perform default behavior
+		this._super(ctx);
+		// Standard Fancytree created a root <ul>. Now move this into first table cell
+		$ul = $(tree.rootNode.ul);
+		$tdFirst = $(">td", tree.tr).eq(0);
+
+		$ul.removeClass("fancytree-container");
+		$ul.removeAttr("tabindex");
+		tree.$container = $table;
+		$table.addClass("fancytree-container fancytree-ext-columnview");
+		$table.attr("tabindex", "0");
+
+		$tdFirst.empty();
+		$ul.detach().appendTo($tdFirst);
+
+		// Force some required options
+		tree.widget.options.autoCollapse = true;
+//      tree.widget.options.autoActivate = true;
+		tree.widget.options.fx = false;
+		tree.widget.options.clickFolderMode = 1;
+
+		// Make sure that only active path is expanded when a node is activated:
+		$table.bind("fancytreeactivate", function(e, data){
+			var i, tdList,
+				node = data.node,
+				tree = data.tree,
+				level = node.getLevel();
+
+			tree._callHook("nodeCollapseSiblings", node);
+			// Clear right neighbours
+			if(level <= tree.columnCount){
+				tdList = $(">td", tree.tr);
+				for(i=level; i<tree.columnCount; i++){
+					tdList.eq(i).empty();
+				}
+			}
+			// Expand nodes on activate, so we populate the right neighbor cell
+			if(!node.expanded && (node.children || node.lazy)) {
+				node.setExpanded();
+			}
+		// Adjust keyboard behaviour:
+		}).bind("fancytreekeydown", function(e, data){
+			var next = null;
+			switch(e.which){
+			case $.ui.keyCode.DOWN:
+				next = data.node.getNextSibling();
+				if( next ){
+					next.setFocus();
+				}
+				return false;
+			case $.ui.keyCode.LEFT:
+				next = data.node.getParent();
+				if( next ){
+					next.setFocus();
+				}
+				return false;
+			case $.ui.keyCode.UP:
+				next = data.node.getPrevSibling();
+				if( next ){
+					next.setFocus();
+				}
+				return false;
+			}
+		});
+	},
+	nodeRender: function(ctx, force, deep, collapsed, _recursive) {
+		// Render standard nested <ul> - <li> hierarchy
+		this._super(ctx, force, deep, collapsed, _recursive);
+		// Remove expander and add a trailing triangle instead
+		var level, $tdChild, $ul,
+			tree = ctx.tree,
+			node = ctx.node,
+			$span = $(node.span);
+
+		$span.find("span.fancytree-expander").remove();
+		if(node.hasChildren() !== false && !$span.find("span.fancytree-cv-right").length){
+			$span.append($("<span class='fancytree-icon fancytree-cv-right'>"));
+		}
+		// Move <ul> with children into the appropriate <td>
+		if(node.ul){
+			node.ul.style.display = ""; // might be hidden if RIGHT was pressed
+			level = node.getLevel();
+			if(level < tree.columnCount){
+				$tdChild = $(">td", tree.tr).eq(level);
+				$ul = $(node.ul).detach();
+				$tdChild.empty().append($ul);
+			}
+		}
+	}
+});
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.dnd.js
+ *
+ * Drag'N'drop support.
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+/* *****************************************************************************
+ * Private functions and variables
+ */
+var logMsg = $.ui.fancytree.debug,
+	didRegisterDnd = false;
+
+/* Convert number to string and prepend +/-; return empty string for 0.*/
+function offsetString(n){
+	return n === 0 ? "" : (( n > 0 ) ? ("+" + n) : ("" + n));
+}
+
+/* *****************************************************************************
+ * Drag and drop support
+ */
+function _initDragAndDrop(tree) {
+	var dnd = tree.options.dnd || null;
+	// Register 'connectToFancytree' option with ui.draggable
+	if(dnd /*&& (dnd.onDragStart || dnd.onDrop)*/) {
+		_registerDnd();
+	}
+	// Attach ui.draggable to this Fancytree instance
+	if(dnd && dnd.onDragStart ) {
+		tree.widget.element.draggable({
+			addClasses: false,
+			appendTo: "body",
+			containment: false,
+			delay: 0,
+			distance: 4,
+			// TODO: merge Dynatree issue 419
+			revert: false,
+			scroll: true, // issue 244: enable scrolling (if ul.fancytree-container)
+			scrollSpeed: 7,
+			scrollSensitivity: 10,
+			// Delegate draggable.start, drag, and stop events to our handler
+			connectToFancytree: true,
+			// Let source tree create the helper element
+			helper: function(event) {
+				var sourceNode = $.ui.fancytree.getNode(event.target);
+				if(!sourceNode){ // issue 211
+					// TODO: remove this hint, when we understand when it happens
+					return "<div>ERROR?: helper requested but sourceNode not found</div>";
+				}
+				return sourceNode.tree.dnd._onDragEvent("helper", sourceNode, null, event, null, null);
+			},
+			start: function(event, ui) {
+//              var sourceNode = $.ui.fancytree.getNode(event.target);
+				// don't return false if sourceNode == null (see issue 268)
+			}
+		});
+	}
+	// Attach ui.droppable to this Fancytree instance
+	if(dnd && dnd.onDrop) {
+		tree.widget.element.droppable({
+			addClasses: false,
+			tolerance: "intersect",
+			greedy: false
+			/*
+			,
+			activate: function(event, ui) {
+				logMsg("droppable - activate", event, ui, this);
+			},
+			create: function(event, ui) {
+				logMsg("droppable - create", event, ui);
+			},
+			deactivate: function(event, ui) {
+				logMsg("droppable - deactivate", event, ui);
+			},
+			drop: function(event, ui) {
+				logMsg("droppable - drop", event, ui);
+			},
+			out: function(event, ui) {
+				logMsg("droppable - out", event, ui);
+			},
+			over: function(event, ui) {
+				logMsg("droppable - over", event, ui);
+			}
+*/
+		});
+	}
+}
+
+//--- Extend ui.draggable event handling --------------------------------------
+
+function _registerDnd() {
+	if(didRegisterDnd){
+		return;
+	}
+
+	// Register proxy-functions for draggable.start/drag/stop
+
+	$.ui.plugin.add("draggable", "connectToFancytree", {
+		start: function(event, ui) {
+			// 'draggable' was renamed to 'ui-draggable' since jQueryUI 1.10
+			var draggable = $(this).data("ui-draggable") || $(this).data("draggable"),
+				sourceNode = ui.helper.data("ftSourceNode") || null;
+//          logMsg("draggable-connectToFancytree.start, %s", sourceNode);
+//          logMsg("    this: %o", this);
+//          logMsg("    event: %o", event);
+//          logMsg("    draggable: %o", draggable);
+//          logMsg("    ui: %o", ui);
+
+			if(sourceNode) {
+				// Adjust helper offset, so cursor is slightly outside top/left corner
+				draggable.offset.click.top = -2;
+				draggable.offset.click.left = + 16;
+//              logMsg("    draggable2: %o", draggable);
+//              logMsg("    draggable.offset.click FIXED: %s/%s", draggable.offset.click.left, draggable.offset.click.top);
+				// Trigger onDragStart event
+				// TODO: when called as connectTo..., the return value is ignored(?)
+				return sourceNode.tree.dnd._onDragEvent("start", sourceNode, null, event, ui, draggable);
+			}
+		},
+		drag: function(event, ui) {
+			// 'draggable' was renamed to 'ui-draggable' since jQueryUI 1.10
+			var isHelper,
+				draggable = $(this).data("ui-draggable") || $(this).data("draggable"),
+				sourceNode = ui.helper.data("ftSourceNode") || null,
+				prevTargetNode = ui.helper.data("ftTargetNode") || null,
+				targetNode = $.ui.fancytree.getNode(event.target);
+//            logMsg("$.ui.fancytree.getNode(%o): %s", event.target, targetNode);
+//            logMsg("connectToFancytree.drag: helper: %o", ui.helper[0]);
+			if(event.target && !targetNode){
+				// We got a drag event, but the targetNode could not be found
+				// at the event location. This may happen,
+				// 1. if the mouse jumped over the drag helper,
+				// 2. or if a non-fancytree element is dragged
+				// We ignore it:
+				isHelper = $(event.target).closest("div.fancytree-drag-helper,#fancytree-drop-marker").length > 0;
+				if(isHelper){
+					logMsg("Drag event over helper: ignored.");
+					return;
+				}
+			}
+//            logMsg("draggable-connectToFancytree.drag: targetNode(from event): %s, ftTargetNode: %s", targetNode, ui.helper.data("ftTargetNode"));
+			ui.helper.data("ftTargetNode", targetNode);
+			// Leaving a tree node
+			if(prevTargetNode && prevTargetNode !== targetNode ) {
+				prevTargetNode.tree.dnd._onDragEvent("leave", prevTargetNode, sourceNode, event, ui, draggable);
+			}
+			if(targetNode){
+				if(!targetNode.tree.options.dnd.onDrop) {
+					// not enabled as drop target
+				} else if(targetNode === prevTargetNode) {
+					// Moving over same node
+					targetNode.tree.dnd._onDragEvent("over", targetNode, sourceNode, event, ui, draggable);
+				}else{
+					// Entering this node first time
+					targetNode.tree.dnd._onDragEvent("enter", targetNode, sourceNode, event, ui, draggable);
+				}
+			}
+			// else go ahead with standard event handling
+		},
+		stop: function(event, ui) {
+			// 'draggable' was renamed to 'ui-draggable' since jQueryUI 1.10
+			var draggable = $(this).data("ui-draggable") || $(this).data("draggable"),
+				sourceNode = ui.helper.data("ftSourceNode") || null,
+				targetNode = ui.helper.data("ftTargetNode") || null,
+//				mouseDownEvent = draggable._mouseDownEvent,
+				eventType = event.type,
+				dropped = (eventType === "mouseup" && event.which === 1);
+//            logMsg("draggable-connectToFancytree.stop: targetNode(from event): %s, ftTargetNode: %s", targetNode, ui.helper.data("ftTargetNode"));
+//            logMsg("draggable-connectToFancytree.stop, %s", sourceNode);
+//            logMsg("    type: %o, downEvent: %o, upEvent: %o", eventType, mouseDownEvent, event);
+//            logMsg("    targetNode: %o", targetNode);
+			if(!dropped){
+				logMsg("Drag was cancelled");
+			}
+			if(targetNode) {
+				if(dropped){
+					targetNode.tree.dnd._onDragEvent("drop", targetNode, sourceNode, event, ui, draggable);
+				}
+				targetNode.tree.dnd._onDragEvent("leave", targetNode, sourceNode, event, ui, draggable);
+			}
+			if(sourceNode){
+				sourceNode.tree.dnd._onDragEvent("stop", sourceNode, null, event, ui, draggable);
+			}
+		}
+	});
+
+	didRegisterDnd = true;
+}
+
+
+/* *****************************************************************************
+ *
+ */
+/** @namespace $.ui.fancytree.dnd */
+$.ui.fancytree.registerExtension("dnd",
+	/** @scope ui_fancytree
+	 * @lends $.ui.fancytree.dnd.prototype
+	 */
+	{
+	// Default options for this extension.
+	options: {
+		// Make tree nodes draggable:
+		onDragStart: null, // Callback(sourceNode), return true, to enable dnd
+		onDragStop: null, // Callback(sourceNode)
+//      helper: null,
+		// Make tree nodes accept draggables
+		autoExpandMS: 1000, // Expand nodes after n milliseconds of hovering.
+		preventVoidMoves: true, // Prevent dropping nodes 'before self', etc.
+		preventRecursiveMoves: true, // Prevent dropping nodes on own descendants
+		onDragEnter: null, // Callback(targetNode, sourceNode)
+		onDragOver: null, // Callback(targetNode, sourceNode, hitMode)
+		onDrop: null, // Callback(targetNode, sourceNode, hitMode)
+		onDragLeave: null // Callback(targetNode, sourceNode)
+	},
+	// Override virtual methods for this extension.
+	// `this`       : Fancytree instance
+	// `this._super`: the virtual function that was overriden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		var tree = ctx.tree;
+		this._super(ctx);
+		_initDragAndDrop(tree);
+	},
+	/* Override key handler in order to cancel dnd on escape.*/
+	nodeKeydown: function(ctx) {
+		var event = ctx.originalEvent;
+		if( event.which === $.ui.keyCode.ESCAPE) {
+			this.dnd._cancelDrag();
+		}
+		this._super(ctx);
+	},
+	/* Display drop marker according to hitMode ('after', 'before', 'over', 'out', 'start', 'stop'). */
+	_setDndStatus: function(sourceNode, targetNode, helper, hitMode, accept) {
+		var posOpts,
+			markerOffsetX = 0,
+			markerAt = "center",
+			instData = this.dnd,
+			$source = sourceNode ? $(sourceNode.span) : null,
+			$target = $(targetNode.span);
+
+		if( !instData.$dropMarker ) {
+			instData.$dropMarker = $("<div id='fancytree-drop-marker'></div>")
+				.hide()
+				.css({"z-index": 1000})
+				.prependTo($(this.$div).parent());
+//                .prependTo("body");
+//          logMsg("Creating marker: %o", this.$dropMarker);
+		}
+/*
+		if(hitMode === "start"){
+		}
+		if(hitMode === "stop"){
+//          sourceNode.removeClass("fancytree-drop-target");
+		}
+*/
+//      this.$dropMarker.attr("class", hitMode);
+		if(hitMode === "after" || hitMode === "before" || hitMode === "over"){
+//          $source && $source.addClass("fancytree-drag-source");
+
+//          $target.addClass("fancytree-drop-target");
+
+			switch(hitMode){
+			case "before":
+				instData.$dropMarker.removeClass("fancytree-drop-after fancytree-drop-over");
+				instData.$dropMarker.addClass("fancytree-drop-before");
+				markerAt = "top";
+				break;
+			case "after":
+				instData.$dropMarker.removeClass("fancytree-drop-before fancytree-drop-over");
+				instData.$dropMarker.addClass("fancytree-drop-after");
+				markerAt = "bottom";
+				break;
+			default:
+				instData.$dropMarker.removeClass("fancytree-drop-after fancytree-drop-before");
+				instData.$dropMarker.addClass("fancytree-drop-over");
+				$target.addClass("fancytree-drop-target");
+				markerOffsetX = 8;
+			}
+
+			if( $.ui.fancytree.jquerySupports.positionMyOfs ){
+				posOpts = {
+					my: "left" + offsetString(markerOffsetX) + " center",
+					at: "left " + markerAt,
+					of: $target
+				};
+			} else {
+				posOpts = {
+					my: "left center",
+					at: "left " + markerAt,
+					of: $target,
+					offset: "" + markerOffsetX + " 0"
+				};
+			}
+			instData.$dropMarker
+				.show()
+				.position(posOpts);
+//          helper.addClass("fancytree-drop-hover");
+		} else {
+//          $source && $source.removeClass("fancytree-drag-source");
+			$target.removeClass("fancytree-drop-target");
+			instData.$dropMarker.hide();
+//          helper.removeClass("fancytree-drop-hover");
+		}
+		if(hitMode === "after"){
+			$target.addClass("fancytree-drop-after");
+		} else {
+			$target.removeClass("fancytree-drop-after");
+		}
+		if(hitMode === "before"){
+			$target.addClass("fancytree-drop-before");
+		} else {
+			$target.removeClass("fancytree-drop-before");
+		}
+		if(accept === true){
+			if($source){
+				$source.addClass("fancytree-drop-accept");
+			}
+			$target.addClass("fancytree-drop-accept");
+			helper.addClass("fancytree-drop-accept");
+		}else{
+			if($source){
+				$source.removeClass("fancytree-drop-accept");
+			}
+			$target.removeClass("fancytree-drop-accept");
+			helper.removeClass("fancytree-drop-accept");
+		}
+		if(accept === false){
+			if($source){
+				$source.addClass("fancytree-drop-reject");
+			}
+			$target.addClass("fancytree-drop-reject");
+			helper.addClass("fancytree-drop-reject");
+		}else{
+			if($source){
+				$source.removeClass("fancytree-drop-reject");
+			}
+			$target.removeClass("fancytree-drop-reject");
+			helper.removeClass("fancytree-drop-reject");
+		}
+	},
+
+	/*
+	 * Handles drag'n'drop functionality.
+	 *
+	 * A standard jQuery drag-and-drop process may generate these calls:
+	 *
+	 * draggable helper():
+	 *     _onDragEvent("helper", sourceNode, null, event, null, null);
+	 * start:
+	 *     _onDragEvent("start", sourceNode, null, event, ui, draggable);
+	 * drag:
+	 *     _onDragEvent("leave", prevTargetNode, sourceNode, event, ui, draggable);
+	 *     _onDragEvent("over", targetNode, sourceNode, event, ui, draggable);
+	 *     _onDragEvent("enter", targetNode, sourceNode, event, ui, draggable);
+	 * stop:
+	 *     _onDragEvent("drop", targetNode, sourceNode, event, ui, draggable);
+	 *     _onDragEvent("leave", targetNode, sourceNode, event, ui, draggable);
+	 *     _onDragEvent("stop", sourceNode, null, event, ui, draggable);
+	 */
+	_onDragEvent: function(eventName, node, otherNode, event, ui, draggable) {
+		if(eventName !== "over"){
+			logMsg("tree.dnd._onDragEvent(%s, %o, %o) - %o", eventName, node, otherNode, this);
+		}
+		var $helper, nodeOfs, relPos, relPos2,
+			enterResponse, hitMode, r,
+			opts = this.options,
+			dnd = opts.dnd,
+			res = null,
+			nodeTag = $(node.span);
+
+		switch (eventName) {
+		case "helper":
+			// Only event and node argument is available
+			$helper = $("<div class='fancytree-drag-helper'><span class='fancytree-drag-helper-img' /></div>")
+//                .append($(event.target).closest("a").clone());
+				.append($(event.target).closest("span.fancytree-title").clone());
+			// issue 244: helper should be child of scrollParent
+			$("ul.fancytree-container", node.tree.$div).append($helper);
+//          $(node.tree.divTree).append($helper);
+			// Attach node reference to helper object
+			$helper.data("ftSourceNode", node);
+			logMsg("helper=%o", $helper);
+			logMsg("helper.sourceNode=%o", $helper.data("ftSourceNode"));
+			res = $helper;
+			break;
+		case "start":
+			if( node.isStatusNode ) {
+				res = false;
+			} else if(dnd.onDragStart) {
+				res = dnd.onDragStart(node);
+			}
+			if(res === false) {
+				this.debug("tree.onDragStart() cancelled");
+				//draggable._clear();
+				// NOTE: the return value seems to be ignored (drag is not canceled, when false is returned)
+				// TODO: call this._cancelDrag()?
+				ui.helper.trigger("mouseup");
+				ui.helper.hide();
+			} else {
+				nodeTag.addClass("fancytree-drag-source");
+			}
+			break;
+		case "enter":
+			if(dnd.preventRecursiveMoves && node.isDescendantOf(otherNode)){
+				r = false;
+			}else{
+				r = dnd.onDragEnter ? dnd.onDragEnter(node, otherNode, ui, draggable) : null;
+			}
+			if(!r){
+				// convert null, undefined, false to false
+				res = false;
+			}else if ( $.isArray(r) ) {
+				// TODO: also accept passing an object of this format directly
+				res = {
+					over: ($.inArray("over", r) >= 0),
+					before: ($.inArray("before", r) >= 0),
+					after: ($.inArray("after", r) >= 0)
+				};
+			}else{
+				res = {
+					over: ((r === true) || (r === "over")),
+					before: ((r === true) || (r === "before")),
+					after: ((r === true) || (r === "after"))
+				};
+			}
+			ui.helper.data("enterResponse", res);
+			logMsg("helper.enterResponse: %o", res);
+			break;
+		case "over":
+			enterResponse = ui.helper.data("enterResponse");
+			hitMode = null;
+			if(enterResponse === false){
+				// Don't call onDragOver if onEnter returned false.
+//                break;
+			} else if(typeof enterResponse === "string") {
+				// Use hitMode from onEnter if provided.
+				hitMode = enterResponse;
+			} else {
+				// Calculate hitMode from relative cursor position.
+				nodeOfs = nodeTag.offset();
+				relPos = { x: event.pageX - nodeOfs.left,
+						   y: event.pageY - nodeOfs.top };
+				relPos2 = { x: relPos.x / nodeTag.width(),
+							y: relPos.y / nodeTag.height() };
+
+				if( enterResponse.after && relPos2.y > 0.75 ){
+					hitMode = "after";
+				} else if(!enterResponse.over && enterResponse.after && relPos2.y > 0.5 ){
+					hitMode = "after";
+				} else if(enterResponse.before && relPos2.y <= 0.25) {
+					hitMode = "before";
+				} else if(!enterResponse.over && enterResponse.before && relPos2.y <= 0.5) {
+					hitMode = "before";
+				} else if(enterResponse.over) {
+					hitMode = "over";
+				}
+				// Prevent no-ops like 'before source node'
+				// TODO: these are no-ops when moving nodes, but not in copy mode
+				if( dnd.preventVoidMoves ){
+					if(node === otherNode){
+						logMsg("    drop over source node prevented");
+						hitMode = null;
+					}else if(hitMode === "before" && otherNode && node === otherNode.getNextSibling()){
+						logMsg("    drop after source node prevented");
+						hitMode = null;
+					}else if(hitMode === "after" && otherNode && node === otherNode.getPrevSibling()){
+						logMsg("    drop before source node prevented");
+						hitMode = null;
+					}else if(hitMode === "over" && otherNode && otherNode.parent === node && otherNode.isLastSibling() ){
+						logMsg("    drop last child over own parent prevented");
+						hitMode = null;
+					}
+				}
+//                logMsg("hitMode: %s - %s - %s", hitMode, (node.parent === otherNode), node.isLastSibling());
+				ui.helper.data("hitMode", hitMode);
+			}
+			// Auto-expand node (only when 'over' the node, not 'before', or 'after')
+			if(hitMode === "over" && dnd.autoExpandMS && node.hasChildren() !== false && !node.expanded) {
+				node.scheduleAction("expand", dnd.autoExpandMS);
+			}
+			if(hitMode && dnd.onDragOver){
+				// TODO: http://code.google.com/p/dynatree/source/detail?r=625
+				res = dnd.onDragOver(node, otherNode, hitMode, ui, draggable);
+			}
+			// issue 332
+//			this._setDndStatus(otherNode, node, ui.helper, hitMode, res!==false);
+			this.dnd._setDndStatus(otherNode, node, ui.helper, hitMode, res!==false && hitMode !== null);
+			break;
+		case "drop":
+			hitMode = ui.helper.data("hitMode");
+			if(hitMode && dnd.onDrop){
+				dnd.onDrop(node, otherNode, hitMode, ui, draggable);
+			}
+			break;
+		case "leave":
+			// Cancel pending expand request
+			node.scheduleAction("cancel");
+			ui.helper.data("enterResponse", null);
+			ui.helper.data("hitMode", null);
+			this.dnd._setDndStatus(otherNode, node, ui.helper, "out", undefined);
+			if(dnd.onDragLeave){
+				dnd.onDragLeave(node, otherNode, ui, draggable);
+			}
+			break;
+		case "stop":
+			nodeTag.removeClass("fancytree-drag-source");
+			if(dnd.onDragStop){
+				dnd.onDragStop(node);
+			}
+			break;
+		default:
+			throw "Unsupported drag event: " + eventName;
+		}
+		return res;
+	},
+
+	_cancelDrag: function() {
+		 var dd = $.ui.ddmanager.current;
+		 if(dd){
+			 dd.cancel();
+		 }
+	}
+});
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.filter.js
+ *
+ * Remove or highlight tree nodes, based on a filter.
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+
+/*******************************************************************************
+ * Private functions and variables
+ */
+
+function _escapeRegex(str){
+	/*jshint regexdash:true */
+	return (str + "").replace(/([.?*+\^\$\[\]\\(){}|-])/g, "\\$1");
+}
+
+
+/**
+ * Dimm or hide nodes.
+ *
+ * @param {function | string} filter
+ * @returns {integer} count
+ * @lends Fancytree.prototype
+ * @requires jquery.fancytree.filter.js
+ */
+$.ui.fancytree._FancytreeClass.prototype.applyFilter = function(filter){
+	var match, re,
+		count = 0;
+	// Reset current filter
+	this.visit(function(node){
+		delete node.match;
+		delete node.subMatch;
+	});
+
+	// Default to 'match title substring (not case sensitive)'
+	if(typeof filter === "string"){
+		match = _escapeRegex(filter); // make sure a '.' is treated literally
+		re = new RegExp(".*" + match + ".*", "i");
+		filter = function(node){
+			return !!re.exec(node.title);
+		};
+	}
+
+	this.enableFilter = true;
+	this.$div.addClass("fancytree-ext-filter");
+	this.visit(function(node){
+		if(filter(node)){
+			count++;
+			node.match = true;
+			node.visitParents(function(p){
+				p.subMatch = true;
+			});
+		}
+	});
+	this.render();
+	return count;
+};
+
+/**
+ * Reset the filter.
+ *
+ * @lends Fancytree.prototype
+ * @requires jquery.fancytree.filter.js
+ */
+$.ui.fancytree._FancytreeClass.prototype.clearFilter = function(){
+	this.visit(function(node){
+		delete node.match;
+		delete node.subMatch;
+		$(node.li).show();
+	});
+
+	this.enableFilter = false;
+	this.render();
+	this.$div.removeClass("fancytree-ext-filter");
+};
+
+
+/*******************************************************************************
+ * Extension code
+ */
+$.ui.fancytree.registerExtension("filter", {
+	// Default options for this extension.
+	options: {
+		mode: "dimm"
+	},
+	// Override virtual methods for this extension.
+	// `this`       : is this extension object
+	// `this._base` : the Fancytree instance
+	// `this._super`: the virtual function that was overriden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		this._super(ctx);
+		ctx.tree.filter = false;
+	},
+	treeDestroy: function(ctx){
+		this._super(ctx);
+	},
+	nodeRenderStatus: function(ctx) {
+		// Set classes for current status
+		var visible,
+			node = ctx.node,
+			opts = ctx.options,
+			tree = ctx.tree,
+			$span = $(node[tree.statusClassPropName]);
+
+		if(!$span.length){
+			return; // nothing to do, if node was not yet rendered
+		}
+		this._super(ctx);
+		if(!tree.enableFilter){
+			return;
+		}
+		if( node.match ){
+			$span.addClass("fancytree-match");
+		}else{
+			$span.removeClass("fancytree-match");
+		}
+		if( node.subMatch ){
+			$span.addClass("fancytree-submatch");
+		}else{
+			$span.removeClass("fancytree-submatch");
+		}
+		if(opts.filter.mode === "hide"){
+			visible = !!(node.match || node.subMatch);
+			node.debug(node.title + ": visible=" + visible);
+			$(node.li).toggle(visible);
+		}
+	}
+});
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.menu.js
+ *
+ * Enable jQuery UI Menu as context menu for tree nodes.
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * @see http://api.jqueryui.com/menu/
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+// prevent duplicate loading
+// if ( $.ui.fancytree && $.ui.fancytree.version ) {
+//     $.ui.fancytree.warn("Fancytree: duplicate include");
+//     return;
+// }
+
+$.ui.fancytree.registerExtension("menu", {
+	version: "1.0.0pre",
+	// Default options for this extension.
+	options: {
+		enable: true,
+		selector: null,  //
+		position: {},    //
+		// Events:
+		create: $.noop,  //
+		beforeOpen: $.noop,    //
+		open: $.noop,    //
+		focus: $.noop,   //
+		select: $.noop,  //
+		close: $.noop    //
+	},
+	// Override virtual methods for this extension.
+	// `this`       : is this extension object
+	// `this._base` : the Fancytree instance
+	// `this._super`: the virtual function that was overridden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		var opts = ctx.options,
+			tree = ctx.tree;
+
+		this._super(ctx);
+
+		// Prepare an object that will be passed with menu events
+		tree.menu.data = {
+			tree: tree,
+			node: null,
+			$menu: null,
+			menuId: null
+		};
+
+//        tree.$container[0].oncontextmenu = function() {return false;};
+		// Replace the standard browser context menu with out own
+		tree.$container.delegate("span.fancytree-node", "contextmenu", function(event) {
+			var node = $.ui.fancytree.getNode(event),
+				ctx = {node: node, tree: node.tree, originalEvent: event, options: tree.options};
+			tree.menu._openMenu(ctx);
+			return false;
+		});
+
+		// Use jquery.ui.menu
+		$(opts.menu.selector).menu({
+			create: function(event, ui){
+				tree.menu.data.$menu = $(this).menu("widget");
+				var data = $.extend({}, tree.menu.data);
+				opts.menu.create.call(tree, event, data);
+			},
+			focus: function(event, ui){
+				var data = $.extend({}, tree.menu.data, {
+					menuItem: ui.item,
+					menuId: ui.item.find(">a").attr("href")
+				});
+				opts.menu.focus.call(tree, event, data);
+			},
+			select: function(event, ui){
+				var data = $.extend({}, tree.menu.data, {
+					menuItem: ui.item,
+					menuId: ui.item.find(">a").attr("href")
+				});
+				if( opts.menu.select.call(tree, event, data) !== false){
+					tree.menu._closeMenu(ctx);
+				}
+			}
+		}).hide();
+	},
+	treeDestroy: function(ctx){
+		this._super(ctx);
+	},
+	_openMenu: function(ctx){
+		var data,
+			tree = ctx.tree,
+			opts = ctx.options,
+			$menu = $(opts.menu.selector);
+
+		tree.menu.data.node = ctx.node;
+		data = $.extend({}, tree.menu.data);
+
+		if( opts.menu.beforeOpen.call(tree, ctx.originalEvent, data) === false){
+			return;
+		}
+
+		$(document).bind("keydown.fancytree", function(event){
+			if( event.which === $.ui.keyCode.ESCAPE ){
+				tree.menu._closeMenu(ctx);
+			}
+		}).bind("mousedown.fancytree", function(event){
+			// Close menu when clicked outside menu
+			if( $(event.target).closest(".ui-menu-item").length === 0 ){
+				tree.menu._closeMenu(ctx);
+			}
+		});
+//        $menu.position($.extend({my: "left top", at: "left bottom", of: event}, opts.menu.position));
+		$menu
+			.css("position", "absolute")
+			.show()
+			.position({my: "left top", at: "right top", of: ctx.originalEvent, collision: "fit"})
+			.focus();
+
+		opts.menu.open.call(tree, ctx.originalEvent, data);
+	},
+	_closeMenu: function(ctx){
+		var $menu,
+			tree = ctx.tree,
+			opts = ctx.options,
+			data = $.extend({}, tree.menu.data);
+		if( opts.menu.close.call(tree, ctx.originalEvent, data) === false){
+			return;
+		}
+		$menu = $(opts.menu.selector);
+		$(document).unbind("keydown.fancytree, mousedown.fancytree");
+		$menu.hide();
+		tree.menu.data.node = null;
+	}
+//	,
+//	nodeClick: function(ctx) {
+//		var event = ctx.originalEvent;
+//		if(event.which === 2 || (event.which === 1 && event.ctrlKey)){
+//			event.preventDefault();
+//			ctx.tree.menu._openMenu(ctx);
+//			return false;
+//		}
+//		this._super(ctx);
+//	}
+});
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.persist.js
+ *
+ * Persist tree status in cookiesRemove or highlight tree nodes, based on a filter.
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * @depends: jquery.cookie.js
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+// prevent duplicate loading
+// if ( $.ui.fancytree && $.ui.fancytree.version ) {
+//     $.ui.fancytree.warn("Fancytree: duplicate include");
+//     return;
+// }
+
+
+/*******************************************************************************
+ * Private functions and variables
+ */
+function _assert(cond, msg){
+	msg = msg || "";
+	if(!cond){
+		$.error("Assertion failed " + msg);
+	}
+}
+
+var ACTIVE = "active",
+	EXPANDED = "expanded",
+	FOCUS = "focus",
+	SELECTED = "selected";
+
+/**
+ *
+ * Called like
+ *     $("#tree").fancytree("getTree").clearCookies("active expanded focus selected");
+ *
+ * @lends Fancytree.prototype
+ * @requires jquery.fancytree.persist.js
+ */
+$.ui.fancytree._FancytreeClass.prototype.clearCookies = function(types){
+	var cookiePrefix = this.persist.cookiePrefix;
+	types = types || "active expanded focus selected";
+	// TODO: optimize
+	if(types.indexOf(ACTIVE) >= 0){
+		$.cookie(cookiePrefix + ACTIVE, null);
+	}
+	if(types.indexOf(EXPANDED) >= 0){
+		$.cookie(cookiePrefix + EXPANDED, null);
+	}
+	if(types.indexOf(FOCUS) >= 0){
+		$.cookie(cookiePrefix + FOCUS, null);
+	}
+	if(types.indexOf(SELECTED) >= 0){
+		$.cookie(cookiePrefix + SELECTED, null);
+	}
+};
+
+
+/* TODO:
+DynaTreeStatus._getTreePersistData = function(cookieId, cookieOpts) {
+	// Static member: Return persistence information from cookies
+	var ts = new DynaTreeStatus(cookieId, cookieOpts);
+	ts.read();
+	return ts.toDict();
+};
+*/
+
+/* *****************************************************************************
+ * Extension code
+ */
+$.ui.fancytree.registerExtension("persist", {
+	// Default options for this extension.
+	options: {
+		cookieDelimiter: "~",
+		cookiePrefix: undefined, // 'fancytree-<treeId>-' by default
+		cookie: {
+			raw: false,
+			expires: "",
+			path: "",
+			domain: "",
+			secure: false
+		},
+		overrideSource: false,  // true: cookie takes precedence over `source` data attributes.
+		types: "active expanded focus selected"
+	},
+
+	/* Append `key` to a cookie. */
+	_setKey: function(type, key, flag){
+		var instData = this.persist,
+			instOpts = this.options.persist,
+			cookieName = instData.cookiePrefix + type,
+			cookie = $.cookie(cookieName),
+			cookieList = cookie ? cookie.split(instOpts.cookieDelimiter) : [],
+			idx = $.inArray(key, cookieList);
+		// Remove, even if we add a key,  so the key is always the last entry
+		if(idx >= 0){
+			cookieList.splice(idx, 1);
+		}
+		// Append key to cookie
+		if(flag){
+			cookieList.push(key);
+		}
+		$.cookie(cookieName, cookieList.join(instOpts.cookieDelimiter), instOpts.cookie);
+	},
+	// Overide virtual methods for this extension.
+	// `this`       : is this Fancytree object
+	// `this._super`: the virtual function that was overridden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		var tree = ctx.tree,
+			opts = ctx.options,
+			instData = this.persist,
+			instOpts = this.options.persist;
+
+		_assert($.cookie, "Missing required plugin for 'persist' extension: jquery.cookie.js");
+
+		instData.cookiePrefix = instOpts.cookiePrefix || "fancytree-" + tree._id + "-";
+		instData.storeActive = instOpts.types.indexOf(ACTIVE) >= 0;
+		instData.storeExpanded = instOpts.types.indexOf(EXPANDED) >= 0;
+		instData.storeSelected = instOpts.types.indexOf(SELECTED) >= 0;
+		instData.storeFocus = instOpts.types.indexOf(FOCUS) >= 0;
+
+		// Bind init-handler to apply cookie state
+		tree.$div.bind("fancytreeinit", function(e){
+			var cookie,
+				keyList,
+				i,
+				prevFocus = $.cookie(instData.cookiePrefix + FOCUS), // record this before node.setActive() overrides it
+				node;
+
+			tree.debug("COOKIE " + document.cookie);
+
+			if(instData.storeExpanded){
+				cookie = $.cookie(instData.cookiePrefix + EXPANDED);
+				if(cookie){
+					keyList = cookie.split(instOpts.cookieDelimiter);
+					for(i=0; i<keyList.length; i++){
+						node = tree.getNodeByKey(keyList[i]);
+						if(node){
+							if(node.expanded === undefined || instOpts.overrideSource && (node.expanded === false)){
+//								node.setExpanded();
+								node.expanded = true;
+								node.render();
+							}
+						}else{
+							// node is no longer member of the tree: remove from cookie
+							instData._setKey(EXPANDED, keyList[i], false);
+						}
+					}
+				}
+			}
+			if(instData.storeSelected){
+				cookie = $.cookie(instData.cookiePrefix + SELECTED);
+				if(cookie){
+					keyList = cookie.split(instOpts.cookieDelimiter);
+					for(i=0; i<keyList.length; i++){
+						node = tree.getNodeByKey(keyList[i]);
+						if(node){
+							if(node.selected === undefined || instOpts.overrideSource && (node.selected === false)){
+//								node.setSelected();
+								node.selected = true;
+								node.renderStatus();
+							}
+						}else{
+							// node is no longer member of the tree: remove from cookie also
+							instData._setKey(SELECTED, keyList[i], false);
+						}
+					}
+				}
+			}
+			if(instData.storeActive){
+				cookie = $.cookie(instData.cookiePrefix + ACTIVE);
+				if(cookie && (opts.persist.overrideSource || !tree.activeNode)){
+					node = tree.getNodeByKey(cookie);
+					if(node){
+						node.setActive();
+					}
+				}
+			}
+			if(instData.storeFocus && prevFocus){
+				node = tree.getNodeByKey(prevFocus);
+				if(node){
+					node.setFocus();
+				}
+			}
+		});
+		// Init the tree
+		this._super(ctx);
+	},
+//	treeDestroy: function(ctx){
+//		this._super(ctx);
+//	},
+	nodeSetActive: function(ctx, flag) {
+		var instData = this.persist,
+			instOpts = this.options.persist;
+		this._super(ctx, flag);
+		if(instData.storeActive){
+			$.cookie(instData.cookiePrefix + ACTIVE,
+					 this.activeNode ? this.activeNode.key : null,
+					 instOpts.cookie);
+		}
+	},
+	nodeSetExpanded: function(ctx, flag) {
+		var node = ctx.node,
+			instData = this.persist;
+
+		this._super(ctx, flag);
+
+		if(instData.storeExpanded){
+			instData._setKey(EXPANDED, node.key, flag);
+		}
+	},
+	nodeSetFocus: function(ctx) {
+		var instData = this.persist,
+			instOpts = this.options.persist;
+
+		this._super(ctx);
+
+		if(instData.storeFocus){
+			$.cookie(this.cookiePrefix + FOCUS,
+					 this.focusNode ? this.focusNode.key : null,
+					 instOpts.cookie);
+		}
+	},
+	nodeSetSelected: function(ctx, flag) {
+		var node = ctx.node,
+			instData = this.persist;
+
+		this._super(ctx, flag);
+
+		if(instData.storeSelected){
+			instData._setKey(SELECTED, node.key, flag);
+		}
+	}
+});
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.table.js
+ *
+ * Render tree as table (aka 'treegrid', 'tabletree').
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+// prevent duplicate loading
+// if ( $.ui.fancytree && $.ui.fancytree.version ) {
+//     $.ui.fancytree.warn("Fancytree: duplicate include");
+//     return;
+// }
+
+
+/* *****************************************************************************
+ * Private functions and variables
+ */
+function _assert(cond, msg){
+	msg = msg || "";
+	if(!cond){
+		$.error("Assertion failed " + msg);
+	}
+}
+
+function insertSiblingAfter(referenceNode, newNode) {
+	referenceNode.parentNode.insertBefore(newNode, referenceNode.nextSibling);
+}
+
+/* Show/hide all rows that are structural descendants of `parent`. */
+function setChildRowVisibility(parent, flag) {
+	parent.visit(function(node){
+		var tr = node.tr;
+		if(tr){
+			tr.style.display = flag ? "" : "none";
+		}
+		if(!node.expanded){
+			return "skip";
+		}
+	});
+}
+
+/* Find node that is rendered in previous row. */
+function findPrevRowNode(node){
+	var i, last, prev,
+		parent = node.parent,
+		siblings = parent ? parent.children : null;
+
+	if(siblings && siblings.length > 1 && siblings[0] !== node){
+		// use the lowest descendant of the preceeding sibling
+		i = $.inArray(node, siblings);
+		prev = siblings[i - 1];
+		_assert(prev.tr);
+		// descend to lowest child (with a <tr> tag)
+		while(prev.children){
+			last = prev.children[prev.children.length - 1];
+			if(!last.tr){
+				break;
+			}
+			prev = last;
+		}
+	}else{
+		// if there is no preceding sibling, use the direct parent
+		prev = parent;
+	}
+	return prev;
+}
+
+
+$.ui.fancytree.registerExtension("table", {
+	// Default options for this extension.
+	options: {
+		indentation: 16,        // indent every node level by 16px
+		nodeColumnIdx: 0,       // render node expander, icon, and title to column #0
+		checkboxColumnIdx: null // render the checkboxes into the 1st column
+	},
+	// Overide virtual methods for this extension.
+	// `this`       : is this extension object
+	// `this._super`: the virtual function that was overriden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		var i, $row, tdRole,
+			tree = ctx.tree,
+			$table = tree.widget.element;
+
+		$table.addClass("fancytree-container fancytree-ext-table");
+		tree.tbody = $table.find("> tbody")[0];
+		tree.columnCount = $("thead >tr >th", $table).length;
+		$(tree.tbody).empty();
+
+		tree.rowFragment = document.createDocumentFragment();
+		$row = $("<tr>");
+		tdRole = "";
+		if(ctx.options.aria){
+			$row.attr("role", "row");
+			tdRole = " role='gridcell'";
+		}
+		for(i=0; i<tree.columnCount; i++) {
+			if(ctx.options.table.nodeColumnIdx === i){
+				$row.append("<td" + tdRole + "><span class='fancytree-node'></span></td>");
+			}else{
+				$row.append("<td" + tdRole + ">");
+			}
+		}
+		tree.rowFragment.appendChild($row.get(0));
+
+		this._super(ctx);
+		// standard Fancytree created a root UL
+		$(tree.rootNode.ul).remove();
+		tree.rootNode.ul = null;
+		tree.$container = $table;
+		// Add container to the TAB chain
+		tree.$container.attr("tabindex", "0");
+		if(this.options.aria){
+			tree.$container
+				.attr("role", "treegrid")
+				.attr("aria-readonly", true);
+		}
+		// Make sure that status classes are set on the node's <tr> elements
+		tree.statusClassPropName = "tr";
+		tree.ariaPropName = "tr";
+	},
+	/* Called by nodeRender to sync node order with tag order.*/
+//    nodeFixOrder: function(ctx) {
+//    },
+	nodeRemoveChildMarkup: function(ctx) {
+		var node = ctx.node;
+//		DT.debug("nodeRemoveChildMarkup()", node.toString());
+		node.visit(function(n){
+			if(n.tr){
+				$(n.tr).remove();
+				n.tr = null;
+			}
+		});
+	},
+	nodeRemoveMarkup: function(ctx) {
+		var node = ctx.node;
+//		DT.debug("nodeRemoveMarkup()", node.toString());
+		if(node.tr){
+			$(node.tr).remove();
+			node.tr = null;
+		}
+		this.nodeRemoveChildMarkup(ctx);
+	},
+	/* Override standard render. */
+	nodeRender: function(ctx, force, deep, collapsed, _recursive) {
+		var $cb, children, firstTr, i, l, newRow, prevNode, prevTr, subCtx,
+			tree = ctx.tree,
+			node = ctx.node,
+			opts = ctx.options,
+			isRootNode = !node.parent;
+//			firstTime = false;
+		if( !_recursive ){
+			ctx.hasCollapsedParents = node.parent && !node.parent.expanded;
+		}
+		if( !isRootNode ){
+			if(!node.tr){
+				// Create new <tr> after previous row
+				newRow = tree.rowFragment.firstChild.cloneNode(true);
+				prevNode = findPrevRowNode(node);
+//				firstTime = true;
+//				$.ui.fancytree.debug("*** nodeRender " + node + ": prev: " + prevNode.key);
+				_assert(prevNode);
+				if(collapsed === true && _recursive){
+					// hide all child rows, so we can use an animation to show it later
+					newRow.style.display = "none";
+				}else if(deep && ctx.hasCollapsedParents){
+					// also hide this row if deep === true but any parent is collapsed
+					newRow.style.display = "none";
+//					newRow.style.color = "red";
+				}
+				if(!prevNode.tr){
+					_assert(!prevNode.parent, "prev. row must have a tr, or is system root");
+					tree.tbody.appendChild(newRow);
+				}else{
+					insertSiblingAfter(prevNode.tr, newRow);
+				}
+				node.tr = newRow;
+				if( node.key && opts.generateIds ){
+					node.tr.id = opts.idPrefix + node.key;
+				}
+				node.tr.ftnode = node;
+				if(opts.aria){
+					// TODO: why doesn't this work:
+//                  node.li.role = "treeitem";
+					$(node.tr).attr("aria-labelledby", "ftal_" + node.key);
+				}
+				node.span = $("span.fancytree-node", node.tr).get(0);
+				// Set icon, link, and title (normally this is only required on initial render)
+				this.nodeRenderTitle(ctx);
+				// move checkbox to custom column
+				if(opts.checkbox && opts.table.checkboxColumnIdx != null){
+//					$("span.fancytree-node", node.tr).get(0);
+					$cb = $("span.fancytree-checkbox", node.span).detach();
+					$(node.tr).find("td:first").append($cb);
+				}
+				// Allow tweaking, binding, after node was created for the first time
+				tree._triggerNodeEvent("createNode", ctx);
+			}
+		}
+		 // Allow tweaking after node state was rendered
+		tree._triggerNodeEvent("renderNode", ctx);
+		// Visit child nodes
+		// Add child markup
+		children = node.children;
+		if(children && (isRootNode || deep || node.expanded)){
+			for(i=0, l=children.length; i<l; i++) {
+				subCtx = $.extend({}, ctx, {node: children[i]});
+				subCtx.hasCollapsedParents = subCtx.hasCollapsedParents || !node.expanded;
+				this.nodeRender(subCtx, force, deep, collapsed, true);
+			}
+		}
+		// Make sure, that <tr> order matches node.children order.
+		if(children && !_recursive){ // we only have to do it once, for the root branch
+			prevTr = node.tr || null;
+			firstTr = tree.tbody.firstChild;
+			// Iterate over all descendants
+			node.visit(function(n){
+				if(n.tr){
+					if(!node.expanded && !isRootNode && n.tr.style.display !== "none"){
+						// fix after a node was dropped over a sibling.
+						// In this case it must be hidden
+						n.tr.style.display = "none";
+					}
+					if(n.tr.previousSibling !== prevTr){
+						node.debug("_fixOrder: mismatch at node: " + n);
+						var nextTr = prevTr ? prevTr.nextSibling : firstTr;
+						tree.tbody.insertBefore(n.tr, nextTr);
+					}
+					prevTr = n.tr;
+				}
+			});
+		}
+		// Update element classes according to node state
+		if(!isRootNode){
+			this.nodeRenderStatus(ctx);
+		}
+		// Finally add the whole structure to the DOM, so the browser can render
+		// if(firstTime){
+		//     parent.ul.appendChild(node.li);
+		// }
+			// TODO: just for debugging
+	//            this._super(ctx);
+	},
+	nodeRenderTitle: function(ctx, title) {
+		var node = ctx.node;
+		this._super(ctx);
+		// let user code write column content
+		ctx.tree._triggerNodeEvent("renderColumns", node);
+	},
+	nodeRenderStatus: function(ctx) {
+		var indent,
+			node = ctx.node,
+			opts = ctx.options;
+
+		 this._super(ctx);
+		 // indent
+		 indent = (node.getLevel() - 1) * opts.table.indentation;
+		 if(indent){
+			 $(node.span).css({marginLeft: indent + "px"});
+		 }
+	 },
+	/* Expand node, return Deferred.promise. */
+	nodeSetExpanded: function(ctx, flag) {
+		var node = ctx.node,
+			dfd = new $.Deferred();
+		this._super(ctx, flag).done(function(){
+			flag = (flag !== false);
+			setChildRowVisibility(ctx.node, flag);
+			dfd.resolveWith(node);
+		});
+		return dfd;
+	},
+	nodeSetStatus: function(ctx, status, message, details) {
+		if(status === "ok"){
+			var node = ctx.node,
+				firstChild = ( node.children ? node.children[0] : null );
+			if ( firstChild && firstChild.isStatusNode ) {
+				$(firstChild.tr).remove();
+			}
+		}
+		this._super(ctx, status, message, details);
+	}/*,
+	treeSetFocus: function(ctx, flag) {
+//	        alert("treeSetFocus" + ctx.tree.$container);
+		ctx.tree.$container.focus();
+		$.ui.fancytree.focusTree = ctx.tree;
+	}*/
+});
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.themeroller.js
+ *
+ * Enable jQuery UI ThemeRoller styles.
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * @see http://jqueryui.com/themeroller/
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+/*******************************************************************************
+ * Extension code
+ */
+$.ui.fancytree.registerExtension("themeroller", {
+	// Default options for this extension.
+	options: {
+		activeClass: "ui-state-active",
+		foccusClass: "ui-state-focus",
+		hoverClass: "ui-state-hover",
+		selectedClass: "ui-state-highlight"
+	},
+	// Overide virtual methods for this extension.
+	// `this`       : is this extension object
+	// `this._base` : the Fancytree instance
+	// `this._super`: the virtual function that was overriden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		this._super(ctx);
+		var $el = ctx.widget.element;
+
+		if($el[0].nodeName === "TABLE"){
+			$el.addClass("ui-widget ui-corner-all");
+			$el.find(">thead tr").addClass("ui-widget-header");
+			$el.find(">tbody").addClass("ui-widget-conent");
+		}else{
+			$el.addClass("ui-widget ui-widget-content ui-corner-all");
+		}
+
+		$el.delegate(".fancytree-node", "mouseenter mouseleave", function(event){
+			var node = $.ui.fancytree.getNode(event.target),
+				flag = (event.type === "mouseenter");
+			node.debug("hover: " + flag);
+			$(node.span).toggleClass("ui-state-hover ui-corner-all", flag);
+		});
+	},
+	treeDestroy: function(ctx){
+		this._super(ctx);
+		ctx.widget.element.removeClass("ui-widget ui-widget-content ui-corner-all");
+	},
+	nodeRenderStatus: function(ctx){
+		var node = ctx.node,
+			$el = $(node.span);
+		this._super(ctx);
+/*
+		.ui-state-highlight: Class to be applied to highlighted or selected elements. Applies "highlight" container styles to an element and its child text, links, and icons.
+		.ui-state-error: Class to be applied to error messaging container elements. Applies "error" container styles to an element and its child text, links, and icons.
+		.ui-state-error-text: An additional class that applies just the error text color without background. Can be used on form labels for instance. Also applies error icon color to child icons.
+
+		.ui-state-default: Class to be applied to clickable button-like elements. Applies "clickable default" container styles to an element and its child text, links, and icons.
+		.ui-state-hover: Class to be applied on mouseover to clickable button-like elements. Applies "clickable hover" container styles to an element and its child text, links, and icons.
+		.ui-state-focus: Class to be applied on keyboard focus to clickable button-like elements. Applies "clickable hover" container styles to an element and its child text, links, and icons.
+		.ui-state-active: Class to be applied on mousedown to clickable button-like elements. Applies "clickable active" container styles to an element and its child text, links, and icons.
+*/
+		$el.toggleClass("ui-state-active", node.isActive());
+		$el.toggleClass("ui-state-focus", node.hasFocus());
+		$el.toggleClass("ui-state-highlight", node.isSelected());
+//		node.debug("ext-themeroller.nodeRenderStatus: ", node.span.className);
+	}
+});
+}(jQuery, window, document));
+
diff --git a/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree.js.bundle b/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree.js.bundle
new file mode 100644
index 00000000..33185b26
--- /dev/null
+++ b/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree.js.bundle
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bundle minify="true" runOnBuild="true">
+  <file>/ClientSource/Scripts/Modules/jQuery-Fancytree/jquery.fancytree-all.js</file>
+</bundle>
\ No newline at end of file
diff --git a/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree.min.js b/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree.min.js
new file mode 100644
index 00000000..07903d08
--- /dev/null
+++ b/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree.min.js
@@ -0,0 +1,2 @@
+(function(n,t,i,r){"use strict";function p(t){t=t||"",n.error("Not implemented: "+t)}function u(t,i){i=": "+i||"",t||n.error("Assertion failed"+i)}function e(n,i){var r,f,u=t.console?t.console[n]:null;if(u)if(u.apply)u.apply(t.console,i);else{for(f="",r=0;r<i.length;r++)f+=i[r];u(f)}}function g(t){for(var r,u,e=n.map(n.trim(t).split("."),function(n){return parseInt(n,10)}),f=n.map(Array.prototype.slice.call(arguments,1),function(n){return parseInt(n,10)}),i=0;i<f.length;i++)if(r=e[i]||0,u=f[i]||0,r!==u)return r>u;return!0}function nt(n,t,i){var r=t[n],u=i[n];return function(){try{return t._super=function(){return r.apply(t,arguments)},u.apply(t,arguments)}finally{t._super=null}}}function tt(t,i,r,u){for(var f in r)typeof r[f]=="function"?typeof t[f]=="function"?t[f]=nt(f,t,r):f.charAt(0)==="_"?t[u][f]=n.proxy(r[f],t):n.error("Could not override tree."+f+". Use prefix '_' to create tree."+u+"._"+f):f!=="options"&&(t[u][f]=i[f])}function c(t,i){return t===r?n.Deferred(function(){this.resolve()}).promise():n.Deferred(function(){this.resolveWith(t,i)}).promise()}function l(t,i){return t===r?n.Deferred(function(){this.reject()}).promise():n.Deferred(function(){this.rejectWith(t,i)}).promise()}function w(n,t){return function(){n.resolveWith(t)}}function b(n){return n=n.toLowerCase(),function(t){return t.title.toLowerCase().indexOf(n)>=0}}function s(t,i){var e,s,r,o;for(this.parent=t,this.tree=t.tree,this.ul=null,this.li=null,this.isStatusNode=!1,this.data={},e=0,s=h.length;e<s;e++)r=h[e],this[r]=i[r];i.data&&n.extend(this.data,i.data);for(r in i)v[r]||n.isFunction(i[r])||d[r]||(this.data[r]=i[r]);this.key==null&&(this.key="_"+f._nextNodeKey++),i.active&&(u(this.tree.activeNode===null,"only one active node allowed"),this.tree.activeNode=this),this.children=null,o=i.children,o&&o.length&&this._setChildren(o)}function y(t){this.widget=t,this.$div=t.element,this.options=t.options,this._id=n.ui.fancytree._nextId++,this._ns=".fancytree-"+this._id,this.activeNode=null,this.focusNode=null,this.lastSelectedNode=null,this.systemFocusElement=null,this.statusClassPropName="span",this.ariaPropName="li",this.nodeContainerAttrName="li",this.$div.find(">ul.fancytree-container").remove();var r={tree:this},i;this.rootNode=new s(r,{title:"root",key:"root_"+this._id,children:null}),this.rootNode.parent=null,i=n("<ul>",{"class":"ui-fancytree fancytree-container"}).appendTo(this.$div),this.$container=i,this.rootNode.ul=i[0],this.options.debugLevel==null&&(this.options.debugLevel=f.debugLevel),this.options.tabbable&&this.$container.attr("tabindex","0"),this.options.aria&&this.$container.attr("role","tree").attr("aria-multiselectable",!0)}if(n.ui.fancytree&&n.ui.fancytree.version){n.ui.fancytree.warn("Fancytree: ignored duplicate include");return}for(var f=null,a="active expanded focus folder lazy selected unselectable".split(" "),k={},h="expanded extraClasses folder hideCheckbox key lazy selected title tooltip unselectable".split(" "),v={},d={active:!0,children:!0,data:!0,focus:!0},o=0;o<a.length;o++)k[a[o]]=!0;for(o=0;o<h.length;o++)v[h[o]]=!0;s.prototype={_findDirectChild:function(n){var t,r,i=this.children;if(i)if(typeof n=="string"){for(t=0,r=i.length;t<r;t++)if(i[t].key===n)return i[t]}else{if(typeof n=="number")return this.children[n];if(n.parent===this)return n}return null},_setChildren:function(n){u(n&&(!this.children||this.children.length===0),"only init supported"),this.children=[];for(var t=0,i=n.length;t<i;t++)this.children.push(new s(this,n[t]))},addChildren:function(t,i){var r,o,e,h=null,f=[];for(n.isPlainObject(t)&&(t=[t]),this.children||(this.children=[]),r=0,o=t.length;r<o;r++)f.push(new s(this,t[r]));return h=f[0],i==null?this.children=this.children.concat(f):(i=this._findDirectChild(i),e=n.inArray(i,this.children),u(e>=0,"insertBefore must be an existing child"),this.children.splice.apply(this.children,[e,0].concat(f))),(!this.parent||this.parent.ul)&&this.render(),this.tree.options.selectMode===3&&this.fixSelection3FromEndNodes(),h},addNode:function(n,t){(t===r||t==="over")&&(t="child");switch(t){case"after":return this.getParent().addChildren(n,this.getNextSibling());case"before":return this.getParent().addChildren(n,this);case"child":case"over":return this.addChildren(n)}u(!1,"Invalid mode: "+t)},applyPatch:function(t){if(t===null)return this.remove(),c(this);var i,r,u={children:!0,expanded:!0,parent:!0};for(i in t)r=t[i],u[i]||n.isFunction(r)||(v[i]?this[i]=r:this.data[i]=r);return t.hasOwnProperty("children")&&(this.removeChildren(),t.children&&this._setChildren(t.children)),this.isVisible()&&(this.renderTitle(),this.renderStatus()),t.hasOwnProperty("expanded")?this.setExpanded(t.expanded):c(this)},collapseSiblings:function(){return this.tree._callHook("nodeCollapseSiblings",this)},copyTo:function(n,t,i){return n.addNode(this.toDict(!0,i),t)},countChildren:function(n){var r=this.children,t,u,i;if(!r)return 0;if(i=r.length,n!==!1)for(t=0,u=i;t<u;t++)i+=r[t].countChildren();return i},debug:function(){this.tree.options.debugLevel>=2&&(Array.prototype.unshift.call(arguments,this.toString()),e("debug",arguments))},discard:function(){if(this.lazy&&n.isArray(this.children))return this.removeChildren(),this.setExpanded(!1)},findAll:function(t){t=n.isFunction(t)?t:b(t);var i=[];return this.visit(function(n){t(n)&&i.push(n)}),i},findFirst:function(t){t=n.isFunction(t)?t:b(t);var i=null;return this.visit(function(n){if(t(n))return i=n,!1}),i},_changeSelectStatusAttrs:function(n){var t=!1;switch(n){case!1:t=this.selected||this.partsel,this.selected=!1,this.partsel=!1;break;case!0:t=!this.selected||!this.partsel,this.selected=!0,this.partsel=!0;break;case r:t=this.selected||!this.partsel,this.selected=!1,this.partsel=!0;break;default:u(!1,"invalid state: "+n)}return this.debug("fixSelection3AfterLoad() _changeSelectStatusAttrs()",n,t),t&&this.renderStatus(),t},fixSelection3AfterClick:function(){var n=this.isSelected();this.visit(function(t){t._changeSelectStatusAttrs(n)}),this.fixSelection3FromEndNodes()},fixSelection3FromEndNodes:function(){function n(t){var i,h,c,f,u,e,o,s=t.children;if(s){for(e=!0,o=!1,i=0,h=s.length;i<h;i++)c=s[i],f=n(c),f!==!1&&(o=!0),f!==!0&&(e=!1);u=e?!0:o?r:!1}else u=!!t.selected;return t._changeSelectStatusAttrs(u),u}u(this.tree.options.selectMode===3,"expected selectMode 3"),n(this),this.visitParents(function(n){for(var t,f,e=n.children,o=!0,s=!1,i=0,u=e.length;i<u;i++)t=e[i],(t.selected||t.partsel)&&(s=!0),t.unselectable||t.selected||(o=!1);f=o?!0:s?r:!1,n._changeSelectStatusAttrs(f)})},fromDict:function(t){for(var i in t)v[i]?this[i]=t[i]:i==="data"?n.extend(this.data,t.data):n.isFunction(t[i])||d[i]||(this.data[i]=t[i]);t.children?(this.removeChildren(),this.addChildren(t.children)):this.renderTitle()},getChildren:function(){return this.hasChildren()===r?r:this.children},getFirstChild:function(){return this.children?this.children[0]:null},getIndex:function(){return n.inArray(this,this.parent.children)},getIndexHier:function(t){t=t||".";var i=[];return n.each(this.getParentList(!1,!0),function(n,t){i.push(t.getIndex()+1)}),i.join(t)},getKeyPath:function(n){var t=[],i=this.tree.options.keyPathSeparator;return this.visitParents(function(n){n.parent&&t.unshift(n.key)},!n),i+t.join(i)},getLastChild:function(){return this.children?this.children[this.children.length-1]:null},getLevel:function(){for(var t=0,n=this.parent;n;)t++,n=n.parent;return t},getNextSibling:function(){if(this.parent)for(var t=this.parent.children,n=0,i=t.length-1;n<i;n++)if(t[n]===this)return t[n+1];return null},getParent:function(){return this.parent},getParentList:function(n,t){for(var r=[],i=t?this:this.parent;i;)(n||i.parent)&&r.unshift(i),i=i.parent;return r},getPrevSibling:function(){if(this.parent)for(var t=this.parent.children,n=1,i=t.length;n<i;n++)if(t[n]===this)return t[n-1];return null},hasChildren:function(){return this.lazy?this.children===null||this.children===r?r:this.children.length===0?!1:this.children.length===1&&this.children[0].isStatusNode?r:!0:!!this.children},hasFocus:function(){return this.tree.hasFocus()&&this.tree.focusNode===this},isActive:function(){return this.tree.activeNode===this},isChildOf:function(n){return this.parent&&this.parent===n},isDescendantOf:function(n){if(!n||n.tree!==this.tree)return!1;for(var t=this.parent;t;){if(t===n)return!0;t=t.parent}return!1},isExpanded:function(){return!!this.expanded},isFirstSibling:function(){var n=this.parent;return!n||n.children[0]===this},isFolder:function(){return!!this.folder},isLastSibling:function(){var n=this.parent;return!n||n.children[n.children.length-1]===this},isLazy:function(){return!!this.lazy},isLoading:function(){p()},isRoot:function(){return this.tree.rootNode===this},isSelected:function(){return!!this.selected},isVisible:function(){for(var i=this.getParentList(!1,!1),n=0,t=i.length;n<t;n++)if(!i[n].expanded)return!1;return!0},makeVisible:function(){for(var i=this.getParentList(!1,!1),n=0,t=i.length;n<t;n++)i[n].setExpanded(!0)},moveTo:function(t,i,f){(i===r||i==="over")&&(i="child");var o,s=this.parent,e=i==="child"?t:t.parent;if(this!==t){if(this.parent){if(e.isDescendantOf(this))throw"Cannot move a node to it's own descendant";}else throw"Cannot move system root";if(this.parent.children.length===1?(this.parent.children=this.parent.lazy?[]:null,this.parent.expanded=!1):(o=n.inArray(this,this.parent.children),u(o>=0),this.parent.children.splice(o,1)),this.parent=e,e.hasChildren())switch(i){case"child":e.children.push(this);break;case"before":o=n.inArray(t,e.children),u(o>=0),e.children.splice(o,0,this);break;case"after":o=n.inArray(t,e.children),u(o>=0),e.children.splice(o+1,0,this);break;default:throw"Invalid mode "+i;}else e.children=[this];f&&t.visit(f,!0),this.tree!==t.tree&&(this.warn("Cross-tree moveTo is experimantal!"),this.visit(function(n){n.tree=t.tree},!0)),s.isDescendantOf(e)||s.render(),e.isDescendantOf(s)||e===s||e.render()}},lazyLoad:function(t){t?this.discard():u(!n.isArray(this.children));var i=this.tree._triggerNodeEvent("lazyload",this);return u(typeof i!="boolean","lazyload event must return source in data.result"),this.tree._callHook("nodeLoadChildren",this,i)},render:function(n,t){return this.tree._callHook("nodeRender",this,n,t)},renderTitle:function(){return this.tree._callHook("nodeRenderTitle",this)},renderStatus:function(){return this.tree._callHook("nodeRenderStatus",this)},remove:function(){return this.parent.removeChild(this)},removeChild:function(n){return this.tree._callHook("nodeRemoveChild",this,n)},removeChildren:function(){return this.tree._callHook("nodeRemoveChildren",this)},scheduleAction:function(n,t){this.tree.timer&&clearTimeout(this.tree.timer),this.tree.timer=null;var i=this;switch(n){case"cancel":break;case"expand":this.tree.timer=setTimeout(function(){i.tree.debug("setTimeout: trigger expand"),i.setExpanded(!0)},t);break;case"activate":this.tree.timer=setTimeout(function(){i.tree.debug("setTimeout: trigger activate"),i.setActive(!0)},t);break;default:throw"Invalid mode "+n;}},scrollIntoView:function(t,i){t=t===!0?{duration:200,queue:!1}:t;var h,e=new n.Deferred,r=n(this.span).position().top,c=n(this.span).height(),u=this.tree.$container,o=u[0].scrollTop,l=Math.max(0,u.innerHeight()-u[0].clientHeight),s=u.height()-l,f=null;return r<0?f=o+r:r+c>s&&(f=o+r-s+c,i&&(h=i?n(i.span).position().top:0,r-h>s&&(f=o+r))),f!==null?t?u.animate({scrollTop:f},t):(u[0].scrollTop=f,e.resolveWith(this)):e.resolveWith(this),e.promise()},setActive:function(n){return this.tree._callHook("nodeSetActive",this,n)},setExpanded:function(n){return this.tree._callHook("nodeSetExpanded",this,n)},setFocus:function(n){return this.tree._callHook("nodeSetFocus",this,n)},setSelected:function(n){return this.tree._callHook("nodeSetSelected",this,n)},setTitle:function(n){this.title=n,this.renderTitle()},sortChildren:function(n,t){var i,u,r=this.children;if(r){if(n=n||function(n,t){var i=n.title.toLowerCase(),r=t.title.toLowerCase();return i===r?0:i>r?1:-1},r.sort(n),t)for(i=0,u=r.length;i<u;i++)r[i].children&&r[i].sortChildren(n,"$norender$");t!=="$norender$"&&this.render()}},toDict:function(t,i){var u,o,f,r={},e=this;if(n.each(h,function(n,t){(e[t]||e[t]===!1)&&(r[t]=e[t])}),n.isEmptyObject(this.data)||(r.data=n.extend({},this.data),n.isEmptyObject(r.data)&&delete r.data),i&&i(r),t&&this.hasChildren())for(r.children=[],u=0,o=this.children.length;u<o;u++)f=this.children[u],f.isStatusNode||r.children.push(f.toDict(!0,i));return r},toggleExpanded:function(){return this.tree._callHook("nodeToggleExpanded",this)},toggleSelected:function(){return this.tree._callHook("nodeToggleSelected",this)},toString:function(){return"<FancytreeNode(#"+this.key+", '"+this.title+"')>"},visit:function(n,t){var r,f,i=!0,u=this.children;if(t===!0&&(i=n(this),i===!1||i==="skip"))return i;if(u)for(r=0,f=u.length;r<f;r++)if(i=u[r].visit(n,!0),i===!1)break;return i},visitParents:function(n,t){if(t&&n(this)===!1)return!1;for(var i=this.parent;i;){if(n(i)===!1)return!1;i=i.parent}return!0},warn:function(){Array.prototype.unshift.call(arguments,this.toString()),e("warn",arguments)}},y.prototype={_makeHookContext:function(t,i){if(t.node!==r)return i&&t.originalEvent!==i&&n.error("invalid args"),t;if(t.tree){var u=t.tree;return{node:t,tree:u,widget:u.widget,options:u.widget.options,originalEvent:i}}if(t.widget)return{node:null,tree:t,widget:t.widget,options:t.widget.options,originalEvent:i};n.error("invalid args")},_callHook:function(t,i){var f=this._makeHookContext(i),r=this[t],u=Array.prototype.slice.call(arguments,2);return n.isFunction(r)||n.error("_callHook('"+t+"') is not a function"),u.unshift(f),r.apply(this,u)},activateKey:function(n){var t=this.getNodeByKey(n);return t?t.setActive():this.activeNode&&this.activeNode.setActive(!1),t},applyPatch:function(t){for(var o,r,f,s,e,c=t.length,h=[],i=0;i<c;i++)r=t[i],u(r.length===2,"patchList must be an array of length-2-arrays"),f=r[0],s=r[1],e=f===null?this.rootNode:this.getNodeByKey(f),e?(o=new n.Deferred,h.push(o),e.applyPatch(s).always(w(o,e))):this.warn("could not find node with key '"+f+"'");return n.when.apply(n,h).promise()},count:function(){return this.rootNode.countChildren()},debug:function(){this.options.debugLevel>=2&&(Array.prototype.unshift.call(arguments,this.toString()),e("debug",arguments))},generateFormElements:function(t,i){var u,f=t!==!1?"ft_"+this._id:t,e=i!==!1?"ft_"+this._id+"_active":i,o="fancytree_result_"+this._id,r=this.$container.find("div#"+o);r.length?r.empty():r=n("<div>",{id:o}).hide().appendTo(this.$container),f&&(u=this.getSelectedNodes(this.options.selectMode===3),n.each(u,function(t,i){r.append(n("<input>",{type:"checkbox",name:f,value:i.key,checked:!0}))})),e&&this.activeNode&&r.append(n("<input>",{type:"radio",name:e,value:this.activeNode.key,checked:!0}))},getActiveNode:function(){return this.activeNode},getFirstChild:function(){return this.rootNode.getFirstChild()},getFocusNode:function(){return this.focusNode},getNodeByKey:function(n,t){var r,u;return!t&&(r=i.getElementById(this.options.idPrefix+n),r)?r.ftnode?r.ftnode:null:(t=t||this.rootNode,u=null,t.visit(function(t){if(t.key===n)return u=t,!1},!0),u)},getSelectedNodes:function(n){var t=[];return this.rootNode.visit(function(i){if(i.selected&&(t.push(i),n===!0))return"skip"}),t},hasFocus:function(){return f.focusTree===this},info:function(){this.options.debugLevel>=1&&(Array.prototype.unshift.call(arguments,this.toString()),e("info",arguments))},loadKeyPath:function(t,i,u){function b(n,t,r){i.call(h,t,"loading"),t.lazyLoad().done(function(){h.loadKeyPath.call(h,o[n],i,t).always(w(r,h))}).fail(function(){h.warn("loadKeyPath: error loading: "+n+" (parent: "+l+")"),i.call(h,t,"error"),r.reject()})}var y,p,a,c,f,o,e,s,l=u||this.rootNode,v=this.options.keyPathSeparator,h=this;for(n.isArray(t)||(t=[t]),o={},a=0;a<t.length;a++)for(c=t[a],c.charAt(0)===v&&(c=c.substr(1)),s=c.split(v);s.length;)if(f=s.shift(),e=l._findDirectChild(f),e)if(s.length===0){i.call(this,e,"ok");break}else if(e.lazy&&e.hasChildren()===r){i.call(this,e,"loaded"),o[f]?o[f].push(s.join(v)):o[f]=[s.join(v)];break}else i.call(this,e,"loaded"),l=e;else{this.warn("loadKeyPath: key not found: "+f+" (parent: "+l+")"),i.call(this,f,"error");break}y=[];for(f in o)e=l._findDirectChild(f),p=new n.Deferred,y.push(p),b(f,e,p);return n.when.apply(n,y).promise()},nodeClick:function(n){var t,i,r=n.originalEvent,u=n.targetType,f=n.node;if(u==="expander")this._callHook("nodeToggleExpanded",n);else if(u==="checkbox")this._callHook("nodeToggleSelected",n),this._callHook("nodeSetFocus",n,!0);else{if(i=!1,t=!0,f.folder)switch(n.options.clickFolderMode){case 2:i=!0,t=!1;break;case 3:t=!0,i=!0}t&&(this.nodeSetFocus(n),this._callHook("nodeSetActive",n,!0)),i&&(!t,this._callHook("nodeToggleExpanded",n))}r.target.localName==="a"&&r.target.className==="fancytree-title"&&r.preventDefault()},nodeCollapseSiblings:function(n){var i,t,u,r=n.node;if(r.parent)for(i=r.parent.children,t=0,u=i.length;t<u;t++)i[t]!==r&&i[t].expanded&&this._callHook("nodeSetExpanded",i[t],!1)},nodeDblclick:function(n){n.targetType==="title"&&n.options.clickFolderMode===4&&this._callHook("nodeToggleExpanded",n),n.targetType==="title"&&n.originalEvent.preventDefault()},nodeKeydown:function(t){function e(n){if(n)return n.makeVisible(),h.ctrlKey||!c.autoActivate?n.setFocus():n.setActive()}var o,s,h=t.originalEvent,i=t.node,f=t.tree,c=t.options,l=!0,u=n.ui.keyCode,r=null;i||(this.rootNode.getFirstChild().setFocus(),i=t.node=this.focusNode,i.debug("Keydown force focus on first node"));switch(h.which){case u.NUMPAD_ADD:case 187:f.nodeSetExpanded(t,!0);break;case u.NUMPAD_SUBTRACT:case 189:f.nodeSetExpanded(t,!1);break;case u.SPACE:c.checkbox?f.nodeToggleSelected(t):f.nodeSetActive(t,!0);break;case u.ENTER:f.nodeSetActive(t,!0);break;case u.BACKSPACE:e(i.parent);break;case u.LEFT:i.expanded?(f.nodeSetExpanded(t,!1),e(i)):i.parent&&i.parent.parent&&e(i.parent);break;case u.RIGHT:!i.expanded&&(i.children||i.lazy)?(f.nodeSetExpanded(t,!0),e(i)):i.children&&e(i.children[0]);break;case u.UP:for(r=i.getPrevSibling();r&&r.expanded&&r.children;)r=r.children[r.children.length-1];!r&&i.parent&&i.parent.parent&&(r=i.parent),e(r);break;case u.DOWN:if(i.expanded&&i.children)r=i.children[0];else for(s=i.getParentList(!1,!0),o=s.length-1;o>=0;o--)if(r=s[o].getNextSibling(),r)break;e(r);break;default:l=!1}l&&h.preventDefault()},nodeLoadChildren:function(t,i){var o,h,f,r,e=t.tree,s=t.node,c=this;if(n.isFunction(i)&&(i=i()),i.url||n.isFunction(i.done)){if(e.nodeSetStatus(t,"loading"),i.url){if(o=n.extend({},t.options.ajax,i),o.debugLazyDelay)return f=o.debugLazyDelay,n.isArray(f)&&(f=f[0]+Math.random()*(f[1]-f[0])),s.debug("nodeLoadChildren waiting debug delay "+Math.round(f)+"ms"),r=n.Deferred(),setTimeout(function(){o.debugLazyDelay=!1,c.nodeLoadChildren(t,o).complete(function(){r.resolve.apply(this,arguments)})},f),r;r=n.ajax(o)}else r=i;r.done(function(i){var r;e.nodeSetStatus(t,"ok"),typeof i=="string"&&n.error("Ajax request returned a string (did you get the JSON dataType wrong?)."),t.options.postProcess?(r=e._triggerNodeEvent("postProcess",t,t.originalEvent,{response:i,dataType:this.dataType}),i=n.isArray(r)?r:i):i&&i.hasOwnProperty("d")&&t.options.enableAspx&&(i=typeof i.d=="string"?n.parseJSON(i.d):i.d),h=i}).fail(function(n,i,r){e.nodeSetStatus(t,"error",i,n.status+": "+r),alert("error: "+i+" ("+n.status+": "+(r.message||r)+")")})}else r=n.Deferred(),h=i,r.resolve();return r.done(function(){u(n.isArray(h),"expected array of children"),s._setChildren(h),s.parent&&(s.isVisible()&&e.nodeRender(t),e._triggerNodeEvent("loadChildren",s))}).fail(function(){e.nodeRender(t)}),r},nodeLoadKeyPath:function(){},nodeMakeVisible:function(n){for(var r=n.node.getParentList(!1,!1),t=0,i=r.length;t<i;t++)r[t].setExpanded(!0)},nodeRemoveChild:function(t,i){var e,s=t.node,h=t.options,o=n.extend({},t,{node:i}),r=s.children;if(f.debug("nodeRemoveChild()",s.toString(),i.toString()),r.length===1)return u(i===r[0]),this.nodeRemoveChildren(t);this.activeNode&&(i===this.activeNode||this.activeNode.isDescendantOf(i))&&this.activeNode.setActive(!1),this.focusNode&&(i===this.focusNode||this.focusNode.isDescendantOf(i))&&(this.focusNode=null),this.nodeRemoveMarkup(o),this.nodeRemoveChildren(o),e=n.inArray(i,r),u(e>=0),i.visit(function(n){n.parent=null},!0),h.removeNode&&h.removeNode.call(t.tree,{type:"removeNode"},o),r.splice(e,1)},nodeRemoveChildMarkup:function(t){var i=t.node;f.debug("nodeRemoveChildMarkup()",i.toString()),i.ul&&(n(i.ul).remove(),i.visit(function(n){n.li=n.ul=null}),i.ul=null)},nodeRemoveChildren:function(t){var u,i=t.node,o=i.children,e=t.options;(f.debug("nodeRemoveChildren()",i.toString()),o)&&(this.activeNode&&this.activeNode.isDescendantOf(i)&&this.activeNode.setActive(!1),this.focusNode&&this.focusNode.isDescendantOf(i)&&(this.focusNode=null),this.nodeRemoveChildMarkup(t),u=n.extend({},t),i.visit(function(n){n.parent=null,e.removeNode&&(u.node=n,e.removeNode.call(t.tree,{type:"removeNode"},u))}),i.children=r,this.nodeRenderStatus(t))},nodeRemoveMarkup:function(t){var i=t.node;f.debug("nodeRemoveMarkup()",i.toString()),i.li&&(n(i.li).remove(),i.li=null),this.nodeRemoveChildMarkup(t)},nodeRender:function(t,r,f,e,o){var a,v,y,h,p,d,s=t.node,g=t.tree,c=t.options,b=c.aria,nt=!1,k=s.parent,w=!k,l=s.children;if(u(w||k.ul,"parent UL must exist"),w||(s.li&&(r||s.li.parentNode!==s.parent.ul)&&(s.li.parentNode!==s.parent.ul&&this.warn("unlink "+s+" (must be child of "+s.parent+")"),this.nodeRemoveMarkup(t)),s.li||(nt=!0,s.li=i.createElement("li"),s.li.ftnode=s,b,s.key&&c.generateIds&&(s.li.id=c.idPrefix+s.key),s.span=i.createElement("span"),s.span.className="fancytree-node",b&&n(s.span).attr("aria-labelledby","ftal_"+s.key),s.li.appendChild(s.span),this.nodeRenderTitle(t),c.createNode&&c.createNode.call(g,{type:"createNode"},t)),c.renderNode&&c.renderNode.call(g,{type:"renderNode"},t)),l){if(w||s.expanded||f===!0){for(s.ul||(s.ul=i.createElement("ul"),(e!==!0||o)&&s.expanded||(s.ul.style.display="none"),b&&n(s.ul).attr("role","group"),s.li.appendChild(s.ul)),h=0,p=l.length;h<p;h++)d=n.extend({},t,{node:l[h]}),this.nodeRender(d,r,f,!1,!0);for(a=s.ul.firstChild,h=0,p=l.length-1;h<p;h++)v=l[h],y=a.ftnode,v!==y?(s.debug("_fixOrder: mismatch at index "+h+": "+v+" != "+y),s.ul.insertBefore(v.li,y.li)):a=a.nextSibling}}else s.ul&&(this.warn("remove child markup for "+s),this.nodeRemoveChildMarkup(t));w||(this.nodeRenderStatus(t),nt&&k.ul.appendChild(s.li));return},nodeRenderTitle:function(n,t){var c,l,s,h,a,i=n.node,y=n.tree,f=n.options,o=f.aria,v=i.getLevel(),u=[],e=i.data.icon;(t!==r&&(i.title=t),i.span)&&(v<f.minExpandLevel?v>1&&(o?u.push("<span role='button' class='fancytree-expander'><\/span>"):u.push("<span class='fancytree-expander'><\/span>")):o?u.push("<span role='button' class='fancytree-expander'><\/span>"):u.push("<span class='fancytree-expander'><\/span>"),f.checkbox&&i.hideCheckbox!==!0&&!i.isStatusNode&&(o?u.push("<span role='checkbox' class='fancytree-checkbox'><\/span>"):u.push("<span class='fancytree-checkbox'><\/span>")),h=o?" role='img'":"",e&&typeof e=="string"?(l=e.charAt(0)==="/"?e:f.imagePath+e,u.push("<img src='"+l+"' alt='' />")):i.data.iconclass?u.push("<span "+h+" class='fancytree-custom-icon "+i.data.iconclass+"'><\/span>"):(e===!0||e!==!1&&f.icons!==!1)&&u.push("<span "+h+" class='fancytree-icon'><\/span>"),s="",f.renderTitle&&(s=f.renderTitle.call(y,{type:"renderTitle"},n)||""),s||(a=i.tooltip?" title='"+i.tooltip.replace(/\"/g,"&quot;")+"'":"",c=o?" id='ftal_"+i.key+"'":"",h=o?" role='treeitem'":"",s="<span "+h+" class='fancytree-title'"+c+a+">"+i.title+"<\/span>"),u.push(s),i.span.innerHTML=u.join(""))},nodeRenderStatus:function(t){var i=t.node,o=t.tree,h=t.options,c=i.hasChildren(),s=i.isLastSibling(),f=h.aria,e=n(i.span).find(".fancytree-title"),u=h._classNames,r=[],l=i[o.statusClassPropName];l&&(r.push(u.node),o.activeNode===i&&r.push(u.active),o.focusNode===i?(r.push(u.focused),f&&e.attr("aria-activedescendant",!0)):f&&e.removeAttr("aria-activedescendant"),i.expanded?(r.push(u.expanded),f&&e.attr("aria-expanded",!0)):f&&e.removeAttr("aria-expanded"),i.folder&&r.push(u.folder),c!==!1&&r.push(u.hasChildren),s&&r.push(u.lastsib),i.lazy&&i.children===null&&r.push(u.lazy),i.partsel&&r.push(u.partsel),i.selected?(r.push(u.selected),f&&e.attr("aria-selected",!0)):f&&e.attr("aria-selected",!1),i.extraClasses&&r.push(i.extraClasses),c===!1?r.push(u.combinedExpanderPrefix+"n"+(s?"l":"")):r.push(u.combinedExpanderPrefix+(i.expanded?"e":"c")+(i.lazy&&i.children===null?"d":"")+(s?"l":"")),r.push(u.combinedIconPrefix+(i.expanded?"e":"c")+(i.folder?"f":"")),i[o.statusClassPropName].className=r.join(" "),i.li&&(i.li.className=s?u.lastsib:""))},nodeSetActive:function(t,i){var e,f=t.node,r=t.tree,o=t.options,s=f===r.activeNode;if(i=i!==!1,f.debug("nodeSetActive",i),s===i)return c(f);if(i&&this._triggerNodeEvent("beforeActivate",f,t.originalEvent)===!1)return l(f,["rejected"]);i?(r.activeNode&&(u(r.activeNode!==f,"node was active (inconsistency)"),e=n.extend({},t,{node:r.activeNode}),r.nodeSetActive(e,!1),u(r.activeNode===null,"deactivate was out of sync?")),o.activeVisible&&r.nodeMakeVisible(t),r.activeNode=f,r.nodeRenderStatus(t),r.nodeSetFocus(t),r._triggerNodeEvent("activate",f)):(u(r.activeNode===f,"node was not active (inconsistency)"),r.activeNode=null,this.nodeRenderStatus(t),t.tree._triggerNodeEvent("deactivate",f))},nodeSetExpanded:function(t,i){var s,f,o,a,h,v,u=t.node,y=t.tree,e=t.options;if(i=i!==!1,u.debug("nodeSetExpanded("+i+")"),u.expanded&&i||!u.expanded&&!i)return u.debug("nodeSetExpanded("+i+"): nothing to do"),c(u);if(!i||u.lazy||u.hasChildren()){if(!i&&u.getLevel()<e.minExpandLevel)return l(u,["locked"]);if(this._triggerNodeEvent("beforeExpand",u,t.originalEvent)===!1)return l(u,["rejected"])}else return l(u,["empty"]);if(f=new n.Deferred,i&&!u.expanded&&e.autoCollapse){h=u.getParentList(!1,!0),v=e.autoCollapse;try{for(e.autoCollapse=!1,o=0,a=h.length;o<a;o++)this._callHook("nodeCollapseSiblings",h[o])}finally{e.autoCollapse=v}}return f.done(function(){t.tree._triggerNodeEvent(i?"expand":"collapse",t),e.autoScroll&&u.getLastChild().scrollIntoView(!0,u)}),s=function(){var r,o,s,h;u.expanded=i,y._callHook("nodeRender",t,!1,!1,!0),u.ul?(s=u.ul.style.display!=="none",h=!!u.expanded,s===h?(u.warn("nodeSetExpanded: UL.style.display already set"),f.resolveWith(u)):e.fx?(r=e.fx.duration||200,o=e.fx.easing,u.debug("nodeSetExpanded: animate start..."),n(u.ul).animate(e.fx,r,o,function(){u.debug("nodeSetExpanded: animate done"),f.resolveWith(u)})):(u.ul.style.display=u.expanded||!parent?"":"none",f.resolveWith(u))):f.resolveWith(u)},i&&u.lazy&&u.hasChildren()===r?(u.debug("nodeSetExpanded: load start..."),u.lazyLoad().done(function(){u.debug("nodeSetExpanded: load done"),f.notifyWith&&f.notifyWith(u,["loaded"]),s.call(y)}).fail(function(n){f.rejectWith(u,["load failed ("+n+")"])})):s(),u.debug("nodeSetExpanded: returns"),f.promise()},nodeSetFocus:function(t,i){t.node.debug("nodeSetFocus("+i+")");var e,r=t.tree,u=t.node;if(i=i!==!1,r.focusNode){if(r.focusNode===u&&i){u.debug("nodeSetFocus("+i+"): nothing to do");return}e=n.extend({},t,{node:r.focusNode}),r.focusNode=null,this._triggerNodeEvent("blur",e),this._callHook("nodeRenderStatus",e)}i&&(f.focusTree!==r&&(u.debug("nodeSetFocus: forcing container focus"),this._callHook("treeSetFocus",t,!0,!0)),this.nodeMakeVisible(t),r.focusNode=u,this._triggerNodeEvent("focus",t),t.options.autoScroll&&u.scrollIntoView(),this._callHook("nodeRenderStatus",t))},nodeSetSelected:function(n,t){var i=n.node,r=n.tree,u=n.options;if(t=t!==!1,i.debug("nodeSetSelected("+t+")",n),!i.unselectable){if(i.selected&&t||!i.selected&&!t||this._triggerNodeEvent("beforeSelect",i,n.originalEvent)===!1)return!!i.selected;t&&u.selectMode===1?r.lastSelectedNode&&r.lastSelectedNode.setSelected(!1):u.selectMode===3&&(i.selected=t,i.fixSelection3AfterClick()),i.selected=t,this.nodeRenderStatus(n),r.lastSelectedNode=t?i:null,r._triggerNodeEvent("select",n)}},nodeSetStatus:function(t,i,r,u){var s,o,f=t.node,e=t.tree;s=function(){var n=f.children?f.children[0]:null;if(n&&n.isStatusNode){try{f.ul&&(f.ul.removeChild(n.li),n.li=null)}catch(t){}f.children.length===1?f.children=[]:f.children.shift()}return},o=function(t){var i=f.children?f.children[0]:null;return i&&i.isStatusNode?(n.extend(i,t),e._callHook("nodeRender",i)):(t.key="_statusNode",f._setChildren([t]),f.children[0].isStatusNode=!0,e.render()),f.children[0]};switch(i){case"ok":s(),n(f.span).removeClass("fancytree-loading");break;case"loading":n(f.span).addClass("fancytree-loading"),f.parent||o({title:e.options.strings.loading+(r?" ("+r+") ":""),tooltip:u,extraClasses:"fancytree-statusnode-wait"});break;case"error":n(f.span).addClass("fancytree-error"),o({title:e.options.strings.loadError+" ("+r+")",tooltip:u,extraClasses:"fancytree-statusnode-error"});break;default:n.error("invalid status "+i)}},nodeToggleExpanded:function(n){return this.nodeSetExpanded(n,!n.node.expanded)},nodeToggleSelected:function(n){return this.nodeSetSelected(n,!n.node.selected)},treeClear:function(n){var t=n.tree;t.activeNode=null,t.focusNode=null,t.$div.find(">ul.fancytree-container").empty(),t.rootNode.children=null},treeCreate:function(){},treeDestroy:function(){},treeInit:function(n){this.treeLoad(n)},treeLoad:function(t,i){var u,f,r=t.tree,e=t.widget.element,o=n.extend({},t,{node:this.rootNode});if(r.rootNode.children&&this.treeClear(t),i=i||this.options.source,i)typeof i=="string"&&p();else{u=e.data("type")||"html";switch(u){case"html":f=e.find(">ul:first"),f.addClass("ui-fancytree-source ui-helper-hidden"),i=n.ui.fancytree.parseHtml(f);break;case"json":i=n.parseJSON(e.text()),i.children&&(i.title&&(r.title=i.title),i=i.children);break;default:n.error("Invalid data-type: "+u)}}return this.nodeLoadChildren(o,i).done(function(){r.render(),t.options.selectMode===3&&r.rootNode.fixSelection3FromEndNodes(),r._triggerTreeEvent("init",!0)}).fail(function(){r.render(),r._triggerTreeEvent("init",!1)})},treeOnFocusInOut:function(t){var i=t.type==="focusin",r=n.ui.fancytree.getNode(t);try{this.debug("treeOnFocusInOut("+i+"), node=",r),u(!this._inFocusHandler,"Focus handler recursion"),this.systemFocusElement=i?t.target:null,this._inFocusHandler=!0,r?this._callHook("nodeSetFocus",r,i):this._callHook("treeSetFocus",this,i)}finally{this._inFocusHandler=!1}},treeSetFocus:function(n,t,i){t=t!==!1,this.debug("treeSetFocus("+t+"), _calledByNodeSetFocus: "+i),this.debug("    focusNode: "+this.focusNode),this.debug("    activeNode: "+this.activeNode),f.focusTree&&(this===f.focusTree&&t||(f.focusTree.focusNode&&f.focusTree.focusNode.setFocus(!1),f.focusTree.$container.removeClass("fancytree-focused"),this._triggerTreeEvent("blurTree"),f.focusTree=null)),t&&f.focusTree!==this?(f.focusTree=this,this.$container.addClass("fancytree-focused"),this.systemFocusElement||(this.debug("Set `:focus` to container"),this.$container.focus()),this.focusNode||i||(this.activeNode?this.activeNode.setFocus():this.rootNode.hasChildren()&&this.warn("NOT setting focus to first child")),this._triggerTreeEvent("focusTree")):f.focusTree=null},reactivate:function(n){var t=this.activeNode;t&&(this.activeNode=null,t.setActive(),n&&t.setFocus())},reload:function(n){return this._callHook("treeClear",this),this._callHook("treeLoad",this,n)},render:function(n,t){return this.rootNode.render(n,t)},setFocus:function(n){return this._callHook("treeSetFocus",this,n)},toDict:function(n,t){var i=this.rootNode.toDict(!0,t);return n?i:i.children},toString:function(){return"<Fancytree(#"+this._id+")>"},_triggerNodeEvent:function(t,i,u,f){var o,e=this._makeHookContext(i,u);return(f&&n.extend(e,f),o=this.widget._trigger(t,u,e),o!==!1&&e.result!==r)?e.result:o},_triggerTreeEvent:function(n,t){var i=this._makeHookContext(this,t),u=this.widget._trigger(n,t,i);return u!==!1&&i.result!==r?i.result:u},visit:function(n){return this.rootNode.visit(n,!1)},warn:function(){Array.prototype.unshift.call(arguments,this.toString()),e("warn",arguments)}},n.widget("ui.fancytree",{options:{activeVisible:!0,ajax:{type:"GET",cache:!1,dataType:"json"},aria:!1,autoActivate:!0,autoCollapse:!1,autoScroll:!1,checkbox:!1,clickFolderMode:4,debugLevel:null,disabled:!1,enableAspx:!0,extensions:[],fx:{height:"toggle",duration:200},generateIds:!1,icons:!0,idPrefix:"ft_",keyboard:!0,keyPathSeparator:"/",minExpandLevel:1,selectMode:2,strings:{loading:"Loading&#8230;",loadError:"Load error!"},tabbable:!0,_classNames:{node:"fancytree-node",folder:"fancytree-folder",combinedExpanderPrefix:"fancytree-exp-",combinedIconPrefix:"fancytree-ico-",hasChildren:"fancytree-has-children",active:"fancytree-active",selected:"fancytree-selected",expanded:"fancytree-expanded",lazy:"fancytree-lazy",focused:"fancytree-focused ui-state-focus",partsel:"fancytree-partsel",lastsib:"fancytree-lastsib"},lazyload:null,postProcess:null},_create:function(){this.tree=new y(this),this.$source=this.source||this.element.data("type")==="json"?this.element:this.element.find(">ul:first");for(var i,t,f=this.options.extensions,e=this.tree,r=0;r<f.length;r++)t=f[r],i=n.ui.fancytree._extensions[t],i||n.error("Could not apply extension '"+t+"' (it is not registered, did you forget to include it?)"),this.tree.options[t]=n.extend(!0,{},i.options,this.tree.options[t]),u(!this.tree[t],"Extension name must not exist as Fancytree attribute: "+t),this.tree[t]={},tt(this.tree,e,i,t),e=i;this.tree._callHook("treeCreate",this.tree)},_init:function(){this.tree._callHook("treeInit",this.tree),this._bind()},_setOption:function(t,i){var r=!0,u=!1;switch(t){case"aria":case"checkbox":case"icons":case"minExpandLevel":case"tabbable":this.tree._callHook("treeCreate",this.tree),u=!0;break;case"source":r=!1,this.tree._callHook("treeLoad",this.tree,i)}this.tree.debug("set option "+t+"="+i+" <"+typeof i+">"),r&&n.Widget.prototype._setOption.apply(this,arguments),u&&this.tree.render(!0,!1)},destroy:function(){this._unbind(),this.tree._callHook("treeDestroy",this.tree),this.tree.$div.find(">ul.fancytree-container").remove(),this.$source&&this.$source.removeClass("ui-helper-hidden"),n.Widget.prototype.destroy.call(this)},_unbind:function(){var t=this.tree._ns;this.element.unbind(t),this.tree.$container.unbind(t),n(i).unbind(t)},_bind:function(){var e=this,u=this.options,t=this.tree,r=t._ns,o=n.support.selectstart?"selectstart":"mousedown";this._unbind(),t.debug("bind events; container: ",t.$container),t.$container.bind("focusin"+r+" focusout"+r,function(n){t.debug("Tree container got event "+n.type),t.treeOnFocusInOut.call(t,n)}).delegate("span.fancytree-title",o+r,function(n){t.debug("<span> got event "+n.type),n.preventDefault()}),n(i).bind("keydown"+r,function(n){if(t.debug("doc got event "+n.type+", hasFocus:"+t.hasFocus()),u.disabled||u.keyboard===!1||!t.hasFocus())return!0;var i=t.focusNode,r=t._makeHookContext(i||t,n),f=t.phase;try{return t.phase="userEvent",i?t._triggerNodeEvent("keydown",i,n)===!1?!1:t._callHook("nodeKeydown",r):t._triggerTreeEvent("keydown",n)===!1?!1:t._callHook("nodeKeydown",r)}finally{t.phase=f}}),this.element.bind("click"+r+" dblclick"+r,function(n){if(u.disabled)return!0;var i,r=f.getEventTarget(n),o=r.node,t=e.tree,s=t.phase;if(!o)return!0;i=t._makeHookContext(o,n);try{t.phase="userEvent";switch(n.type){case"click":return i.targetType=r.type,t._triggerNodeEvent("click",i,n)===!1?!1:t._callHook("nodeClick",i);case"dblclick":return i.targetType=r.type,t._triggerNodeEvent("dblclick",i,n)===!1?!1:t._callHook("nodeDblclick",i)}}finally{t.phase=s}})},getActiveNode:function(){return this.tree.activeNode},getNodeByKey:function(n){return this.tree.getNodeByKey(n)},getRootNode:function(){return this.tree.rootNode},getTree:function(){return this.tree}}),f=n.ui.fancytree,n.extend(n.ui.fancytree,{version:"development",buildType:"release",debugLevel:1,_nextId:1,_nextNodeKey:1,_extensions:{},focusTree:null,_FancytreeClass:y,_FancytreeNodeClass:s,jquerySupports:{positionMyOfs:g(n.ui.version,1,9)},debug:function(){n.ui.fancytree.debugLevel>=2&&e("log",arguments)},error:function(){e("error",arguments)},getEventTargetType:function(n){return this.getEventTarget(n).type},getEventTarget:function(n){var i=n&&n.target?n.target.className:"",t={node:this.getNode(n.target),type:r};return i==="fancytree-title"?t.type="title":i==="fancytree-expander"?t.type=t.node.hasChildren()===!1?"prefix":"expander":i==="fancytree-checkbox"?t.type="checkbox":i==="fancytree-icon"?t.type="icon":i.indexOf("fancytree-node")>=0&&(t.type="title"),t},getNode:function(n){if(n instanceof s)return n;for(n.selector!==r?n=n[0]:n.originalEvent!==r&&(n=n.target);n;){if(n.ftnode)return n.ftnode;n=n.parentNode}return null},info:function(){n.ui.fancytree.debugLevel>=1&&e("info",arguments)},parseHtml:function(t){var l=t.find(">li"),o,i,f,s,u,h,e,c=[];return l.each(function(){var y,w,v=n(this),b=v.find(">span:first",this),p=b.length?null:v.find(">a:first"),l={tooltip:null,data:{}};for(b.length?l.title=b.html():p&&p.length?(l.title=p.html(),l.data.href=p.attr("href"),l.data.target=p.attr("target"),l.tooltip=p.attr("title")):(l.title=v.html(),s=l.title.search(/<ul/i),s>=0&&(l.title=l.title.substring(0,s))),l.title=n.trim(l.title),i=0,f=a.length;i<f;i++)l[a[i]]=r;for(h=this.className.split(" "),o=[],i=0,f=h.length;i<f;i++)e=h[i],k[e]?l[e]=!0:o.push(e);l.extraClasses=o.join(" "),u=v.attr("title"),u&&(l.tooltip=u),u=v.attr("id"),u&&(l.key=u),y=v.data(),y&&!n.isEmptyObject(y)&&(w=y.json,delete y.json,n.extend(l.data,y),w&&n.extend(l.data,w)),t=v.find(">ul:first"),l.children=t.length?n.ui.fancytree.parseHtml(t):l.lazy?r:null,c.push(l)}),c},registerExtension:function(t,i){n.ui.fancytree._extensions[t]=i},warn:function(){e("warn",arguments)}})})(jQuery,window,document),function(n){"use strict";n.ui.fancytree.registerExtension("columnview",{options:{},treeInit:function(t){var f,u,i=t.tree,r=i.widget.element;i.tr=n("tbody tr",r)[0],i.columnCount=n(">td",i.tr).length,this._super(t),u=n(i.rootNode.ul),f=n(">td",i.tr).eq(0),u.removeClass("fancytree-container"),u.removeAttr("tabindex"),i.$container=r,r.addClass("fancytree-container fancytree-ext-columnview"),r.attr("tabindex","0"),f.empty(),u.detach().appendTo(f),i.widget.options.autoCollapse=!0,i.widget.options.fx=!1,i.widget.options.clickFolderMode=1,r.bind("fancytreeactivate",function(t,i){var u,e,r=i.node,f=i.tree,o=r.getLevel();if(f._callHook("nodeCollapseSiblings",r),o<=f.columnCount)for(e=n(">td",f.tr),u=o;u<f.columnCount;u++)e.eq(u).empty();!r.expanded&&(r.children||r.lazy)&&r.setExpanded()}).bind("fancytreekeydown",function(t,i){var r=null;switch(t.which){case n.ui.keyCode.DOWN:return r=i.node.getNextSibling(),r&&r.setFocus(),!1;case n.ui.keyCode.LEFT:return r=i.node.getParent(),r&&r.setFocus(),!1;case n.ui.keyCode.UP:return r=i.node.getPrevSibling(),r&&r.setFocus(),!1}})},nodeRender:function(t,i,r,u,f){this._super(t,i,r,u,f);var o,h,c,l=t.tree,e=t.node,s=n(e.span);s.find("span.fancytree-expander").remove(),e.hasChildren()===!1||s.find("span.fancytree-cv-right").length||s.append(n("<span class='fancytree-icon fancytree-cv-right'>")),e.ul&&(e.ul.style.display="",o=e.getLevel(),o<l.columnCount&&(h=n(">td",l.tr).eq(o),c=n(e.ul).detach(),h.empty().append(c)))}})}(jQuery,window,document),function(n,t,i,r){"use strict";function e(n){return n===0?"":n>0?"+"+n:""+n}function o(t){var i=t.options.dnd||null;i&&s(),i&&i.onDragStart&&t.widget.element.draggable({addClasses:!1,appendTo:"body",containment:!1,delay:0,distance:4,revert:!1,scroll:!0,scrollSpeed:7,scrollSensitivity:10,connectToFancytree:!0,helper:function(t){var i=n.ui.fancytree.getNode(t.target);return i?i.tree.dnd._onDragEvent("helper",i,null,t,null,null):"<div>ERROR?: helper requested but sourceNode not found<\/div>"},start:function(){}}),i&&i.onDrop&&t.widget.element.droppable({addClasses:!1,tolerance:"intersect",greedy:!1})}function s(){f||(n.ui.plugin.add("draggable","connectToFancytree",{start:function(t,i){var r=n(this).data("ui-draggable")||n(this).data("draggable"),u=i.helper.data("ftSourceNode")||null;if(u)return r.offset.click.top=-2,r.offset.click.left=16,u.tree.dnd._onDragEvent("start",u,null,t,i,r)},drag:function(t,i){var s,e=n(this).data("ui-draggable")||n(this).data("draggable"),o=i.helper.data("ftSourceNode")||null,f=i.helper.data("ftTargetNode")||null,r=n.ui.fancytree.getNode(t.target);if(t.target&&!r&&(s=n(t.target).closest("div.fancytree-drag-helper,#fancytree-drop-marker").length>0,s)){u("Drag event over helper: ignored.");return}i.helper.data("ftTargetNode",r),f&&f!==r&&f.tree.dnd._onDragEvent("leave",f,o,t,i,e),r&&r.tree.options.dnd.onDrop&&(r===f?r.tree.dnd._onDragEvent("over",r,o,t,i,e):r.tree.dnd._onDragEvent("enter",r,o,t,i,e))},stop:function(t,i){var e=n(this).data("ui-draggable")||n(this).data("draggable"),r=i.helper.data("ftSourceNode")||null,f=i.helper.data("ftTargetNode")||null,s=t.type,o=s==="mouseup"&&t.which===1;o||u("Drag was cancelled"),f&&(o&&f.tree.dnd._onDragEvent("drop",f,r,t,i,e),f.tree.dnd._onDragEvent("leave",f,r,t,i,e)),r&&r.tree.dnd._onDragEvent("stop",r,null,t,i,e)}}),f=!0)}var u=n.ui.fancytree.debug,f=!1;n.ui.fancytree.registerExtension("dnd",{options:{onDragStart:null,onDragStop:null,autoExpandMS:1e3,preventVoidMoves:!0,preventRecursiveMoves:!0,onDragEnter:null,onDragOver:null,onDrop:null,onDragLeave:null},treeInit:function(n){var t=n.tree;this._super(n),o(t)},nodeKeydown:function(t){var i=t.originalEvent;i.which===n.ui.keyCode.ESCAPE&&this.dnd._cancelDrag(),this._super(t)},_setDndStatus:function(t,i,r,u,f){var a,l=0,c="center",s=this.dnd,h=t?n(t.span):null,o=n(i.span);if(s.$dropMarker||(s.$dropMarker=n("<div id='fancytree-drop-marker'><\/div>").hide().css({"z-index":1e3}).prependTo(n(this.$div).parent())),u==="after"||u==="before"||u==="over"){switch(u){case"before":s.$dropMarker.removeClass("fancytree-drop-after fancytree-drop-over"),s.$dropMarker.addClass("fancytree-drop-before"),c="top";break;case"after":s.$dropMarker.removeClass("fancytree-drop-before fancytree-drop-over"),s.$dropMarker.addClass("fancytree-drop-after"),c="bottom";break;default:s.$dropMarker.removeClass("fancytree-drop-after fancytree-drop-before"),s.$dropMarker.addClass("fancytree-drop-over"),o.addClass("fancytree-drop-target"),l=8}a=n.ui.fancytree.jquerySupports.positionMyOfs?{my:"left"+e(l)+" center",at:"left "+c,of:o}:{my:"left center",at:"left "+c,of:o,offset:""+l+" 0"},s.$dropMarker.show().position(a)}else o.removeClass("fancytree-drop-target"),s.$dropMarker.hide();u==="after"?o.addClass("fancytree-drop-after"):o.removeClass("fancytree-drop-after"),u==="before"?o.addClass("fancytree-drop-before"):o.removeClass("fancytree-drop-before"),f===!0?(h&&h.addClass("fancytree-drop-accept"),o.addClass("fancytree-drop-accept"),r.addClass("fancytree-drop-accept")):(h&&h.removeClass("fancytree-drop-accept"),o.removeClass("fancytree-drop-accept"),r.removeClass("fancytree-drop-accept")),f===!1?(h&&h.addClass("fancytree-drop-reject"),o.addClass("fancytree-drop-reject"),r.addClass("fancytree-drop-reject")):(h&&h.removeClass("fancytree-drop-reject"),o.removeClass("fancytree-drop-reject"),r.removeClass("fancytree-drop-reject"))},_onDragEvent:function(t,i,f,e,o,s){t!=="over"&&u("tree.dnd._onDragEvent(%s, %o, %o) - %o",t,i,f,this);var y,b,k,p,a,h,l,d=this.options,c=d.dnd,v=null,w=n(i.span);switch(t){case"helper":y=n("<div class='fancytree-drag-helper'><span class='fancytree-drag-helper-img' /><\/div>").append(n(e.target).closest("span.fancytree-title").clone()),n("ul.fancytree-container",i.tree.$div).append(y),y.data("ftSourceNode",i),u("helper=%o",y),u("helper.sourceNode=%o",y.data("ftSourceNode")),v=y;break;case"start":i.isStatusNode?v=!1:c.onDragStart&&(v=c.onDragStart(i)),v===!1?(this.debug("tree.onDragStart() cancelled"),o.helper.trigger("mouseup"),o.helper.hide()):w.addClass("fancytree-drag-source");break;case"enter":l=c.preventRecursiveMoves&&i.isDescendantOf(f)?!1:c.onDragEnter?c.onDragEnter(i,f,o,s):null,v=l?n.isArray(l)?{over:n.inArray("over",l)>=0,before:n.inArray("before",l)>=0,after:n.inArray("after",l)>=0}:{over:l===!0||l==="over",before:l===!0||l==="before",after:l===!0||l==="after"}:!1,o.helper.data("enterResponse",v),u("helper.enterResponse: %o",v);break;case"over":a=o.helper.data("enterResponse"),h=null,a===!1||(typeof a=="string"?h=a:(b=w.offset(),k={x:e.pageX-b.left,y:e.pageY-b.top},p={x:k.x/w.width(),y:k.y/w.height()},a.after&&p.y>.75?h="after":!a.over&&a.after&&p.y>.5?h="after":a.before&&p.y<=.25?h="before":!a.over&&a.before&&p.y<=.5?h="before":a.over&&(h="over"),c.preventVoidMoves&&(i===f?(u("    drop over source node prevented"),h=null):h==="before"&&f&&i===f.getNextSibling()?(u("    drop after source node prevented"),h=null):h==="after"&&f&&i===f.getPrevSibling()?(u("    drop before source node prevented"),h=null):h==="over"&&f&&f.parent===i&&f.isLastSibling()&&(u("    drop last child over own parent prevented"),h=null)),o.helper.data("hitMode",h))),h==="over"&&c.autoExpandMS&&i.hasChildren()!==!1&&!i.expanded&&i.scheduleAction("expand",c.autoExpandMS),h&&c.onDragOver&&(v=c.onDragOver(i,f,h,o,s)),this.dnd._setDndStatus(f,i,o.helper,h,v!==!1&&h!==null);break;case"drop":if(h=o.helper.data("hitMode"),h&&c.onDrop)c.onDrop(i,f,h,o,s);break;case"leave":if(i.scheduleAction("cancel"),o.helper.data("enterResponse",null),o.helper.data("hitMode",null),this.dnd._setDndStatus(f,i,o.helper,"out",r),c.onDragLeave)c.onDragLeave(i,f,o,s);break;case"stop":if(w.removeClass("fancytree-drag-source"),c.onDragStop)c.onDragStop(i);break;default:throw"Unsupported drag event: "+t;}return v},_cancelDrag:function(){var t=n.ui.ddmanager.current;t&&t.cancel()}})}(jQuery,window,document),function(n){"use strict";function t(n){return(n+"").replace(/([.?*+\^\$\[\]\\(){}|-])/g,"\\$1")}n.ui.fancytree._FancytreeClass.prototype.applyFilter=function(n){var i,r,u=0;return this.visit(function(n){delete n.match,delete n.subMatch}),typeof n=="string"&&(i=t(n),r=new RegExp(".*"+i+".*","i"),n=function(n){return!!r.exec(n.title)}),this.enableFilter=!0,this.$div.addClass("fancytree-ext-filter"),this.visit(function(t){n(t)&&(u++,t.match=!0,t.visitParents(function(n){n.subMatch=!0}))}),this.render(),u},n.ui.fancytree._FancytreeClass.prototype.clearFilter=function(){this.visit(function(t){delete t.match,delete t.subMatch,n(t.li).show()}),this.enableFilter=!1,this.render(),this.$div.removeClass("fancytree-ext-filter")},n.ui.fancytree.registerExtension("filter",{options:{mode:"dimm"},treeInit:function(n){this._super(n),n.tree.filter=!1},treeDestroy:function(n){this._super(n)},nodeRenderStatus:function(t){var u,i=t.node,e=t.options,f=t.tree,r=n(i[f.statusClassPropName]);r.length&&(this._super(t),f.enableFilter)&&(i.match?r.addClass("fancytree-match"):r.removeClass("fancytree-match"),i.subMatch?r.addClass("fancytree-submatch"):r.removeClass("fancytree-submatch"),e.filter.mode==="hide"&&(u=!!(i.match||i.subMatch),i.debug(i.title+": visible="+u),n(i.li).toggle(u)))}})}(jQuery,window,document),function(n,t,i){"use strict";n.ui.fancytree.registerExtension("menu",{version:"1.0.0pre",options:{enable:!0,selector:null,position:{},create:n.noop,beforeOpen:n.noop,open:n.noop,focus:n.noop,select:n.noop,close:n.noop},treeInit:function(t){var r=t.options,i=t.tree;this._super(t),i.menu.data={tree:i,node:null,$menu:null,menuId:null},i.$container.delegate("span.fancytree-node","contextmenu",function(t){var r=n.ui.fancytree.getNode(t),u={node:r,tree:r.tree,originalEvent:t,options:i.options};return i.menu._openMenu(u),!1}),n(r.menu.selector).menu({create:function(t){i.menu.data.$menu=n(this).menu("widget");var u=n.extend({},i.menu.data);r.menu.create.call(i,t,u)},focus:function(t,u){var f=n.extend({},i.menu.data,{menuItem:u.item,menuId:u.item.find(">a").attr("href")});r.menu.focus.call(i,t,f)},select:function(u,f){var e=n.extend({},i.menu.data,{menuItem:f.item,menuId:f.item.find(">a").attr("href")});r.menu.select.call(i,u,e)!==!1&&i.menu._closeMenu(t)}}).hide()},treeDestroy:function(n){this._super(n)},_openMenu:function(t){var u,r=t.tree,f=t.options,e=n(f.menu.selector);(r.menu.data.node=t.node,u=n.extend({},r.menu.data),f.menu.beforeOpen.call(r,t.originalEvent,u)!==!1)&&(n(i).bind("keydown.fancytree",function(i){i.which===n.ui.keyCode.ESCAPE&&r.menu._closeMenu(t)}).bind("mousedown.fancytree",function(i){n(i.target).closest(".ui-menu-item").length===0&&r.menu._closeMenu(t)}),e.css("position","absolute").show().position({my:"left top",at:"right top",of:t.originalEvent,collision:"fit"}).focus(),f.menu.open.call(r,t.originalEvent,u))},_closeMenu:function(t){var u,r=t.tree,f=t.options,e=n.extend({},r.menu.data);f.menu.close.call(r,t.originalEvent,e)!==!1&&(u=n(f.menu.selector),n(i).unbind("keydown.fancytree, mousedown.fancytree"),u.hide(),r.menu.data.node=null)}})}(jQuery,window,document),function(n,t,i,r){"use strict";function s(t,i){i=i||"",t||n.error("Assertion failed "+i)}var e="active",u="expanded",o="focus",f="selected";n.ui.fancytree._FancytreeClass.prototype.clearCookies=function(t){var i=this.persist.cookiePrefix;t=t||"active expanded focus selected",t.indexOf(e)>=0&&n.cookie(i+e,null),t.indexOf(u)>=0&&n.cookie(i+u,null),t.indexOf(o)>=0&&n.cookie(i+o,null),t.indexOf(f)>=0&&n.cookie(i+f,null)},n.ui.fancytree.registerExtension("persist",{options:{cookieDelimiter:"~",cookiePrefix:r,cookie:{raw:!1,expires:"",path:"",domain:"",secure:!1},overrideSource:!1,types:"active expanded focus selected"},_setKey:function(t,i,r){var h=this.persist,f=this.options.persist,e=h.cookiePrefix+t,o=n.cookie(e),u=o?o.split(f.cookieDelimiter):[],s=n.inArray(i,u);s>=0&&u.splice(s,1),r&&u.push(i),n.cookie(e,u.join(f.cookieDelimiter),f.cookie)},treeInit:function(t){var l=t.tree,a=t.options,h=this.persist,c=this.options.persist;s(n.cookie,"Missing required plugin for 'persist' extension: jquery.cookie.js"),h.cookiePrefix=c.cookiePrefix||"fancytree-"+l._id+"-",h.storeActive=c.types.indexOf(e)>=0,h.storeExpanded=c.types.indexOf(u)>=0,h.storeSelected=c.types.indexOf(f)>=0,h.storeFocus=c.types.indexOf(o)>=0,l.$div.bind("fancytreeinit",function(){var v,y,s,p=n.cookie(h.cookiePrefix+o),t;if(l.debug("COOKIE "+i.cookie),h.storeExpanded&&(v=n.cookie(h.cookiePrefix+u),v))for(y=v.split(c.cookieDelimiter),s=0;s<y.length;s++)t=l.getNodeByKey(y[s]),t?(t.expanded===r||c.overrideSource&&t.expanded===!1)&&(t.expanded=!0,t.render()):h._setKey(u,y[s],!1);if(h.storeSelected&&(v=n.cookie(h.cookiePrefix+f),v))for(y=v.split(c.cookieDelimiter),s=0;s<y.length;s++)t=l.getNodeByKey(y[s]),t?(t.selected===r||c.overrideSource&&t.selected===!1)&&(t.selected=!0,t.renderStatus()):h._setKey(f,y[s],!1);h.storeActive&&(v=n.cookie(h.cookiePrefix+e),v&&(a.persist.overrideSource||!l.activeNode)&&(t=l.getNodeByKey(v),t&&t.setActive())),h.storeFocus&&p&&(t=l.getNodeByKey(p),t&&t.setFocus())}),this._super(t)},nodeSetActive:function(t,i){var r=this.persist,u=this.options.persist;this._super(t,i),r.storeActive&&n.cookie(r.cookiePrefix+e,this.activeNode?this.activeNode.key:null,u.cookie)},nodeSetExpanded:function(n,t){var r=n.node,i=this.persist;this._super(n,t),i.storeExpanded&&i._setKey(u,r.key,t)},nodeSetFocus:function(t){var i=this.persist,r=this.options.persist;this._super(t),i.storeFocus&&n.cookie(this.cookiePrefix+o,this.focusNode?this.focusNode.key:null,r.cookie)},nodeSetSelected:function(n,t){var r=n.node,i=this.persist;this._super(n,t),i.storeSelected&&i._setKey(f,r.key,t)}})}(jQuery,window,document),function(n,t,i){"use strict";function r(t,i){i=i||"",t||n.error("Assertion failed "+i)}function u(n,t){n.parentNode.insertBefore(t,n.nextSibling)}function f(n,t){n.visit(function(n){var i=n.tr;return i&&(i.style.display=t?"":"none"),n.expanded?void 0:"skip"})}function e(t){var o,f,i,e=t.parent,u=e?e.children:null;if(u&&u.length>1&&u[0]!==t)for(o=n.inArray(t,u),i=u[o-1],r(i.tr);i.children;){if(f=i.children[i.children.length-1],!f.tr)break;i=f}else i=e;return i}n.ui.fancytree.registerExtension("table",{options:{indentation:16,nodeColumnIdx:0,checkboxColumnIdx:null},treeInit:function(t){var f,u,e,r=t.tree,o=r.widget.element;for(o.addClass("fancytree-container fancytree-ext-table"),r.tbody=o.find("> tbody")[0],r.columnCount=n("thead >tr >th",o).length,n(r.tbody).empty(),r.rowFragment=i.createDocumentFragment(),u=n("<tr>"),e="",t.options.aria&&(u.attr("role","row"),e=" role='gridcell'"),f=0;f<r.columnCount;f++)t.options.table.nodeColumnIdx===f?u.append("<td"+e+"><span class='fancytree-node'><\/span><\/td>"):u.append("<td"+e+">");r.rowFragment.appendChild(u.get(0)),this._super(t),n(r.rootNode.ul).remove(),r.rootNode.ul=null,r.$container=o,r.$container.attr("tabindex","0"),this.options.aria&&r.$container.attr("role","treegrid").attr("aria-readonly",!0),r.statusClassPropName="tr",r.ariaPropName="tr"},nodeRemoveChildMarkup:function(t){var i=t.node;i.visit(function(t){t.tr&&(n(t.tr).remove(),t.tr=null)})},nodeRemoveMarkup:function(t){var i=t.node;i.tr&&(n(i.tr).remove(),i.tr=null),this.nodeRemoveChildMarkup(t)},nodeRender:function(t,i,f,o,s){var d,a,g,w,nt,c,v,y,b,l=t.tree,h=t.node,p=t.options,k=!h.parent;if(s||(t.hasCollapsedParents=h.parent&&!h.parent.expanded),k||h.tr||(c=l.rowFragment.firstChild.cloneNode(!0),v=e(h),r(v),o===!0&&s?c.style.display="none":f&&t.hasCollapsedParents&&(c.style.display="none"),v.tr?u(v.tr,c):(r(!v.parent,"prev. row must have a tr, or is system root"),l.tbody.appendChild(c)),h.tr=c,h.key&&p.generateIds&&(h.tr.id=p.idPrefix+h.key),h.tr.ftnode=h,p.aria&&n(h.tr).attr("aria-labelledby","ftal_"+h.key),h.span=n("span.fancytree-node",h.tr).get(0),this.nodeRenderTitle(t),p.checkbox&&p.table.checkboxColumnIdx!=null&&(d=n("span.fancytree-checkbox",h.span).detach(),n(h.tr).find("td:first").append(d)),l._triggerNodeEvent("createNode",t)),l._triggerNodeEvent("renderNode",t),a=h.children,a&&(k||f||h.expanded))for(w=0,nt=a.length;w<nt;w++)b=n.extend({},t,{node:a[w]}),b.hasCollapsedParents=b.hasCollapsedParents||!h.expanded,this.nodeRender(b,i,f,o,!0);a&&!s&&(y=h.tr||null,g=l.tbody.firstChild,h.visit(function(n){if(n.tr){if(h.expanded||k||n.tr.style.display==="none"||(n.tr.style.display="none"),n.tr.previousSibling!==y){h.debug("_fixOrder: mismatch at node: "+n);var t=y?y.nextSibling:g;l.tbody.insertBefore(n.tr,t)}y=n.tr}})),k||this.nodeRenderStatus(t)},nodeRenderTitle:function(n){var t=n.node;this._super(n),n.tree._triggerNodeEvent("renderColumns",t)},nodeRenderStatus:function(t){var i,r=t.node,u=t.options;this._super(t),i=(r.getLevel()-1)*u.table.indentation,i&&n(r.span).css({marginLeft:i+"px"})},nodeSetExpanded:function(t,i){var u=t.node,r=new n.Deferred;return this._super(t,i).done(function(){i=i!==!1,f(t.node,i),r.resolveWith(u)}),r},nodeSetStatus:function(t,i,r,u){if(i==="ok"){var e=t.node,f=e.children?e.children[0]:null;f&&f.isStatusNode&&n(f.tr).remove()}this._super(t,i,r,u)}})}(jQuery,window,document),function(n){"use strict";n.ui.fancytree.registerExtension("themeroller",{options:{activeClass:"ui-state-active",foccusClass:"ui-state-focus",hoverClass:"ui-state-hover",selectedClass:"ui-state-highlight"},treeInit:function(t){this._super(t);var i=t.widget.element;i[0].nodeName==="TABLE"?(i.addClass("ui-widget ui-corner-all"),i.find(">thead tr").addClass("ui-widget-header"),i.find(">tbody").addClass("ui-widget-conent")):i.addClass("ui-widget ui-widget-content ui-corner-all"),i.delegate(".fancytree-node","mouseenter mouseleave",function(t){var i=n.ui.fancytree.getNode(t.target),r=t.type==="mouseenter";i.debug("hover: "+r),n(i.span).toggleClass("ui-state-hover ui-corner-all",r)})},treeDestroy:function(n){this._super(n),n.widget.element.removeClass("ui-widget ui-widget-content ui-corner-all")},nodeRenderStatus:function(t){var i=t.node,r=n(i.span);this._super(t),r.toggleClass("ui-state-active",i.isActive()),r.toggleClass("ui-state-focus",i.hasFocus()),r.toggleClass("ui-state-highlight",i.isSelected())}})}(jQuery,window,document);
+//@ sourceMappingURL=jQuery-Fancytree.min.js.map
\ No newline at end of file
diff --git a/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree.min.js.map b/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree.min.js.map
new file mode 100644
index 00000000..0c5bf327
--- /dev/null
+++ b/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree.min.js.map
@@ -0,0 +1,8 @@
+{
+"version":3,
+"file":"jQuery-Fancytree.min.js",
+"lineCount":1,
+"mappings":"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",
+"sources":["/ClientSource/Scripts/Modules/jQuery-Fancytree/jquery.fancytree-all.js"],
+"names":["$","window","document","undefined","_raiseNotImplemented","msg","error","_assert","cond","consoleApply","method","args","i","s","fn","console","apply","length","isVersionAtLeast","dottedVersion","v","t","verParts","map","trim","split","e","parseInt","testParts","Array","prototype","slice","call","arguments","_makeVirtualFunction","methodName","base","sub","_super","func","base._super","_subclassObject","tree","extension","extName","attrName","charAt","proxy","_getResolvedPromise","context","argArray","Deferred","resolve","promise","resolveWith","_getRejectedPromise","reject","rejectWith","_makeResolveFunc","deferred","_makeNodeTitleMatcher","toLowerCase","node","title","indexOf","FancytreeNode","parent","obj","l","name","cl","ul","li","isStatusNode","data","NODE_ATTRS","extend","NODE_ATTR_MAP","isFunction","NONE_NODE_DATA_MAP","key","FT","_nextNodeKey","active","activeNode","children","_setChildren","Fancytree","widget","$div","element","options","_id","ui","fancytree","_nextId","_ns","focusNode","lastSelectedNode","systemFocusElement","statusClassPropName","ariaPropName","nodeContainerAttrName","find","remove","fakeParent","$ul","rootNode","appendTo","$container","debugLevel","tabbable","attr","aria","version","warn","CLASS_ATTRS","CLASS_ATTR_MAP","_findDirectChild","ptr","push","addChildren","insertBefore","pos","firstNode","nodeList","isPlainObject","concat","inArray","splice","render","selectMode","fixSelection3FromEndNodes","addNode","mode","getParent","getNextSibling","applyPatch","patch","IGNORE_MAP","hasOwnProperty","removeChildren","isVisible","renderTitle","renderStatus","setExpanded","expanded","collapseSiblings","_callHook","copyTo","toDict","countChildren","deep","n","debug","unshift","toString","discard","lazy","isArray","findAll","match","res","visit","findFirst","_changeSelectStatusAttrs","state","changed","selected","partsel","fixSelection3AfterClick","flag","isSelected","_walk","child","allSelected","someSelected","visitParents","unselectable","fromDict","dict","getChildren","hasChildren","getFirstChild","getIndex","getIndexHier","separator","each","getParentList","o","join","getKeyPath","excludeSelf","path","sep","keyPathSeparator","getLastChild","getLevel","level","dtn","ac","includeRoot","includeSelf","getPrevSibling","hasFocus","isActive","isChildOf","otherNode","isDescendantOf","p","isExpanded","isFirstSibling","isFolder","folder","isLastSibling","isLazy","isLoading","isRoot","parents","makeVisible","moveTo","targetNode","prevParent","targetParent","lazyLoad","source","_triggerNodeEvent","force","removeChild","childNode","scheduleAction","ms","timer","clearTimeout","self","setTimeout","setActive","scrollIntoView","effects","topNode","topNodeY","dfd","nodeY","span","position","top","nodeHeight","height","scrollTop","horzScrollHeight","Math","max","innerHeight","clientHeight","containerHeight","newScrollTop","animate","setFocus","setSelected","setTitle","sortChildren","cmp","a","b","x","y","sort","recursive","callback","isEmptyObject","toggleExpanded","toggleSelected","_makeHookContext","originalEvent","funcName","contextObject","ctx","activateKey","getNodeByKey","patchList","p2","patchCount","deferredList","always","when","count","generateFormElements","selectedName","activeName","id","$result","empty","hide","getSelectedNodes","idx","append","getActiveNode","getFocusNode","searchRoot","el","getElementById","idPrefix","ftnode","stopOnParents","focusTree","info","loadKeyPath","keyPathList","_rootNode","__lazyload","done","loadMap","fail","root","segList","substr","shift","nodeClick","activate","expand","event","targetType","clickFolderMode","nodeSetFocus","target","localName","className","preventDefault","nodeCollapseSiblings","nodeDblclick","nodeKeydown","_goto","ctrlKey","opts","autoActivate","handled","KC","keyCode","sib","which","NUMPAD_ADD","nodeSetExpanded","NUMPAD_SUBTRACT","SPACE","checkbox","nodeToggleSelected","nodeSetActive","ENTER","BACKSPACE","LEFT","RIGHT","UP","DOWN","nodeLoadChildren","ajax","delay","url","nodeSetStatus","debugLazyDelay","random","round","complete","postProcess","dataType","enableAspx","d","parseJSON","jqXHR","textStatus","errorThrown","status","alert","message","nodeRender","nodeLoadKeyPath","nodeMakeVisible","nodeRemoveChild","subCtx","nodeRemoveChildren","nodeRemoveMarkup","removeNode","nodeRemoveChildMarkup","nodeRenderStatus","collapsed","_recursive","childLI","childNode1","childNode2","firstTime","isRootNode","parentNode","createElement","generateIds","appendChild","nodeRenderTitle","createNode","renderNode","style","display","firstChild","nextSibling","imageSrc","nodeTitle","role","tooltip","ares","icon","minExpandLevel","hideCheckbox","imagePath","iconclass","icons","replace","innerHTML","isLastSib","$ariaElem","cn","_classNames","cnList","statusElem","focused","removeAttr","lastsib","extraClasses","combinedExpanderPrefix","combinedIconPrefix","activeVisible","_afterLoad","prevAC","autoCollapse","autoScroll","duration","easing","fx","notifyWith","errMsg","ctx2","nodeSetSelected","details","_clearStatusNode","_setStatusNode","removeClass","addClass","strings","loading","loadError","nodeToggleExpanded","treeClear","treeCreate","treeDestroy","treeInit","treeLoad","type","rootCtx","parseHtml","text","_triggerTreeEvent","treeOnFocusInOut","getNode","_inFocusHandler","treeSetFocus","_calledByNodeSetFocus","focus","reactivate","reload","extra","_trigger","result","_create","$source","extensions","_extensions","_init","_bind","_setOption","value","callDefault","rerender","Widget","destroy","_unbind","ns","unbind","that","selstartEvent","support","selectstart","bind","delegate","disabled","keyboard","prevPhase","phase","et","getEventTarget","getRootNode","getTree","getEventTargetType","tcn","selector","$children","iPos","tmp","classes","allData","jsonData","$li","$liSpan","$liA","html","href","search","substring","json","registerExtension","definition","jQuery","$tdFirst","$table","tr","columnCount","eq","detach","tdList","next","$tdChild","$span","offsetString","_initDragAndDrop","dnd","_registerDnd","onDragStart","draggable","helper","sourceNode","_onDragEvent","start","onDrop","droppable","didRegisterDnd","plugin","add","offset","click","left","drag","isHelper","prevTargetNode","closest","logMsg","stop","eventType","dropped","ESCAPE","_cancelDrag","_setDndStatus","hitMode","accept","posOpts","markerOffsetX","markerAt","instData","$target","$dropMarker","css","prependTo","jquerySupports","positionMyOfs","show","eventName","$helper","nodeOfs","relPos","relPos2","enterResponse","r","nodeTag","clone","trigger","preventRecursiveMoves","onDragEnter","pageX","pageY","width","after","over","before","preventVoidMoves","autoExpandMS","onDragOver","onDragLeave","onDragStop","dd","ddmanager","current","cancel","_escapeRegex","str","_FancytreeClass","applyFilter","$.ui.fancytree._FancytreeClass.prototype.applyFilter","filter","re","subMatch","RegExp","exec","enableFilter","clearFilter","$.ui.fancytree._FancytreeClass.prototype.clearFilter","visible","toggle","noop","menu","_openMenu","create","$menu","item","select","_closeMenu","beforeOpen","open","close","ACTIVE","EXPANDED","FOCUS","SELECTED","clearCookies","$.ui.fancytree._FancytreeClass.prototype.clearCookies","types","cookiePrefix","persist","cookie","_setKey","instOpts","cookieName","cookieList","cookieDelimiter","storeActive","storeExpanded","storeSelected","storeFocus","keyList","prevFocus","overrideSource","insertSiblingAfter","referenceNode","newNode","setChildRowVisibility","findPrevRowNode","last","prev","siblings","$row","tdRole","tbody","rowFragment","createDocumentFragment","table","nodeColumnIdx","get","$cb","firstTr","newRow","prevNode","prevTr","hasCollapsedParents","cloneNode","checkboxColumnIdx","previousSibling","nextTr","indent","indentation","$el","nodeName","toggleClass"]
+}
diff --git a/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree/jquery.fancytree-all.js b/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree/jquery.fancytree-all.js
new file mode 100644
index 00000000..0feb4852
--- /dev/null
+++ b/Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree/jquery.fancytree-all.js
@@ -0,0 +1,5282 @@
+/*!
+ * jquery.fancytree.js
+ * Dynamic tree view control, with support for lazy loading of branches.
+ * https://github.com/mar10/fancytree/
+ *
+ * Copyright (c) 2006-2013, Martin Wendt (http://wwWendt.de)
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version 2.0.0-2
+ * @date 2013-09-15T18:55
+ */
+
+// Start of local namespace
+;(function($, window, document, undefined) {
+// relax some jslint checks:
+/*globals alert */
+
+"use strict";
+
+// prevent duplicate loading
+if ( $.ui.fancytree && $.ui.fancytree.version ) {
+	$.ui.fancytree.warn("Fancytree: ignored duplicate include");
+	return;
+}
+
+
+/* *****************************************************************************
+ * Private functions and variables
+ */
+
+function _raiseNotImplemented(msg){
+	msg = msg || "";
+	$.error("Not implemented: " + msg);
+}
+
+function _assert(cond, msg){
+	// TODO: see qunit.js extractStacktrace()
+	msg = ": " + msg || "";
+	if(!cond){
+		$.error("Assertion failed" + msg);
+	}
+}
+
+function consoleApply(method, args){
+	var i, s,
+		fn = window.console ? window.console[method] : null;
+
+	if(fn){
+		if(fn.apply){
+			fn.apply(window.console, args);
+		}else{
+			// IE?
+			s = "";
+			for( i=0; i<args.length; i++){
+				s += args[i];
+			}
+			fn(s);
+		}
+	}
+}
+
+/** Return true if dotted version string is equal or higher than requested version.
+ *
+ * See http://jsfiddle.net/mar10/FjSAN/
+ */
+function isVersionAtLeast(dottedVersion, major, minor, patch){
+	var i, v, t,
+		verParts = $.map($.trim(dottedVersion).split("."), function(e){ return parseInt(e, 10); }),
+		testParts = $.map(Array.prototype.slice.call(arguments, 1), function(e){ return parseInt(e, 10); });
+
+	for( i = 0; i < testParts.length; i++ ){
+		v = verParts[i] || 0;
+		t = testParts[i] || 0;
+		if( v !== t ){
+			return ( v > t );
+		}
+	}
+	return true;
+}
+
+/** Return a wrapper that calls sub.fn() and exposes base.fn() as _super(). */
+function _makeVirtualFunction(methodName, base, sub){
+	var _super = base[methodName],
+		func = sub[methodName];
+	// if(rexTestSuper && !rexTestSuper.test(func)){
+	//     // sub.methodName() doesn't call _super(), so no wrapper required
+	//     return func;
+	// }
+	return function(){
+		try{
+			base._super = function(){
+				return _super.apply(base, arguments);
+			};
+//			sub._base = base;
+			return  func.apply(base, arguments);
+		}finally{
+			base._super = null;
+		}
+	};
+}
+
+/**
+ * Subclass `base` by creating proxy functions
+ */
+function _subclassObject(tree, base, extension, extName){
+//	$.ui.fancytree.debug("_subclassObject", base, extension, extName);
+	for(var attrName in extension){
+		if(typeof extension[attrName] === "function"){
+			if(typeof tree[attrName] === "function"){
+				// override existing method
+				tree[attrName] = _makeVirtualFunction(attrName, tree, extension);
+			}else if(attrName.charAt(0) === "_"){
+				// Create private methods in tree.EXTENSION namespace
+				tree[extName][attrName] = $.proxy(extension[attrName], tree);
+			}else{
+				$.error("Could not override tree." + attrName + ". Use prefix '_' to create tree." + extName + "._" + attrName);
+			}
+		}else{
+			// Create member variables in tree.EXTENSION namespace
+			if(attrName !== "options"){
+				tree[extName][attrName] = base[attrName];
+			}
+		}
+	}
+}
+
+
+function _getResolvedPromise(context, argArray){
+	if(context === undefined){
+		return $.Deferred(function(){this.resolve();}).promise();
+	}else{
+		return $.Deferred(function(){this.resolveWith(context, argArray);}).promise();
+	}
+}
+
+
+function _getRejectedPromise(context, argArray){
+	if(context === undefined){
+		return $.Deferred(function(){this.reject();}).promise();
+	}else{
+		return $.Deferred(function(){this.rejectWith(context, argArray);}).promise();
+	}
+}
+
+
+function _makeResolveFunc(deferred, context){
+	return function(){
+		deferred.resolveWith(context);
+	};
+}
+
+
+// TODO: use currying
+function _makeNodeTitleMatcher(s){
+	s = s.toLowerCase();
+	return function(node){
+		return node.title.toLowerCase().indexOf(s) >= 0;
+	};
+}
+
+var i,
+	FT = null, // initialized below
+	//Boolean attributes that can be set with equivalent class names in the LI tags
+	CLASS_ATTRS = "active expanded focus folder lazy selected unselectable".split(" "),
+	CLASS_ATTR_MAP = {},
+	//	Top-level Fancytree node attributes, that can be set by dict
+	NODE_ATTRS = "expanded extraClasses folder hideCheckbox key lazy selected title tooltip unselectable".split(" "),
+	NODE_ATTR_MAP = {},
+	// Attribute names that should NOT be added to node.data
+	NONE_NODE_DATA_MAP = {"active": true, "children": true, "data": true, "focus": true};
+
+for(i=0; i<CLASS_ATTRS.length; i++){ CLASS_ATTR_MAP[CLASS_ATTRS[i]] = true; }
+for(i=0; i<NODE_ATTRS.length; i++){ NODE_ATTR_MAP[NODE_ATTRS[i]] = true; }
+
+
+/* *****************************************************************************
+ * FancytreeNode
+ */
+
+
+/**
+ * Creates a new node
+ * @class Represents the hierarchical data model and operations.
+ * @name FancytreeNode
+ * @constructor
+ * @param {FancytreeNode} parent
+ * @param {NodeData} data
+ *
+ * @property {Fancytree} tree
+ * @property {FancytreeNode} parent Parent node
+ * @property {String} key
+ * @property {String} title
+ * @property {object} data Contains all extra data that was passed on node creation
+ * @property {FancytreeNode[] | null | undefined} children list of child nodes
+ * @property {Boolean} isStatusNode
+ * @property {Boolean} expanded
+ * @property {Boolean} folder
+ * @property {Boolean} href
+ * @property {String} extraClasses
+ * @property {Boolean} lazy
+ * @property {Boolean} nolink OBSOLETE
+ * @property {Boolean} selected
+ * @property {String} target
+ * @property {String} tooltip
+ */
+function FancytreeNode(parent, obj){
+	var i, l, name, cl;
+
+	this.parent = parent;
+	this.tree = parent.tree;
+	this.ul = null;
+	this.li = null;  // <li id='key' ftnode=this> tag
+	this.isStatusNode = false;
+	this.data = {};
+
+	// TODO: merge this code with node.toDict()
+	// copy attributes from obj object
+	for(i=0, l=NODE_ATTRS.length; i<l; i++){
+		name = NODE_ATTRS[i];
+		this[name] = obj[name];
+	}
+	// node.data += obj.data
+	if(obj.data){
+		$.extend(this.data, obj.data);
+	}
+	// copy all other attributes to this.data.NAME
+	for(name in obj){
+		if(!NODE_ATTR_MAP[name] && !$.isFunction(obj[name]) && !NONE_NODE_DATA_MAP[name]){
+			// node.data.NAME = obj.NAME
+			this.data[name] = obj[name];
+		}
+	}
+
+	// Fix missing key
+	if( this.key == null ){ // test for null OR undefined
+		this.key = "_" + (FT._nextNodeKey++);
+	}
+	// Fix tree.activeNode
+	// TODO: not elegant: we use obj.active as marker to set tree.activeNode
+	// when loading from a dictionary.
+	if(obj.active){
+		_assert(this.tree.activeNode === null, "only one active node allowed");
+		this.tree.activeNode = this;
+	}
+	// TODO: handle obj.focus = true
+	// Create child nodes
+	this.children = null;
+	cl = obj.children;
+	if(cl && cl.length){
+		this._setChildren(cl);
+	}
+}
+
+
+FancytreeNode.prototype = /**@lends FancytreeNode*/{
+	/* Return the direct child FancytreeNode with a given key, index. */
+	_findDirectChild: function(ptr){
+		var i, l,
+			cl = this.children;
+
+		if(cl){
+			if(typeof ptr === "string"){
+				for(i=0, l=cl.length; i<l; i++){
+					if(cl[i].key === ptr){
+						return cl[i];
+					}
+				}
+			}else if(typeof ptr === "number"){
+				return this.children[ptr];
+			}else if(ptr.parent === this){
+				return ptr;
+			}
+		}
+		return null;
+	},
+	// TODO: activate()
+	// TODO: activateSilently()
+	/* Internal helper called in recursive addChildren sequence.*/
+	_setChildren: function(children){
+		_assert(children && (!this.children || this.children.length === 0), "only init supported");
+		this.children = [];
+		for(var i=0, l=children.length; i<l; i++){
+			this.children.push(new FancytreeNode(this, children[i]));
+		}
+	},
+	/**
+	 * Append (or insert) a list of child nodes.
+	 *
+	 * @param {NodeData[]} children array of child node definitions (also single child accepted)
+	 * @param {FancytreeNode | String | Integer} [insertBefore] child node (or key or index of such).
+	 *     If omitted, the new children are appended.
+	 * @returns {FancytreeNode} first child added
+	 *
+	 * @see applyPatch to modify existing child nodes.
+	 * @see FanctreeNode.applyPatch to modify existing child nodes.
+	 * @see FanctreeNode#applyPatch to modify existing child nodes.
+	 * @see applyPatch
+	 * @see FanctreeNode.applyPatch
+	 * @see FanctreeNode#applyPatch
+	 */
+	addChildren: function(children, insertBefore){
+		var i, l, pos,
+			firstNode = null,
+			nodeList = [];
+
+		if($.isPlainObject(children) ){
+			children = [children];
+		}
+		if(!this.children){
+			this.children = [];
+		}
+		for(i=0, l=children.length; i<l; i++){
+			nodeList.push(new FancytreeNode(this, children[i]));
+		}
+		firstNode = nodeList[0];
+		if(insertBefore == null){
+			this.children = this.children.concat(nodeList);
+		}else{
+			insertBefore = this._findDirectChild(insertBefore);
+			pos = $.inArray(insertBefore, this.children);
+			_assert(pos >= 0, "insertBefore must be an existing child");
+			// insert nodeList after children[pos]
+			this.children.splice.apply(this.children, [pos, 0].concat(nodeList));
+		}
+		if(!this.parent || this.parent.ul){
+			// render if the parent was rendered (or this is a root node)
+			this.render();
+		}
+		if( this.tree.options.selectMode === 3 ){
+			this.fixSelection3FromEndNodes();
+		}
+		return firstNode;
+	},
+	/**
+	 * Append or prepend a node, or append a child node.
+	 *
+	 * @param {NodeData} node node definition
+	 * @param {String} [mode] 'before', 'after', or 'child'
+	 * @returns {FancytreeNode} new node
+	 */
+	addNode: function(node, mode){
+		if(mode === undefined || mode === "over"){
+			mode = "child";
+		}
+		switch(mode){
+		case "after":
+			return this.getParent().addChildren(node, this.getNextSibling());
+		case "before":
+			return this.getParent().addChildren(node, this);
+		case "child":
+		case "over":
+			return this.addChildren(node);
+		}
+		_assert(false, "Invalid mode: " + mode);
+	},
+	/**
+	 *
+	 * @param {NodePatch} patch
+	 * @returns {$.Promise}
+	 * @see {@link applyPatch} to modify existing child nodes.
+	 * @see FancytreeNode#addChildren
+	 */
+	applyPatch: function(patch) {
+		// patch [key, null] means 'remove'
+		if(patch === null){
+			this.remove();
+			return _getResolvedPromise(this);
+		}
+		// TODO: make sure that root node is not collapsed or modified
+		// copy (most) attributes to node.ATTR or node.data.ATTR
+		var name, promise, v,
+			IGNORE_MAP = { children: true, expanded: true, parent: true }; // TODO: should be global
+
+		for(name in patch){
+			v = patch[name];
+			if( !IGNORE_MAP[name] && !$.isFunction(v)){
+				if(NODE_ATTR_MAP[name]){
+					this[name] = v;
+				}else{
+					this.data[name] = v;
+				}
+			}
+		}
+		// Remove and/or create children
+		if(patch.hasOwnProperty("children")){
+			this.removeChildren();
+			if(patch.children){ // only if not null and not empty list
+				// TODO: addChildren instead?
+				this._setChildren(patch.children);
+			}
+			// TODO: how can we APPEND or INSERT child nodes?
+		}
+		if(this.isVisible()){
+			this.renderTitle();
+			this.renderStatus();
+		}
+		// Expand collapse (final step, since this may be async)
+		if(patch.hasOwnProperty("expanded")){
+			promise = this.setExpanded(patch.expanded);
+		}else{
+			promise = _getResolvedPromise(this);
+		}
+		return promise;
+	},
+	/**
+	 * @returns {$.Promise}
+	 */
+	collapseSiblings: function() {
+		return this.tree._callHook("nodeCollapseSiblings", this);
+	},
+	/** Copy this node as sibling or child of `node`.
+	 *
+	 * @param {FancytreeNode} node source node
+	 * @param {String} mode 'before' | 'after' | 'child'
+	 * @param {Function} [map] callback function(NodeData) that could modify the new node
+	 * @returns {FancytreeNode} new
+	 */
+	copyTo: function(node, mode, map) {
+		return node.addNode(this.toDict(true, map), mode);
+	},
+	/** Count direct and indirect children.
+	 *
+	 * @param {Boolean} [deep=true] pass 'false' to only count direct children
+	 * @returns {int} number of child nodes
+	 */
+	countChildren: function(deep) {
+		var cl = this.children, i, l, n;
+		if( !cl ){
+			return 0;
+		}
+		n = cl.length;
+		if(deep !== false){
+			for(i=0, l=n; i<l; i++){
+				n += cl[i].countChildren();
+			}
+		}
+		return n;
+	},
+	// TODO: deactivate()
+	/** Write to browser console if debugLevel >= 2 (prepending node info)
+	 *
+	 * @param {*} msg string or object or array of such
+	 */
+	debug: function(msg){
+		if( this.tree.options.debugLevel >= 2 ) {
+			Array.prototype.unshift.call(arguments, this.toString());
+			consoleApply("debug", arguments);
+		}
+	},
+	/** Remove all children of a lazy node and collapse.*/
+	discard: function(){
+		if(this.lazy && $.isArray(this.children)){
+			this.removeChildren();
+			return this.setExpanded(false);
+		}
+	},
+	// TODO: expand(flag)
+	/**Find all nodes that contain `match` in the title.
+	 *
+	 * @param {String | function(node)} match string to search for, of a function that
+	 * returns `true` if a node is matched.
+	 * @returns {FancytreeNode[]} array of nodes (may be empty)
+	 * @see FancytreeNode#findAll
+	 */
+	findAll: function(match) {
+		match = $.isFunction(match) ? match : _makeNodeTitleMatcher(match);
+		var res = [];
+		this.visit(function(n){
+			if(match(n)){
+				res.push(n);
+			}
+		});
+		return res;
+	},
+	/**Find first node that contains `match` in the title (not including self).
+	 *
+	 * @param {String | function(node)} match string to search for, of a function that
+	 * returns `true` if a node is matched.
+	 * @returns {FancytreeNode} matching node or null
+	 * @example
+	 * <b>fat</b> text
+	 */
+	findFirst: function(match) {
+		match = $.isFunction(match) ? match : _makeNodeTitleMatcher(match);
+		var res = null;
+		this.visit(function(n){
+			if(match(n)){
+				res = n;
+				return false;
+			}
+		});
+		return res;
+	},
+	/* Apply selection state (internal use only) */
+	_changeSelectStatusAttrs: function (state) {
+		var changed = false;
+
+		switch(state){
+		case false:
+			changed = ( this.selected || this.partsel );
+			this.selected = false;
+			this.partsel = false;
+			break;
+		case true:
+			changed = ( !this.selected || !this.partsel );
+			this.selected = true;
+			this.partsel = true;
+			break;
+		case undefined:
+			changed = ( this.selected || !this.partsel );
+			this.selected = false;
+			this.partsel = true;
+			break;
+		default:
+			_assert(false, "invalid state: " + state);
+		}
+		this.debug("fixSelection3AfterLoad() _changeSelectStatusAttrs()", state, changed);
+		if( changed ){
+			this.renderStatus();
+		}
+		return changed;
+	},
+	/**
+	 * Fix selection status, after this node was (de)selected in multi-hier mode.
+	 * This includes (de)selecting all children.
+	 */
+	fixSelection3AfterClick: function() {
+		var flag = this.isSelected();
+
+//		this.debug("fixSelection3AfterClick()");
+
+		this.visit(function(node){
+			node._changeSelectStatusAttrs(flag);
+		});
+		this.fixSelection3FromEndNodes();
+	},
+	/**
+	 * Fix selection status for multi-hier mode.
+	 * Only end-nodes are considered to update the descendants branch and parents.
+	 * Should be called after this node has loaded new children or after
+	 * children have been modified using the API.
+	 */
+	fixSelection3FromEndNodes: function() {
+//		this.debug("fixSelection3FromEndNodes()");
+		_assert(this.tree.options.selectMode === 3, "expected selectMode 3");
+
+		// Visit all end nodes and adjust their parent's `selected` and `partsel`
+		// attributes. Return selection state true, false, or undefined.
+		function _walk(node){
+			var i, l, child, s, state, allSelected,someSelected,
+				children = node.children;
+
+			if( children ){
+				// check all children recursively
+				allSelected = true;
+				someSelected = false;
+
+				for( i=0, l=children.length; i<l; i++ ){
+					child = children[i];
+					// the selection state of a node is not relevant; we need the end-nodes
+					s = _walk(child);
+					if( s !== false ) {
+						someSelected = true;
+					}
+					if( s !== true ) {
+						allSelected = false;
+					}
+				}
+				state = allSelected ? true : (someSelected ? undefined : false);
+			}else{
+				// This is an end-node: simply report the status
+//				state = ( node.unselectable ) ? undefined : !!node.selected;
+				state = !!node.selected;
+			}
+			node._changeSelectStatusAttrs(state);
+			return state;
+		}
+		_walk(this);
+
+		// Update parent's state
+		this.visitParents(function(node){
+			var i, l, child, state,
+				children = node.children,
+				allSelected = true,
+				someSelected = false;
+
+			for( i=0, l=children.length; i<l; i++ ){
+				child = children[i];
+				// When fixing the parents, we trust the sibling status (i.e.
+				// we don't recurse)
+				if( child.selected || child.partsel ) {
+					someSelected = true;
+				}
+				if( !child.unselectable && !child.selected ) {
+					allSelected = false;
+				}
+			}
+			state = allSelected ? true : (someSelected ? undefined : false);
+			node._changeSelectStatusAttrs(state);
+		});
+	},
+	// TODO: focus()
+	/**
+	 * Update node data. If dict contains 'children', then also replace
+	 * the hole sub tree.
+	 * @param {NodeData} dict
+	 *
+	 * @see FancytreeNode#addChildren
+	 * @see FancytreeNode#applyPatch
+	 */
+	fromDict: function(dict) {
+		// copy all other attributes to this.data.xxx
+		for(var name in dict){
+			if(NODE_ATTR_MAP[name]){
+				// node.NAME = dict.NAME
+				this[name] = dict[name];
+			}else if(name === "data"){
+				// node.data += dict.data
+				$.extend(this.data, dict.data);
+			}else if(!$.isFunction(dict[name]) && !NONE_NODE_DATA_MAP[name]){
+				// node.data.NAME = dict.NAME
+				this.data[name] = dict[name];
+			}
+		}
+		if(dict.children){
+			// recursively set children and render
+			this.removeChildren();
+			this.addChildren(dict.children);
+		}else{
+			this.renderTitle();
+		}
+/*
+		var children = dict.children;
+		if(children === undefined){
+			this.data = $.extend(this.data, dict);
+			this.render();
+			return;
+		}
+		dict = $.extend({}, dict);
+		dict.children = undefined;
+		this.data = $.extend(this.data, dict);
+		this.removeChildren();
+		this.addChild(children);
+*/
+	},
+	/** @returns {FancytreeNode[] | undefined} list of child nodes (undefined for unexpanded lazy nodes).*/
+	getChildren: function() {
+		if(this.hasChildren() === undefined){ // TODO: only required for lazy nodes?
+			return undefined; // Lazy node: unloaded, currently loading, or load error
+		}
+		return this.children;
+	},
+	/** @returns {FancytreeNode | null}*/
+	getFirstChild: function() {
+		return this.children ? this.children[0] : null;
+	},
+	/** @returns {int} 0-based child index.*/
+	getIndex: function() {
+//		return this.parent.children.indexOf(this);
+		return $.inArray(this, this.parent.children); // indexOf doesn't work in IE7
+	},
+	/**@returns {String} hierarchical child index (1-based: '3.2.4').*/
+	getIndexHier: function(separator) {
+		separator = separator || ".";
+		var res = [];
+		$.each(this.getParentList(false, true), function(i, o){
+			res.push(o.getIndex() + 1);
+		});
+		return res.join(separator);
+	},
+	/**
+	 * @param {Boolean} [excludeSelf=false]
+	 * @returns {String} parent keys separated by options.keyPathSeparator
+	 */
+	getKeyPath: function(excludeSelf) {
+		var path = [],
+			sep = this.tree.options.keyPathSeparator;
+		this.visitParents(function(n){
+			if(n.parent){
+				path.unshift(n.key);
+			}
+		}, !excludeSelf);
+		return sep + path.join(sep);
+	},
+	/**@returns {FancytreeNode | null} last child of this node.*/
+	getLastChild: function() {
+		return this.children ? this.children[this.children.length - 1] : null;
+	},
+	/** @returns {int} node depth. 0: System root node, 1: visible top-level node, 2: first sub-level, .... */
+	getLevel: function() {
+		var level = 0,
+			dtn = this.parent;
+		while( dtn ) {
+			level++;
+			dtn = dtn.parent;
+		}
+		return level;
+	},
+	/** @returns {FancytreeNode | null} */
+	getNextSibling: function() {
+		// TODO: use indexOf, if available: (not in IE6)
+		if( this.parent ){
+			var i, l,
+				ac = this.parent.children;
+
+			for(i=0, l=ac.length-1; i<l; i++){ // up to length-2, so next(last) = null
+				if( ac[i] === this ){
+					return ac[i+1];
+				}
+			}
+		}
+		return null;
+	},
+	/** @returns {FancytreeNode | null} returns null for the system root node*/
+	getParent: function() {
+		// TODO: return null for top-level nodes?
+		return this.parent;
+	},
+	/**
+	 * @param {Boolean} [includeRoot=false]
+	 * @param {Boolean} [includeSelf=false]
+	 * @returns {FancytreeNode[]}
+	 */
+	getParentList: function(includeRoot, includeSelf) {
+		var l = [],
+			dtn = includeSelf ? this : this.parent;
+		while( dtn ) {
+			if( includeRoot || dtn.parent ){
+				l.unshift(dtn);
+			}
+			dtn = dtn.parent;
+		}
+		return l;
+	},
+	/** @returns {FancytreeNode | null} */
+	getPrevSibling: function() {
+		if( this.parent ){
+			var i, l,
+				ac = this.parent.children;
+
+			for(i=1, l=ac.length; i<l; i++){ // start with 1, so prev(first) = null
+				if( ac[i] === this ){
+					return ac[i-1];
+				}
+			}
+		}
+		return null;
+	},
+	/** @returns {boolean | undefined} Check if node has children (returns undefined, if not sure). */
+	hasChildren: function() {
+		if(this.lazy){
+			if(this.children === null || this.children === undefined){
+				// Not yet loaded
+				return undefined;
+			}else if(this.children.length === 0){
+				// Loaded, but response was empty
+				return false;
+			}else if(this.children.length === 1 && this.children[0].isStatusNode ){
+				// Currently loading or load error
+				return undefined;
+			}
+			return true;
+		}
+		return !!this.children;
+	},
+	/**@returns {Boolean} true, if node has keyboard focus*/
+	hasFocus: function() {
+		return (this.tree.hasFocus() && this.tree.focusNode === this);
+	},
+	/**@returns {Boolean} true, if node is active*/
+	isActive: function() {
+		return (this.tree.activeNode === this);
+	},
+	/**
+	 * @param {FancytreeNode} otherNode
+	 * @returns {Boolean} true, if node is a direct child of otherNode
+	 */
+	isChildOf: function(otherNode) {
+		return (this.parent && this.parent === otherNode);
+	},
+	/**
+	 * @param {FancytreeNode} otherNode
+	 * @returns {Boolean} true, if node is a sub node of otherNode
+	 */
+	isDescendantOf: function(otherNode) {
+		if(!otherNode || otherNode.tree !== this.tree){
+			return false;
+		}
+		var p = this.parent;
+		while( p ) {
+			if( p === otherNode ){
+				return true;
+			}
+			p = p.parent;
+		}
+		return false;
+	},
+	/** @returns {Boolean} true, if node is expanded*/
+	isExpanded: function() {
+		return !!this.expanded;
+	},
+	/** @returns {Boolean}*/
+	isFirstSibling: function() {
+		var p = this.parent;
+		return !p || p.children[0] === this;
+	},
+	/** @returns {Boolean}*/
+	isFolder: function() {
+		return !!this.folder;
+	},
+	/** @returns {Boolean}*/
+	isLastSibling: function() {
+		var p = this.parent;
+		return !p || p.children[p.children.length-1] === this;
+	},
+	/** @returns {Boolean} true, if node is lazy (even if data was already loaded)*/
+	isLazy: function() {
+		return !!this.lazy;
+	},
+	/** @returns {Boolean} true, if children are currently beeing loaded*/
+	isLoading: function() {
+		_raiseNotImplemented(); // TODO: implement
+	},
+	/**@returns {Boolean} true, if node is the (invisible) system root node*/
+	isRoot: function() {
+		return (this.tree.rootNode === this);
+	},
+	/** @returns {Boolean} true, if node is selected (e.g. has a checkmark set)*/
+	isSelected: function() {
+		return !!this.selected;
+	},
+	// TODO: use _isStatusNode as class attribute name
+//  isStatusNode: function() {
+//      return (this.data.isStatusNode === true);
+//  },
+	/** Return true, if all parents are expanded. */
+	isVisible: function() {
+		var i, l,
+			parents = this.getParentList(false, false);
+
+		for(i=0, l=parents.length; i<l; i++){
+			if( ! parents[i].expanded ){ return false; }
+		}
+		return true;
+	},
+	/** Expand all parents and optionally scroll into visible area as neccessary (async).
+	 *
+	 */
+	makeVisible: function() {
+		// TODO: implement scolling (http://www.w3.org/TR/wai-aria-practices/#visualfocus)
+		// TODO: return $.promise
+		var i, l,
+			parents = this.getParentList(false, false);
+
+		for(i=0, l=parents.length; i<l; i++){
+			parents[i].setExpanded(true);
+		}
+	},
+	/** Move this node to targetNode.
+	 *  @param {FancytreeNode} targetNode
+	 *  @param {String} mode
+	 *      'child': append this node as last child of targetNode.
+	 *               This is the default. To be compatble with the D'n'd
+	 *               hitMode, we also accept 'over'.
+	 *      'before': add this node as sibling before targetNode.
+	 *      'after': add this node as sibling after targetNode.
+	 *  @param	[map] optional callback(FancytreeNode) to allow modifcations
+	 */
+	moveTo: function(targetNode, mode, map) {
+		if(mode === undefined || mode === "over"){
+			mode = "child";
+		}
+		var pos,
+			prevParent = this.parent,
+			targetParent = (mode === "child") ? targetNode : targetNode.parent;
+
+		if(this === targetNode){
+			return;
+		}else if( !this.parent  ){
+			throw "Cannot move system root";
+		}else if( targetParent.isDescendantOf(this) ){
+			throw "Cannot move a node to it's own descendant";
+		}
+		// Unlink this node from current parent
+		if( this.parent.children.length === 1 ) {
+			this.parent.children = this.parent.lazy ? [] : null;
+			this.parent.expanded = false;
+		} else {
+			pos = $.inArray(this, this.parent.children);
+			_assert(pos >= 0);
+			this.parent.children.splice(pos, 1);
+		}
+		// Remove from source DOM parent
+//		if(this.parent.ul){
+//			this.parent.ul.removeChild(this.li);
+//		}
+
+		// Insert this node to target parent's child list
+		this.parent = targetParent;
+		if( targetParent.hasChildren() ) {
+			switch(mode) {
+			case "child":
+				// Append to existing target children
+				targetParent.children.push(this);
+				break;
+			case "before":
+				// Insert this node before target node
+				pos = $.inArray(targetNode, targetParent.children);
+				_assert(pos >= 0);
+				targetParent.children.splice(pos, 0, this);
+				break;
+			case "after":
+				// Insert this node after target node
+				pos = $.inArray(targetNode, targetParent.children);
+				_assert(pos >= 0);
+				targetParent.children.splice(pos+1, 0, this);
+				break;
+			default:
+				throw "Invalid mode " + mode;
+			}
+		} else {
+			targetParent.children = [ this ];
+		}
+		// Parent has no <ul> tag yet:
+//		if( !targetParent.ul ) {
+//			// This is the parent's first child: create UL tag
+//			// (Hidden, because it will be
+//			targetParent.ul = document.createElement("ul");
+//			targetParent.ul.style.display = "none";
+//			targetParent.li.appendChild(targetParent.ul);
+//		}
+//		// Issue 319: Add to target DOM parent (only if node was already rendered(expanded))
+//		if(this.li){
+//			targetParent.ul.appendChild(this.li);
+//		}^
+
+		// Let caller modify the nodes
+		if( map ){
+			targetNode.visit(map, true);
+		}
+		// Handle cross-tree moves
+		if( this.tree !== targetNode.tree ) {
+			// Fix node.tree for all source nodes
+//			_assert(false, "Cross-tree move is not yet implemented.");
+			this.warn("Cross-tree moveTo is experimantal!");
+			this.visit(function(n){
+				// TODO: fix selection state and activation, ...
+				n.tree = targetNode.tree;
+			}, true);
+		}
+		// Update HTML markup
+		if( !prevParent.isDescendantOf(targetParent)) {
+			prevParent.render();
+		}
+		if( !targetParent.isDescendantOf(prevParent) && targetParent !== prevParent) {
+			targetParent.render();
+		}
+		// TODO: fix selection state
+		// TODO: fix active state
+
+/*
+		var tree = this.tree;
+		var opts = tree.options;
+		var pers = tree.persistence;
+
+
+		// Always expand, if it's below minExpandLevel
+//		tree.logDebug ("%s._addChildNode(%o), l=%o", this, ftnode, ftnode.getLevel());
+		if ( opts.minExpandLevel >= ftnode.getLevel() ) {
+//			tree.logDebug ("Force expand for %o", ftnode);
+			this.bExpanded = true;
+		}
+
+		// In multi-hier mode, update the parents selection state
+		// issue #82: only if not initializing, because the children may not exist yet
+//		if( !ftnode.data.isStatusNode && opts.selectMode==3 && !isInitializing )
+//			ftnode._fixSelectionState();
+
+		// In multi-hier mode, update the parents selection state
+		if( ftnode.bSelected && opts.selectMode==3 ) {
+			var p = this;
+			while( p ) {
+				if( !p.hasSubSel )
+					p._setSubSel(true);
+				p = p.parent;
+			}
+		}
+		// render this node and the new child
+		if ( tree.bEnableUpdate )
+			this.render();
+
+		return ftnode;
+
+*/
+	},
+	/**
+	 * Discard and reload all children of a lazy node.
+	 * @param {Boolean} [discard=false]
+	 * @returns $.Promise
+	 */
+	lazyLoad: function(discard) {
+		if(discard){
+			this.discard();
+		}else{
+			_assert(!$.isArray(this.children));
+		}
+		var source = this.tree._triggerNodeEvent("lazyload", this);
+		_assert(typeof source !== "boolean", "lazyload event must return source in data.result");
+		return this.tree._callHook("nodeLoadChildren", this, source);
+	},
+	/**
+	 * @see Fancytree#nodeRender
+	 */
+	render: function(force, deep) {
+		return this.tree._callHook("nodeRender", this, force, deep);
+	},
+	/**
+	 * @see Fancytree#nodeRenderTitle
+	 */
+	renderTitle: function() {
+		return this.tree._callHook("nodeRenderTitle", this);
+	},
+	/**
+	 * @see Fancytree#nodeRenderStatus
+	 */
+	renderStatus: function() {
+		return this.tree._callHook("nodeRenderStatus", this);
+	},
+	/** Remove this node (not allowed for root).*/
+	remove: function() {
+		return this.parent.removeChild(this);
+	},
+	/**Remove childNode from list of direct children.*/
+	removeChild: function(childNode) {
+		return this.tree._callHook("nodeRemoveChild", this, childNode);
+	},
+	/**Remove all child nodes (and descendents).*/
+	removeChildren: function() {
+		return this.tree._callHook("nodeRemoveChildren", this);
+	},
+	// TODO: resetLazy()
+	/** Schedule activity for delayed execution (cancel any pending request).
+	 *  scheduleAction('cancel') will cancel the request.
+	 */
+	scheduleAction: function(mode, ms) {
+		if( this.tree.timer ) {
+			clearTimeout(this.tree.timer);
+//            this.tree.debug("clearTimeout(%o)", this.tree.timer);
+		}
+		this.tree.timer = null;
+		var self = this; // required for closures
+		switch (mode) {
+		case "cancel":
+			// Simply made sure that timer was cleared
+			break;
+		case "expand":
+			this.tree.timer = setTimeout(function(){
+				self.tree.debug("setTimeout: trigger expand");
+				self.setExpanded(true);
+			}, ms);
+			break;
+		case "activate":
+			this.tree.timer = setTimeout(function(){
+				self.tree.debug("setTimeout: trigger activate");
+				self.setActive(true);
+			}, ms);
+			break;
+		default:
+			throw "Invalid mode " + mode;
+		}
+//        this.tree.debug("setTimeout(%s, %s): %s", mode, ms, this.tree.timer);
+	},
+	/**
+	 *
+	 * @param {Boolean | PlainObject} [effects=false] animation options.
+	 * @param {FancytreeNode} [topNode=null] this node will remain visible in
+	 *     any case, even if `this` is outside the scroll pane.
+	 * @returns $.Promise
+	 */
+	scrollIntoView: function(effects, topNode) {
+		effects = (effects === true) ? {duration: 200, queue: false} : effects;
+		var topNodeY,
+			dfd = new $.Deferred(),
+			nodeY = $(this.span).position().top,
+			nodeHeight = $(this.span).height(),
+			$container = this.tree.$container,
+			scrollTop = $container[0].scrollTop,
+			horzScrollHeight = Math.max(0, ($container.innerHeight() - $container[0].clientHeight)),
+//			containerHeight = $container.height(),
+			containerHeight = $container.height() - horzScrollHeight,
+			newScrollTop = null;
+
+//		console.log("horzScrollHeight: " + horzScrollHeight);
+//		console.log("$container[0].scrollTop: " + $container[0].scrollTop);
+//		console.log("$container[0].scrollHeight: " + $container[0].scrollHeight);
+//		console.log("$container[0].clientHeight: " + $container[0].clientHeight);
+//		console.log("$container.innerHeight(): " + $container.innerHeight());
+//		console.log("$container.height(): " + $container.height());
+
+		if(nodeY < 0){
+			newScrollTop = scrollTop + nodeY;
+		}else if((nodeY + nodeHeight) > containerHeight){
+			newScrollTop = scrollTop + nodeY - containerHeight + nodeHeight;
+			// If a topNode was passed, make sure that it is never scrolled
+			// outside the upper border
+			if(topNode){
+				topNodeY = topNode ? $(topNode.span).position().top : 0;
+				if((nodeY - topNodeY) > containerHeight){
+					newScrollTop = scrollTop + nodeY;
+				}
+			}
+		}
+		if(newScrollTop !== null){
+			if(effects){
+				// TODO: resolve dfd after animation
+//				var that = this;
+				$container.animate({scrollTop: newScrollTop}, effects);
+			}else{
+				$container[0].scrollTop = newScrollTop;
+				dfd.resolveWith(this);
+			}
+		}else{
+			dfd.resolveWith(this);
+		}
+		return dfd.promise();
+/* from jQuery.menu:
+		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
+		if ( this._hasScroll() ) {
+			borderTop = parseFloat( $.css( this.activeMenu[0], "borderTopWidth" ) ) || 0;
+			paddingTop = parseFloat( $.css( this.activeMenu[0], "paddingTop" ) ) || 0;
+			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
+			scroll = this.activeMenu.scrollTop();
+			elementHeight = this.activeMenu.height();
+			itemHeight = item.height();
+
+			if ( offset < 0 ) {
+				this.activeMenu.scrollTop( scroll + offset );
+			} else if ( offset + itemHeight > elementHeight ) {
+				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
+			}
+		}
+		*/
+	},
+
+	/**Activate this node.
+	 * @param {Boolean} [flag=true] pass false to deactivate
+	 */
+	setActive: function(flag){
+		return this.tree._callHook("nodeSetActive", this, flag);
+	},
+	/**Expand this node.
+	 * @param {Boolean} [flag=true] pass false to collapse
+	 */
+	setExpanded: function(flag){
+		return this.tree._callHook("nodeSetExpanded", this, flag);
+	},
+	/**Set keyboard focus to this node.
+	 * @param {Boolean} [flag=true] pass false to blur
+	 * @see Fancytree#setFocus
+	 */
+	setFocus: function(flag){
+		return this.tree._callHook("nodeSetFocus", this, flag);
+	},
+	// TODO: setLazyNodeStatus
+	/**Select this node.
+	 * @param {Boolean} [flag=true] pass false to deselect
+	 */
+	setSelected: function(flag){
+		return this.tree._callHook("nodeSetSelected", this, flag);
+	},
+	setTitle: function(title){
+		this.title = title;
+		this.renderTitle();
+	},
+	/**Sort child list by title.
+	 * @param {function} [cmd] custom compare function.
+	 * @param {Boolean} [deep] pass true to sort all descendant nodes
+	 */
+	sortChildren: function(cmp, deep) {
+		var i,l,
+			cl = this.children;
+
+		if( !cl ){
+			return;
+		}
+		cmp = cmp || function(a, b) {
+			var x = a.title.toLowerCase(),
+				y = b.title.toLowerCase();
+			return x === y ? 0 : x > y ? 1 : -1;
+			};
+		cl.sort(cmp);
+		if( deep ){
+			for(i=0, l=cl.length; i<l; i++){
+				if( cl[i].children ){
+					cl[i].sortChildren(cmp, "$norender$");
+				}
+			}
+		}
+		if( deep !== "$norender$" ){
+			this.render();
+		}
+	},
+	/** Convert node (or whole branch) into a dictionary.
+	 *
+	 * The result is compatible with node.addChildren().
+	 *
+	 * @param {Boolean} recursive
+	 * @param {function} callback callback(dict) is called for every dict (), in order to allow modifications
+	 * @returns {NodePatch}
+	 */
+	toDict: function(recursive, callback) {
+		var i, l, node,
+			dict = {},
+			self = this;
+
+		$.each(NODE_ATTRS, function(i, a){
+//			if(self[a] !== undefined && self[a] !== null){
+			if(self[a] || self[a] === false){
+				dict[a] = self[a];
+			}
+		});
+		if(!$.isEmptyObject(this.data)){
+			dict.data = $.extend({}, this.data);
+			if($.isEmptyObject(dict.data)){
+				delete dict.data;
+			}
+		}
+		if( callback ){
+			callback(dict);
+		}
+		if( recursive ) {
+			if(this.hasChildren()){
+				dict.children = [];
+				for(i=0, l=this.children.length; i<l; i++ ){
+					node = this.children[i];
+					if( !node.isStatusNode ){
+						dict.children.push(node.toDict(true, callback));
+					}
+				}
+			}else{
+//                dict.children = null;
+			}
+		}
+		return dict;
+	},
+	/** Flip expanded status.  */
+	toggleExpanded: function(){
+		return this.tree._callHook("nodeToggleExpanded", this);
+	},
+	/** Flip selection status.  */
+	toggleSelected: function(){
+		return this.tree._callHook("nodeToggleSelected", this);
+	},
+	toString: function() {
+		return "<FancytreeNode(#" + this.key + ", '" + this.title + "')>";
+	},
+	/** Call fn(node) for all child nodes. Stop iteration, if fn() returns false.
+	 * Skip current branch, if fn() returns 'skip'.
+	 * @param {function} fn the callback function.
+	 *     Return false to stop iteration, return "skip" to skip this node and children only.
+	 * @param {Boolean} [includeSelf=false]
+	 * @returns {Boolean} false, if the iterator was stopped.
+	 */
+	visit: function(fn, includeSelf) {
+		var i, l,
+			res = true,
+			children = this.children;
+
+		if( includeSelf === true ) {
+			res = fn(this);
+			if( res === false || res === "skip" ){
+				return res;
+			}
+		}
+		if(children){
+			for(i=0, l=children.length; i<l; i++){
+				res = children[i].visit(fn, true);
+				if( res === false ){
+					break;
+				}
+			}
+		}
+		return res;
+	},
+	/**
+	 *
+	 * @param fn
+	 * @param includeSelf
+	 * @returns {Boolean}
+	 */
+	visitParents: function(fn, includeSelf) {
+		// Visit parent nodes (bottom up)
+		if(includeSelf && fn(this) === false){
+			return false;
+		}
+		var p = this.parent;
+		while( p ) {
+			if(fn(p) === false){
+				return false;
+			}
+			p = p.parent;
+		}
+		return true;
+	},
+	/** Write warning to browser console (prepending node info)
+	 *
+	 * @param {*} msg string or object or array of such
+	 */
+	warn: function(msg){
+		Array.prototype.unshift.call(arguments, this.toString());
+		consoleApply("warn", arguments);
+	}
+};
+
+
+/* *****************************************************************************
+ * Fancytree
+ */
+/**
+ * Construct a new tree.
+ * @class The controller behind a fancytree.
+ * @name Fancytree
+ * @constructor
+ * @param {Widget} widget
+ *
+ * @property {FancytreeOptions} options
+ * @property {FancytreeNode} rootNode
+ * @property {FancytreeNode} activeNode
+ * @property {FancytreeNode} focusNode
+ * @property {jQueryObject} $div
+ * @property {object} widget
+ * @property {String} _id
+ * @property {String} statusClassPropName
+ * @property {String} ariaPropName
+ * @property {String} nodeContainerAttrName
+ * @property {FancytreeNode} lastSelectedNode
+ */
+function Fancytree(widget){
+	// TODO: rename widget to widget (it's not a jQuery object)
+	this.widget = widget;
+	this.$div = widget.element;
+	this.options = widget.options;
+	this._id = $.ui.fancytree._nextId++;
+	this._ns = ".fancytree-" + this._id; // append for namespaced events
+	this.activeNode = null;
+	this.focusNode = null;
+	this.lastSelectedNode = null;
+	this.systemFocusElement = null,
+
+	this.statusClassPropName = "span";
+	this.ariaPropName = "li";
+	this.nodeContainerAttrName = "li";
+
+	// Remove previous markup if any
+	this.$div.find(">ul.fancytree-container").remove();
+
+	// Create a node without parent.
+	var fakeParent = { tree: this },
+		$ul;
+	this.rootNode = new FancytreeNode(fakeParent, {
+		title: "root",
+		key: "root_" + this._id,
+		children: null
+	});
+	this.rootNode.parent = null;
+
+	// Create root markup
+	$ul = $("<ul>", {
+		"class": "ui-fancytree fancytree-container"
+	}).appendTo(this.$div);
+	this.$container = $ul;
+	this.rootNode.ul = $ul[0];
+
+	if(this.options.debugLevel == null){
+		this.options.debugLevel = FT.debugLevel;
+	}
+	// Add container to the TAB chain
+	// See http://www.w3.org/TR/wai-aria-practices/#focus_activedescendant
+	if(this.options.tabbable){
+		this.$container.attr("tabindex", "0");
+	}
+	if(this.options.aria){
+		this.$container.attr("role", "tree")
+			.attr("aria-multiselectable", true);
+	}
+}
+
+
+Fancytree.prototype = /**@lends Fancytree*/{
+	/** Return a context object that can be re-used for _callHook().
+	 * @param {Fancytree | FancytreeNode | EventData} obj
+	 * @param {Event} originalEvent
+	 * @returns {EventData}
+	 */
+	_makeHookContext: function(obj, originalEvent) {
+		if(obj.node !== undefined){
+			// obj is already a context object
+			if(originalEvent && obj.originalEvent !== originalEvent){
+				$.error("invalid args");
+			}
+			return obj;
+		}else if(obj.tree){
+			// obj is a FancytreeNode
+			var tree = obj.tree;
+			return { node: obj, tree: tree, widget: tree.widget, options: tree.widget.options, originalEvent: originalEvent };
+		}else if(obj.widget){
+			// obj is a Fancytree
+			return { node: null, tree: obj, widget: obj.widget, options: obj.widget.options, originalEvent: originalEvent };
+		}
+		$.error("invalid args");
+	},
+	/** Trigger a hook function: funcName(ctx, [...]).
+	 *
+	 * @param {String} funcName
+	 * @param {Fancytree|FancytreeNode|EventData} contextObject
+	 * @param {any, ...}  [_extraArgs] optional additional arguments
+	 * @returns {any}
+	 */
+	_callHook: function(funcName, contextObject, _extraArgs) {
+		var ctx = this._makeHookContext(contextObject),
+			fn = this[funcName],
+			args = Array.prototype.slice.call(arguments, 2);
+		if(!$.isFunction(fn)){
+			$.error("_callHook('" + funcName + "') is not a function");
+		}
+		args.unshift(ctx);
+//		this.debug("_hook", funcName, ctx.node && ctx.node.toString() || ctx.tree.toString(), args);
+		return fn.apply(this, args);
+	},
+	/** Activate node with a given key.
+	 *
+	 * A prevously activated node will be deactivated.
+	 * Pass key = false, to deactivate the current node only.
+	 * @param {String} key
+	 * @returns {FancytreeNode} activated node (null, if not found)
+	 */
+	activateKey: function(key) {
+		var node = this.getNodeByKey(key);
+		if(node){
+			node.setActive();
+		}else if(this.activeNode){
+			this.activeNode.setActive(false);
+		}
+		return node;
+	},
+	/**
+	 *
+	 * @param {Array} patchList array of [key, NodePatch] arrays
+	 * @returns {$.Promise} resolved, when all patches have been applied
+	 * @see TreePatch
+	 */
+	applyPatch: function(patchList) {
+		var dfd, i, p2, key, patch, node,
+			patchCount = patchList.length,
+			deferredList = [];
+
+		for(i=0; i<patchCount; i++){
+			p2 = patchList[i];
+			_assert(p2.length === 2, "patchList must be an array of length-2-arrays");
+			key = p2[0];
+			patch = p2[1];
+			node = (key === null) ? this.rootNode : this.getNodeByKey(key);
+			if(node){
+				dfd = new $.Deferred();
+				deferredList.push(dfd);
+				node.applyPatch(patch).always(_makeResolveFunc(dfd, node));
+			}else{
+				this.warn("could not find node with key '" + key + "'");
+			}
+		}
+		// Return a promise that is resovled, when ALL patches were applied
+		return $.when.apply($, deferredList).promise();
+	},
+	/* TODO: implement in dnd extension
+	cancelDrag: function() {
+		var dd = $.ui.ddmanager.current;
+		if(dd){
+			dd.cancel();
+		}
+	},
+   */
+	count: function() {
+		return this.rootNode.countChildren();
+	},
+	/** Write to browser console if debugLevel >= 2 (prepending tree info)
+	 *
+	 * @param {*} msg string or object or array of such
+	 */
+	debug: function(msg){
+		if( this.options.debugLevel >= 2 ) {
+			Array.prototype.unshift.call(arguments, this.toString());
+			consoleApply("debug", arguments);
+		}
+	},
+	// TODO: disable()
+	// TODO: enable()
+	// TODO: enableUpdate()
+	// TODO: fromDict
+	/**
+	 * Generate INPUT elements that can be submitted with html forms.
+	 *
+	 * In selectMode 3 only the topmost selected nodes are considered.
+	 *
+	 * @param {Boolean | String} [selected=true]
+	 * @param {Boolean | String} [active=true]
+	 */
+	generateFormElements: function(selected, active) {
+		// TODO: test case
+		var nodeList,
+			selectedName = (selected !== false) ? "ft_" + this._id : selected,
+			activeName = (active !== false) ? "ft_" + this._id + "_active" : active,
+			id = "fancytree_result_" + this._id,
+			$result = this.$container.find("div#" + id);
+
+		if($result.length){
+			$result.empty();
+		}else{
+			$result = $("<div>", {
+				id: id
+			}).hide().appendTo(this.$container);
+		}
+		if(selectedName){
+			nodeList = this.getSelectedNodes( this.options.selectMode === 3 );
+			$.each(nodeList, function(idx, node){
+				$result.append($("<input>", {
+					type: "checkbox",
+					name: selectedName,
+					value: node.key,
+					checked: true
+				}));
+			});
+		}
+		if(activeName && this.activeNode){
+			$result.append($("<input>", {
+				type: "radio",
+				name: activeName,
+				value: this.activeNode.key,
+				checked: true
+			}));
+		}
+	},
+	/**
+	 * Return node that is active.
+	 * @returns {FancytreeNode}
+	 */
+	getActiveNode: function() {
+		return this.activeNode;
+	},
+	/** @returns {FancytreeNode | null}*/
+	getFirstChild: function() {
+		return this.rootNode.getFirstChild();
+	},
+	/**
+	 * Return node that has keyboard focus.
+	 * @param {Boolean} [ifTreeHasFocus=false]
+	 * @returns {FancytreeNode}
+	 */
+	getFocusNode: function(ifTreeHasFocus) {
+		// TODO: implement ifTreeHasFocus
+		return this.focusNode;
+	},
+	getNodeByKey: function(key, searchRoot) {
+		// Search the DOM by element ID (assuming this is faster than traversing all nodes).
+		// $("#...") has problems, if the key contains '.', so we use getElementById()
+		var el, match;
+		if(!searchRoot){
+			el = document.getElementById(this.options.idPrefix + key);
+			if( el ){
+				return el.ftnode ? el.ftnode : null;
+			}
+		}
+		// Not found in the DOM, but still may be in an unrendered part of tree
+		// TODO: optimize with specialized loop
+		// TODO: consider keyMap?
+		searchRoot = searchRoot || this.rootNode;
+		match = null;
+		searchRoot.visit(function(node){
+//            window.console.log("getNodeByKey(" + key + "): ", node.key);
+			if(node.key === key) {
+				match = node;
+				return false;
+			}
+		}, true);
+		return match;
+	},
+	// TODO: getRoot()
+	/**
+	 * Return a list of selected nodes.
+	 * @param {Boolean} [stopOnParents=false] only return the topmost selected
+	 *     node (useful with selectMode 3)
+	 * @returns {FancytreeNode[]}
+	 */
+	getSelectedNodes: function(stopOnParents) {
+		var nodeList = [];
+		this.rootNode.visit(function(node){
+			if( node.selected ) {
+				nodeList.push(node);
+				if( stopOnParents === true ){
+					return "skip"; // stop processing this branch
+				}
+			}
+		});
+		return nodeList;
+	},
+	/**
+	 * @returns {Boolean} true if the tree control has keyboard focus
+	 */
+	hasFocus: function(){
+		return FT.focusTree === this;
+	},
+	/** Write to browser console if debugLevel >= 1 (prepending tree info)
+	 *
+	 * @param {*} msg string or object or array of such
+	 */
+	info: function(msg){
+		if( this.options.debugLevel >= 1 ) {
+			Array.prototype.unshift.call(arguments, this.toString());
+			consoleApply("info", arguments);
+		}
+	},
+/*
+	TODO: isInitializing: function() {
+		return ( this.phase=="init" || this.phase=="postInit" );
+	},
+	TODO: isReloading: function() {
+		return ( this.phase=="init" || this.phase=="postInit" ) && this.options.persist && this.persistence.cookiesFound;
+	},
+	TODO: isUserEvent: function() {
+		return ( this.phase=="userEvent" );
+	},
+*/
+	/**
+	 * Expand all parents of one or more nodes.
+	 * Calls
+	 * @param {String | String[]} keyPath one or more key paths (e.g. '/3/2_1/7')
+	 * @param {function} callback callbeck(mode) is called for every visited node
+	 * @returns {$.Promise}
+	 */
+	/*
+	_loadKeyPath: function(keyPath, callback) {
+		var tree = this.tree;
+		tree.logDebug("%s._loadKeyPath(%s)", this, keyPath);
+		if(keyPath === ""){
+			throw "Key path must not be empty";
+		}
+		var segList = keyPath.split(tree.options.keyPathSeparator);
+		if(segList[0] === ""){
+			throw "Key path must be relative (don't start with '/')";
+		}
+		var seg = segList.shift();
+
+		for(var i=0, l=this.childList.length; i < l; i++){
+			var child = this.childList[i];
+			if( child.data.key === seg ){
+				if(segList.length === 0) {
+					// Found the end node
+					callback.call(tree, child, "ok");
+
+				}else if(child.data.isLazy && (child.childList === null || child.childList === undefined)){
+					tree.logDebug("%s._loadKeyPath(%s) -> reloading %s...", this, keyPath, child);
+					var self = this;
+					child.reloadChildren(function(node, isOk){
+						// After loading, look for direct child with that key
+						if(isOk){
+							tree.logDebug("%s._loadKeyPath(%s) -> reloaded %s.", node, keyPath, node);
+							callback.call(tree, child, "loaded");
+							node._loadKeyPath(segList.join(tree.options.keyPathSeparator), callback);
+						}else{
+							tree.logWarning("%s._loadKeyPath(%s) -> reloadChildren() failed.", self, keyPath);
+							callback.call(tree, child, "error");
+						}
+					}); // Note: this line gives a JSLint warning (Don't make functions within a loop)
+					// we can ignore it, since it will only be exectuted once, the the loop is ended
+					// See also http://stackoverflow.com/questions/3037598/how-to-get-around-the-jslint-error-dont-make-functions-within-a-loop
+				} else {
+					callback.call(tree, child, "loaded");
+					// Look for direct child with that key
+					child._loadKeyPath(segList.join(tree.options.keyPathSeparator), callback);
+				}
+				return;
+			}
+		}
+		// Could not find key
+		tree.logWarning("Node not found: " + seg);
+		return;
+	},
+
+	 */
+	loadKeyPath: function(keyPathList, callback, _rootNode) {
+		var deferredList, dfd, i, path, key, loadMap, node, segList,
+			root = _rootNode || this.rootNode,
+			sep = this.options.keyPathSeparator,
+			self = this;
+
+		if(!$.isArray(keyPathList)){
+			keyPathList = [keyPathList];
+		}
+		// Pass 1: handle all path segments for nodes that are already loaded
+		// Collect distinct top-most lazy nodes in a map
+		loadMap = {};
+
+		for(i=0; i<keyPathList.length; i++){
+			path = keyPathList[i];
+			// strip leading slash
+			if(path.charAt(0) === sep){
+				path = path.substr(1);
+			}
+			// traverse and strip keys, until we hit a lazy, unloaded node
+			segList = path.split(sep);
+			while(segList.length){
+				key = segList.shift();
+//                node = _findDirectChild(root, key);
+				node = root._findDirectChild(key);
+				if(!node){
+					this.warn("loadKeyPath: key not found: " + key + " (parent: " + root + ")");
+					callback.call(this, key, "error");
+					break;
+				}else if(segList.length === 0){
+					callback.call(this, node, "ok");
+					break;
+				}else if(!node.lazy || (node.hasChildren() !== undefined )){
+					callback.call(this, node, "loaded");
+					root = node;
+				}else{
+					callback.call(this, node, "loaded");
+//                    segList.unshift(key);
+					if(loadMap[key]){
+						loadMap[key].push(segList.join(sep));
+					}else{
+						loadMap[key] = [segList.join(sep)];
+					}
+					break;
+				}
+			}
+		}
+//        alert("loadKeyPath: loadMap=" + JSON.stringify(loadMap));
+		// Now load all lazy nodes and continue itearation for remaining paths
+		deferredList = [];
+		// Avoid jshint warning 'Don't make functions within a loop.':
+		function __lazyload(key, node, dfd){
+			callback.call(self, node, "loading");
+			node.lazyLoad().done(function(){
+			  self.loadKeyPath.call(self, loadMap[key], callback, node).always(_makeResolveFunc(dfd, self));
+		  }).fail(function(errMsg){
+			  self.warn("loadKeyPath: error loading: " + key + " (parent: " + root + ")");
+			  callback.call(self, node, "error");
+			  dfd.reject();
+		  });
+		}
+		for(key in loadMap){
+			node = root._findDirectChild(key);
+//            alert("loadKeyPath: lazy node(" + key + ") = " + node);
+			dfd = new $.Deferred();
+			deferredList.push(dfd);
+			__lazyload(key, node, dfd);
+		}
+		// Return a promise that is resovled, when ALL paths were loaded
+		return $.when.apply($, deferredList).promise();
+	},
+	/** _Default handling for mouse click events. */
+	nodeClick: function(ctx) {
+//      this.tree.logDebug("ftnode.onClick(" + event.type + "): ftnode:" + this + ", button:" + event.button + ", which: " + event.which);
+		var activate, expand,
+			event = ctx.originalEvent,
+			targetType = ctx.targetType,
+			node = ctx.node;
+
+		// TODO: use switch
+		// TODO: make sure clicks on embedded <input> doesn't steal focus (see table sample)
+		if( targetType === "expander" ) {
+			// Clicking the expander icon always expands/collapses
+			this._callHook("nodeToggleExpanded", ctx);
+//            this._callHook("nodeSetFocus", ctx, true); // issue 95
+		} else if( targetType === "checkbox" ) {
+			// Clicking the checkbox always (de)selects
+			this._callHook("nodeToggleSelected", ctx);
+			this._callHook("nodeSetFocus", ctx, true); // issue 95
+		} else {
+			// Honor `clickFolderMode` for
+			expand = false;
+			activate = true;
+			if( node.folder ) {
+				switch( ctx.options.clickFolderMode ) {
+				case 2: // expand only
+					expand = true;
+					activate = false;
+					break;
+				case 3: // expand and activate
+					activate = true;
+					expand = true; //!node.isExpanded();
+					break;
+				// else 1 or 4: just activate
+				}
+			}
+			if( activate ) {
+				this.nodeSetFocus(ctx);
+				this._callHook("nodeSetActive", ctx, true);
+			}
+			if( expand ) {
+				if(!activate){
+//                    this._callHook("nodeSetFocus", ctx);
+				}
+//				this._callHook("nodeSetExpanded", ctx, true);
+				this._callHook("nodeToggleExpanded", ctx);
+			}
+		}
+		// Make sure that clicks stop, otherwise <a href='#'> jumps to the top
+		if(event.target.localName === "a" && event.target.className === "fancytree-title"){
+			event.preventDefault();
+		}
+		// TODO: return promise?
+	},
+	nodeCollapseSiblings: function(ctx) {
+		// TODO: return promise?
+		var ac, i, l,
+			node = ctx.node;
+
+		if( node.parent ){
+			ac = node.parent.children;
+			for (i=0, l=ac.length; i<l; i++) {
+				if ( ac[i] !== node && ac[i].expanded ){
+					this._callHook("nodeSetExpanded", ac[i], false);
+				}
+			}
+		}
+	},
+	nodeDblclick: function(ctx) {
+		// TODO: return promise?
+		if( ctx.targetType === "title" && ctx.options.clickFolderMode === 4) {
+//			this.nodeSetFocus(ctx);
+//			this._callHook("nodeSetActive", ctx, true);
+			this._callHook("nodeToggleExpanded", ctx);
+		}
+		// TODO: prevent text selection on dblclicks
+		if( ctx.targetType === "title" ) {
+			ctx.originalEvent.preventDefault();
+		}
+	},
+	/** Default handling for mouse keydown events.
+	 *
+	 * NOTE: this may be called with node == null if tree (but no node) has focus.
+	 */
+	nodeKeydown: function(ctx) {
+		// TODO: return promise?
+		var i, parents,
+			event = ctx.originalEvent,
+			node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options,
+			handled = true,
+			KC = $.ui.keyCode,
+			sib = null;
+
+//		node.debug("ftnode.nodeKeydown(" + event.type + "): ftnode:" + this + ", charCode:" + event.charCode + ", keyCode: " + event.keyCode + ", which: " + event.which);
+
+		// Set focus to first node, if no other node has the focus yet
+		if( !node ){
+			this.rootNode.getFirstChild().setFocus();
+			node = ctx.node = this.focusNode;
+			node.debug("Keydown force focus on first node");
+		}
+		// Navigate to node
+		function _goto(n){
+			if( n ){
+				n.makeVisible();
+				return (event.ctrlKey || !opts.autoActivate ) ? n.setFocus() : n.setActive();
+			}
+		}
+
+		switch( event.which ) {
+			// charCodes:
+			case KC.NUMPAD_ADD: //107: // '+'
+			case 187: // '+' @ Chrome, Safari
+				tree.nodeSetExpanded(ctx, true);
+				break;
+			case KC.NUMPAD_SUBTRACT: // '-'
+			case 189: // '-' @ Chrome, Safari
+				tree.nodeSetExpanded(ctx, false);
+				break;
+			case KC.SPACE:
+				if(opts.checkbox){
+					tree.nodeToggleSelected(ctx);
+				}else{
+					tree.nodeSetActive(ctx, true);
+				}
+				break;
+			case KC.ENTER:
+				tree.nodeSetActive(ctx, true);
+				break;
+			case KC.BACKSPACE:
+				_goto(node.parent);
+				break;
+			case KC.LEFT:
+				if( node.expanded ) {
+					tree.nodeSetExpanded(ctx, false);
+//					tree.nodeSetFocus(ctx);
+					_goto(node);
+				} else if( node.parent && node.parent.parent ) {
+//					node.parent.setFocus();
+					_goto(node.parent);
+				}
+				break;
+			case KC.RIGHT:
+				if( !node.expanded && (node.children || node.lazy) ) {
+					tree.nodeSetExpanded(ctx, true);
+//					tree.nodeSetFocus(ctx);
+					_goto(node);
+				} else if( node.children ) {
+//					node.children[0].setFocus();
+					_goto(node.children[0]);
+				}
+				break;
+			case KC.UP:
+				sib = node.getPrevSibling();
+				while( sib && sib.expanded && sib.children ){
+					sib = sib.children[sib.children.length - 1];
+				}
+				if( !sib && node.parent && node.parent.parent ){
+					sib = node.parent;
+				}
+				_goto(sib);
+				break;
+			case KC.DOWN:
+				if( node.expanded && node.children ) {
+					sib = node.children[0];
+				} else {
+					parents = node.getParentList(false, true);
+					for(i=parents.length-1; i>=0; i--) {
+						sib = parents[i].getNextSibling();
+						if( sib ){ break; }
+					}
+				}
+				_goto(sib);
+				break;
+			default:
+				handled = false;
+		}
+		if(handled){
+			event.preventDefault();
+		}
+	},
+
+	// /** Default handling for mouse keypress events. */
+	// nodeKeypress: function(ctx) {
+	//     var event = ctx.originalEvent;
+	// },
+
+	// /** Trigger lazyload event (async). */
+	// nodeLazyLoad: function(ctx) {
+	//     var node = ctx.node;
+	//     if(this._triggerNodeEvent())
+	// },
+	/** Load children (async).
+	 *  source may be
+	 *    - an array of children
+	 *    - a node object
+	 *    - an Ajax options object
+	 *    - an Ajax.promise
+	 *
+	 * @param {object} ctx
+	 * @param {object[]|object|string|$.Promise|function} source
+	 * @returns {$.Promise} The deferred will be resolved as soon as the (ajax)
+	 *     data was rendered.
+	 */
+	nodeLoadChildren: function(ctx, source) {
+		var ajax, children, delay, dfd,
+			tree = ctx.tree,
+			node = ctx.node,
+			self = this;
+
+		if($.isFunction(source)){
+			source = source();
+		}
+		if(source.url || $.isFunction(source.done)){
+			tree.nodeSetStatus(ctx, "loading");
+			if(source.url){
+				// `source` is an Ajax options object
+				ajax = $.extend({}, ctx.options.ajax, source);
+				if(ajax.debugLazyDelay){
+					// simulate a slow server
+					delay = ajax.debugLazyDelay;
+					if($.isArray(delay)){ // random delay range [min..max]
+						delay = delay[0] + Math.random() * (delay[1] - delay[0]);
+					}
+					node.debug("nodeLoadChildren waiting debug delay " + Math.round(delay) + "ms");
+					dfd = $.Deferred();
+					setTimeout(function(){
+						ajax.debugLazyDelay = false;
+						self.nodeLoadChildren(ctx, ajax).complete(function(){
+							dfd.resolve.apply(this, arguments);
+						});
+					}, delay);
+					return dfd;
+				}else{
+					dfd = $.ajax(ajax);
+				}
+			}else{
+				// `source` is a promise, as returned by a $.ajax call
+				dfd = source;
+			}
+			dfd.done(function(data, textStatus, jqXHR){
+				var res;
+				tree.nodeSetStatus(ctx, "ok");
+				if(typeof data === "string"){ $.error("Ajax request returned a string (did you get the JSON dataType wrong?)."); }
+				// postProcess is similar to the standard dataFilter hook,
+				// but it is also called for JSONP
+				if( ctx.options.postProcess ){
+					res = tree._triggerNodeEvent("postProcess", ctx, ctx.originalEvent, {response: data, dataType: this.dataType});
+					data = $.isArray(res) ? res : data;
+				} else if (data && data.hasOwnProperty("d") && ctx.options.enableAspx ) {
+					// Process ASPX WebMethod JSON object inside "d" property
+					data = (typeof data.d === "string") ? $.parseJSON(data.d) : data.d;
+				}
+				children = data;
+
+			}).fail(function(jqXHR, textStatus, errorThrown){
+				tree.nodeSetStatus(ctx, "error", textStatus, jqXHR.status + ": " + errorThrown);
+				alert("error: " + textStatus + " (" + jqXHR.status + ": " + (errorThrown.message || errorThrown) + ")");
+			});
+		}else{
+			// `source` is an array of child objects
+			dfd = $.Deferred();
+			children = source;
+			dfd.resolve();
+		}
+		dfd.done(function(){
+			_assert($.isArray(children), "expected array of children");
+			node._setChildren(children);
+			if(node.parent){
+				// if nodeLoadChildren was called for rootNode, the caller must
+				// use tree.render() instead
+				if(node.isVisible()){
+					tree.nodeRender(ctx);
+				}
+				// trigger fancytreeloadchildren (except for tree-reload)
+				tree._triggerNodeEvent("loadChildren", node);
+			}
+		}).fail(function(){
+			tree.nodeRender(ctx);
+		});
+		return dfd;
+	},
+	// isVisible: function() {
+	//     // Return true, if all parents are expanded.
+	//     var parents = ctx.node.getParentList(false, false);
+	//     for(var i=0, l=parents.length; i<l; i++){
+	//         if( ! parents[i].expanded ){ return false; }
+	//     }
+	//     return true;
+	// },
+	/** Expand all keys that */
+	nodeLoadKeyPath: function(ctx, keyPathList) {
+		// TODO: implement and improve
+		// http://code.google.com/p/fancytree/issues/detail?id=222
+	},
+	/** Expand all parents.*/
+	nodeMakeVisible: function(ctx) {
+		// TODO: also scroll as neccessary: http://stackoverflow.com/questions/8938352/fancytree-how-to-scroll-to-active-node
+		// Do we need an extra parameter?
+		var i, l,
+			parents = ctx.node.getParentList(false, false);
+		for(i=0, l=parents.length; i<l; i++){
+			parents[i].setExpanded(true);
+		}
+	},
+//	/** Handle focusin/focusout events.*/
+//	nodeOnFocusInOut: function(ctx) {
+//		if(ctx.originalEvent.type === "focusin"){
+//			this.nodeSetFocus(ctx);
+//			// if(ctx.tree.focusNode){
+//			//     $(ctx.tree.focusNode.li).removeClass("fancytree-focused");
+//			// }
+//			// ctx.tree.focusNode = ctx.node;
+//			// $(ctx.node.li).addClass("fancytree-focused");
+//		}else{
+//			_assert(ctx.originalEvent.type === "focusout");
+//			// ctx.tree.focusNode = null;
+//			// $(ctx.node.li).removeClass("fancytree-focused");
+//		}
+//		// $(ctx.node.li).toggleClass("fancytree-focused", ctx.originalEvent.type === "focus");
+//	},
+	/**
+	 * Remove a single direct child of ctx.node.
+	 * @param ctx
+	 * @param {FancytreeNode} childNode dircect child of ctx.node
+	 */
+	nodeRemoveChild: function(ctx, childNode) {
+		var idx,
+			node = ctx.node,
+			opts = ctx.options,
+			subCtx = $.extend({}, ctx, {node: childNode}),
+			children = node.children;
+
+		FT.debug("nodeRemoveChild()", node.toString(), childNode.toString());
+
+		if( children.length === 1 ) {
+			_assert(childNode === children[0]);
+			return this.nodeRemoveChildren(ctx);
+		}
+		if( this.activeNode && (childNode === this.activeNode || this.activeNode.isDescendantOf(childNode))){
+			this.activeNode.setActive(false); // TODO: don't fire events
+		}
+		if( this.focusNode && (childNode === this.focusNode || this.focusNode.isDescendantOf(childNode))){
+			this.focusNode = null;
+		}
+		// TODO: persist must take care to clear select and expand cookies
+		this.nodeRemoveMarkup(subCtx);
+		this.nodeRemoveChildren(subCtx);
+		idx = $.inArray(childNode, children);
+		_assert(idx >= 0);
+		// Unlink to support GC
+		childNode.visit(function(n){
+			n.parent = null;
+		}, true);
+		if ( opts.removeNode ){
+			opts.removeNode.call(ctx.tree, {type: "removeNode"}, subCtx);
+		}
+		// remove from child list
+		children.splice(idx, 1);
+	},
+	/**Remove HTML markup for all descendents of ctx.node.
+	 * @param {EventData} ctx
+	 */
+	nodeRemoveChildMarkup: function(ctx) {
+		var node = ctx.node;
+
+		FT.debug("nodeRemoveChildMarkup()", node.toString());
+		// TODO: Unlink attr.ftnode to support GC
+		if(node.ul){
+			$(node.ul).remove();
+			node.visit(function(n){
+				n.li = n.ul = null;
+			});
+			node.ul = null;
+		}
+	},
+	/**Remove all descendants of ctx.node.
+	* @param {EventData} ctx
+	*/
+	nodeRemoveChildren: function(ctx) {
+		var subCtx,
+			node = ctx.node,
+			children = node.children,
+			opts = ctx.options;
+
+		FT.debug("nodeRemoveChildren()", node.toString());
+		if(!children){
+			return;
+		}
+		if( this.activeNode && this.activeNode.isDescendantOf(node)){
+			this.activeNode.setActive(false); // TODO: don't fire events
+		}
+		if( this.focusNode && this.focusNode.isDescendantOf(node)){
+			this.focusNode = null;
+		}
+		// TODO: persist must take care to clear select and expand cookies
+		this.nodeRemoveChildMarkup(ctx);
+		// Unlink children to support GC
+		// TODO: also delete this.children (not possible using visit())
+		subCtx = $.extend({}, ctx);
+		node.visit(function(n){
+			n.parent = null;
+			if ( opts.removeNode ){
+				subCtx.node = n;
+				opts.removeNode.call(ctx.tree, {type: "removeNode"}, subCtx);
+			}
+		});
+		// Set to 'undefined' which is interpreted as 'not yet loaded' for lazy nodes
+		node.children = undefined;
+		// TODO: ? this._isLoading = false;
+		this.nodeRenderStatus(ctx);
+	},
+	/**Remove HTML markup for ctx.node and all its descendents.
+	 * @param {EventData} ctx
+	 */
+	nodeRemoveMarkup: function(ctx) {
+		var node = ctx.node;
+		FT.debug("nodeRemoveMarkup()", node.toString());
+		// TODO: Unlink attr.ftnode to support GC
+		if(node.li){
+			$(node.li).remove();
+			node.li = null;
+		}
+		this.nodeRemoveChildMarkup(ctx);
+	},
+	/**
+	 * Create `<li><span>..</span> .. </li>` tags for this node.
+	 *
+	 * This method takes care that all HTML markup is created that is required
+	 * to display this node in it's current state.
+	 *
+	 * Call this method to create new nodes, or after the strucuture
+	 * was changed (e.g. after moving this node or adding/removing children)
+	 * nodeRenderTitle() and nodeRenderStatus() are implied.
+	 *
+	 * Note: if a node was created/removed, nodeRender() must be called for the
+	 *       parent!
+	 * <code>
+	 * <li id='KEY' ftnode=NODE>
+	 *     <span class='fancytree-node fancytree-expanded fancytree-has-children fancytree-lastsib fancytree-exp-el fancytree-ico-e'>
+	 *         <span class="fancytree-expander"></span>
+	 *         <span class="fancytree-checkbox"></span> // only present in checkbox mode
+	 *         <span class="fancytree-icon"></span>
+	 *         <a href="#" class="fancytree-title"> Node 1 </a>
+	 *     </span>
+	 *     <ul> // only present if node has children
+	 *         <li id='KEY' ftnode=NODE> child1 ... </li>
+	 *         <li id='KEY' ftnode=NODE> child2 ... </li>
+	 *     </ul>
+	 * </li>
+	 * </code>
+	 *
+	 * @param: {EventData} ctx
+	 * @param: {Boolean} [force=false] re-render, even if html markup was already created
+	 * @param: {Boolean} [deep=false] also render all descendants, even if parent is collapsed
+	 * @param: {Boolean} [collapsed=false] force root node to be collapsed, so we can apply animated expand later
+	 */
+	nodeRender: function(ctx, force, deep, collapsed, _recursive) {
+		/* This method must take care of all cases where the current data mode
+		 * (i.e. node hierarchy) does not match the current markup.
+		 *
+		 * - node was not yet rendered:
+		 *   create markup
+		 * - node was rendered: exit fast
+		 * - children have been added
+		 * - childern have been removed
+		 */
+		var childLI, childNode1, childNode2, i, l, subCtx,
+			node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options,
+			aria = opts.aria,
+			firstTime = false,
+			parent = node.parent,
+			isRootNode = !parent,
+			children = node.children;
+//		FT.debug("nodeRender(" + !!force + ", " + !!deep + ")", node.toString());
+
+		_assert(isRootNode || parent.ul, "parent UL must exist");
+
+		// Render the node
+		if( !isRootNode ){
+			// Discard markup on force-mode, or if it is not linked to parent <ul>
+			if(node.li && (force || (node.li.parentNode !== node.parent.ul) ) ){
+				if(node.li.parentNode !== node.parent.ul){
+//					alert("unlink " + node + " (must be child of " + node.parent + ")");
+					this.warn("unlink " + node + " (must be child of " + node.parent + ")");
+				}
+//	            this.debug("nodeRemoveMarkup...");
+				this.nodeRemoveMarkup(ctx);
+			}
+			// Create <li><span /> </li>
+//			node.debug("render...");
+			if( !node.li ) {
+//	            node.debug("render... really");
+				firstTime = true;
+				node.li = document.createElement("li");
+				node.li.ftnode = node;
+				if(aria){
+					// TODO: why doesn't this work:
+//					node.li.role = "treeitem";
+//                    $(node.li).attr("role", "treeitem")
+//                    .attr("aria-labelledby", "ftal_" + node.key);
+				}
+				if( node.key && opts.generateIds ){
+					node.li.id = opts.idPrefix + node.key;
+				}
+				node.span = document.createElement("span");
+				node.span.className = "fancytree-node";
+				if(aria){
+					$(node.span).attr("aria-labelledby", "ftal_" + node.key);
+				}
+				node.li.appendChild(node.span);
+				// Note: we don't add the LI to the DOM know, but only after we
+				// added all sub elements (hoping that this performs better since
+				// the browser only have to render once)
+				// TODO: benchmarks to prove this
+//                parent.ul.appendChild(node.li);
+
+				// Create inner HTML for the <span> (expander, checkbox, icon, and title)
+				this.nodeRenderTitle(ctx);
+
+				// Allow tweaking and binding, after node was created for the first time
+//				tree._triggerNodeEvent("createNode", ctx);
+				if ( opts.createNode ){
+					opts.createNode.call(tree, {type: "createNode"}, ctx);
+				}
+			}else{
+//				this.nodeRenderTitle(ctx);
+			}
+			// Allow tweaking after node state was rendered
+//			tree._triggerNodeEvent("renderNode", ctx);
+			if ( opts.renderNode ){
+				opts.renderNode.call(tree, {type: "renderNode"}, ctx);
+			}
+		}
+
+		// Visit child nodes
+		if( children ){
+			if( isRootNode || node.expanded || deep === true ) {
+				// Create a UL to hold the children
+				if( !node.ul ){
+					node.ul = document.createElement("ul");
+					if((collapsed === true && !_recursive) || !node.expanded){
+						// hide top UL, so we can use an animation to show it later
+						node.ul.style.display = "none";
+					}
+					if(aria){
+						$(node.ul).attr("role", "group");
+					}
+					node.li.appendChild(node.ul);
+				}
+				// Add child markup
+				for(i=0, l=children.length; i<l; i++) {
+					subCtx = $.extend({}, ctx, {node: children[i]});
+					this.nodeRender(subCtx, force, deep, false, true);
+				}
+				// Make sure, that <li> order matches node.children order.
+//                this.nodeFixOrder(ctx);
+				childLI = node.ul.firstChild;
+				for(i=0, l=children.length-1; i<l; i++) {
+					childNode1 = children[i];
+					childNode2 = childLI.ftnode;
+					if( childNode1 !== childNode2 ) {
+						node.debug("_fixOrder: mismatch at index " + i + ": " + childNode1 + " != " + childNode2);
+						node.ul.insertBefore(childNode1.li, childNode2.li);
+					} else {
+						childLI = childLI.nextSibling;
+					}
+				}
+				// TODO: need to check, if node.ul has <li>s, that are not in node.children[] ?
+			}
+		}else{
+			// No children: remove markup if any
+			if( node.ul ){
+//				alert("remove child markup for " + node);
+				this.warn("remove child markup for " + node);
+				this.nodeRemoveChildMarkup(ctx);
+			}
+		}
+		if( !isRootNode ){
+			// Update element classes according to node state
+			this.nodeRenderStatus(ctx);
+			// Finally add the whole structure to the DOM, so the browser can render
+			if(firstTime){
+				parent.ul.appendChild(node.li);
+			}
+		}
+		return;
+	},
+	/** Create HTML for the node's outer <span> (expander, checkbox, icon, and title).
+	 * @param {EventData} ctx
+	 */
+	nodeRenderTitle: function(ctx, title) {
+		// set node connector images, links and text
+		var id, imageSrc, nodeTitle, role, tooltip,
+			node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options,
+			aria = opts.aria,
+			level = node.getLevel(),
+			ares = [],
+			icon = node.data.icon;
+
+		if(title !== undefined){
+			node.title = title;
+		}
+		if(!node.span){
+			// Silently bail out if node was not rendered yet, assuming
+			// node.render() will be called as the node becomes visible
+			return;
+		}
+		// connector (expanded, expandable or simple)
+		// TODO: optiimize this if clause
+		if( level < opts.minExpandLevel ) {
+			if(level > 1){
+				if(aria){
+					ares.push("<span role='button' class='fancytree-expander'></span>");
+				}else{
+					ares.push("<span class='fancytree-expander'></span>");
+				}
+			}
+			// .. else (i.e. for root level) skip expander/connector alltogether
+		} else {
+			if(aria){
+				ares.push("<span role='button' class='fancytree-expander'></span>");
+			}else{
+				ares.push("<span class='fancytree-expander'></span>");
+			}
+		}
+		// Checkbox mode
+		if( opts.checkbox && node.hideCheckbox !== true && !node.isStatusNode ) {
+			if(aria){
+				ares.push("<span role='checkbox' class='fancytree-checkbox'></span>");
+			}else{
+				ares.push("<span class='fancytree-checkbox'></span>");
+			}
+		}
+		// folder or doctype icon
+		role = aria ? " role='img'" : "";
+		if ( icon && typeof icon === "string" ) {
+			imageSrc = (icon.charAt(0) === "/") ? icon : (opts.imagePath + icon);
+			ares.push("<img src='" + imageSrc + "' alt='' />");
+		} else if ( node.data.iconclass ) {
+			// TODO: review and test and document
+			ares.push("<span " + role + " class='fancytree-custom-icon" + " " + node.data.iconclass +  "'></span>");
+		} else if ( icon === true || (icon !== false && opts.icons !== false) ) {
+			// opts.icons defines the default behavior.
+			// node.icon == true/false can override this
+			ares.push("<span " + role + " class='fancytree-icon'></span>");
+		}
+		// node title
+		nodeTitle = "";
+		// TODO: currently undocumented; may be removed?
+		if ( opts.renderTitle ){
+			nodeTitle = opts.renderTitle.call(tree, {type: "renderTitle"}, ctx) || "";
+		}
+		if(!nodeTitle){
+			// TODO: escape tooltip string
+			tooltip = node.tooltip ? " title='" + node.tooltip.replace(/\"/g, "&quot;") + "'" : "";
+			id = aria ? " id='ftal_" + node.key + "'" : "";
+			role = aria ? " role='treeitem'" : "";
+//				href = node.data.href || "#";
+//			if( opts.nolink || node.nolink ) {
+//            nodeTitle = "<span role='treeitem' tabindex='-1' class='fancytree-title'" + id + tooltip + ">" + node.title + "</span>";
+			nodeTitle = "<span " + role + " class='fancytree-title'" + id + tooltip + ">" + node.title + "</span>";
+//			} else {
+//				nodeTitle = "<a href='" + href + "' tabindex='-1' class='fancytree-title'" + tooltip + ">" + node.title + "</a>";
+//			}
+		}
+		ares.push(nodeTitle);
+		// Note: this will trigger focusout, if node had the focus
+		node.span.innerHTML = ares.join("");
+	},
+	/** Update element classes according to node state.
+	 * @param {EventData} ctx
+	 */
+	nodeRenderStatus: function(ctx) {
+		// Set classes for current status
+		var node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options,
+//			nodeContainer = node[tree.nodeContainerAttrName],
+			hasChildren = node.hasChildren(),
+			isLastSib = node.isLastSibling(),
+			aria = opts.aria,
+//            $ariaElem = aria ? $(node[tree.ariaPropName]) : null,
+			$ariaElem = $(node.span).find(".fancytree-title"),
+			cn = opts._classNames,
+			cnList = [],
+			statusElem = node[tree.statusClassPropName];
+
+		if( !statusElem ){
+			// if this function is called for an unrendered node, ignore it (will be updated on nect render anyway)
+			return;
+		}
+		// Build a list of class names that we will add to the node <span>
+		cnList.push(cn.node);
+		if( tree.activeNode === node ){
+			cnList.push(cn.active);
+//			$(">span.fancytree-title", statusElem).attr("tabindex", "0");
+//			tree.$container.removeAttr("tabindex");
+		}else{
+//			$(">span.fancytree-title", statusElem).removeAttr("tabindex");
+//			tree.$container.attr("tabindex", "0");
+		}
+		if( tree.focusNode === node ){
+			cnList.push(cn.focused);
+			if(aria){
+//              $(">span.fancytree-title", statusElem).attr("tabindex", "0");
+//                $(">span.fancytree-title", statusElem).attr("tabindex", "-1");
+				// TODO: is this the right element for this attribute?
+				$ariaElem
+					.attr("aria-activedescendant", true);
+//					.attr("tabindex", "-1");
+			}
+		}else if(aria){
+//			$(">span.fancytree-title", statusElem).attr("tabindex", "-1");
+			$ariaElem
+				.removeAttr("aria-activedescendant");
+//				.removeAttr("tabindex");
+		}
+		if( node.expanded ){
+			cnList.push(cn.expanded);
+			if(aria){
+				$ariaElem.attr("aria-expanded", true);
+			}
+		}else if(aria){
+			$ariaElem.removeAttr("aria-expanded");
+		}
+		if( node.folder ){
+			cnList.push(cn.folder);
+		}
+		if( hasChildren !== false ){
+			cnList.push(cn.hasChildren);
+		}
+		// TODO: required?
+		if( isLastSib ){
+			cnList.push(cn.lastsib);
+		}
+		if( node.lazy && node.children === null ){
+			cnList.push(cn.lazy);
+		}
+		if( node.partsel ){
+			cnList.push(cn.partsel);
+		}
+		if( node.selected ){
+			cnList.push(cn.selected);
+			if(aria){
+				$ariaElem.attr("aria-selected", true);
+			}
+		}else if(aria){
+			$ariaElem.attr("aria-selected", false);
+		}
+		if( node.extraClasses ){
+			cnList.push(node.extraClasses);
+		}
+		// IE6 doesn't correctly evaluate multiple class names,
+		// so we create combined class names that can be used in the CSS
+		if( hasChildren === false ){
+			cnList.push(cn.combinedExpanderPrefix + "n" +
+					(isLastSib ? "l" : "")
+					);
+		}else{
+			cnList.push(cn.combinedExpanderPrefix +
+					(node.expanded ? "e" : "c") +
+					(node.lazy && node.children === null ? "d" : "") +
+					(isLastSib ? "l" : "")
+					);
+		}
+		cnList.push(cn.combinedIconPrefix +
+				(node.expanded ? "e" : "c") +
+				(node.folder ? "f" : "")
+				);
+//        node.span.className = cnList.join(" ");
+		node[tree.statusClassPropName].className = cnList.join(" ");
+
+		// TODO: we should not set this in the <span> tag also, if we set it here:
+		// Maybe most (all) of the classes should be set in LI instead of SPAN?
+		if(node.li){
+			node.li.className = isLastSib ? cn.lastsib : "";
+		}
+	},
+	/** Activate node.
+	 * flag defaults to true.
+	 * If flag is true, the node is activated (must be a synchronous operation)
+	 * If flag is false, the node is deactivated (must be a synchronous operation)
+	 * @param {EventData} ctx
+	 * @param {Boolean} [flag=true]
+	 */
+	nodeSetActive: function(ctx, flag) {
+		// Handle user click / [space] / [enter], according to clickFolderMode.
+		var subCtx,
+			node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options,
+//			userEvent = !!ctx.originalEvent,
+			isActive = (node === tree.activeNode);
+		// flag defaults to true
+		flag = (flag !== false);
+		node.debug("nodeSetActive", flag);
+
+		if(isActive === flag){
+			// Nothing to do
+			return _getResolvedPromise(node);
+		}else if(flag && this._triggerNodeEvent("beforeActivate", node, ctx.originalEvent) === false ){
+			// Callback returned false
+			return _getRejectedPromise(node, ["rejected"]);
+		}
+		if(flag){
+			if(tree.activeNode){
+				_assert(tree.activeNode !== node, "node was active (inconsistency)");
+				subCtx = $.extend({}, ctx, {node: tree.activeNode});
+				tree.nodeSetActive(subCtx, false);
+				_assert(tree.activeNode === null, "deactivate was out of sync?");
+			}
+			if(opts.activeVisible){
+				tree.nodeMakeVisible(ctx);
+			}
+			tree.activeNode = node;
+			tree.nodeRenderStatus(ctx);
+			tree.nodeSetFocus(ctx);
+			tree._triggerNodeEvent("activate", node);
+		}else{
+			_assert(tree.activeNode === node, "node was not active (inconsistency)");
+			tree.activeNode = null;
+			this.nodeRenderStatus(ctx);
+			ctx.tree._triggerNodeEvent("deactivate", node);
+		}
+	},
+	/** Expand or collapse node, return Deferred.promise.
+	 *
+	 * @param {EventData} ctx
+	 * @param {Boolean} [flag=true]
+	 * @returns {$.Promise} The deferred will be resolved as soon as the (lazy)
+	 *     data was retrieved, rendered, and the expand animation finshed.
+	 */
+	nodeSetExpanded: function(ctx, flag) {
+		var _afterLoad, dfd, i, l, parents, prevAC,
+			node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options;
+		// flag defaults to true
+		flag = (flag !== false);
+
+		node.debug("nodeSetExpanded(" + flag + ")");
+		// TODO: !!node.expanded is nicer, but doesn't pass jshint
+		// https://github.com/jshint/jshint/issues/455
+//        if( !!node.expanded === !!flag){
+		if((node.expanded && flag) || (!node.expanded && !flag)){
+			// Nothing to do
+			node.debug("nodeSetExpanded(" + flag + "): nothing to do");
+			return _getResolvedPromise(node);
+		}else if(flag && !node.lazy && !node.hasChildren() ){
+			// Prevent expanding of empty nodes
+			return _getRejectedPromise(node, ["empty"]);
+		}else if( !flag && node.getLevel() < opts.minExpandLevel ) {
+			// Prevent collapsing locked levels
+			return _getRejectedPromise(node, ["locked"]);
+		}else if ( this._triggerNodeEvent("beforeExpand", node, ctx.originalEvent) === false ){
+			// Callback returned false
+			return _getRejectedPromise(node, ["rejected"]);
+		}
+		//
+		dfd = new $.Deferred();
+
+		// Auto-collapse mode: collapse all siblings
+		if( flag && !node.expanded && opts.autoCollapse ) {
+			parents = node.getParentList(false, true);
+			prevAC = opts.autoCollapse;
+			try{
+				opts.autoCollapse = false;
+				for(i=0, l=parents.length; i<l; i++){
+					// TODO: should return promise?
+					this._callHook("nodeCollapseSiblings", parents[i]);
+				}
+			}finally{
+				opts.autoCollapse = prevAC;
+			}
+		}
+		// Trigger expand/collapse after expanding
+		dfd.done(function(){
+			ctx.tree._triggerNodeEvent(flag ? "expand" : "collapse", ctx);
+			if(opts.autoScroll){
+				// Scroll down to last child, but keep current node visible
+				node.getLastChild().scrollIntoView(true, node);
+			}
+		});
+
+		// vvv Code below is executed after loading finished:
+		_afterLoad = function(){
+			var duration, easing, isVisible, isExpanded;
+
+			node.expanded = flag;
+			// Create required markup, but make sure the top UL is hidden, so we
+			// can animate later
+			tree._callHook("nodeRender", ctx, false, false, true);
+
+			// If the currently active node is now hidden, deactivate it
+			// if( opts.activeVisible && this.activeNode && ! this.activeNode.isVisible() ) {
+			//     this.activeNode.deactivate();
+			// }
+
+			// Expanding a lazy node: set 'loading...' and call callback
+			// if( bExpand && this.data.isLazy && this.childList === null && !this._isLoading ) {
+			//     this._loadContent();
+			//     return;
+			// }
+			// Hide children, if node is collapsed
+			if( node.ul ) {
+				isVisible = (node.ul.style.display !== "none");
+				isExpanded = !!node.expanded;
+	//            _assert(isVisible !== isExpanded);
+				if( isVisible === isExpanded ) {
+					node.warn("nodeSetExpanded: UL.style.display already set");
+					dfd.resolveWith(node);
+				} else if( opts.fx ) {
+					duration = opts.fx.duration || 200;
+					easing = opts.fx.easing;
+					node.debug("nodeSetExpanded: animate start...");
+					$(node.ul).animate(opts.fx, duration, easing, function(){
+						node.debug("nodeSetExpanded: animate done");
+						dfd.resolveWith(node);
+					});
+				} else {
+					node.ul.style.display = ( node.expanded || !parent ) ? "" : "none";
+					dfd.resolveWith(node);
+				}
+			}else{
+				dfd.resolveWith(node);
+			}
+		};
+		// ^^^ Code above is executed after loading finshed.
+
+		// Load lazy nodes, if any. Then continue with _afterLoad()
+		if(flag && node.lazy && node.hasChildren() === undefined){
+			node.debug("nodeSetExpanded: load start...");
+			node.lazyLoad().done(function(){
+				node.debug("nodeSetExpanded: load done");
+				if(dfd.notifyWith){ // requires jQuery 1.6+
+					dfd.notifyWith(node, ["loaded"]);
+				}
+				_afterLoad.call(tree);
+			}).fail(function(errMsg){
+				dfd.rejectWith(node, ["load failed (" + errMsg + ")"]);
+			});
+/*
+			var source = tree._triggerNodeEvent("lazyload", node, ctx.originalEvent);
+			_assert(typeof source !== "boolean", "lazyload event must return source in data.result");
+			node.debug("nodeSetExpanded: load start...");
+			this._callHook("nodeLoadChildren", ctx, source).done(function(){
+				node.debug("nodeSetExpanded: load done");
+				if(dfd.notifyWith){ // requires jQuery 1.6+
+					dfd.notifyWith(node, ["loaded"]);
+				}
+				_afterLoad.call(tree);
+			}).fail(function(errMsg){
+				dfd.rejectWith(node, ["load failed (" + errMsg + ")"]);
+			});
+*/
+		}else{
+			_afterLoad();
+		}
+		node.debug("nodeSetExpanded: returns");
+		return dfd.promise();
+	},
+	/**
+	 * @param {EventData} ctx
+	 * @param {Boolean} [flag=true]
+	 */
+	nodeSetFocus: function(ctx, flag) {
+		ctx.node.debug("nodeSetFocus(" + flag + ")");
+		var ctx2,
+			tree = ctx.tree,
+			node = ctx.node;
+
+		flag = (flag !== false);
+
+		// Blur previous node if any
+		if(tree.focusNode){
+			if(tree.focusNode === node && flag){
+				node.debug("nodeSetFocus(" + flag + "): nothing to do");
+				return;
+			}
+			ctx2 = $.extend({}, ctx, {node: tree.focusNode});
+			tree.focusNode = null;
+			this._triggerNodeEvent("blur", ctx2);
+			this._callHook("nodeRenderStatus", ctx2);
+		}
+		// Set focus to container and node
+		if(flag){
+			if(FT.focusTree !== tree){
+				node.debug("nodeSetFocus: forcing container focus");
+				// Note: we pass _calledByNodeSetFocus=true
+				this._callHook("treeSetFocus", ctx, true, true);
+			}
+			this.nodeMakeVisible(ctx);
+			tree.focusNode = node;
+//			node.debug("FOCUS...");
+//			$(node.span).find(".fancytree-title").focus();
+			this._triggerNodeEvent("focus", ctx);
+//          if(ctx.options.autoActivate){
+//              tree.nodeSetActive(ctx, true);
+//          }
+			if(ctx.options.autoScroll){
+				node.scrollIntoView();
+			}
+			this._callHook("nodeRenderStatus", ctx);
+		}
+	},
+	/** (De)Select node, return new status (sync).
+	 *
+	 * @param {EventData} ctx
+	 * @param {Boolean} [flag=true]
+	 */
+	nodeSetSelected: function(ctx, flag) {
+		var node = ctx.node,
+			tree = ctx.tree,
+			opts = ctx.options;
+		// flag defaults to true
+		flag = (flag !== false);
+
+		node.debug("nodeSetSelected(" + flag + ")", ctx);
+		if( node.unselectable){
+			return;
+		}
+		// TODO: !!node.expanded is nicer, but doesn't pass jshint
+		// https://github.com/jshint/jshint/issues/455
+//        if( !!node.expanded === !!flag){
+		if((node.selected && flag) || (!node.selected && !flag)){
+			return !!node.selected;
+		}else if ( this._triggerNodeEvent("beforeSelect", node, ctx.originalEvent) === false ){
+			return !!node.selected;
+		}
+		if(flag && opts.selectMode === 1){
+			// single selection mode
+			if(tree.lastSelectedNode){
+				tree.lastSelectedNode.setSelected(false);
+			}
+		}else if(opts.selectMode === 3){
+			// multi.hier selection mode
+			node.selected = flag;
+//			this._fixSelectionState(node);
+			node.fixSelection3AfterClick();
+		}
+		node.selected = flag;
+		this.nodeRenderStatus(ctx);
+		tree.lastSelectedNode = flag ? node : null;
+		tree._triggerNodeEvent("select", ctx);
+	},
+	/** Show node status (ok, loading, error) using styles and a dummy child node.
+	 *
+	 * @param {EventData} ctx
+	 * @param status
+	 * @param message
+	 * @param details
+	 */
+	nodeSetStatus: function(ctx, status, message, details) {
+		var _clearStatusNode, _setStatusNode,
+			node = ctx.node,
+			tree = ctx.tree;
+
+		_clearStatusNode = function() {
+			var firstChild = ( node.children ? node.children[0] : null );
+			if ( firstChild && firstChild.isStatusNode ) {
+				try{
+					// I've seen exceptions here with loadKeyPath...
+					if(node.ul){
+						node.ul.removeChild(firstChild.li);
+						firstChild.li = null; // avoid leaks (issue 215)
+					}
+				}catch(e){}
+				if( node.children.length === 1 ){
+					node.children = [];
+				}else{
+					node.children.shift();
+				}
+			}
+			return;
+		};
+		_setStatusNode = function(data) {
+			var firstChild = ( node.children ? node.children[0] : null );
+			if ( firstChild && firstChild.isStatusNode ) {
+				$.extend(firstChild, data);
+				tree._callHook("nodeRender", firstChild);
+			} else {
+				data.key = "_statusNode";
+				node._setChildren([data]);
+				node.children[0].isStatusNode = true;
+				tree.render();
+			}
+			return node.children[0];
+		};
+		switch(status){
+		case "ok":
+		  _clearStatusNode();
+		  $(node.span).removeClass("fancytree-loading");
+		  break;
+		case "loading":
+			$(node.span).addClass("fancytree-loading");
+			if(!node.parent){
+				_setStatusNode({
+					title: tree.options.strings.loading +
+						(message ? " (" + message + ") " : ""),
+					tooltip: details,
+					extraClasses: "fancytree-statusnode-wait"
+				});
+			}
+			break;
+		case "error":
+			$(node.span).addClass("fancytree-error");
+			_setStatusNode({
+				title: tree.options.strings.loadError + " (" + message + ")",
+				tooltip: details,
+				extraClasses: "fancytree-statusnode-error"
+			});
+			break;
+		default:
+			$.error("invalid status " + status);
+		}
+	},
+	/**
+	 *
+	 * @param {EventData} ctx
+	 */
+	nodeToggleExpanded: function(ctx) {
+		return this.nodeSetExpanded(ctx, !ctx.node.expanded);
+	},
+	/**
+	 * @param {EventData} ctx
+	 */
+	nodeToggleSelected: function(ctx) {
+		return this.nodeSetSelected(ctx, !ctx.node.selected);
+	},
+	/** Remove all nodes.
+	 * @param {EventData} ctx
+	 */
+	treeClear: function(ctx) {
+		var tree = ctx.tree;
+		tree.activeNode = null;
+		tree.focusNode = null;
+		tree.$div.find(">ul.fancytree-container").empty();
+		// TODO: call destructors and remove reference loops
+		tree.rootNode.children = null;
+	},
+	/** Widget was created (called only once, even it re-initialized).
+	 * @param {EventData} ctx
+	 */
+	treeCreate: function(ctx) {
+	},
+	/** Widget was destroyed.
+	 * @param {EventData} ctx
+	 */
+	treeDestroy: function(ctx) {
+	},
+	/** Widget was (re-)initialized.
+	 * @param {EventData} ctx
+	 */
+	treeInit: function(ctx) {
+		this.treeLoad(ctx);
+	},
+	/** Parse Fancytree from source, as configured in the options.
+	 * @param {EventData} ctx
+	 * @param {object} [source] new source
+	 */
+	treeLoad: function(ctx, source) {
+		var type, $ul,
+			tree = ctx.tree,
+			$container = ctx.widget.element,
+			dfd,
+			// calling context for root node
+			rootCtx = $.extend({}, ctx, {node: this.rootNode});
+
+		if(tree.rootNode.children){
+			this.treeClear(ctx);
+		}
+		source = source || this.options.source;
+
+		if(!source){
+			type = $container.data("type") || "html";
+			switch(type){
+			case "html":
+				$ul = $container.find(">ul:first");
+				$ul.addClass("ui-fancytree-source ui-helper-hidden");
+				source = $.ui.fancytree.parseHtml($ul);
+				break;
+			case "json":
+	//            $().addClass("ui-helper-hidden");
+				source = $.parseJSON($container.text());
+				if(source.children){
+					if(source.title){tree.title = source.title;}
+					source = source.children;
+				}
+				break;
+			default:
+				$.error("Invalid data-type: " + type);
+			}
+		}else if(typeof source === "string"){
+			// TODO: source is an element ID
+			_raiseNotImplemented();
+		}
+
+		// $container.addClass("ui-widget ui-widget-content ui-corner-all");
+		// Trigger fancytreeinit after nodes have been loaded
+		dfd = this.nodeLoadChildren(rootCtx, source).done(function(){
+			tree.render();
+			if( ctx.options.selectMode === 3 ){
+				tree.rootNode.fixSelection3FromEndNodes();
+			}
+			tree._triggerTreeEvent("init", true);
+		}).fail(function(){
+			tree.render();
+			tree._triggerTreeEvent("init", false);
+		});
+		return dfd;
+	},
+	/* Handle focus and blur events for the container (also fired for child elements). */
+	treeOnFocusInOut: function(event) {
+		var flag = (event.type === "focusin"),
+			node = $.ui.fancytree.getNode(event);
+
+		try{
+			this.debug("treeOnFocusInOut(" + flag + "), node=", node);
+			_assert(!this._inFocusHandler, "Focus handler recursion");
+			this.systemFocusElement = flag ? event.target : null;
+			this._inFocusHandler = true;
+			if(node){
+				// For example clicking into an <input> that is part of a node
+				this._callHook("nodeSetFocus", node, flag);
+			}else{
+				this._callHook("treeSetFocus", this, flag);
+			}
+		}finally{
+			this._inFocusHandler = false;
+		}
+	},
+	/* */
+	treeSetFocus: function(ctx, flag, _calledByNodeSetFocus) {
+		flag = (flag !== false);
+
+		this.debug("treeSetFocus(" + flag + "), _calledByNodeSetFocus: " + _calledByNodeSetFocus);
+		this.debug("    focusNode: " + this.focusNode);
+		this.debug("    activeNode: " + this.activeNode);
+		// Blur previous tree if any
+		if(FT.focusTree){
+			if(this !== FT.focusTree || !flag ){
+				// prev. node looses focus, if prev. tree blurs
+				if(FT.focusTree.focusNode){
+					FT.focusTree.focusNode.setFocus(false);
+				}
+				FT.focusTree.$container.removeClass("fancytree-focused");
+				this._triggerTreeEvent("blurTree");
+				FT.focusTree = null;
+			}
+		}
+		//
+		if( flag && FT.focusTree !== this ){
+			FT.focusTree = this;
+			this.$container.addClass("fancytree-focused");
+			// Make sure container gets `:focus` when we clicked inside
+			if( !this.systemFocusElement ){
+				this.debug("Set `:focus` to container");
+				this.$container.focus();
+			}
+			// Set focus to a node
+			if( ! this.focusNode && !_calledByNodeSetFocus){
+				if( this.activeNode ){
+					this.activeNode.setFocus();
+				}else if( this.rootNode.hasChildren()){
+					this.warn("NOT setting focus to first child");
+//					this.rootNode.getFirstChild().setFocus();
+				}
+			}
+			this._triggerTreeEvent("focusTree");
+		}else{
+			FT.focusTree = null;
+		}
+
+	},
+	/** Re-fire beforeActivate and activate events. */
+	reactivate: function(setFocus) {
+		var node = this.activeNode;
+		if( node ) {
+			this.activeNode = null; // Force re-activating
+			node.setActive();
+			if( setFocus ){
+				node.setFocus();
+			}
+		}
+	},
+	// TODO: redraw()
+	/** Reload tree from source and return a promise.
+	 * @param source
+	 * @returns {$.Promise}
+	 */
+	reload: function(source) {
+		this._callHook("treeClear", this);
+		return this._callHook("treeLoad", this, source);
+	},
+	/**Render tree (i.e. all top-level nodes).
+	 * @param {Boolean} [force=false]
+	 * @param {Boolean} [deep=false]
+	 */
+	render: function(force, deep) {
+		return this.rootNode.render(force, deep);
+	},
+	// TODO: selectKey: function(key, select)
+	// TODO: serializeArray: function(stopOnParents)
+	/**
+	 * @param {Boolean} [flag=true]
+	 */
+	setFocus: function(flag) {
+//        _assert(false, "Not implemented");
+		return this._callHook("treeSetFocus", this, flag);
+	},
+	/**
+	 * Return all nodes as nested list of {@link NodeData}.
+	 *
+	 * @param {Boolean} [includeRoot=false] Returns the hidden system root node (and it's children)
+	 * @param {function} [callback] Called for every node
+	 * @returns {Array | object}
+	 * @see FancytreeNode#toDict
+	 */
+	toDict: function(includeRoot, callback){
+		var res = this.rootNode.toDict(true, callback);
+		return includeRoot ? res : res.children;
+	},
+	/**Implicitly called for string conversions.
+	 * @returns {String}
+	 */
+	toString: function(){
+		return "<Fancytree(#" + this._id + ")>";
+	},
+	/** _trigger a widget event with additional node ctx.
+	 * @see EventData
+	 */
+	_triggerNodeEvent: function(type, node, originalEvent, extra) {
+//		this.debug("_trigger(" + type + "): '" + ctx.node.title + "'", ctx);
+		var res,
+			ctx = this._makeHookContext(node, originalEvent);
+		if( extra ) {
+			$.extend(ctx, extra);
+		}
+		res = this.widget._trigger(type, originalEvent, ctx);
+
+		if(res !== false && ctx.result !== undefined){
+			return ctx.result;
+		}
+		return res;
+	},
+	/** _trigger a widget event with additional tree data. */
+	_triggerTreeEvent: function(type, originalEvent) {
+//		this.debug("_trigger(" + type + ")", ctx);
+		var ctx = this._makeHookContext(this, originalEvent),
+			res = this.widget._trigger(type, originalEvent, ctx);
+
+		if(res !== false && ctx.result !== undefined){
+			return ctx.result;
+		}
+		return res;
+	},
+	/**
+	 *
+	 * @param {function} fn
+	 */
+	visit: function(fn) {
+		return this.rootNode.visit(fn, false);
+	},
+	/** Write warning to browser console (prepending tree info)
+	 *
+	 * @param {*} msg string or object or array of such
+	 */
+	warn: function(msg){
+		Array.prototype.unshift.call(arguments, this.toString());
+		consoleApply("warn", arguments);
+	}
+};
+
+
+/* ******************************************************************************
+ * jQuery UI widget boilerplate
+ * @  name ui_fancytree
+ * @  class The jQuery.ui.fancytree widget
+ */
+/* * @namespace ui */
+/* * @namespace ui.fancytree */
+/** @namespace $.ui.fancytree */
+$.widget("ui.fancytree",
+	/** @lends $.ui.fancytree.prototype */
+	{
+	/**These options will be used as defaults
+	 * @type {FancytreeOptions}
+	 */
+	options:
+	{
+		/** @type {Boolean}  Make sure, active nodes are visible (expanded). */
+		activeVisible: true,
+		ajax: {
+			type: "GET",
+			cache: false, // false: Append random '_' argument to the request url to prevent caching.
+//          timeout: 0, // >0: Make sure we get an ajax error if server is unreachable
+			dataType: "json" // Expect json format and pass json object to callbacks.
+		},  //
+		aria: false, // TODO: default to true
+		autoActivate: true,
+		autoCollapse: false,
+//      autoFocus: false,
+		autoScroll: false,
+		checkbox: false,
+		/**defines click behavior*/
+		clickFolderMode: 4,
+		debugLevel: null, // 0..2 (null: use global setting $.ui.fancytree.debugInfo)
+		disabled: false, // TODO: required anymore?
+		enableAspx: true, // TODO: document
+		extensions: [],
+		fx: { height: "toggle", duration: 200 },
+		generateIds: false,
+		icons: true,
+		idPrefix: "ft_",
+		keyboard: true,
+		keyPathSeparator: "/",
+		minExpandLevel: 1,
+		selectMode: 2,
+		strings: {
+			loading: "Loading&#8230;",
+			loadError: "Load error!"
+		},
+		tabbable: true,
+		_classNames: {
+//			container: "fancytree-container",
+			node: "fancytree-node",
+			folder: "fancytree-folder",
+//			empty: "fancytree-empty",
+//			vline: "fancytree-vline",
+//			expander: "fancytree-expander",
+//            connector: "fancytree-connector",
+//			checkbox: "fancytree-checkbox",
+//			icon: "fancytree-icon",
+//			title: "fancytree-title",
+//			noConnector: "fancytree-no-connector",
+//			statusnodeError: "fancytree-statusnode-error",
+//			statusnodeWait: "fancytree-statusnode-wait",
+//			hidden: "fancytree-hidden",
+			combinedExpanderPrefix: "fancytree-exp-",
+			combinedIconPrefix: "fancytree-ico-",
+//			loading: "fancytree-loading",
+			hasChildren: "fancytree-has-children",
+			active: "fancytree-active",
+			selected: "fancytree-selected",
+			expanded: "fancytree-expanded",
+			lazy: "fancytree-lazy",
+			focused: "fancytree-focused ui-state-focus",
+			partsel: "fancytree-partsel",
+			lastsib: "fancytree-lastsib"
+		},
+		// events
+		lazyload: null,
+		postProcess: null
+	},
+	/* Set up the widget, Called on first $().fancytree() */
+	_create: function() {
+		this.tree = new Fancytree(this);
+
+		this.$source = this.source || this.element.data("type") === "json" ? this.element
+			: this.element.find(">ul:first");
+		// Subclass Fancytree instance with all enabled extensions
+		var extension, extName, i,
+			extensions = this.options.extensions,
+			base = this.tree;
+
+		for(i=0; i<extensions.length; i++){
+			extName = extensions[i];
+			extension = $.ui.fancytree._extensions[extName];
+			if(!extension){
+				$.error("Could not apply extension '" + extName + "' (it is not registered, did you forget to include it?)");
+			}
+			// Add extension options as tree.options.EXTENSION
+//			_assert(!this.tree.options[extName], "Extension name must not exist as option name: " + extName);
+			this.tree.options[extName] = $.extend(true, {}, extension.options, this.tree.options[extName]);
+			// Add a namespace tree.EXTENSION, to hold instance data
+			_assert(!this.tree[extName], "Extension name must not exist as Fancytree attribute: " + extName);
+//			this.tree[extName] = extension;
+			this.tree[extName] = {};
+			// Subclass Fancytree methods using proxies.
+			_subclassObject(this.tree, base, extension, extName);
+			// current extension becomes base for the next extension
+			base = extension;
+		}
+		//
+		this.tree._callHook("treeCreate", this.tree);
+		// Note: 'fancytreecreate' event is fired by widget base class
+//        this.tree._triggerTreeEvent("create");
+	},
+
+	/* Called on every $().fancytree() */
+	_init: function() {
+		this.tree._callHook("treeInit", this.tree);
+		// TODO: currently we call bind after treeInit, because treeInit
+		// might change tree.$container.
+		// It would be better, to move ebent binding into hooks altogether
+		this._bind();
+	},
+
+	/* Use the _setOption method to respond to changes to options */
+	_setOption: function(key, value) {
+		var callDefault = true,
+			rerender = false;
+		switch( key ) {
+		case "aria":
+		case "checkbox":
+		case "icons":
+		case "minExpandLevel":
+		case "tabbable":
+//		case "nolink":
+			this.tree._callHook("treeCreate", this.tree);
+			rerender = true;
+			break;
+		case "source":
+			callDefault = false;
+			this.tree._callHook("treeLoad", this.tree, value);
+			break;
+		}
+		this.tree.debug("set option " + key + "=" + value + " <" + typeof(value) + ">");
+		if(callDefault){
+			// In jQuery UI 1.8, you have to manually invoke the _setOption method from the base widget
+			$.Widget.prototype._setOption.apply(this, arguments);
+			// TODO: In jQuery UI 1.9 and above, you use the _super method instead
+//          this._super( "_setOption", key, value );
+		}
+		if(rerender){
+			this.tree.render(true, false);  // force, not-deep
+		}
+	},
+
+	/** Use the destroy method to clean up any modifications your widget has made to the DOM */
+	destroy: function() {
+		this._unbind();
+		this.tree._callHook("treeDestroy", this.tree);
+		// this.element.removeClass("ui-widget ui-widget-content ui-corner-all");
+		this.tree.$div.find(">ul.fancytree-container").remove();
+		this.$source && this.$source.removeClass("ui-helper-hidden");
+		// In jQuery UI 1.8, you must invoke the destroy method from the base widget
+		$.Widget.prototype.destroy.call(this);
+		// TODO: delete tree and nodes to make garbage collect easier?
+		// TODO: In jQuery UI 1.9 and above, you would define _destroy instead of destroy and not call the base method
+	},
+
+	// -------------------------------------------------------------------------
+
+	/* Remove all event handlers for our namespace */
+	_unbind: function() {
+		var ns = this.tree._ns;
+		this.element.unbind(ns);
+		this.tree.$container.unbind(ns);
+		$(document).unbind(ns);
+	},
+	/* Add mouse and kyboard handlers to the container */
+	_bind: function() {
+		var that = this,
+			opts = this.options,
+			tree = this.tree,
+			ns = tree._ns,
+			selstartEvent = ( $.support.selectstart ? "selectstart" : "mousedown" );
+
+		// Remove all previuous handlers for this tree
+		this._unbind();
+
+		//alert("keydown" + ns + "foc=" + tree.hasFocus() + tree.$container);
+		tree.debug("bind events; container: ", tree.$container);
+		tree.$container.bind("focusin" + ns + " focusout" + ns, function(event){
+			tree.debug("Tree container got event " + event.type);
+			tree.treeOnFocusInOut.call(tree, event);
+		}).delegate("span.fancytree-title", selstartEvent + ns, function(event){
+			// prevent mouse-drags to select text ranges
+			tree.debug("<span> got event " + event.type);
+			event.preventDefault();
+		});
+		// keydown must be bound to document, because $container might not
+		// receive these events
+		$(document).bind("keydown" + ns, function(event){
+			// TODO: also bind keyup and keypress
+			tree.debug("doc got event " + event.type + ", hasFocus:" + tree.hasFocus());
+			if(opts.disabled || opts.keyboard === false || !tree.hasFocus()){
+				return true;
+			}
+			var node = tree.focusNode,
+				// node may be null
+				ctx = tree._makeHookContext(node || tree, event),
+				prevPhase = tree.phase;
+			try {
+				tree.phase = "userEvent";
+				if(node){
+					return ( tree._triggerNodeEvent("keydown", node, event) === false ) ? false : tree._callHook("nodeKeydown", ctx);
+				}else{
+					return ( tree._triggerTreeEvent("keydown", event) === false ) ? false : tree._callHook("nodeKeydown", ctx);
+				}
+			} finally {
+				tree.phase = prevPhase;
+			}
+		});
+		this.element.bind("click" + ns + " dblclick" + ns, function(event){
+			if(opts.disabled){
+				return true;
+			}
+			var ctx,
+				et = FT.getEventTarget(event),
+				node = et.node,
+				tree = that.tree,
+				prevPhase = tree.phase;
+
+			if( !node ){
+				return true;  // Allow bubbling of other events
+			}
+			ctx = tree._makeHookContext(node, event);
+//			that.tree.debug("event(" + event.type + "): node: ", node);
+			try {
+				tree.phase = "userEvent";
+				switch(event.type) {
+				case "click":
+					ctx.targetType = et.type;
+					return ( tree._triggerNodeEvent("click", ctx, event) === false ) ? false : tree._callHook("nodeClick", ctx);
+				case "dblclick":
+					ctx.targetType = et.type;
+					return ( tree._triggerNodeEvent("dblclick", ctx, event) === false ) ? false : tree._callHook("nodeDblclick", ctx);
+				}
+//             } catch(e) {
+// //                var _ = null; // issue 117 // TODO
+//                 $.error(e);
+			} finally {
+				tree.phase = prevPhase;
+			}
+		});
+	},
+	/** @returns {FancytreeNode} the active node or null */
+	getActiveNode: function() {
+		return this.tree.activeNode;
+	},
+	/**
+	 * @param {String} key
+	 * @returns {FancytreeNode} the matching node or null
+	 */
+	getNodeByKey: function(key) {
+		return this.tree.getNodeByKey(key);
+	},
+	/** @returns {FancytreeNode} the invisible system root node */
+	getRootNode: function() {
+		return this.tree.rootNode;
+	},
+	/** @returns {Fancytree} the current tree instance */
+	getTree: function() {
+		return this.tree;
+	}
+});
+
+// $.ui.fancytree was created by the widget factory. Create a local shortcut:
+FT = $.ui.fancytree;
+
+/**
+ * Static members in the `$.ui.fancytree` namespace.
+ * @  name $.ui.fancytree
+ * @example:
+ * alert(""version: " + $.ui.fancytree.version);
+ * var node = $.ui.fancytree.()
+ */
+$.extend($.ui.fancytree,
+	/** @lends $.ui.fancytree */
+	{
+	/** @type {String} */
+	version: "development",
+	/** @type {String} */
+	buildType: "release",
+	/** @type {int} */
+	debugLevel: 1,  // used by $.ui.fancytree.debug() and as default for tree.options.debugLevel
+
+	_nextId: 1,
+	_nextNodeKey: 1,
+	_extensions: {},
+	focusTree: null,
+
+	/** Expose class object as $.ui.fancytree._FancytreeClass */
+	_FancytreeClass: Fancytree,
+	/** Expose class object as $.ui.fancytree._FancytreeNodeClass */
+	_FancytreeNodeClass: FancytreeNode,
+	/* Feature checks to provide backwards compatibility */
+	jquerySupports: {
+		// http://jqueryui.com/upgrade-guide/1.9/#deprecated-offset-option-merged-into-my-and-at
+		positionMyOfs: isVersionAtLeast($.ui.version, 1, 9)
+		},
+	debug: function(msg){
+		/*jshint expr:true */
+		($.ui.fancytree.debugLevel >= 2) && consoleApply("log", arguments);
+	},
+	error: function(msg){
+		consoleApply("error", arguments);
+	},
+	/** Return a {node: FancytreeNode, type: TYPE} object for a mouse event.
+	 *
+	 * @static
+	 * @param {Event} event Mouse event, e.g. click, ...
+	 * @returns {String} 'title' | 'prefix' | 'expander' | 'checkbox' | 'icon' | undefined
+	 */
+	getEventTargetType: function(event){
+		return this.getEventTarget(event).type;
+	},
+	/** Return a {node: FancytreeNode, type: TYPE} object for a mouse event.
+	 *
+	 * @param {Event} event Mouse event, e.g. click, ...
+	 * @returns {object} Return a {node: FancytreeNode, type: TYPE} object
+	 *     TYPE: 'title' | 'prefix' | 'expander' | 'checkbox' | 'icon' | undefined
+	 */
+	getEventTarget: function(event){
+		var tcn = event && event.target ? event.target.className : "",
+			res = {node: this.getNode(event.target), type: undefined};
+		// TODO: use map for fast lookup
+		// FIXME: cannot work, when tcn also contains UI themeroller classes
+		//        Use $(res.node).hasClass() instead
+		if( tcn === "fancytree-title" ){
+			res.type = "title";
+		}else if( tcn === "fancytree-expander" ){
+			res.type = (res.node.hasChildren() === false ? "prefix" : "expander");
+		}else if( tcn === "fancytree-checkbox" ){
+			res.type = "checkbox";
+		}else if( tcn === "fancytree-icon" ){
+			res.type = "icon";
+		}else if( tcn.indexOf("fancytree-node") >= 0 ){
+			// TODO: issue #93 (http://code.google.com/p/fancytree/issues/detail?id=93)
+//			res.type = this._getTypeForOuterNodeEvent(event);
+			res.type = "title";
+		}
+		return res;
+	},
+	/** Return a FancytreeNode instance from element.
+	 *
+	 * @param {Element | jQueryObject | Event} el
+	 * @returns {FancytreeNode} matching node or null
+	 */
+	getNode: function(el){
+		if(el instanceof FancytreeNode){
+			return el; // el already was a FancytreeNode
+		}else if(el.selector !== undefined){
+			el = el[0]; // el was a jQuery object: use the DOM element
+		}else if(el.originalEvent !== undefined){
+			el = el.target; // el was an Event
+		}
+		while( el ) {
+			if(el.ftnode) {
+				return el.ftnode;
+			}
+			el = el.parentNode;
+		}
+		return null;
+	},
+	/* Return a Fancytree instance from element.
+	* TODO: this function could help to get around the data('fancytree') / data('ui-fancytree') problem
+	* @param {Element | jQueryObject | Event} el
+	* @returns {Fancytree} matching tree or null
+	* /
+	getTree: function(el){
+		if(el instanceof Fancytree){
+			return el; // el already was a Fancytree
+		}else if(el.selector !== undefined){
+			el = el[0]; // el was a jQuery object: use the DOM element
+		}else if(el.originalEvent !== undefined){
+			el = el.target; // el was an Event
+		}
+		...
+		return null;
+	},
+	*/
+	info: function(msg){
+		/*jshint expr:true */
+		($.ui.fancytree.debugLevel >= 1) && consoleApply("info", arguments);
+	},
+	/**
+	 * Parse tree data from HTML <ul> markup
+	 *
+	 * @param {jQueryObject} $ul
+	 * @returns {NodeData[]}
+	 */
+	parseHtml: function($ul) {
+		// TODO: understand this:
+		/*jshint validthis:true */
+		var $children = $ul.find(">li"),
+			extraClasses, i, l, iPos, tmp, classes, className,
+			children = [];
+//			that = this;
+
+		$children.each(function() {
+			var allData, jsonData,
+				$li = $(this),
+				$liSpan = $li.find(">span:first", this),
+				$liA = $liSpan.length ? null : $li.find(">a:first"),
+				d = { tooltip: null, data: {} };
+
+			if( $liSpan.length ) {
+				d.title = $liSpan.html();
+
+			} else if( $liA && $liA.length ) {
+				// If a <li><a> tag is specified, use it literally and extract href/target.
+				d.title = $liA.html();
+				d.data.href = $liA.attr("href");
+				d.data.target = $liA.attr("target");
+				d.tooltip = $liA.attr("title");
+
+			} else {
+				// If only a <li> tag is specified, use the trimmed string up to
+				// the next child <ul> tag.
+				d.title = $li.html();
+				iPos = d.title.search(/<ul/i);
+				if( iPos >= 0 ){
+					d.title = d.title.substring(0, iPos);
+				}
+			}
+			d.title = $.trim(d.title);
+
+			// Make sure all fields exist
+			for(i=0, l=CLASS_ATTRS.length; i<l; i++){
+				d[CLASS_ATTRS[i]] = undefined;
+			}
+			// Initialize to `true`, if class is set and collect extraClasses
+			classes = this.className.split(" ");
+			extraClasses = [];
+			for(i=0, l=classes.length; i<l; i++){
+				className = classes[i];
+				if(CLASS_ATTR_MAP[className]){
+					d[className] = true;
+				}else{
+					extraClasses.push(className);
+				}
+			}
+			d.extraClasses = extraClasses.join(" ");
+
+			// Parse node options from ID, title and class attributes
+			tmp = $li.attr("title");
+			if( tmp ){
+				d.tooltip = tmp; // overrides <a title='...'>
+			}
+			tmp = $li.attr("id");
+			if( tmp ){
+				d.key = tmp;
+			}
+			// Add <li data-NAME='...'> as node.data.NAME
+			// See http://api.jquery.com/data/#data-html5
+			allData = $li.data();
+//            alert("d: " + JSON.stringify(allData));
+			if(allData && !$.isEmptyObject(allData)) {
+				// Special handling for <li data-json='...'>
+				jsonData = allData.json;
+				delete allData.json;
+				$.extend(d.data, allData);
+				// If a 'data-json' attribute is present, evaluate and add to node.data
+				if(jsonData) {
+//	              alert("$li.data()" + JSON.stringify(jsonData));
+					// <li data-json='...'> is already returned as object
+					// see http://api.jquery.com/data/#data-html5
+					$.extend(d.data, jsonData);
+				}
+			}
+//	        that.debug("parse ", d);
+//	        var childNode = parentTreeNode.addChild(data);
+			// Recursive reading of child nodes, if LI tag contains an UL tag
+			$ul = $li.find(">ul:first");
+			if( $ul.length ) {
+				d.children = $.ui.fancytree.parseHtml($ul);
+			}else{
+				d.children = d.lazy ? undefined : null;
+			}
+			children.push(d);
+//            FT.debug("parse ", d, children);
+		});
+		return children;
+	},
+	/** Add Fancytree extension definition to the list of globally available extensions.
+	 *
+	 * @param name
+	 * @param definition
+	 */
+	registerExtension: function(name, definition){
+		$.ui.fancytree._extensions[name] = definition;
+	},
+	warn: function(msg){
+		consoleApply("warn", arguments);
+	}
+});
+
+// Use $.ui.fancytree.debugLevel as default for tree.options.debugLevel
+//$.ui.fancytree.debug($.ui.fancytree.prototype);
+//$.ui.fancytree.prototype.options.debugLevel = $.ui.fancytree.debugLevel;
+
+
+/* *****************************************************************************
+ * Register AMD
+ */
+// http://stackoverflow.com/questions/10918063/how-to-make-a-jquery-plugin-loadable-with-requirejs
+
+// if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
+//     define( "jquery", [], function () { return jQuery; } );
+// }
+
+// TODO: maybe like so:?
+// https://raw.github.com/malsup/blockui/master/jquery.blockUI.js
+/*
+if( typeof define === "function" && define.amd ) {
+	define( ["jquery"], function () {
+		return jQuery.ui.fancytree;
+	});
+}
+*/
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.columnview.js
+ *
+ * Render tree like a Mac Finder's column view.
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+// prevent duplicate loading
+// if ( $.ui.fancytree && $.ui.fancytree.version ) {
+//     $.ui.fancytree.warn("Fancytree: duplicate include");
+//     return;
+// }
+
+
+/*******************************************************************************
+ * Private functions and variables
+ */
+/*
+function _assert(cond, msg){
+	msg = msg || "";
+	if(!cond){
+		$.error("Assertion failed " + msg);
+	}
+}
+*/
+
+/*******************************************************************************
+ * Private functions and variables
+ */
+$.ui.fancytree.registerExtension("columnview", {
+	// Default options for this extension.
+	options: {
+	},
+	// Overide virtual methods for this extension.
+	// `this`       : is this extension object
+	// `this._base` : the Fancytree instance
+	// `this._super`: the virtual function that was overriden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		var $tdFirst, $ul,
+			tree = ctx.tree,
+			$table = tree.widget.element;
+
+		tree.tr = $("tbody tr", $table)[0];
+		tree.columnCount = $(">td", tree.tr).length;
+		// Perform default behavior
+		this._super(ctx);
+		// Standard Fancytree created a root <ul>. Now move this into first table cell
+		$ul = $(tree.rootNode.ul);
+		$tdFirst = $(">td", tree.tr).eq(0);
+
+		$ul.removeClass("fancytree-container");
+		$ul.removeAttr("tabindex");
+		tree.$container = $table;
+		$table.addClass("fancytree-container fancytree-ext-columnview");
+		$table.attr("tabindex", "0");
+
+		$tdFirst.empty();
+		$ul.detach().appendTo($tdFirst);
+
+		// Force some required options
+		tree.widget.options.autoCollapse = true;
+//      tree.widget.options.autoActivate = true;
+		tree.widget.options.fx = false;
+		tree.widget.options.clickFolderMode = 1;
+
+		// Make sure that only active path is expanded when a node is activated:
+		$table.bind("fancytreeactivate", function(e, data){
+			var i, tdList,
+				node = data.node,
+				tree = data.tree,
+				level = node.getLevel();
+
+			tree._callHook("nodeCollapseSiblings", node);
+			// Clear right neighbours
+			if(level <= tree.columnCount){
+				tdList = $(">td", tree.tr);
+				for(i=level; i<tree.columnCount; i++){
+					tdList.eq(i).empty();
+				}
+			}
+			// Expand nodes on activate, so we populate the right neighbor cell
+			if(!node.expanded && (node.children || node.lazy)) {
+				node.setExpanded();
+			}
+		// Adjust keyboard behaviour:
+		}).bind("fancytreekeydown", function(e, data){
+			var next = null;
+			switch(e.which){
+			case $.ui.keyCode.DOWN:
+				next = data.node.getNextSibling();
+				if( next ){
+					next.setFocus();
+				}
+				return false;
+			case $.ui.keyCode.LEFT:
+				next = data.node.getParent();
+				if( next ){
+					next.setFocus();
+				}
+				return false;
+			case $.ui.keyCode.UP:
+				next = data.node.getPrevSibling();
+				if( next ){
+					next.setFocus();
+				}
+				return false;
+			}
+		});
+	},
+	nodeRender: function(ctx, force, deep, collapsed, _recursive) {
+		// Render standard nested <ul> - <li> hierarchy
+		this._super(ctx, force, deep, collapsed, _recursive);
+		// Remove expander and add a trailing triangle instead
+		var level, $tdChild, $ul,
+			tree = ctx.tree,
+			node = ctx.node,
+			$span = $(node.span);
+
+		$span.find("span.fancytree-expander").remove();
+		if(node.hasChildren() !== false && !$span.find("span.fancytree-cv-right").length){
+			$span.append($("<span class='fancytree-icon fancytree-cv-right'>"));
+		}
+		// Move <ul> with children into the appropriate <td>
+		if(node.ul){
+			node.ul.style.display = ""; // might be hidden if RIGHT was pressed
+			level = node.getLevel();
+			if(level < tree.columnCount){
+				$tdChild = $(">td", tree.tr).eq(level);
+				$ul = $(node.ul).detach();
+				$tdChild.empty().append($ul);
+			}
+		}
+	}
+});
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.dnd.js
+ *
+ * Drag'N'drop support.
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+/* *****************************************************************************
+ * Private functions and variables
+ */
+var logMsg = $.ui.fancytree.debug,
+	didRegisterDnd = false;
+
+/* Convert number to string and prepend +/-; return empty string for 0.*/
+function offsetString(n){
+	return n === 0 ? "" : (( n > 0 ) ? ("+" + n) : ("" + n));
+}
+
+/* *****************************************************************************
+ * Drag and drop support
+ */
+function _initDragAndDrop(tree) {
+	var dnd = tree.options.dnd || null;
+	// Register 'connectToFancytree' option with ui.draggable
+	if(dnd /*&& (dnd.onDragStart || dnd.onDrop)*/) {
+		_registerDnd();
+	}
+	// Attach ui.draggable to this Fancytree instance
+	if(dnd && dnd.onDragStart ) {
+		tree.widget.element.draggable({
+			addClasses: false,
+			appendTo: "body",
+			containment: false,
+			delay: 0,
+			distance: 4,
+			// TODO: merge Dynatree issue 419
+			revert: false,
+			scroll: true, // issue 244: enable scrolling (if ul.fancytree-container)
+			scrollSpeed: 7,
+			scrollSensitivity: 10,
+			// Delegate draggable.start, drag, and stop events to our handler
+			connectToFancytree: true,
+			// Let source tree create the helper element
+			helper: function(event) {
+				var sourceNode = $.ui.fancytree.getNode(event.target);
+				if(!sourceNode){ // issue 211
+					// TODO: remove this hint, when we understand when it happens
+					return "<div>ERROR?: helper requested but sourceNode not found</div>";
+				}
+				return sourceNode.tree.dnd._onDragEvent("helper", sourceNode, null, event, null, null);
+			},
+			start: function(event, ui) {
+//              var sourceNode = $.ui.fancytree.getNode(event.target);
+				// don't return false if sourceNode == null (see issue 268)
+			}
+		});
+	}
+	// Attach ui.droppable to this Fancytree instance
+	if(dnd && dnd.onDrop) {
+		tree.widget.element.droppable({
+			addClasses: false,
+			tolerance: "intersect",
+			greedy: false
+			/*
+			,
+			activate: function(event, ui) {
+				logMsg("droppable - activate", event, ui, this);
+			},
+			create: function(event, ui) {
+				logMsg("droppable - create", event, ui);
+			},
+			deactivate: function(event, ui) {
+				logMsg("droppable - deactivate", event, ui);
+			},
+			drop: function(event, ui) {
+				logMsg("droppable - drop", event, ui);
+			},
+			out: function(event, ui) {
+				logMsg("droppable - out", event, ui);
+			},
+			over: function(event, ui) {
+				logMsg("droppable - over", event, ui);
+			}
+*/
+		});
+	}
+}
+
+//--- Extend ui.draggable event handling --------------------------------------
+
+function _registerDnd() {
+	if(didRegisterDnd){
+		return;
+	}
+
+	// Register proxy-functions for draggable.start/drag/stop
+
+	$.ui.plugin.add("draggable", "connectToFancytree", {
+		start: function(event, ui) {
+			// 'draggable' was renamed to 'ui-draggable' since jQueryUI 1.10
+			var draggable = $(this).data("ui-draggable") || $(this).data("draggable"),
+				sourceNode = ui.helper.data("ftSourceNode") || null;
+//          logMsg("draggable-connectToFancytree.start, %s", sourceNode);
+//          logMsg("    this: %o", this);
+//          logMsg("    event: %o", event);
+//          logMsg("    draggable: %o", draggable);
+//          logMsg("    ui: %o", ui);
+
+			if(sourceNode) {
+				// Adjust helper offset, so cursor is slightly outside top/left corner
+				draggable.offset.click.top = -2;
+				draggable.offset.click.left = + 16;
+//              logMsg("    draggable2: %o", draggable);
+//              logMsg("    draggable.offset.click FIXED: %s/%s", draggable.offset.click.left, draggable.offset.click.top);
+				// Trigger onDragStart event
+				// TODO: when called as connectTo..., the return value is ignored(?)
+				return sourceNode.tree.dnd._onDragEvent("start", sourceNode, null, event, ui, draggable);
+			}
+		},
+		drag: function(event, ui) {
+			// 'draggable' was renamed to 'ui-draggable' since jQueryUI 1.10
+			var isHelper,
+				draggable = $(this).data("ui-draggable") || $(this).data("draggable"),
+				sourceNode = ui.helper.data("ftSourceNode") || null,
+				prevTargetNode = ui.helper.data("ftTargetNode") || null,
+				targetNode = $.ui.fancytree.getNode(event.target);
+//            logMsg("$.ui.fancytree.getNode(%o): %s", event.target, targetNode);
+//            logMsg("connectToFancytree.drag: helper: %o", ui.helper[0]);
+			if(event.target && !targetNode){
+				// We got a drag event, but the targetNode could not be found
+				// at the event location. This may happen,
+				// 1. if the mouse jumped over the drag helper,
+				// 2. or if a non-fancytree element is dragged
+				// We ignore it:
+				isHelper = $(event.target).closest("div.fancytree-drag-helper,#fancytree-drop-marker").length > 0;
+				if(isHelper){
+					logMsg("Drag event over helper: ignored.");
+					return;
+				}
+			}
+//            logMsg("draggable-connectToFancytree.drag: targetNode(from event): %s, ftTargetNode: %s", targetNode, ui.helper.data("ftTargetNode"));
+			ui.helper.data("ftTargetNode", targetNode);
+			// Leaving a tree node
+			if(prevTargetNode && prevTargetNode !== targetNode ) {
+				prevTargetNode.tree.dnd._onDragEvent("leave", prevTargetNode, sourceNode, event, ui, draggable);
+			}
+			if(targetNode){
+				if(!targetNode.tree.options.dnd.onDrop) {
+					// not enabled as drop target
+				} else if(targetNode === prevTargetNode) {
+					// Moving over same node
+					targetNode.tree.dnd._onDragEvent("over", targetNode, sourceNode, event, ui, draggable);
+				}else{
+					// Entering this node first time
+					targetNode.tree.dnd._onDragEvent("enter", targetNode, sourceNode, event, ui, draggable);
+				}
+			}
+			// else go ahead with standard event handling
+		},
+		stop: function(event, ui) {
+			// 'draggable' was renamed to 'ui-draggable' since jQueryUI 1.10
+			var draggable = $(this).data("ui-draggable") || $(this).data("draggable"),
+				sourceNode = ui.helper.data("ftSourceNode") || null,
+				targetNode = ui.helper.data("ftTargetNode") || null,
+//				mouseDownEvent = draggable._mouseDownEvent,
+				eventType = event.type,
+				dropped = (eventType === "mouseup" && event.which === 1);
+//            logMsg("draggable-connectToFancytree.stop: targetNode(from event): %s, ftTargetNode: %s", targetNode, ui.helper.data("ftTargetNode"));
+//            logMsg("draggable-connectToFancytree.stop, %s", sourceNode);
+//            logMsg("    type: %o, downEvent: %o, upEvent: %o", eventType, mouseDownEvent, event);
+//            logMsg("    targetNode: %o", targetNode);
+			if(!dropped){
+				logMsg("Drag was cancelled");
+			}
+			if(targetNode) {
+				if(dropped){
+					targetNode.tree.dnd._onDragEvent("drop", targetNode, sourceNode, event, ui, draggable);
+				}
+				targetNode.tree.dnd._onDragEvent("leave", targetNode, sourceNode, event, ui, draggable);
+			}
+			if(sourceNode){
+				sourceNode.tree.dnd._onDragEvent("stop", sourceNode, null, event, ui, draggable);
+			}
+		}
+	});
+
+	didRegisterDnd = true;
+}
+
+
+/* *****************************************************************************
+ *
+ */
+/** @namespace $.ui.fancytree.dnd */
+$.ui.fancytree.registerExtension("dnd",
+	/** @scope ui_fancytree
+	 * @lends $.ui.fancytree.dnd.prototype
+	 */
+	{
+	// Default options for this extension.
+	options: {
+		// Make tree nodes draggable:
+		onDragStart: null, // Callback(sourceNode), return true, to enable dnd
+		onDragStop: null, // Callback(sourceNode)
+//      helper: null,
+		// Make tree nodes accept draggables
+		autoExpandMS: 1000, // Expand nodes after n milliseconds of hovering.
+		preventVoidMoves: true, // Prevent dropping nodes 'before self', etc.
+		preventRecursiveMoves: true, // Prevent dropping nodes on own descendants
+		onDragEnter: null, // Callback(targetNode, sourceNode)
+		onDragOver: null, // Callback(targetNode, sourceNode, hitMode)
+		onDrop: null, // Callback(targetNode, sourceNode, hitMode)
+		onDragLeave: null // Callback(targetNode, sourceNode)
+	},
+	// Override virtual methods for this extension.
+	// `this`       : Fancytree instance
+	// `this._super`: the virtual function that was overriden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		var tree = ctx.tree;
+		this._super(ctx);
+		_initDragAndDrop(tree);
+	},
+	/* Override key handler in order to cancel dnd on escape.*/
+	nodeKeydown: function(ctx) {
+		var event = ctx.originalEvent;
+		if( event.which === $.ui.keyCode.ESCAPE) {
+			this.dnd._cancelDrag();
+		}
+		this._super(ctx);
+	},
+	/* Display drop marker according to hitMode ('after', 'before', 'over', 'out', 'start', 'stop'). */
+	_setDndStatus: function(sourceNode, targetNode, helper, hitMode, accept) {
+		var posOpts,
+			markerOffsetX = 0,
+			markerAt = "center",
+			instData = this.dnd,
+			$source = sourceNode ? $(sourceNode.span) : null,
+			$target = $(targetNode.span);
+
+		if( !instData.$dropMarker ) {
+			instData.$dropMarker = $("<div id='fancytree-drop-marker'></div>")
+				.hide()
+				.css({"z-index": 1000})
+				.prependTo($(this.$div).parent());
+//                .prependTo("body");
+//          logMsg("Creating marker: %o", this.$dropMarker);
+		}
+/*
+		if(hitMode === "start"){
+		}
+		if(hitMode === "stop"){
+//          sourceNode.removeClass("fancytree-drop-target");
+		}
+*/
+//      this.$dropMarker.attr("class", hitMode);
+		if(hitMode === "after" || hitMode === "before" || hitMode === "over"){
+//          $source && $source.addClass("fancytree-drag-source");
+
+//          $target.addClass("fancytree-drop-target");
+
+			switch(hitMode){
+			case "before":
+				instData.$dropMarker.removeClass("fancytree-drop-after fancytree-drop-over");
+				instData.$dropMarker.addClass("fancytree-drop-before");
+				markerAt = "top";
+				break;
+			case "after":
+				instData.$dropMarker.removeClass("fancytree-drop-before fancytree-drop-over");
+				instData.$dropMarker.addClass("fancytree-drop-after");
+				markerAt = "bottom";
+				break;
+			default:
+				instData.$dropMarker.removeClass("fancytree-drop-after fancytree-drop-before");
+				instData.$dropMarker.addClass("fancytree-drop-over");
+				$target.addClass("fancytree-drop-target");
+				markerOffsetX = 8;
+			}
+
+			if( $.ui.fancytree.jquerySupports.positionMyOfs ){
+				posOpts = {
+					my: "left" + offsetString(markerOffsetX) + " center",
+					at: "left " + markerAt,
+					of: $target
+				};
+			} else {
+				posOpts = {
+					my: "left center",
+					at: "left " + markerAt,
+					of: $target,
+					offset: "" + markerOffsetX + " 0"
+				};
+			}
+			instData.$dropMarker
+				.show()
+				.position(posOpts);
+//          helper.addClass("fancytree-drop-hover");
+		} else {
+//          $source && $source.removeClass("fancytree-drag-source");
+			$target.removeClass("fancytree-drop-target");
+			instData.$dropMarker.hide();
+//          helper.removeClass("fancytree-drop-hover");
+		}
+		if(hitMode === "after"){
+			$target.addClass("fancytree-drop-after");
+		} else {
+			$target.removeClass("fancytree-drop-after");
+		}
+		if(hitMode === "before"){
+			$target.addClass("fancytree-drop-before");
+		} else {
+			$target.removeClass("fancytree-drop-before");
+		}
+		if(accept === true){
+			if($source){
+				$source.addClass("fancytree-drop-accept");
+			}
+			$target.addClass("fancytree-drop-accept");
+			helper.addClass("fancytree-drop-accept");
+		}else{
+			if($source){
+				$source.removeClass("fancytree-drop-accept");
+			}
+			$target.removeClass("fancytree-drop-accept");
+			helper.removeClass("fancytree-drop-accept");
+		}
+		if(accept === false){
+			if($source){
+				$source.addClass("fancytree-drop-reject");
+			}
+			$target.addClass("fancytree-drop-reject");
+			helper.addClass("fancytree-drop-reject");
+		}else{
+			if($source){
+				$source.removeClass("fancytree-drop-reject");
+			}
+			$target.removeClass("fancytree-drop-reject");
+			helper.removeClass("fancytree-drop-reject");
+		}
+	},
+
+	/*
+	 * Handles drag'n'drop functionality.
+	 *
+	 * A standard jQuery drag-and-drop process may generate these calls:
+	 *
+	 * draggable helper():
+	 *     _onDragEvent("helper", sourceNode, null, event, null, null);
+	 * start:
+	 *     _onDragEvent("start", sourceNode, null, event, ui, draggable);
+	 * drag:
+	 *     _onDragEvent("leave", prevTargetNode, sourceNode, event, ui, draggable);
+	 *     _onDragEvent("over", targetNode, sourceNode, event, ui, draggable);
+	 *     _onDragEvent("enter", targetNode, sourceNode, event, ui, draggable);
+	 * stop:
+	 *     _onDragEvent("drop", targetNode, sourceNode, event, ui, draggable);
+	 *     _onDragEvent("leave", targetNode, sourceNode, event, ui, draggable);
+	 *     _onDragEvent("stop", sourceNode, null, event, ui, draggable);
+	 */
+	_onDragEvent: function(eventName, node, otherNode, event, ui, draggable) {
+		if(eventName !== "over"){
+			logMsg("tree.dnd._onDragEvent(%s, %o, %o) - %o", eventName, node, otherNode, this);
+		}
+		var $helper, nodeOfs, relPos, relPos2,
+			enterResponse, hitMode, r,
+			opts = this.options,
+			dnd = opts.dnd,
+			res = null,
+			nodeTag = $(node.span);
+
+		switch (eventName) {
+		case "helper":
+			// Only event and node argument is available
+			$helper = $("<div class='fancytree-drag-helper'><span class='fancytree-drag-helper-img' /></div>")
+//                .append($(event.target).closest("a").clone());
+				.append($(event.target).closest("span.fancytree-title").clone());
+			// issue 244: helper should be child of scrollParent
+			$("ul.fancytree-container", node.tree.$div).append($helper);
+//          $(node.tree.divTree).append($helper);
+			// Attach node reference to helper object
+			$helper.data("ftSourceNode", node);
+			logMsg("helper=%o", $helper);
+			logMsg("helper.sourceNode=%o", $helper.data("ftSourceNode"));
+			res = $helper;
+			break;
+		case "start":
+			if( node.isStatusNode ) {
+				res = false;
+			} else if(dnd.onDragStart) {
+				res = dnd.onDragStart(node);
+			}
+			if(res === false) {
+				this.debug("tree.onDragStart() cancelled");
+				//draggable._clear();
+				// NOTE: the return value seems to be ignored (drag is not canceled, when false is returned)
+				// TODO: call this._cancelDrag()?
+				ui.helper.trigger("mouseup");
+				ui.helper.hide();
+			} else {
+				nodeTag.addClass("fancytree-drag-source");
+			}
+			break;
+		case "enter":
+			if(dnd.preventRecursiveMoves && node.isDescendantOf(otherNode)){
+				r = false;
+			}else{
+				r = dnd.onDragEnter ? dnd.onDragEnter(node, otherNode, ui, draggable) : null;
+			}
+			if(!r){
+				// convert null, undefined, false to false
+				res = false;
+			}else if ( $.isArray(r) ) {
+				// TODO: also accept passing an object of this format directly
+				res = {
+					over: ($.inArray("over", r) >= 0),
+					before: ($.inArray("before", r) >= 0),
+					after: ($.inArray("after", r) >= 0)
+				};
+			}else{
+				res = {
+					over: ((r === true) || (r === "over")),
+					before: ((r === true) || (r === "before")),
+					after: ((r === true) || (r === "after"))
+				};
+			}
+			ui.helper.data("enterResponse", res);
+			logMsg("helper.enterResponse: %o", res);
+			break;
+		case "over":
+			enterResponse = ui.helper.data("enterResponse");
+			hitMode = null;
+			if(enterResponse === false){
+				// Don't call onDragOver if onEnter returned false.
+//                break;
+			} else if(typeof enterResponse === "string") {
+				// Use hitMode from onEnter if provided.
+				hitMode = enterResponse;
+			} else {
+				// Calculate hitMode from relative cursor position.
+				nodeOfs = nodeTag.offset();
+				relPos = { x: event.pageX - nodeOfs.left,
+						   y: event.pageY - nodeOfs.top };
+				relPos2 = { x: relPos.x / nodeTag.width(),
+							y: relPos.y / nodeTag.height() };
+
+				if( enterResponse.after && relPos2.y > 0.75 ){
+					hitMode = "after";
+				} else if(!enterResponse.over && enterResponse.after && relPos2.y > 0.5 ){
+					hitMode = "after";
+				} else if(enterResponse.before && relPos2.y <= 0.25) {
+					hitMode = "before";
+				} else if(!enterResponse.over && enterResponse.before && relPos2.y <= 0.5) {
+					hitMode = "before";
+				} else if(enterResponse.over) {
+					hitMode = "over";
+				}
+				// Prevent no-ops like 'before source node'
+				// TODO: these are no-ops when moving nodes, but not in copy mode
+				if( dnd.preventVoidMoves ){
+					if(node === otherNode){
+						logMsg("    drop over source node prevented");
+						hitMode = null;
+					}else if(hitMode === "before" && otherNode && node === otherNode.getNextSibling()){
+						logMsg("    drop after source node prevented");
+						hitMode = null;
+					}else if(hitMode === "after" && otherNode && node === otherNode.getPrevSibling()){
+						logMsg("    drop before source node prevented");
+						hitMode = null;
+					}else if(hitMode === "over" && otherNode && otherNode.parent === node && otherNode.isLastSibling() ){
+						logMsg("    drop last child over own parent prevented");
+						hitMode = null;
+					}
+				}
+//                logMsg("hitMode: %s - %s - %s", hitMode, (node.parent === otherNode), node.isLastSibling());
+				ui.helper.data("hitMode", hitMode);
+			}
+			// Auto-expand node (only when 'over' the node, not 'before', or 'after')
+			if(hitMode === "over" && dnd.autoExpandMS && node.hasChildren() !== false && !node.expanded) {
+				node.scheduleAction("expand", dnd.autoExpandMS);
+			}
+			if(hitMode && dnd.onDragOver){
+				// TODO: http://code.google.com/p/dynatree/source/detail?r=625
+				res = dnd.onDragOver(node, otherNode, hitMode, ui, draggable);
+			}
+			// issue 332
+//			this._setDndStatus(otherNode, node, ui.helper, hitMode, res!==false);
+			this.dnd._setDndStatus(otherNode, node, ui.helper, hitMode, res!==false && hitMode !== null);
+			break;
+		case "drop":
+			hitMode = ui.helper.data("hitMode");
+			if(hitMode && dnd.onDrop){
+				dnd.onDrop(node, otherNode, hitMode, ui, draggable);
+			}
+			break;
+		case "leave":
+			// Cancel pending expand request
+			node.scheduleAction("cancel");
+			ui.helper.data("enterResponse", null);
+			ui.helper.data("hitMode", null);
+			this.dnd._setDndStatus(otherNode, node, ui.helper, "out", undefined);
+			if(dnd.onDragLeave){
+				dnd.onDragLeave(node, otherNode, ui, draggable);
+			}
+			break;
+		case "stop":
+			nodeTag.removeClass("fancytree-drag-source");
+			if(dnd.onDragStop){
+				dnd.onDragStop(node);
+			}
+			break;
+		default:
+			throw "Unsupported drag event: " + eventName;
+		}
+		return res;
+	},
+
+	_cancelDrag: function() {
+		 var dd = $.ui.ddmanager.current;
+		 if(dd){
+			 dd.cancel();
+		 }
+	}
+});
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.filter.js
+ *
+ * Remove or highlight tree nodes, based on a filter.
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+
+/*******************************************************************************
+ * Private functions and variables
+ */
+
+function _escapeRegex(str){
+	/*jshint regexdash:true */
+	return (str + "").replace(/([.?*+\^\$\[\]\\(){}|-])/g, "\\$1");
+}
+
+
+/**
+ * Dimm or hide nodes.
+ *
+ * @param {function | string} filter
+ * @returns {integer} count
+ * @lends Fancytree.prototype
+ * @requires jquery.fancytree.filter.js
+ */
+$.ui.fancytree._FancytreeClass.prototype.applyFilter = function(filter){
+	var match, re,
+		count = 0;
+	// Reset current filter
+	this.visit(function(node){
+		delete node.match;
+		delete node.subMatch;
+	});
+
+	// Default to 'match title substring (not case sensitive)'
+	if(typeof filter === "string"){
+		match = _escapeRegex(filter); // make sure a '.' is treated literally
+		re = new RegExp(".*" + match + ".*", "i");
+		filter = function(node){
+			return !!re.exec(node.title);
+		};
+	}
+
+	this.enableFilter = true;
+	this.$div.addClass("fancytree-ext-filter");
+	this.visit(function(node){
+		if(filter(node)){
+			count++;
+			node.match = true;
+			node.visitParents(function(p){
+				p.subMatch = true;
+			});
+		}
+	});
+	this.render();
+	return count;
+};
+
+/**
+ * Reset the filter.
+ *
+ * @lends Fancytree.prototype
+ * @requires jquery.fancytree.filter.js
+ */
+$.ui.fancytree._FancytreeClass.prototype.clearFilter = function(){
+	this.visit(function(node){
+		delete node.match;
+		delete node.subMatch;
+		$(node.li).show();
+	});
+
+	this.enableFilter = false;
+	this.render();
+	this.$div.removeClass("fancytree-ext-filter");
+};
+
+
+/*******************************************************************************
+ * Extension code
+ */
+$.ui.fancytree.registerExtension("filter", {
+	// Default options for this extension.
+	options: {
+		mode: "dimm"
+	},
+	// Override virtual methods for this extension.
+	// `this`       : is this extension object
+	// `this._base` : the Fancytree instance
+	// `this._super`: the virtual function that was overriden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		this._super(ctx);
+		ctx.tree.filter = false;
+	},
+	treeDestroy: function(ctx){
+		this._super(ctx);
+	},
+	nodeRenderStatus: function(ctx) {
+		// Set classes for current status
+		var visible,
+			node = ctx.node,
+			opts = ctx.options,
+			tree = ctx.tree,
+			$span = $(node[tree.statusClassPropName]);
+
+		if(!$span.length){
+			return; // nothing to do, if node was not yet rendered
+		}
+		this._super(ctx);
+		if(!tree.enableFilter){
+			return;
+		}
+		if( node.match ){
+			$span.addClass("fancytree-match");
+		}else{
+			$span.removeClass("fancytree-match");
+		}
+		if( node.subMatch ){
+			$span.addClass("fancytree-submatch");
+		}else{
+			$span.removeClass("fancytree-submatch");
+		}
+		if(opts.filter.mode === "hide"){
+			visible = !!(node.match || node.subMatch);
+			node.debug(node.title + ": visible=" + visible);
+			$(node.li).toggle(visible);
+		}
+	}
+});
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.menu.js
+ *
+ * Enable jQuery UI Menu as context menu for tree nodes.
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * @see http://api.jqueryui.com/menu/
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+// prevent duplicate loading
+// if ( $.ui.fancytree && $.ui.fancytree.version ) {
+//     $.ui.fancytree.warn("Fancytree: duplicate include");
+//     return;
+// }
+
+$.ui.fancytree.registerExtension("menu", {
+	version: "1.0.0pre",
+	// Default options for this extension.
+	options: {
+		enable: true,
+		selector: null,  //
+		position: {},    //
+		// Events:
+		create: $.noop,  //
+		beforeOpen: $.noop,    //
+		open: $.noop,    //
+		focus: $.noop,   //
+		select: $.noop,  //
+		close: $.noop    //
+	},
+	// Override virtual methods for this extension.
+	// `this`       : is this extension object
+	// `this._base` : the Fancytree instance
+	// `this._super`: the virtual function that was overridden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		var opts = ctx.options,
+			tree = ctx.tree;
+
+		this._super(ctx);
+
+		// Prepare an object that will be passed with menu events
+		tree.menu.data = {
+			tree: tree,
+			node: null,
+			$menu: null,
+			menuId: null
+		};
+
+//        tree.$container[0].oncontextmenu = function() {return false;};
+		// Replace the standard browser context menu with out own
+		tree.$container.delegate("span.fancytree-node", "contextmenu", function(event) {
+			var node = $.ui.fancytree.getNode(event),
+				ctx = {node: node, tree: node.tree, originalEvent: event, options: tree.options};
+			tree.menu._openMenu(ctx);
+			return false;
+		});
+
+		// Use jquery.ui.menu
+		$(opts.menu.selector).menu({
+			create: function(event, ui){
+				tree.menu.data.$menu = $(this).menu("widget");
+				var data = $.extend({}, tree.menu.data);
+				opts.menu.create.call(tree, event, data);
+			},
+			focus: function(event, ui){
+				var data = $.extend({}, tree.menu.data, {
+					menuItem: ui.item,
+					menuId: ui.item.find(">a").attr("href")
+				});
+				opts.menu.focus.call(tree, event, data);
+			},
+			select: function(event, ui){
+				var data = $.extend({}, tree.menu.data, {
+					menuItem: ui.item,
+					menuId: ui.item.find(">a").attr("href")
+				});
+				if( opts.menu.select.call(tree, event, data) !== false){
+					tree.menu._closeMenu(ctx);
+				}
+			}
+		}).hide();
+	},
+	treeDestroy: function(ctx){
+		this._super(ctx);
+	},
+	_openMenu: function(ctx){
+		var data,
+			tree = ctx.tree,
+			opts = ctx.options,
+			$menu = $(opts.menu.selector);
+
+		tree.menu.data.node = ctx.node;
+		data = $.extend({}, tree.menu.data);
+
+		if( opts.menu.beforeOpen.call(tree, ctx.originalEvent, data) === false){
+			return;
+		}
+
+		$(document).bind("keydown.fancytree", function(event){
+			if( event.which === $.ui.keyCode.ESCAPE ){
+				tree.menu._closeMenu(ctx);
+			}
+		}).bind("mousedown.fancytree", function(event){
+			// Close menu when clicked outside menu
+			if( $(event.target).closest(".ui-menu-item").length === 0 ){
+				tree.menu._closeMenu(ctx);
+			}
+		});
+//        $menu.position($.extend({my: "left top", at: "left bottom", of: event}, opts.menu.position));
+		$menu
+			.css("position", "absolute")
+			.show()
+			.position({my: "left top", at: "right top", of: ctx.originalEvent, collision: "fit"})
+			.focus();
+
+		opts.menu.open.call(tree, ctx.originalEvent, data);
+	},
+	_closeMenu: function(ctx){
+		var $menu,
+			tree = ctx.tree,
+			opts = ctx.options,
+			data = $.extend({}, tree.menu.data);
+		if( opts.menu.close.call(tree, ctx.originalEvent, data) === false){
+			return;
+		}
+		$menu = $(opts.menu.selector);
+		$(document).unbind("keydown.fancytree, mousedown.fancytree");
+		$menu.hide();
+		tree.menu.data.node = null;
+	}
+//	,
+//	nodeClick: function(ctx) {
+//		var event = ctx.originalEvent;
+//		if(event.which === 2 || (event.which === 1 && event.ctrlKey)){
+//			event.preventDefault();
+//			ctx.tree.menu._openMenu(ctx);
+//			return false;
+//		}
+//		this._super(ctx);
+//	}
+});
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.persist.js
+ *
+ * Persist tree status in cookiesRemove or highlight tree nodes, based on a filter.
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * @depends: jquery.cookie.js
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+// prevent duplicate loading
+// if ( $.ui.fancytree && $.ui.fancytree.version ) {
+//     $.ui.fancytree.warn("Fancytree: duplicate include");
+//     return;
+// }
+
+
+/*******************************************************************************
+ * Private functions and variables
+ */
+function _assert(cond, msg){
+	msg = msg || "";
+	if(!cond){
+		$.error("Assertion failed " + msg);
+	}
+}
+
+var ACTIVE = "active",
+	EXPANDED = "expanded",
+	FOCUS = "focus",
+	SELECTED = "selected";
+
+/**
+ *
+ * Called like
+ *     $("#tree").fancytree("getTree").clearCookies("active expanded focus selected");
+ *
+ * @lends Fancytree.prototype
+ * @requires jquery.fancytree.persist.js
+ */
+$.ui.fancytree._FancytreeClass.prototype.clearCookies = function(types){
+	var cookiePrefix = this.persist.cookiePrefix;
+	types = types || "active expanded focus selected";
+	// TODO: optimize
+	if(types.indexOf(ACTIVE) >= 0){
+		$.cookie(cookiePrefix + ACTIVE, null);
+	}
+	if(types.indexOf(EXPANDED) >= 0){
+		$.cookie(cookiePrefix + EXPANDED, null);
+	}
+	if(types.indexOf(FOCUS) >= 0){
+		$.cookie(cookiePrefix + FOCUS, null);
+	}
+	if(types.indexOf(SELECTED) >= 0){
+		$.cookie(cookiePrefix + SELECTED, null);
+	}
+};
+
+
+/* TODO:
+DynaTreeStatus._getTreePersistData = function(cookieId, cookieOpts) {
+	// Static member: Return persistence information from cookies
+	var ts = new DynaTreeStatus(cookieId, cookieOpts);
+	ts.read();
+	return ts.toDict();
+};
+*/
+
+/* *****************************************************************************
+ * Extension code
+ */
+$.ui.fancytree.registerExtension("persist", {
+	// Default options for this extension.
+	options: {
+		cookieDelimiter: "~",
+		cookiePrefix: undefined, // 'fancytree-<treeId>-' by default
+		cookie: {
+			raw: false,
+			expires: "",
+			path: "",
+			domain: "",
+			secure: false
+		},
+		overrideSource: false,  // true: cookie takes precedence over `source` data attributes.
+		types: "active expanded focus selected"
+	},
+
+	/* Append `key` to a cookie. */
+	_setKey: function(type, key, flag){
+		var instData = this.persist,
+			instOpts = this.options.persist,
+			cookieName = instData.cookiePrefix + type,
+			cookie = $.cookie(cookieName),
+			cookieList = cookie ? cookie.split(instOpts.cookieDelimiter) : [],
+			idx = $.inArray(key, cookieList);
+		// Remove, even if we add a key,  so the key is always the last entry
+		if(idx >= 0){
+			cookieList.splice(idx, 1);
+		}
+		// Append key to cookie
+		if(flag){
+			cookieList.push(key);
+		}
+		$.cookie(cookieName, cookieList.join(instOpts.cookieDelimiter), instOpts.cookie);
+	},
+	// Overide virtual methods for this extension.
+	// `this`       : is this Fancytree object
+	// `this._super`: the virtual function that was overridden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		var tree = ctx.tree,
+			opts = ctx.options,
+			instData = this.persist,
+			instOpts = this.options.persist;
+
+		_assert($.cookie, "Missing required plugin for 'persist' extension: jquery.cookie.js");
+
+		instData.cookiePrefix = instOpts.cookiePrefix || "fancytree-" + tree._id + "-";
+		instData.storeActive = instOpts.types.indexOf(ACTIVE) >= 0;
+		instData.storeExpanded = instOpts.types.indexOf(EXPANDED) >= 0;
+		instData.storeSelected = instOpts.types.indexOf(SELECTED) >= 0;
+		instData.storeFocus = instOpts.types.indexOf(FOCUS) >= 0;
+
+		// Bind init-handler to apply cookie state
+		tree.$div.bind("fancytreeinit", function(e){
+			var cookie,
+				keyList,
+				i,
+				prevFocus = $.cookie(instData.cookiePrefix + FOCUS), // record this before node.setActive() overrides it
+				node;
+
+			tree.debug("COOKIE " + document.cookie);
+
+			if(instData.storeExpanded){
+				cookie = $.cookie(instData.cookiePrefix + EXPANDED);
+				if(cookie){
+					keyList = cookie.split(instOpts.cookieDelimiter);
+					for(i=0; i<keyList.length; i++){
+						node = tree.getNodeByKey(keyList[i]);
+						if(node){
+							if(node.expanded === undefined || instOpts.overrideSource && (node.expanded === false)){
+//								node.setExpanded();
+								node.expanded = true;
+								node.render();
+							}
+						}else{
+							// node is no longer member of the tree: remove from cookie
+							instData._setKey(EXPANDED, keyList[i], false);
+						}
+					}
+				}
+			}
+			if(instData.storeSelected){
+				cookie = $.cookie(instData.cookiePrefix + SELECTED);
+				if(cookie){
+					keyList = cookie.split(instOpts.cookieDelimiter);
+					for(i=0; i<keyList.length; i++){
+						node = tree.getNodeByKey(keyList[i]);
+						if(node){
+							if(node.selected === undefined || instOpts.overrideSource && (node.selected === false)){
+//								node.setSelected();
+								node.selected = true;
+								node.renderStatus();
+							}
+						}else{
+							// node is no longer member of the tree: remove from cookie also
+							instData._setKey(SELECTED, keyList[i], false);
+						}
+					}
+				}
+			}
+			if(instData.storeActive){
+				cookie = $.cookie(instData.cookiePrefix + ACTIVE);
+				if(cookie && (opts.persist.overrideSource || !tree.activeNode)){
+					node = tree.getNodeByKey(cookie);
+					if(node){
+						node.setActive();
+					}
+				}
+			}
+			if(instData.storeFocus && prevFocus){
+				node = tree.getNodeByKey(prevFocus);
+				if(node){
+					node.setFocus();
+				}
+			}
+		});
+		// Init the tree
+		this._super(ctx);
+	},
+//	treeDestroy: function(ctx){
+//		this._super(ctx);
+//	},
+	nodeSetActive: function(ctx, flag) {
+		var instData = this.persist,
+			instOpts = this.options.persist;
+		this._super(ctx, flag);
+		if(instData.storeActive){
+			$.cookie(instData.cookiePrefix + ACTIVE,
+					 this.activeNode ? this.activeNode.key : null,
+					 instOpts.cookie);
+		}
+	},
+	nodeSetExpanded: function(ctx, flag) {
+		var node = ctx.node,
+			instData = this.persist;
+
+		this._super(ctx, flag);
+
+		if(instData.storeExpanded){
+			instData._setKey(EXPANDED, node.key, flag);
+		}
+	},
+	nodeSetFocus: function(ctx) {
+		var instData = this.persist,
+			instOpts = this.options.persist;
+
+		this._super(ctx);
+
+		if(instData.storeFocus){
+			$.cookie(this.cookiePrefix + FOCUS,
+					 this.focusNode ? this.focusNode.key : null,
+					 instOpts.cookie);
+		}
+	},
+	nodeSetSelected: function(ctx, flag) {
+		var node = ctx.node,
+			instData = this.persist;
+
+		this._super(ctx, flag);
+
+		if(instData.storeSelected){
+			instData._setKey(SELECTED, node.key, flag);
+		}
+	}
+});
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.table.js
+ *
+ * Render tree as table (aka 'treegrid', 'tabletree').
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+// prevent duplicate loading
+// if ( $.ui.fancytree && $.ui.fancytree.version ) {
+//     $.ui.fancytree.warn("Fancytree: duplicate include");
+//     return;
+// }
+
+
+/* *****************************************************************************
+ * Private functions and variables
+ */
+function _assert(cond, msg){
+	msg = msg || "";
+	if(!cond){
+		$.error("Assertion failed " + msg);
+	}
+}
+
+function insertSiblingAfter(referenceNode, newNode) {
+	referenceNode.parentNode.insertBefore(newNode, referenceNode.nextSibling);
+}
+
+/* Show/hide all rows that are structural descendants of `parent`. */
+function setChildRowVisibility(parent, flag) {
+	parent.visit(function(node){
+		var tr = node.tr;
+		if(tr){
+			tr.style.display = flag ? "" : "none";
+		}
+		if(!node.expanded){
+			return "skip";
+		}
+	});
+}
+
+/* Find node that is rendered in previous row. */
+function findPrevRowNode(node){
+	var i, last, prev,
+		parent = node.parent,
+		siblings = parent ? parent.children : null;
+
+	if(siblings && siblings.length > 1 && siblings[0] !== node){
+		// use the lowest descendant of the preceeding sibling
+		i = $.inArray(node, siblings);
+		prev = siblings[i - 1];
+		_assert(prev.tr);
+		// descend to lowest child (with a <tr> tag)
+		while(prev.children){
+			last = prev.children[prev.children.length - 1];
+			if(!last.tr){
+				break;
+			}
+			prev = last;
+		}
+	}else{
+		// if there is no preceding sibling, use the direct parent
+		prev = parent;
+	}
+	return prev;
+}
+
+
+$.ui.fancytree.registerExtension("table", {
+	// Default options for this extension.
+	options: {
+		indentation: 16,        // indent every node level by 16px
+		nodeColumnIdx: 0,       // render node expander, icon, and title to column #0
+		checkboxColumnIdx: null // render the checkboxes into the 1st column
+	},
+	// Overide virtual methods for this extension.
+	// `this`       : is this extension object
+	// `this._super`: the virtual function that was overriden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		var i, $row, tdRole,
+			tree = ctx.tree,
+			$table = tree.widget.element;
+
+		$table.addClass("fancytree-container fancytree-ext-table");
+		tree.tbody = $table.find("> tbody")[0];
+		tree.columnCount = $("thead >tr >th", $table).length;
+		$(tree.tbody).empty();
+
+		tree.rowFragment = document.createDocumentFragment();
+		$row = $("<tr>");
+		tdRole = "";
+		if(ctx.options.aria){
+			$row.attr("role", "row");
+			tdRole = " role='gridcell'";
+		}
+		for(i=0; i<tree.columnCount; i++) {
+			if(ctx.options.table.nodeColumnIdx === i){
+				$row.append("<td" + tdRole + "><span class='fancytree-node'></span></td>");
+			}else{
+				$row.append("<td" + tdRole + ">");
+			}
+		}
+		tree.rowFragment.appendChild($row.get(0));
+
+		this._super(ctx);
+		// standard Fancytree created a root UL
+		$(tree.rootNode.ul).remove();
+		tree.rootNode.ul = null;
+		tree.$container = $table;
+		// Add container to the TAB chain
+		tree.$container.attr("tabindex", "0");
+		if(this.options.aria){
+			tree.$container
+				.attr("role", "treegrid")
+				.attr("aria-readonly", true);
+		}
+		// Make sure that status classes are set on the node's <tr> elements
+		tree.statusClassPropName = "tr";
+		tree.ariaPropName = "tr";
+	},
+	/* Called by nodeRender to sync node order with tag order.*/
+//    nodeFixOrder: function(ctx) {
+//    },
+	nodeRemoveChildMarkup: function(ctx) {
+		var node = ctx.node;
+//		DT.debug("nodeRemoveChildMarkup()", node.toString());
+		node.visit(function(n){
+			if(n.tr){
+				$(n.tr).remove();
+				n.tr = null;
+			}
+		});
+	},
+	nodeRemoveMarkup: function(ctx) {
+		var node = ctx.node;
+//		DT.debug("nodeRemoveMarkup()", node.toString());
+		if(node.tr){
+			$(node.tr).remove();
+			node.tr = null;
+		}
+		this.nodeRemoveChildMarkup(ctx);
+	},
+	/* Override standard render. */
+	nodeRender: function(ctx, force, deep, collapsed, _recursive) {
+		var $cb, children, firstTr, i, l, newRow, prevNode, prevTr, subCtx,
+			tree = ctx.tree,
+			node = ctx.node,
+			opts = ctx.options,
+			isRootNode = !node.parent;
+//			firstTime = false;
+		if( !_recursive ){
+			ctx.hasCollapsedParents = node.parent && !node.parent.expanded;
+		}
+		if( !isRootNode ){
+			if(!node.tr){
+				// Create new <tr> after previous row
+				newRow = tree.rowFragment.firstChild.cloneNode(true);
+				prevNode = findPrevRowNode(node);
+//				firstTime = true;
+//				$.ui.fancytree.debug("*** nodeRender " + node + ": prev: " + prevNode.key);
+				_assert(prevNode);
+				if(collapsed === true && _recursive){
+					// hide all child rows, so we can use an animation to show it later
+					newRow.style.display = "none";
+				}else if(deep && ctx.hasCollapsedParents){
+					// also hide this row if deep === true but any parent is collapsed
+					newRow.style.display = "none";
+//					newRow.style.color = "red";
+				}
+				if(!prevNode.tr){
+					_assert(!prevNode.parent, "prev. row must have a tr, or is system root");
+					tree.tbody.appendChild(newRow);
+				}else{
+					insertSiblingAfter(prevNode.tr, newRow);
+				}
+				node.tr = newRow;
+				if( node.key && opts.generateIds ){
+					node.tr.id = opts.idPrefix + node.key;
+				}
+				node.tr.ftnode = node;
+				if(opts.aria){
+					// TODO: why doesn't this work:
+//                  node.li.role = "treeitem";
+					$(node.tr).attr("aria-labelledby", "ftal_" + node.key);
+				}
+				node.span = $("span.fancytree-node", node.tr).get(0);
+				// Set icon, link, and title (normally this is only required on initial render)
+				this.nodeRenderTitle(ctx);
+				// move checkbox to custom column
+				if(opts.checkbox && opts.table.checkboxColumnIdx != null){
+//					$("span.fancytree-node", node.tr).get(0);
+					$cb = $("span.fancytree-checkbox", node.span).detach();
+					$(node.tr).find("td:first").append($cb);
+				}
+				// Allow tweaking, binding, after node was created for the first time
+				tree._triggerNodeEvent("createNode", ctx);
+			}
+		}
+		 // Allow tweaking after node state was rendered
+		tree._triggerNodeEvent("renderNode", ctx);
+		// Visit child nodes
+		// Add child markup
+		children = node.children;
+		if(children && (isRootNode || deep || node.expanded)){
+			for(i=0, l=children.length; i<l; i++) {
+				subCtx = $.extend({}, ctx, {node: children[i]});
+				subCtx.hasCollapsedParents = subCtx.hasCollapsedParents || !node.expanded;
+				this.nodeRender(subCtx, force, deep, collapsed, true);
+			}
+		}
+		// Make sure, that <tr> order matches node.children order.
+		if(children && !_recursive){ // we only have to do it once, for the root branch
+			prevTr = node.tr || null;
+			firstTr = tree.tbody.firstChild;
+			// Iterate over all descendants
+			node.visit(function(n){
+				if(n.tr){
+					if(!node.expanded && !isRootNode && n.tr.style.display !== "none"){
+						// fix after a node was dropped over a sibling.
+						// In this case it must be hidden
+						n.tr.style.display = "none";
+					}
+					if(n.tr.previousSibling !== prevTr){
+						node.debug("_fixOrder: mismatch at node: " + n);
+						var nextTr = prevTr ? prevTr.nextSibling : firstTr;
+						tree.tbody.insertBefore(n.tr, nextTr);
+					}
+					prevTr = n.tr;
+				}
+			});
+		}
+		// Update element classes according to node state
+		if(!isRootNode){
+			this.nodeRenderStatus(ctx);
+		}
+		// Finally add the whole structure to the DOM, so the browser can render
+		// if(firstTime){
+		//     parent.ul.appendChild(node.li);
+		// }
+			// TODO: just for debugging
+	//            this._super(ctx);
+	},
+	nodeRenderTitle: function(ctx, title) {
+		var node = ctx.node;
+		this._super(ctx);
+		// let user code write column content
+		ctx.tree._triggerNodeEvent("renderColumns", node);
+	},
+	nodeRenderStatus: function(ctx) {
+		var indent,
+			node = ctx.node,
+			opts = ctx.options;
+
+		 this._super(ctx);
+		 // indent
+		 indent = (node.getLevel() - 1) * opts.table.indentation;
+		 if(indent){
+			 $(node.span).css({marginLeft: indent + "px"});
+		 }
+	 },
+	/* Expand node, return Deferred.promise. */
+	nodeSetExpanded: function(ctx, flag) {
+		var node = ctx.node,
+			dfd = new $.Deferred();
+		this._super(ctx, flag).done(function(){
+			flag = (flag !== false);
+			setChildRowVisibility(ctx.node, flag);
+			dfd.resolveWith(node);
+		});
+		return dfd;
+	},
+	nodeSetStatus: function(ctx, status, message, details) {
+		if(status === "ok"){
+			var node = ctx.node,
+				firstChild = ( node.children ? node.children[0] : null );
+			if ( firstChild && firstChild.isStatusNode ) {
+				$(firstChild.tr).remove();
+			}
+		}
+		this._super(ctx, status, message, details);
+	}/*,
+	treeSetFocus: function(ctx, flag) {
+//	        alert("treeSetFocus" + ctx.tree.$container);
+		ctx.tree.$container.focus();
+		$.ui.fancytree.focusTree = ctx.tree;
+	}*/
+});
+}(jQuery, window, document));
+
+/*!
+ * jquery.fancytree.themeroller.js
+ *
+ * Enable jQuery UI ThemeRoller styles.
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * @see http://jqueryui.com/themeroller/
+ *
+ * Copyright (c) 2013, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version DEVELOPMENT
+ * @date DEVELOPMENT
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+/*******************************************************************************
+ * Extension code
+ */
+$.ui.fancytree.registerExtension("themeroller", {
+	// Default options for this extension.
+	options: {
+		activeClass: "ui-state-active",
+		foccusClass: "ui-state-focus",
+		hoverClass: "ui-state-hover",
+		selectedClass: "ui-state-highlight"
+	},
+	// Overide virtual methods for this extension.
+	// `this`       : is this extension object
+	// `this._base` : the Fancytree instance
+	// `this._super`: the virtual function that was overriden (member of prev. extension or Fancytree)
+	treeInit: function(ctx){
+		this._super(ctx);
+		var $el = ctx.widget.element;
+
+		if($el[0].nodeName === "TABLE"){
+			$el.addClass("ui-widget ui-corner-all");
+			$el.find(">thead tr").addClass("ui-widget-header");
+			$el.find(">tbody").addClass("ui-widget-conent");
+		}else{
+			$el.addClass("ui-widget ui-widget-content ui-corner-all");
+		}
+
+		$el.delegate(".fancytree-node", "mouseenter mouseleave", function(event){
+			var node = $.ui.fancytree.getNode(event.target),
+				flag = (event.type === "mouseenter");
+			node.debug("hover: " + flag);
+			$(node.span).toggleClass("ui-state-hover ui-corner-all", flag);
+		});
+	},
+	treeDestroy: function(ctx){
+		this._super(ctx);
+		ctx.widget.element.removeClass("ui-widget ui-widget-content ui-corner-all");
+	},
+	nodeRenderStatus: function(ctx){
+		var node = ctx.node,
+			$el = $(node.span);
+		this._super(ctx);
+/*
+		.ui-state-highlight: Class to be applied to highlighted or selected elements. Applies "highlight" container styles to an element and its child text, links, and icons.
+		.ui-state-error: Class to be applied to error messaging container elements. Applies "error" container styles to an element and its child text, links, and icons.
+		.ui-state-error-text: An additional class that applies just the error text color without background. Can be used on form labels for instance. Also applies error icon color to child icons.
+
+		.ui-state-default: Class to be applied to clickable button-like elements. Applies "clickable default" container styles to an element and its child text, links, and icons.
+		.ui-state-hover: Class to be applied on mouseover to clickable button-like elements. Applies "clickable hover" container styles to an element and its child text, links, and icons.
+		.ui-state-focus: Class to be applied on keyboard focus to clickable button-like elements. Applies "clickable hover" container styles to an element and its child text, links, and icons.
+		.ui-state-active: Class to be applied on mousedown to clickable button-like elements. Applies "clickable active" container styles to an element and its child text, links, and icons.
+*/
+		$el.toggleClass("ui-state-active", node.isActive());
+		$el.toggleClass("ui-state-focus", node.hasFocus());
+		$el.toggleClass("ui-state-highlight", node.isSelected());
+//		node.debug("ext-themeroller.nodeRenderStatus: ", node.span.className);
+	}
+});
+}(jQuery, window, document));
diff --git a/Disco.Web/ClientSource/Style/BundleSite.css b/Disco.Web/ClientSource/Style/BundleSite.css
index 2b1b1c8e..8b25da34 100644
--- a/Disco.Web/ClientSource/Style/BundleSite.css
+++ b/Disco.Web/ClientSource/Style/BundleSite.css
@@ -2081,7 +2081,8 @@ div.form > table table.sub > tbody > tr > th.name {
   width: 33%;
   padding: 10px;
 }
-#pageMenu td .pageMenuArea > a {
+#pageMenu td .pageMenuArea > a,
+#pageMenu td .pageMenuArea > h3 {
   text-decoration: none;
   font-size: 1.2em;
   padding-left: 18px;
@@ -2089,7 +2090,8 @@ div.form > table table.sub > tbody > tr > th.name {
   background-repeat: no-repeat;
   background-position: left center;
 }
-#pageMenu td .pageMenuArea > a:hover {
+#pageMenu td .pageMenuArea > a:hover,
+#pageMenu td .pageMenuArea > h3:hover {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACf0lEQVQ4y32SO4/UZRSHn3Pey/8yszNy2RmUXVxDDKgFkYTYYaKx0cKGxm+hJGhljBZgYaFQW1phYWFCNH4GTfACCSa6KhFidl0GdtiZ//u+x2LEsCg+zclJzvmdqxx973umRfBOcN5x+9dN7lzfQoMjZWNl1Lw27IcTX1++ebpqI1QBbSI0EderUO7DzIiDGlGhpAw5MzVZttXRy3Ubx6UUHsTvEijG+rlj//jxlc/ZSLodTz5xZG1P+GL94rcvplw29EGB9Xee4r+QEDAjpVsJfW7l2NrMLq1/de3VnMvv90T0yttP8zD2HF6mjTpp5sZ4AvH46omDLxy55JWRFVsUOXT22vMmrIjIfq8sOZU1VRkLtAUbHBhW450De1cjEIOwHSObl69/c+OH316Spt7ws8f2P2NwtMDB6Kj6Qfq9qPucsDys3LhY4VE6GhVaBS2Jn57c96wjf3nzl61Tvtu8M7VSbpvxZzLr7Zj1N/8eoZYCCNGBF8E5qJxwN8Nd9cd7g/pTX02nDdBg0gNawRBZzFfMSAaTmWFmIFAMggr9qN082Sd+by0bIjziRJwTllR1KIsVd+qYtuKb7/4okqIhBZzCIGje2Ulnclc+8pNJ95lBUBWngheRCqgA7TBNUU9a7T5WDw5hELD5PJ/OZucBxMweesbRBz+TVU+5GC6qGI2TWem6M3mWL+RZopul3Z/4L5qAd7KklSdmo5unNylcuD9E/y/fzFO23LB/y2GeN0op58UMimHFsFx2d3D4/R/ZrgfceH20uELnCcjV4HirE/nQx4B4B6EgVUDbarGDx9+9QhDITc12f4gUAMOAYHKoF2lTtKuL9zW4Z8z4C2DFDQO2dDsSAAAAAElFTkSuQmCC) /*Images/Actions/pageMenuIconHover.png*/;
 }
 #pageMenu td .pageMenuArea .pageMenuBlurb {
diff --git a/Disco.Web/ClientSource/Style/BundleSite.min.css b/Disco.Web/ClientSource/Style/BundleSite.min.css
index c62ca7aa..5bd7b4d4 100644
--- a/Disco.Web/ClientSource/Style/BundleSite.min.css
+++ b/Disco.Web/ClientSource/Style/BundleSite.min.css
@@ -1 +1 @@
-.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:.1px;display:block}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted #000}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin-top:2px;padding:.5em .5em .5em .7em;min-height:0}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-noicons{padding-left:.7em}.ui-accordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month-year{width:100%}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:49%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:21px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-menu{list-style:none;padding:2px;margin:0;display:block;outline:none}.ui-menu .ui-menu{margin-top:-3px;position:absolute}.ui-menu .ui-menu-item{margin:0;padding:0;width:100%;list-style-image:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}.ui-menu .ui-menu-divider{margin:5px -2px 5px -2px;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-menu-item a{text-decoration:none;display:block;padding:2px .4em;line-height:1.5;min-height:0;font-weight:normal}.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active{font-weight:normal;margin:-1px}.ui-menu .ui-state-disabled{font-weight:normal;margin:.4em 0 .2em;line-height:1.5}.ui-menu .ui-state-disabled a{cursor:default}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item a{position:relative;padding-left:2em}.ui-menu .ui-icon{position:absolute;top:.2em;left:.2em}.ui-menu .ui-menu-icon{position:static;float:right}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url(data:image/gif;base64,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);height:100%;filter:alpha(opacity=25);opacity:.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:22px}.ui-spinner-button{width:16px;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top:none;border-bottom:none;border-right:none}.ui-spinner .ui-icon{position:absolute;margin-top:-8px;top:50%;left:0}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-spinner .ui-icon-triangle-1-s{background-position:-65px -16px}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav li a{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active a,.ui-tabs .ui-tabs-nav li.ui-state-disabled a,.ui-tabs .ui-tabs-nav li.ui-tabs-loading a{cursor:text}.ui-tabs .ui-tabs-nav li a,.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #ddd;background:#eee url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABkCAYAAABHLFpgAAAAIUlEQVQYlWP48ePHfyYGBgaGIUT8//8fO5cSFn6J4UQAAJSgIpAFCJPdAAAAAElFTkSuQmCC) 50% top repeat-x;color:#333}.ui-widget-content a{color:#333}.ui-widget-header{border:1px solid #e78f08;background:#f6a828 url(data:image/png;base64,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) 50% 50% repeat-x;color:#fff;font-weight:bold}.ui-widget-header a{color:#fff}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #ccc;background:#f6f6f6 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAGQCAYAAABvWArbAAAAL0lEQVQ4je3HsQ0AIBDDwIT9F/4igpYiAyDk5mRrZvaSJAD4liT32u7bqi0APMcBiYQKDwcroFAAAAAASUVORK5CYII=) 50% 50% repeat-x;font-weight:bold;color:#1c94c4}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#1c94c4;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #fbcb09;background:#fdf5ce url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAGQCAYAAABvWArbAAAARElEQVQ4jWP4+/PhfyYGBgaGUWKUGCWGL/HnLQMTAwMjjGBkYmBiYGBiYGJgZEZlMcNlYRKMCMUQAwbcM6PEKDFKYCEAGrQJAcbElNQAAAAASUVORK5CYII=) 50% 50% repeat-x;font-weight:bold;color:#c77405}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited{color:#c77405;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #fbd850;background:#fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAGQCAYAAABvWArbAAAAMElEQVQ4je3LIQ4AIBTD0O3f/8wrFgmKhMy8pKJKwkhSKeVbbGuAPU9f4PIopTxgAeS0DRtI4yK0AAAAAElFTkSuQmCC) 50% 50% repeat-x;font-weight:bold;color:#eb8f00}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#eb8f00;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fed22f;background:#ffe45c url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABkCAYAAABHLFpgAAAASElEQVQYldWPwQmAQBADJ+m/DfuzgN2ND/WjX+HwMzAQBkL2LQb4EZLCZLAYnDSWGpO6lBSGwjy1sHjvRN+pM1oYBmv5349xADIyLQUayPX/AAAAAElFTkSuQmCC) 50% top repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#b81900 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAy0lEQVRYhe3XQQrCMBSE4d8svIH0Ft5/5X3EG7jRTYUYk5ekackgb5alDF8LbZjT7bq8SPJ83NNLPzlfluo9e/SFPctyGe37AqrhIAIq4mAFquIAgjIOMh/JSNkRD2sCZ+PAeIMKOCgAVXCQASrhIAGq4SACKuJgBariAIIyDhp+1D1lRzxsE3DmcVgFzj6rTeBsHBhABRwUgCo48E3im6Sv7BPfJFvLfJOMllnxTdJSlotvkp6yOL5JtpSBb5Kxstb4JimV1fKXm+QNcHvyUkD/BIAAAAAASUVORK5CYII=) 50% 50% repeat;color:#fff}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#fff}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#fff}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url(data:image/png;base64,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)}.ui-widget-header .ui-icon{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAADwCAMAAADYSUr5AAAA7VBMVEX8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vz8/vywC3+8AAAATnRSTlMAGBAyBAhQv4OZLiJUcEBmYBoSzQwgPBZCSEoeWiYwUiyFNIeBw2rJz8c4RBy9uXyrtaWNqa2zKP2fJO8KBgKPo2KVoa9s351GPm5+kWho0kj9AAAPhUlEQVR4nO1djWLbthEGyUiq5YSSLXtp7FpLOmfzkmxr126tmi2p03RJ1/Xe/3EGgARxPyAgRbIk2/hkSz4CJO4+HsE7AJSVysjI2AMUUOxahZ2iANhzBtZWr4BoIRSYAVN5u4QwDwQDRbcwfUi5KS3wFuDmFnQLa4Dtb//cqktwD5QEFFwfUs7PoCCA7y4bEJVFizcIob8KmhAplwwqVjt+9FBl3uINQniwEiryEyw9JHqGpQdEFNi+B4QQ7QOiHhysIPoAxUqxvdvvA9K42bsAv4S2fxfYOe57IJSRkZGRkZGxx7jxSHDHcRBXQMTyIjInBgHwBJ/bEx8PEANC+uhbpSSggCBAVODVabpI1S/k4WLZpTn6NpMhoX9Y40hxYERFpMcqUs4AloCtDQdID1YhnyXZ2hLjAYWiO9Dy1PDB7tPhIqLx+uMB8grZaR+Qxl2/C2RkZGRkZGRk7A7rBf7J0DR5/LUTjzUPIPSPGvQJiVJiB7kcQCiUOJrcFNtDZIf2xarQ3aGvLNxAVIFAabz90BFiBIlycTBhgWwOWCH0FLYHlPqwHaCvcIn2ZbosCevfPTRiFFcgvHukCjWwrc3GrGh1fsAof8EaUReKXkCB4/MzFNo97qLpFiKFYv/kNR5YQxQbQEofkZ2OuEOHqqT6gFTpru8CN7x/+jaZkZGRkZGRcV+x/rLUNcMMqUAscgnFocmpqkTzqymwVAPxfJ5PnIUUQOUKT04tEdWZyv3JCQSn96WS4pD97QfyW25A7NhSAbyhmVj0FEltA4vdiygBibXhoUYgykCUP7HwPTDeEqAIcHVMkZg7Zx4k0uFANs63hPQXCoRLAwdgGsr9Az7Qv7sgQGgg1aPl/BJLExBWgG4RFRLFImGmIquPC/klEGyCG0AuAXaJJC+B8FVe9NYQDEcXB8g6AQcjYJ1goJIggHWCrFR0S6kRHN5+4BzFi8NaoN35NRxUvL+JJdZr7PV4wK6fj8nIyMjIyNhr3OxdXAYq7FHZwB6bDSzSh4sF0utChqo0NAvaT1hLzXwFinmCzmeDucEQK18TTaQoFgP7bNC+RZ4OT4T6gQogDFYk+1QxQlj19QGSAWKiLYp8P0Ag1Gbz1ULfWHLg9iUnQNK5QQJcukm04blKLH2GgEJCY+HzXAZWCvHKco3Bp6MIaCjSXXRJyOxeqhnzEaF93MfFGW/O16ZvDL5TM4MJIjujz/cHypkQuuzRwWJ93BKdIt+wCRAPl9kpe2Ikkb2mFgGlxh/i40d3EHfdvoyMjIyMu43ylt/IAmGHnN5iIt7wKfbv01RAcJqFRl9lcjYQSnbQqKgC4fYOwSJt6N6trE0twZ9kN/PqNpTQeICvr4TLsDYC06U7BMjshS+v1/aT7IwQYD5LcgRQXMT2FrBfBLjZ6151jDElk9tPFfpUgk2yregusX25BJbwAFEfM+YI6vGAti4bTtizB+TjfQCrERyhKb2X8D6A9wX75P4t4neBYJeP6pdhg/gQl8MWvytzeSTjgOQBynQdh/iXKdxOrGJ/RkZGRsb9QmXihGr5+g8GGg9uTh+KoVZuNIzV+CwRucFBEyr1mVjx4irOxwM1BhirB6Q+2eNQi4eqR+aF6mELtoMzCR7V9RAFe/ZvQogNiyY8FPSUTFsLp8TeTmMui5mtw7bcaT0Yw2AA4wFRQIlkgq+1DQrNhkmoxS5Jq+u6bMAIGRECEANgXHTgWzwgBOhDH2l0oTQ4D8D5NMktBgNywAEMjo8rwATMZrPY7JGxBoJCkIBDQiAY09EGTUiBCWkUpISfGPR5AAwBfZiG2z7Ayc1yeKTxid39xBNwfHr4O0LA48ePFTvhYrF1r4tyAoz9n2MCqEuBtp/6GDR0oAYfG/R6wJExHYZHfhygsv7fEWCOj4bYmsP5A+pL4MkTfAnMlD4F+r3bobKvTyTA2P/w7PN+Agq2QW8piqMCpTBwenoKvX0AHGkGtP2YAPvTEWA7QUTAudn7/NxtOG46wWNmDtpBEkBzN7rBEvAFHp+YTB/q97qPAN4gHFqgBi8uLsC7qPCA6mg41G/+ErByPwEXDdoNxRhOx+M5jPEzQugS0ht+b1/Y3gEnYMAIAOIBE29/hIDucE8tmMsNOgK4B1RHFu4UCRlMHzv0xzcajcfdXWDs2h8TArBCkoDUJYDLmz6w7ip3BFS0ve5wTRwAn6keMA9I3QYbfSZ0DKbyt+7OXjGI1idPcfNyAyfAMlCrzaGqphYrxHocLHRJVycnfGUcbtT+jIyMjIw9x7Nn8fJSzG0TmFtO8rZT+XT3S3ub+tKJbbLd5diTVp50+zahyeHSslJ/YPrU0fuazrZO2CZ92/ZCCVXlGRiZKPJyPPRxyIFWeXLQBXJBKiq/3divEAN6ZwM200Qjm7EJBZeWm/PRWVCbYK7s7u2l4XaCz+lzgOfMfhMonXr7TWzeZb98dbgIzBT8Ub8eYYUqfZ4rVJ/MDbIDgPqTulJ/xvntWAtjIisqnwxOkGz0n077FARoY79GdA6HPE4rOy196NiMWHTZlSSApcOgXpy/fHV2joaNKu3ffsAnRcBf4K/6NcIG6tIxk3HyoXPjASqfUgXbYN5PzpL2njkR9QMjeDTVHDTCgRuxOegjoO0FvKzP/t/gmVdI24+G7NIe8JX6Wv3dDyldMA+4YB5wwTygtd+dwRqaTqrLb1l73zTSN52CNpnHuQOYPsDblybgxfkXh/oVtr+N1DEBJdhRJyd/Bd/q1z+cbNrD17iVKyajcnv9arhOkRPgsruuD6DmNPwpDNrLw2CoTgHni4yALr0L29+tiKAEIPn868ejx//8rpWP3OEOl5On9OwpcQm0MhafP/ey8f1uvDNIgGLQG8z4YO99ENgg95etwv4uYJYY8fUGHYH6j6fscHFZMftlAl9i+9XL73X3N/n+ZStOzfVfRvYXhrbdKOpEgVQTg/wsDuDD3kwOfQNMTJ5y+/ltUDWLunyxnRF46IqlBzGMY4X7inggREFioIyMjIyMHWCIB6ZNKAcXseo3vLTQTkVE7348dlwJJSz0+wLfmi8BhZqfw3D4ww/wHVLnEd5/fgYvXsDZ3MlsvYUbbnDjDZ3MN3TJG4+bxjAaDl8TBri9qxEw1ccao2wTNAMLHo2f+sjrXwb/9qHoYqgPMBXJTVfOpmrZH23y6uvo0LHSyY6fHGwKfHJlAuMFvObjDYrIqxBgQi20h7Hd/nYVLmno+eaNUm/eeH2GCuopntnhBJAlI2AHo9CCh1I1QxUdAbqqGY9BBLwyc3W4wYVhvY8A4BoIc1l5M7vnPWphZW9/Ses3n37y9a0uGqFwFQZsQQbd386DogpgEk+dzynsAZMJXq8+ns9NeukJ0PYrNATGGefJQlhkLo7DTXr+y3bNiOsDvrXTz/C2q1DXZH84iRNwrP88Nj+u2DjYEE6RBxD9Knj16ujVHC67A7422o02RwD3gB+t7EblWvu9geOFxSnd3ROmT+nJyQkhoPlsxVONc/3TEdBos+jtA+ZzcwHgTvD1cDjaYCcItA8w9i88A8b+mqSjc6Pvqd998QguEQPmQMeo23ODN86+p0/bn1buBkT6+oBhNZ/PYY4ZAHYb3PRd4LkZmPX68NRtMZn4ASvdA+qf0jMA5MP9eeg28Nug9QiLnj5A33U1MAES6xHAUNpz/9zFAYE1gqQDMT3G6xI9pwdw/aIgKoHCS1YGlRnSq9yCjdXjgN3j+N27YyROHxmuNAeNKPpYuXIyIyMjYy0M8eros59MF/PT2c602T7eA7zvhJ9dr/vzDjXaLp4Yc5+0wllzxzHv3gdmMMM7/CcQzKgVBqYTmFn+Z+mKm8J7k0A5F/jgCfjQ1WBhQyiOqD0lYuqBb+AyzMw9Ha2G3m6c8qQx+AlqnIceQp+Sb6i9UyQWbhr54+AjnZ0VzW2TAN0DmBT6PWmc6jDBE2PK2u+nF43dyP7Q0t1pOcX2fdRvH0mF2Q4JqN35rnHjVIeaXfIAVyUuw/aHCCiJy9iF5l1621zweI8KZrPZ9iJdb7DXJ3US0OSrtZ10imt7wHY7QesAzUMz1oZ3noB3qFJ/H18j97FYuw8QDN4oeKf30osvcSW2ExLo+VcbuAuo/sUIm8fMG9xocO3Ea19J9gFYivnHJ2KnyfovZlgW3v6ySx32abQiIyMjIyPjhlFDTLxpwIgFMnTp6A3g4IDKNY+stkwAMAoIAbasxBXqUWneSAWTMjt50lTqT29rFjvXohjsDNm2YPXDFlICmrJOZ3t6tHm8AiEAl0sCeLIIorIRt+cFbew/QRsoAXb4o1XSfoywzm0FTMAoYBNvLyFu8v8HpLBtD1iKgC17wHb7AI6d9wFbvguAIGTHd4E9wG7jgIyMjIyM+434c2R3HeV/Ffx6jtZu6ijl8h59T655jhR+rdHzDOP6beABCheb8O8/WFXeOyzgf5oAhVYnKxP7CwaAf1afJu8bSrhS6tdaXeGnrRenOqOlz9d6QwYnA/3TLd+GE7qe3chA5YF5DfY0vK3adfOX/gyNp2BW25MHdxAB9qvRiiP3/XpQQFGYDU4+Mi///XumXG8pjvaUAOsBGlf4jJt+YYEzeEzAdw06F19R3juM7D1wita86GR0CKfDHgLuXCc4Bri6vMLdfjMc4VNSUNsdodo2xu/1+Xl/K5+az8jIyMhYG/z5gJTMF1GtKq/a3rpyCvz5gJTMl9GtKq/a3rpyCmfQ4WwZmS+kXFVetb115ST48wEf/AGcfG1iw+tWbpbS2vJ3nQxcVr3lH3z5h972FUTLzYpOVk7l5hD+eYcYwDcAnewOotrZ4OtrPDucqi/LRX0/RR4qx7Nn4U8g+qjffvuN6Gf+nC85vwauHjaYyubqvWYKY4VEfSUMitdnBCT1Ue63R5439m+OgCn6DroAAaHPVQxKth/wkJgHmG8bmQMsT0D6EjDfvhVRKO3ywOQUgRA7nmL1uawZmHf1k+DPBwQ6NdcJ+k6Md1LA5f5ONdhJ8vZ5J0vLHT99srkGOjmJbd/G1r2Nriqnse1AZt1AalU5jW2HsuuG0qvKGRkZGRkZGRG0gcONyXsP9v8D0/IdJADiBNiXl3327WRGgOL/9HC/0XwlIURkRhC4tz6Z/fu7fUf2gHvfB9z3u0BGRkZGRkbGplHcnkgguQoSqtUXuhbs/wPtMwqV0HUJAvj5vk32b8IDuL23yn7qAXZ5u32hbRX7d3o82Df1FZXvbh9QOfhyxldr/+3xgXU9oKmvsHyr7F/XA269/eveBXrsv7N9QALe/tvjA0kPWAXGbvebkbHn+D/J5nMcHzx1UAAAAABJRU5ErkJggg==)}.ui-state-default .ui-icon{background-image:url(data:image/png;base64,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)}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url(data:image/png;base64,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)}.ui-state-active .ui-icon{background-image:url(data:image/png;base64,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)}.ui-state-highlight .ui-icon{background-image:url(data:image/png;base64,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)}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAADwCAMAAADYSUr5AAAA7VBMVEX80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nzkx5/eAAAATnRSTlMAGBAyBAhQv4OZLiJUcEBmYBoSzQwgPBZCSEoeWiYwUiyFNIeBw2rJz8c4RBy9uXyrtaWNqa2zKP2fJO8KBgKPo2KVoa9s351GPm5+kWho0kj9AAAPhUlEQVR4nO1djWLbthEGyUiq5YSSLXtp7FpLOmfzkmxr126tmi2p03RJ1/Xe/3EGgARxPyAgRbIk2/hkSz4CJO4+HsE7AJSVysjI2AMUUOxahZ2iANhzBtZWr4BoIRSYAVN5u4QwDwQDRbcwfUi5KS3wFuDmFnQLa4Dtb//cqktwD5QEFFwfUs7PoCCA7y4bEJVFizcIob8KmhAplwwqVjt+9FBl3uINQniwEiryEyw9JHqGpQdEFNi+B4QQ7QOiHhysIPoAxUqxvdvvA9K42bsAv4S2fxfYOe57IJSRkZGRkZGxx7jxSHDHcRBXQMTyIjInBgHwBJ/bEx8PEANC+uhbpSSggCBAVODVabpI1S/k4WLZpTn6NpMhoX9Y40hxYERFpMcqUs4AloCtDQdID1YhnyXZ2hLjAYWiO9Dy1PDB7tPhIqLx+uMB8grZaR+Qxl2/C2RkZGRkZGRk7A7rBf7J0DR5/LUTjzUPIPSPGvQJiVJiB7kcQCiUOJrcFNtDZIf2xarQ3aGvLNxAVIFAabz90BFiBIlycTBhgWwOWCH0FLYHlPqwHaCvcIn2ZbosCevfPTRiFFcgvHukCjWwrc3GrGh1fsAof8EaUReKXkCB4/MzFNo97qLpFiKFYv/kNR5YQxQbQEofkZ2OuEOHqqT6gFTpru8CN7x/+jaZkZGRkZGRcV+x/rLUNcMM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)}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#666 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAwklEQVRYhe3XXQqDMBhE0dtsIKvNwrOC+mIhTfNrlAzlm0eR4ShomFcI4U2WGGN+6Sfe++49d/S5O8tKWe37AqrhIAEq4uAEquIAnDIOCh/JStkTD9sE7sZB4w0q4KACVMFBAaiEgwyohoMEqIiDE6iKA3DKOBj4Uc+UPfGwQ8Cdx2EXuPusbgJ346ABVMBBBaiCA9sktknmyj6xTXK1zDbJalkrtklGykqxTTJTlsY2yZUysE2yVjYa2yS1sl7+cpMcegPyrqBRcaoAAAAASUVORK5CYII=) 50% 50% repeat;opacity:.5;filter:Alpha(Opacity=50)}.ui-widget-shadow{margin:-5px 0 0 -5px;padding:5px;background:#000 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAABkCAYAAAD0ZHJ6AAAAeUlEQVRoge3OMQHAIBAAsQf/nlsJDDfAkCjImplvHrZvB04EK8FKsBKsBCvBSrASrAQrwUqwEqwEK8FKsBKsBCvBSrASrAQrwUqwEqwEK8FKsBKsBCvBSrASrAQrwUqwEqwEK8FKsBKsBCvBSrASrAQrwUqwEqwEqx92LQHHRpDUNwAAAABJRU5ErkJggg==) 50% 50% repeat-x;opacity:.2;filter:Alpha(Opacity=20);border-radius:5px}.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}body{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;margin:0;padding:0 10px;color:#333}body.layout{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAFvCAMAAABEoqrSAAADAFBMVEVRUVFUVFRYWFhbW1tfX19iYmJmZmZpaWltbW1wcHB0dHR3d3d7e3t/f3/MzMzNzc3Ozs7Pz8/Q0NDR0dHS0tLT09PU1NTV1dXW1tbX19fY2NjZ2dna2trb29vc3Nzd3d3e3t7f39/g4ODh4eHi4uLj4+Pk5OTl5eXm5ubn5+fo6Ojp6enq6urr6+vs7Ozt7e3u7u7v7+/w8PDx8fHy8vLz8/P09PT19fX29vb39/f4+Pj5+fn6+vr7+/v8/Pz9/f3+/v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD28iAmAAAAbklEQVRIx2NUZ4ABlv9kMZkYRrXhYUphMwzZXEYCogQV0FfbUHMOrSxGAoyMBEygM/M/zZnMjFiZDPQEjCYEsin2/EYKk6qGDTVzR7TnRwN1NFBHPT8aqKOBOur5Uc+PBip1zWVkYGCBCv2nhrkAr7hI+jpl4KUAAAAASUVORK5CYII=) left top repeat-x #d1d1d1}.page{max-width:1230px;min-width:750px;margin-left:auto;margin-right:auto}header,#header{position:relative;margin:0;padding:0;height:110px}header #headerMenu,#header #headerMenu{height:24px;padding:4px;line-height:22px;text-align:right}header #headerMenu a,#header #headerMenu a{color:#000;text-decoration:none}header #headerMenu a:hover,#header #headerMenu a:hover{text-decoration:underline}header #heading,#header #heading{float:left;height:75px}header #heading img,#header #heading img{height:75px;width:300px}header nav,#header nav{padding:0;margin:0;font-size:1.1em}header nav ul#menu,#header nav ul#menu{height:29px;padding:3px 6px;margin:0;list-style:none;z-index:100000}header nav ul#menu>li,#header nav ul#menu>li{display:inline-block;z-index:100000;margin-bottom:-4px}header nav ul#menu>li a,#header nav ul#menu>li a{padding:4px 10px;text-decoration:none;color:#fff;display:inline-block;height:21px}header nav ul#menu>li a:hover,#header nav ul#menu>li a:hover{color:#ffd5ba;text-decoration:none}header nav ul#menu>li a:active,#header nav ul#menu>li a:active{text-decoration:none}header nav ul#menu>li.sep,#header nav ul#menu>li.sep{margin-top:4px;height:21px;border-left:1px solid #777}header nav ul#menu>li.moveRight,#header nav ul#menu>li.moveRight{margin-left:40px}header nav ul#menu>li>ul,#header nav ul#menu>li>ul{z-index:100000;display:none;list-style:none;position:absolute;margin:2px 0 0 0;-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0;border-left:1px solid #ecab72;border-bottom:2px solid #ecab72;border-right:1px solid #ecab72;padding:0;min-width:180px}header nav ul#menu>li>ul li,#header nav ul#menu>li>ul li{position:relative;background-color:rgba(242,242,242,.9);background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAUCAYAAABMDlehAAAAIUlEQVQI12NgYGBQYGJgYPgLJ/6gciEEMwMDAyMzA1kAAB/mByD2JQzYAAAAAElFTkSuQmCC);background-position:top;background-repeat:repeat-x}header nav ul#menu>li>ul li:hover,#header nav ul#menu>li>ul li:hover{background-color:rgba(249,228,210,.75)}header nav ul#menu>li>ul li.hasSubMenu,#header nav ul#menu>li>ul li.hasSubMenu{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAANCAYAAACgu+4kAAAAa0lEQVQoz2NgGBRg8uTJO4BYhxIDVgPxHyCeDcQS5BpiAcSHgfgzENcBMRe5BgUC8U0gfgrEiUDMRI4hLEBcA8T/gfgCqZolgLgb6pUDQOxArEY5IJ4CxN9J0gjVPBeIf5GsEckA8jQOCgAAAvdRUNet20oAAAAASUVORK5CYII=),url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAUCAYAAABMDlehAAAAIUlEQVQI12NgYGBQYGJgYPgLJ/6gciEEMwMDAyMzA1kAAB/mByD2JQzYAAAAAElFTkSuQmCC);background-position:center right,top;background-repeat:no-repeat,repeat-x;padding-right:14px}header nav ul#menu>li>ul li a,#header nav ul#menu>li>ul li a{display:block;padding:4px 10px;text-decoration:none;color:#000}header nav ul#menu>li>ul li a:active,#header nav ul#menu>li>ul li a:active{text-decoration:none}header nav ul#menu>li>ul li a:hover,#header nav ul#menu>li>ul li a:hover{color:#5a300c;text-decoration:none}header nav ul#menu>li>ul li:last-child,#header nav ul#menu>li>ul li:last-child{-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0}header nav ul#menu>li>ul ul,#header nav ul#menu>li>ul ul{display:none;list-style:none;position:absolute;top:-1px;left:180px;-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0;border-top:1px solid #eaa161;border-left:1px solid #eaa161;border-bottom:2px solid #eaa161;border-right:1px solid #eaa161;padding:0;min-width:180px}header #SearchQuery,#header #SearchQuery{font-size:.9em;margin-left:10px}header .watermark,#header .watermark{background-color:#eee}#layout_PageHeading{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAA8CAYAAABfESsNAAAAOUlEQVRIx+2SuREAIAzDFELL/uOSFVLx3Mm1C8nnABaNDJq5WJzAVkZGZXyPMg7+jUwCIeNZmdcZC2pxCZOpoRNgAAAAAElFTkSuQmCC) left top repeat-x #fff;height:50px;padding:6px 20px 4px 20px;font-size:2em;color:#000;line-height:50px;position:relative}#layout_PageHeading a{text-decoration:none}#layout_Page{background-color:#fff;overflow:auto;padding:0 30px 15px 30px;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}#layout_uiExtensions{display:none}footer,#footer{color:#777;padding:10px 0;text-align:center;margin:0;font-size:.9em}footer a:link,#footer a:link,footer a:visited,#footer a:visited,footer a:active,#footer a:active{color:#777}footer a:link,#footer a:link,footer a:active,#footer a:active{text-decoration:underline}footer a:hover,#footer a:hover{color:#4f81bd;text-decoration:none}p,ul{margin:0 0 20px 0;line-height:1.6em}ul{margin:0;line-height:1.6em}header,footer,nav,section{display:block}form{display:inline}img{border:none;padding:0;margin:0;vertical-align:bottom}code{font-family:Consolas,"Courier New",monospace}hr{border:none;border-bottom:1px dashed #aaa;margin-top:15px}a:link{color:#335a87;text-decoration:none}a:visited{color:#335a87}a:hover{color:#4f81bd;text-decoration:underline}a:active{color:#335a87}a.button{display:inline-block;padding:4px 10px;margin:2px;border:1px solid #875a33;background:#db761d;color:#fff;font-weight:bold;text-transform:uppercase;cursor:pointer;white-space:nowrap;text-decoration:none}a.button[disabled],a.button.disabled{background:#9e9e9e;border:1px solid #696969;cursor:default}a.button.alert{border-color:#900;background-color:#e90000}a.button.small{padding:2px 5px;font-size:.9em}a.button:hover{border:1px solid #696969;background:#9e9e9e}div.actionBar{margin:0 -30px 0 -30px;padding:10px;border-top:1px solid #e5bd99;text-align:right;background-color:#f2f2f2}div.actionBar:not(:first-child){margin-top:10px}div.actionBar:last-child{margin-bottom:-15px;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}h1,h2,h3,h4,h5,h6{color:#000;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-weight:lighter;font-stretch:condensed;margin:0}h1:first-child,h2:first-child,h3:first-child,h4:first-child,h5:first-child,h6:first-child{margin-top:0!important;padding-top:0!important}h1>a:link,h2>a:link,h3>a:link,h4>a:link,h5>a:link,h6>a:link{text-decoration:none}h1{font-size:24px}h2{font-size:20px;padding:8px 0 4px 0}h3{font-size:18px}h4{font-size:14px}h5,h6{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-stretch:normal;font-weight:bold}table{border:none;border-collapse:collapse;width:100%}table td{padding:5px;margin:0;border:none;vertical-align:top}table th{padding:5px;margin:0;text-align:left;font-weight:bold;vertical-align:top}table.none{border:none!important}table.none tr,table.none td,table.none th{padding:0!important;margin:0!important;background:none!important;border:none!important}table.genericData{border:solid 1px #e8eef4;border-collapse:collapse}table.genericData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}table.genericData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}table.genericData>thead>tr>th,table.genericData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}table.genericData>tbody>tr:hover>td{background-color:#e8eef4}table.genericData>tfoot>tr>th,table.genericData>tfoot>tr>td{background-color:#e8eef4}table.genericData td.id{text-align:center}table.genericData td.id a{padding:0 6px}.smallTable th,.smallTable td{font-size:.9em}.dataTables_wrapper{position:relative}.dataTables_wrapper .dataTables_filter{position:absolute;height:20px;margin-top:-20px;right:0;font-size:.9em;-moz-opacity:.3;opacity:.3}.dataTables_wrapper .dataTables_filter input{font-size:.95em;padding:0;height:1.4em;width:150px}.dataTables_wrapper .dataTables_length{position:absolute;height:20px;margin-top:-20px;right:200px;font-size:.9em;-moz-opacity:.3;opacity:.3}.dataTables_wrapper .dataTables_length select{font-size:.95em;padding:0;height:1.4em}.dataTables_wrapper .dataTables_showStatusClosed{display:block;position:absolute;height:20px;margin-top:-20px;right:320px;font-weight:bold}.dataTables_wrapper .dataTables_paginate{text-align:right;background-color:#e8eef4;padding:2px 4px;font-size:.9em}.dataTables_wrapper .dataTables_paginate a{cursor:pointer;padding:2px;margin:0 3px;color:#335a87;background-repeat:no-repeat;-moz-opacity:.3;opacity:.3;text-transform:uppercase}.dataTables_wrapper .dataTables_paginate .first{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAKklEQVQI12NgQALGUe0SQPwfnY0iCcVwNjZJFAxT8J+QAvwmEHQDPl8AAAYqTAY6Jng6AAAAAElFTkSuQmCC);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .first.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAKklEQVQI12NgQAKxsbESQPwfnY0iCcVwNjZJFAxT8J+QAvwmEHQDPl8AAEm8TIFT3+fIAAAAAElFTkSuQmCC)}.dataTables_wrapper .dataTables_paginate .previous{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAGMo9olgPg/XkmsCpAlcSn4T0gBfhMIugFdEQCMVyg5CPiC8wAAAABJRU5ErkJggg==);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .previous.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAH6+vokgPg/XkmsCpAlcSn4T0gBfhMIugFdEQDzojUdMBAGjgAAAABJRU5ErkJggg==)}.dataTables_wrapper .dataTables_paginate .next{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Mwjmr/D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwCZ1Cg5w6CPqwAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper .dataTables_paginate .next.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Po6+v7D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwDwPjUdLMfQ6AAAAABJRU5ErkJggg==)}.dataTables_wrapper .dataTables_paginate .last{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAK0lEQVQI12Mwjmr/D8QSDECAzIYDqCBYApmNTQE6liCk4D/JJuB1A05fAABJ/EwGJKVDGAAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper .dataTables_paginate .last.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAK0lEQVQI12OIjY39D8QSDECAzIYDqCBYApmNTQE6liCk4D/JJuB1A05fAACQykyB48rZCQAAAABJRU5ErkJggg==)}.dataTables_wrapper .dataTables_paginate .paginate_active{font-weight:bold;color:#db761d}.dataTables_wrapper .dataTables_paginate .paginate_button_disabled{color:#ccc;cursor:default}.dataTables_wrapper .dataTables_paginate .paginate_enabled_previous{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAGMo9olgPg/XkmsCpAlcSn4T0gBfhMIugFdEQCMVyg5CPiC8wAAAABJRU5ErkJggg==);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .paginate_disabled_previous{color:#ccc;cursor:default;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAH6+vokgPg/XkmsCpAlcSn4T0gBfhMIugFdEQDzojUdMBAGjgAAAABJRU5ErkJggg==);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .paginate_enabled_next{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Mwjmr/D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwCZ1Cg5w6CPqwAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper .dataTables_paginate .paginate_disabled_next{color:#ccc;cursor:default;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Po6+v7D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwDwPjUdLMfQ6AAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper:hover .dataTables_filter,.dataTables_wrapper:hover .dataTables_length,.dataTables_wrapper:hover .dataTables_paginate a{-moz-opacity:1;opacity:1}.dataTables_wrapper table>thead tr>th{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAD6CAYAAACoLMeFAAAAdElEQVRo3u3bOwqAMBAFwBwjh/CUluKRhfVTiil0UYjMwJLqLfmUYUuBtw3jUreKfc2E43aTi/C9Jo3wUR4WAAAAAAAAejBPc90q9jUTjkdNTuGjPj9/bgfpO0i/AgAAAAAAAPQnPZ6YHpBsNEnNefrt4+9Wmn6nW/cZ1MQAAAAASUVORK5CYII=);background-repeat:no-repeat}.dataTables_wrapper table>thead tr>th.sorting{background-position:right center;cursor:pointer}.dataTables_wrapper table>thead tr>th.sorting_desc{background-position:right bottom;cursor:pointer}.dataTables_wrapper table>thead tr>th.sorting_asc{background-position:right top;cursor:pointer}.dataTables_wrapper table>thead tr>th.sorting_disabled{background-image:none}span.icon{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;cursor:default}span.icon.JobStatusClosed,span.icon.DeviceStatusDecommissioned{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACg0lEQVQ4y3VTTWsaURR9M35EDWqMxhBoUIrFD0h+QIuIWLPrrkhWiuAiuHCRIsmuaaEEau0yUFDX/oIuQjZBLBbsQhtSqEiLIFqDiVFj/RjHnvdoili9MMzMnXvPOXPufRyZH3KNRuMwGAyboijy19fX1Xa7/RX5wWwhN/u+tbW1HwwGw06n86Fer2fJZrNJstlsJZVKfSgWi2+REv4DkEgkBjSmo9GoB+zk9vZ2LJfLJRzHkeFwKOp0Oh45Eo/HPyUSieeCINSmAWSBQODjwcHB01arNVpaWpLRRlbw9z6ZTMhgMBAAJI3FYp+TyaQb6d/s6/b29v7x8XG83++PZAhaPN14HzzPk/F4LIBAenh4eFQoFF5xSMojkch3h8NhAgBrvG+eF/QbAAi8qJ+cnDziIMkWDoe/3d3diSDn4QVjWhSYChmNRiI84NPp9GPOYrF43G73GXUappHl5WUilUrnNkM+9YHdaS0ms8vZbDaP1Wo9q9VqRKFQkNXVVQIlcwHATKCUqaC/Uq1Wdzmz2bzp9Xor+Xx+AukcBVikALLvAUS1Ws1XKpUn1AOJ3+/vnJ6eKldWVphBVB71YXoSlBX7QKjRdB+wcL9yuZyFVezs7LxwuVzvMpmMCJm8Uqkk9KJKKAj9Z9rY7XYpkADVUsh/DdKXDGBtbY3b29urgn2jXC6LaOQhkahUKqaEGocFI71ejy0SgPIgc5VKpd6/gZtMJnkoFPppNBo3rq6uCA7SRKvV0j2hkicwmT03Go0v5+fnz7AHtXmHifh8vihMPbLb7SoAsNzNzQ25vLxsg/U9tu/NxcWFsOg0soBBkvX19Qc4jRaw8p1Op1Kv139gUsPZ2j85BjJj8dYkIwAAAABJRU5ErkJggg==)}span.icon.JobStatusOpen,span.icon.DeviceStatusActive{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACs0lEQVQ4y4WTXUiTURjHJ9Wi6PKc9z3vtnebm9vcNNM0v2fldKI2tS7SyqRMceRXS8qlhjgpUjQ0KlAsow+yboq6iKwb+wCjvOkqLxKVsC686UIL5/bvrMIwZj3w48Dz/5/nOTycR6EIE4QQpWgm8YZM2WXI0BSLFpLEcxsV/wtuirDtiWyqfXLw48BCF+5jEPcwgMvfOuEeLZ2xuSJbuGd9+MuMkLze5Ofn4cElnEM32pb74EM/OtGL9sANXOFZD/L6k18TiUh/d96Q3RX/rBlH4V4sW6pfrkBj4AjqgxWoRTnqcBjHg4dQ832//wyqsLtn2zihZNNKAWuR9mT5fDaKpuxLrtksuGY4/CyczUTBbMYKrk92FE/v9JfNO2Apkdt/XqYiVdpvGqcTJnRIHItC4gsTxxyWpJdm7HhlQeKEESnX9Z+pRLcoVFYxOuWhBuYhFjAMizDcYjDc/gdcNw2zwNZhBk2CmKaI3KV2JF5VQe8VoG6jUF+gUPWsQRfXfRS6Dgprr4jIHFaqMORqHNu9euhKBbByCuYhEJvDwzwUUjWFzDHX8QL5vIAqnckZQ/wF+4SgtJcbqwgEd3hCmnSAQC6jgZgGCXKOmK4g0WSdfUS9yJxcLOPGCgJazanhuH9T8ysX0lTcE/Im+DRfhBQ+xFDE1mmb4kYF6OtpgB3jxjre7TSnlZtbBai8IlijALGSQFNJ/XF9DNG16o4/HymWROQ9ss2ljQkwdgsBmQ9MP8gQdUcDy10dTNe00Pbwqfuo3zggIKlf+5Zm0c2rfiNNoUrnU9ucc0oN+QFB+rg1mP8hFfmTach4ExsURwhMjwlSh7XvWIEgrblQMS2GU65J68IJFOIiGjiNqA+4UPg+9mtMp9xOnGss06rdyKPrpEpRJ3tVDt1ZlivV8oUuocpw3h+OzGWzs/zxOgAAAABJRU5ErkJggg==)}span.icon.JobStatusAwaitingWarrantyRepair,span.icon.JobStatusAwaitingRepairs{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACwklEQVQ4y4WTX0jTURTHJ5pR+Hjv7/ebzqlZ6kzJhbj8N6dzmqb5J3NWOtJmav7LTBNTbNPAlVY+FGyYk0ryJfr3YJk+WAlGZlQECWkqYT340oMW6vbtmtE/Zh74cC7nfM+53HvPFYkcGCHElXj7hXjKo1Il8sg04uMfymIbResZEzn5qFKqD1r6Jkwv52GZAczTQPPYV2gt/dM+qtR6pnFxXMwJJKy6faDqDXB2HGgYw7LxLStmNL2C7fIHYCUXVtMxTHix+N+dN4RUmh7ljwI5fQuLuoFlHB60QTdoR+4gkMc4NGBH9oNvS/oxYEdl2wihdNOvBtLYvSfi7s4h2jq5qLTOQGmdxoqP6ppB5B9Ed39ETPfUkvrWHDxj05t+FFOOd/VtvDbl1foCWw1D2GZ8DD/DGjQ/gX/LU/gyrXdt1yfKi91EvK8sQGK4A6G408YftTJ/nXHjP7B8idUmHLeCl8nDRR6hKrV71RVwGXWgaQ2gWa2g+9sck2UCzTSytQG8vh2CIl4rkig0am9dHTiVFjQyFySxCiTplENoQhVobCGophB8RhmEiCStSNge4ene0AlOmWknigyQGD2IqtgxK7moA6DKHJs4uwJ8aHyEiEgDnD1aeheIPAEkMoehA1EWMnERo/gnRauxlVwU0zCtRG/8TP0VbqvPuK+smjvTD5pSbiOqIyBxZSC7a0H2nAbH4JPZETWVrEkBaFzBknDsEjzSSw2/B8k7yCnw/L1Z7uIQuLxzNprTBiHfAklJD7xKb0KqvwqBxdgFLnGFZkjLO57TQOXmv6aR+ilcAy88nPXonQQpvQ2ZacS+y/wO4eZxBJme2Ul+L8jJ+5DWWUe5ncniNT/UFm19jaxnfH4PG+uKCaDyPZA6bENQ1+svnrrmJhKc4LL+rwxOdOaVBV7uKXVqIbNRw6tL/Yk83dWR9jsKtpCP82kfBAAAAABJRU5ErkJggg==)}span.icon.JobStatusAwaitingDeviceReturn,span.icon.JobStatusAwaitingUserAction,span.icon.JobStatusAwaitingAccountingPayment,span.icon.JobStatusAwaitingAccountingCharge,span.icon.DeviceStatusNotEnrolled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACyElEQVQ4y4WTWUhUYRTHRyqj6PH77r2j46hZbgxkEOM+huPW4lqkuUzuVm5M5jg5iqm51RgpWSnagKbZU6HZovWgFSklhEbkg6JS2oNhPTiaOvPv3gKpGOnAj+9wzv+cDw7niEQWjBBi7exEPPy87MJ95ZJIFydygI9tF/3PeJHVUaVjweOu+Mmlz3XASgvwoxnLc5Xovxc7Ex7kWMxrtlos5jhC6nXyZzCqAVQBxpJ1rFcApkpgucwENPHN1Gi4KH8lFhPxvz9vq9N4DGApBca5uNX1ryqYFpNhXlQB3xJ5kng/ASvzJ9awnA69bt8wpWTHRoMIpfTcwlggpkb9V2fHFZgZU0B4Z8f9MDvmu8Gn9/6YfhewtvBBiahgu7JfxSxLrdtrnaZHB+wx2LsHQw/3YqjP2SIveF4+csHocyfcrnGYF4vpLpGbM+v6oEmC1qucyXCdRcctDndaNkfIGxp57RUO+2Wst+igj63yRqkNtHkMSjQUtRUU+hrL1F2iqNBRlBdR1OtYBPlysaLgAIlSm+mA2AgGifEU6lyCovOWUedRZKTwJFHkJLI4FMA38PHi7Fp1NogJY8zR4QTpKQSnMy0j5E4eJ4iLpqa8BDGCFKyPyNWVbOmusjWGBPKJYwSqRIKMNIKsDL4o6zeCL8SEXFwMgaCtyJV88ZTzQxQsRyUt6G9nkJtKTWkqgpyzBJoCAp2W5wIDrYZFfg6D1FMEqQl07Voxh2yVbfnGHshkxKqnyX1usI3B5VLGpOeH1dLIobNVgrsGe7TdlEJfzQkDXGvWM2jQSd8oFHTnX9vo6Umtn7a6z0312OJ+F8HwEzfzx9demBjxxsiAzNzdSdDbQWColr49HMaINz2oYvXuwok+tyVMHQEW8njyYZoMx1iv7HtloV1ZSMgmx/SnhYaSLanJrL220EZZquGCs8+wLpFRxNqS9ifnTKmvqTT0WwAAAABJRU5ErkJggg==)}span.icon.JobStatusAwaitingInsuranceProcessing{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACzElEQVQ4y4WTbUiTURTHJ9mi8OO9z/NM59Q0p2ZkEJrv1jYly7Q3Z2XLmWalqcvS+ZJDpfCVNEhwacO0NAqK+lBqQWaBkfZBiGaUqIm9+cVQC+ezf88MjGLigR/3cM7/3AvnniMS2TFCiNiLeAcEu4bFBUlD472IfKsQWyNayQSRg9Jjd97tw48+fq2axYIR4JuAbxU/cVfdPabyiCsSNI52iznCkdLAuicWHYCLgKUECygX/ApgwQAeVwGrkKsIbHgpIRLJ/y+vLgyo6rFoge9Jc/M/NAuYSeExo7FiNhmYPQrMHLFiKvGXhU8DSjfX9lNC1y5doJLtOWveMYWh8JF5c8Q43kWMwXYOh43DHPqX9+ETeBs5avmgmEKMa4JhsZilrLjW88Zor9sgHnv1omvDc3R7L0cfeuQv0Oc5iBr3658lVOIkkrO+PkbpfVzhmvkm1oQWrg0mrn1ZbPlGzsRf5kzYxG4JFoW6RCnKnBuhY/QopCW4RCtRQ2vtUkmrYKDlKKZlMLB1COOUalGUVKU45a5HAqNGMk1GLtGhgBTYRUd1SKPpSBE4xmZhO7dTLQrmQlwNzs2IZfZZ48lepJE0nCQZdrHlEskh7KdJvEaSjUhWGSLyIfJV1S6dc0oSjYMkCRqiQbogzCAnhKI/2HxbzJY7IGhs2lxp+ZcgGuS0+BNaWVZeB9ONdHqG15LjyCKZyCf5KCbFKGaKoGcLkMPkIJWkQkNTLaVcPbQumWVLc+BPNjoY/R5MtjG9KGOq+UqhYY2cEa3Sm2h368A1WQuquVpbAy31TBMMsobXETR83T/TGEQDxa1+XZNdLiO4Q+7hqW+/dWCbGW+Ch/HM/5W1k9xCJ3mIaplpIJaJlSy7UOfWF53v8R2endgFTGcL5ACf4nh0+Q9N610rDNFE6bjiVsYQ1apUVuumd9YrCrkLqkz2tDyBxIntaX8D6jqsQHV9jFEAAAAASUVORK5CYII=)}span.icon.success{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB4klEQVQ4y2P4//8/AyWYZA0ckxlYyDaAcy4Dt0SZ0FnBWP7tJBvAOZuBW7xC4MLe67v+x84L+8/ky7CFaAM4pgE1lwtc3Hl92/+o+UH/HWda/Q+c7Pmf0ZVxE1yRyFJWYZElbKbomnnnM3CLlPNd3H5ny/+oTYH/Reax/Refyv1fKFjgLrcHiwBYEftkBhGrfpO3LpPsf3LNZ3CEaZZcy8UjWS94cfvjzf8TjoT+V90u+l9hsfB/Vi+m22xuDJxgL4i2cop59ru82XV36/91t1b+N+3X/ya+mt1Gaaswm1yr+MVVj5b+z7qQ8N/8pMZ//Q1K/1l9mO+weTBwwAORPYh1SdqW2H+VF/P/L74/9//8+zP+azQrf1GtVXi04OnM/yW3M/973rD8b3vI8D9bOPNdjjSIzSixwOHPvsdgocrP+OvB/yc+6fg/7Wnf/6Wv5v+veV74P/K513+fa/b/uZM47grOZOLEmZCY/Bl3G2xU+Rn30v9/y/uK/y2fKv+nf434HwY0QCCH9672XhkOgimRJYRxr8N+sx/5/xL+V/zP/J/6IeK/WJHQXc9bVpxEJ2X2CJbd4af9fja+K/+vVKJwp+hbCgfJeYE3nmufcoP82Tn/J3CSnZnSf0Sy0iQ3omMAFlyLENN9tK8AAAAASUVORK5CYII=)}span.icon.error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}span.icon.warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC)}span.icon.information{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==)}#layout_Page>div:first-child.jobTable{padding-top:30px}table.jobTable{border:solid 1px #e8eef4;border-collapse:collapse;table-layout:fixed}table.jobTable>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}table.jobTable>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}table.jobTable>thead>tr>th,table.jobTable>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}table.jobTable>tbody>tr:hover>td{background-color:#e8eef4}table.jobTable>tfoot>tr>th,table.jobTable>tfoot>tr>td{background-color:#e8eef4}table.jobTable.hideStatusClosed tr[data-status=Closed]{display:none}table.jobTable td.id,table.jobTable th.id{width:45px;text-align:center}table.jobTable td.id a,table.jobTable th.id a{padding:0 6px}table.jobTable td.status,table.jobTable th.status{width:220px}table.jobTable td.type,table.jobTable th.type{width:45px}table.jobTable td.device,table.jobTable th.device{width:100px}table.jobTable td.user,table.jobTable th.user{width:230px}table.jobTable td.technician,table.jobTable th.technician{width:80px}table.jobTable td.location,table.jobTable th.location{width:200px}table.deviceTable tr.decommissioned{background-color:#ededed}textarea{min-height:75px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif}input[type="text"],input[type="password"],input[type="file"],input[type="number"]{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;border:1px solid #ccc;padding:2px;color:#444;width:200px}input[type="text"].small,input[type="password"].small,input[type="file"].small,input[type="number"].small{padding:0 2px;width:150px}input[type="text"].discreet,input[type="password"].discreet,input[type="file"].discreet,input[type="number"].discreet{border:1px solid #fff}input[type="text"].discreet:hover,input[type="password"].discreet:hover,input[type="file"].discreet:hover,input[type="number"].discreet:hover,input[type="text"].discreet:focus,input[type="password"].discreet:focus,input[type="file"].discreet:focus,input[type="number"].discreet:focus{border:1px solid #ccc}select{font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-size:12px;border:1px solid #ccc;padding:2px;color:#444}input[type="submit"],button{padding:5px}input[type="submit"].button,button.button{font-size:12px;padding:6px 10px 4px 10px;margin:2px;border:1px solid #875a33;background:#db761d;color:#fff;font-weight:bold;text-transform:uppercase;cursor:pointer}input[type="submit"].button.alert,button.button.alert{border-color:#900;background-color:#e90000}input[type="submit"].button.small,button.button.small{padding:2px 5px;font-size:.9em}input[type="submit"].button[disabled],button.button[disabled]{background:#9e9e9e;border:1px solid #696969;cursor:default}input[type="submit"].button:hover,button.button:hover{border:1px solid #696969;background:#9e9e9e}ul.none{list-style:none;margin:0;padding:0}ul.none li{margin:0}div.form{margin:0 auto}div.form>p.actions{text-align:right}div.form>table{border-top:6px solid #005fab;border-left:1px solid #005fab;border-right:1px solid #005fab;border-bottom:3px solid #005fab}div.form>table>tbody>tr>td,div.form>table>tbody>tr>th{background:none;border:none;margin:0;padding:8px 5px}div.form>table>tbody>tr>th{font-weight:normal;text-align:right}div.form>table>tbody>tr:nth-child(odd){background-color:#eee;margin:0;padding:0}div.form>table>tbody>tr>td.details{padding:0}div.form>table>tbody>tr>th.name{width:150px;text-align:right}div.form>table table.sub>tbody>tr:not(:first-child)>th,div.form>table table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}div.form>table table.sub>tbody>tr>th{font-weight:normal;text-align:right}div.form>table table.sub>tbody>tr>th.name{text-align:right}#pageMenu td{border-right:1px dashed #aaa;width:33%;padding:10px}#pageMenu td .pageMenuArea>a{text-decoration:none;font-size:1.2em;padding-left:18px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABxElEQVQ4y52TzUsCQRjG99Ql6FBQeImKDv0XXUQCTyuRZmCWCubH7vr9tX6CoBcxUVHUUDwsHjpEXQPPhSF46VwX/4EgInx7ZoNuUbrw25ndmXnmed93huP+eCwWy7HL5Spxiz5ms1lIJpPPOp1uYyEBg8Fg63a7lM/nx1qtdm1uAZ7nT2u1Gg0GA8pmsw96vV4zl4DJZOKr1SopikL9fp/S6fQYous/EyRJ2gcnPp9PDAaDcjgcbkej0VtwH4lEHguFwku9XqdGo0GdTkclHo8/GY3G73AymYwLqhVwncvl7orF4rBcLk8qlcq01WpRs9lUF/V6PdUFC4X9TyQSI6vVus35/X4rHORBWxRFBQzBBEwxRgy4IjhiO1MqlVLbWCxGXq93xOF1AUpAATdgKAjCBEzRJ7fbTXa7nWw220/rcDjY4g+n0+nnEOcR1GNQvYStK9R8iHAm4BVZf0P5ZkwEgmwRwRlz9IlWVHOAU7YElj0ezwomrGKiBmyBHXzvIrRzoIYSCASY/VkoFBL+XUZU55DlAE5JluV3uPXOdQ6QrDOWOAb6wtwnEaFKLOMot7TQXUAIB7AeXvg2YvdNVGTvt/EvEoULbtcvb5gAAAAASUVORK5CYII=);background-repeat:no-repeat;background-position:left center}#pageMenu td .pageMenuArea>a:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACf0lEQVQ4y32SO4/UZRSHn3Pey/8yszNy2RmUXVxDDKgFkYTYYaKx0cKGxm+hJGhljBZgYaFQW1phYWFCNH4GTfACCSa6KhFidl0GdtiZ//u+x2LEsCg+zclJzvmdqxx973umRfBOcN5x+9dN7lzfQoMjZWNl1Lw27IcTX1++ebpqI1QBbSI0EderUO7DzIiDGlGhpAw5MzVZttXRy3Ubx6UUHsTvEijG+rlj//jxlc/ZSLodTz5xZG1P+GL94rcvplw29EGB9Xee4r+QEDAjpVsJfW7l2NrMLq1/de3VnMvv90T0yttP8zD2HF6mjTpp5sZ4AvH46omDLxy55JWRFVsUOXT22vMmrIjIfq8sOZU1VRkLtAUbHBhW450De1cjEIOwHSObl69/c+OH316Spt7ws8f2P2NwtMDB6Kj6Qfq9qPucsDys3LhY4VE6GhVaBS2Jn57c96wjf3nzl61Tvtu8M7VSbpvxZzLr7Zj1N/8eoZYCCNGBF8E5qJxwN8Nd9cd7g/pTX02nDdBg0gNawRBZzFfMSAaTmWFmIFAMggr9qN082Sd+by0bIjziRJwTllR1KIsVd+qYtuKb7/4okqIhBZzCIGje2Ulnclc+8pNJ95lBUBWngheRCqgA7TBNUU9a7T5WDw5hELD5PJ/OZucBxMweesbRBz+TVU+5GC6qGI2TWem6M3mWL+RZopul3Z/4L5qAd7KklSdmo5unNylcuD9E/y/fzFO23LB/y2GeN0op58UMimHFsFx2d3D4/R/ZrgfceH20uELnCcjV4HirE/nQx4B4B6EgVUDbarGDx9+9QhDITc12f4gUAMOAYHKoF2lTtKuL9zW4Z8z4C2DFDQO2dDsSAAAAAElFTkSuQmCC)}#pageMenu td .pageMenuArea .pageMenuBlurb{font-size:.9em;color:#888;margin-bottom:10px}#pageMenu td .pageMenuArea .pageMenuBlurb a{text-decoration:none}#pageMenu td .pageMenuArea:not(:last-child){border-bottom:1px dashed #aaa}#pageMenu td:first-child{padding-left:0}#pageMenu td:last-child{border-right:none;padding-right:0}#pageMenu td .pageMenuArea>a.noticeboard{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACAElEQVQ4y6VTy65hURCt7f1oIkQnfAEx8wkmNyIGBPGK72DqC/yECDFoE0M/YMxQjO8V1/vN7lqlj3T3VCUrZ+86u1atWvscRW+GajabOhwO03q9loTdbiebzSZPwGw20+l0ouv1Sufz+QWn00nL5ZJUuVzWj8eDFosFxeNxUkqR1WoVoBh7vL/dbgKtNY3HYwoGg8/3lUpF7/d7ikQixGuyWCzkcrlEBdYguN/vdLlcCOd2ux21222az+fk8XhIFYtFjSTGqNVqUgB5hgIEFGCM7XYr8nu9nigWgnw+rzebDQUCAapWqy8CdAcQKDocDkKCETqdjijx+XxPApgB2aVS6R8jTSaTSDfmBxEIut2u7NFUZbNZIUDnXC4nBEYxpCPggeEDCAaDgYwnBJlMRgggL5VKyQEUg9AwETlcI4AYDocyvxCk02m9Wq0IPiQSCZEGAw0VxjVCAQhANhqNyO/3Pz1IJpMa7k6nU4pGo3LAKP47DBLEZDKhWCxGXq+XFDuvIb/f70sRABXo7HA4pACkIACwBlGhUBClqtFofLM0XygUkgSu8Hg8ktvtFpkwC+YhZ3zG2M9mMyj4UujAxT/r9foHd+ec1wXwVf5gFQ6Gmbs+uMmVv4UTE+1Y4ReP8avVan2q//8uPoyc5w8wAz5HzTgy9owtk95ef+O7v/NvnbVDH4UJh38AAAAASUVORK5CYII=)}#pageMenu td .pageMenuArea>a.noticeboard:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACcElEQVQ4T6WTPW4lRRRGT1VXV78fjwfbGhAjAQEBkCMhEREgkRGTMIJdOGdCEBtwxoiYhAUgfiREhsTYJAYhojF+fm+6X3d1Vd17CewdzCedDXw6x5kZL7Lw+IvH9urDh/S7LQ6IXaSLHbHriF0kNIE5JXIp5JSY80yaM91yxWazIVxcnHP+9A/+2hbeefd9Wka6NtO1A413OOdQNWZRihjVGn7/9TfePIq4piHgHClNvP3eh3z82ecsGs/BMrBqA6F1eAdFjJSF52PlKiW2s5IufmR175CgokgtbK+37G5memeMy47YFlrvAIeYsk/CZsiMReh3PZ0IKkoQEXIplGFg1+9pUHIR2rYhhADAOFeGKZPSTDXP8HzAlcxSlQBQa6Xv9+xu9jgrxEWmjQHXeFJWqii1VuY0I9bQ9wPLUhE1gkhFRRmGPdc3OxxCFyfwAVEwByKGSKHkQrGGaZxQFVQrwcwwE8Yx8d/1Fq8VGg+uoQke5xxmRilCKQUlMO5HtDPMjFCrYGrsU+bqZkTrTNu2xBjx3oMHE0OkUkql0pCyYlGRKoRaC2Jw/fc5f/7yPc4qMXZ473B3thmgZogISsPmn3P0rWNyKYTjkxPWB2v0p5/594en+MaTixIcLBcdAGKKqqGmmBoixisffEJoA+H1197Y5ppf+vKrr4ltYLFckqaJ9XrN0fHRrcp5Zppm8pxIcyLnwuXlJYf3718F4OjbJ09ePj09/cg5DrvYrh48OFl1sTtwzi2cd03bttrFWMYxpCb4oYv1KgT/HdizW1PgmWHfAHz66JED7t2xABpub5iAPdCfnZ1V7iJ2L5rz//8JgNlI5+OxAAAAAElFTkSuQmCC)}#pageMenu td .pageMenuArea>a.report{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEUAAAAiIiIkJCQlJSUmJiYrKyssLCwuLi4zMzM3Nzc6Ojo8PDw+Pj5CQkJERERFRUVHR0dISEhJSUlOTk5QUFBRUVFWVlZeXl5gYGBjY2NlZWVmZmZpaWlqampra2tsbGxtbW1wcHBzc3N1dXV5eXl6enp8fHx+fn6AgICCgoKQkJCYmJiZmZmampqbm5ucnJydnZ2enp6fn5+goKChoaGioqKjo6OkpKS3t7e7u7u9vb3BwcHExMTFxcXIyMjJycnKysrLy8vOzs7Pz8/S0tLV1dXW1tbX19fY2Nja2trc3Nzd3d3g4ODq6urr6+vt7e3v7+/y8vL09PT19fX29vb39/f4+Pj5+fn8/Pz+/v7///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD1JbRTAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAAALFJREFUGBkFwbtKA1EUAMA5d8+yeRC0SMBgYyq19P9/QgLaiJ2NXWADWdzHdSbqW621Vogo75LTBsAHqY4/oBQPlaQ5lDiPz3cIkuU3LF1/bRyRtIeI8+ppFyCZvoaXqe+vjWOQor02063uNiUESXtZXnMevm+Pp6AwDvPStNFfKiQl0mqKv4kgWbal6bIp60aQzOtlanNuuypIbvfD3MXYZYVkvy2xF8cIQfKJECJK8A++czvTNtPiyQAAAABJRU5ErkJggg==)}#pageMenu td .pageMenuArea>a.report:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB+UlEQVQ4y42TTWsTYRDHf/Pspkkb8rJpYwI2VKkUcyg0kmPvIt4MXrz25kkvnvwAfgA9SXLy4tF+Ay8eeqlgoSxELWqrMZqaZpvuZl8eDyWLTRpwYHgGhuc3/5lhRGtNq9XSWmsmfdJEBBFBKcXW1pYAmONko9Egn8/zP9ZsNuPYBNBa0+v1sG370g9KKUzzvFatVrugLlaQzWYpl8sopRARNt9u4DgurzZfc6tYRxA0Om5lCjAcnmLbdpwcGH02cjW8dsDO5x0MwwCgXq9fUBcDLKuAZRViBV+efqeYXCb52GA9X4sBkxYDXNfj4YslnKMRz550sY4yDH4P8dohu8buBQVTLYgIC+kFep2PFKSP5+c5a5sMewGpVZNqdj1WNjkDNQ4Spsn+3h6f3r8klQCVVhznXPh5Rurefew7t+luv5kN8P2A4x8fOHE8CBVqURNcdQmVwZ+vhzw/HfFtzpw9A6UEzCtE6SohiqgijHwXSQjt/i/mR/NkRv7sNUaRprRcZSE8b8e4qXEdB0kaWMzx4GxANpWcDfA8j1LlBklHCPyAYMklqoS4ocu1lMVqKslBGM0GdDpdVq6v4R7CqXdAbtHHS2cYjk5QhSLkPCTwZ8+gWl2j+WiAYRiIlNhXg7ha9O4uSilWLlljDGi1WlOnO/mOT/lfwF9Tu75p8aEVrAAAAABJRU5ErkJggg==)}#pageMenu td .pageMenuArea>a.noIcon{padding-left:0;background-image:none}#pageMenu td .pageMenuArea>a.noIcon:hover{background-image:none}table.subtleHighlight{border:1px solid #ccc;background-color:#ededed;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}td.subtleHighlight{border:1px solid #ccc;background-color:#ededed;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.field-validation-error{color:red}.field-validation-valid{display:none}.input-validation-error{border:1px solid red;background-color:#fee}.validation-summary-errors{font-weight:bold;color:red}.validation-summary-valid{display:none}.ajaxHelperIcon{height:16px;width:16px;display:inline-block;background-repeat:no-repeat;margin-bottom:-4px}.ajaxLoading{height:11px;background-image:url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA);margin-bottom:0}.ajaxSave{cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACEUlEQVQ4y52Su05UURSGv33mzDlzc1CpBBI7fAArTWjEyyMY7U14AzsLn8DagicwEk0kEBOjYoBCQmJlSKQTSMB4IsOcy15rL4uZkQBqwd/u7C//ZbmJianbXsP87Oyt6OGD+wXgLBh/U+ScqQW3vPz2wtr653xzY+1q3C+KztjY+FS323X37t4hSVL+p19ZxsLCK9rdywDEDgtJkqpZFPtKEAVRBdyJj2ZGmiYEM8zAl+UAYAaVrwgqiBk+rxBVnDsLCOZQMzQoGnQEMFQVCYG+D/jKo/IPAI4QDFVDvB8AwhCgIVAUQpEXqCrRKUAwQ9RwzhE0IF4GAAyCKFVZYeZod7r44eNpB41mg6OjQypf4UcOLChJmrK19ZWnTx7TaLSGJYL7U6RhQBzH9I96bG9/I0nT4whxvYbXGh8/rlPkfaLIkdbTYVkBCKgEolpE2miSpilpWhs5MMQLIQSarRYzN68zfW0aNWg3m9TrMQ6oxzEbm1/48GmdPM8Jw2OLDRDxHPUOabWazM094sXL1ywuvWP++bMTPZQivF9ZxXvBReXxjCICUUVVRgDs7uyxt7N7psjsZ0ZVVqh6LMSjFUKsqjHeI/EgV6/Xo8h7ZwC+EsQLoorZMIKXar8o+lm/t3+x3WnyZnGJmZkbTE5eYWVllfHxS6gqnU6bLMv4cfCdssg5IBkuNYghnFNuZOW8+g2XUFURWZwj0wAAAABJRU5ErkJggg==)}.ajaxOk{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB5UlEQVQ4y2NgGJyAiYGZQ4pVS8JUKFrCWDCCTYxFjYERKEoM4JRjMfOab3G28V3hv75/9f/7/tb/r3uZ/89xguEhVlEmbbyaueVZLUPP2X7P/h/9P+1H+P/Ub2H/U7+H/8/4Ffk/93/Mf+/dZm9ZhRl1sOtmZ+AwXyB/2/GW4X+78/r/HS8a/Xe6ZPzf6bIxmHa4aPjf5a7Jf50OyRNY9fPrsfkoreX+L7qI/b/UKu7/cuv4/ytsFPyvCMTyGwT+y67l+y+xgvO//BLu/5zyzLYYBkiH8vQJljP/5ypj+M/TzPCftweIJwDxRCDuBYq1M/znqmH4L1TP9F/Ejb0AwwCZMJ4ZPI7M/9m9gQpTGf5zFwE1VQJxNZANNJQ7h+E/ZzTQsBCm/6LeHCUYBoh4ciYLh7P+Z3Vg+M8RDFQcBzQoBWIYZwJQLIzhP6szw3/BQNb/fLasgRgGsOkyi6s2835gDwdqSoe4AGxzGYTNlQFxgUwhxwMmdUYurAEpEceToTSZ8z9XKVATMBwEpjP/F5zJ/J+nDcivYPgv180OdAF7BN60IJnFk6u6iOubxk6B/45X9f47XzP4r7lb+L/iHM4PQnEc8USlRrYAFhnZRoEK0xVKy0yWKy2VquUrZPNjFhuc+Q4ABEOzcbMMpzIAAAAASUVORK5CYII=)}.ajaxRemove{cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC)}.ajaxRemove:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#layout_Page div.hiddenDialog{display:none}* html .clearfix{height:1%;overflow:visible}*+html .clearfix{min-height:1%}.clearfix:after{clear:both;content:".";display:block;height:0;visibility:hidden;font-size:0}div.columnHost .column50{float:left;width:50%}.error{color:red}.alert{color:#ff5e00}.smallText{font-size:.9em}.smallMessage{font-style:italic;color:#666;font-size:.9em}.nowrap{white-space:nowrap}.code{font-family:Consolas,"Courier New",monospace}div.code{border:1px dashed #bbb;background-color:#fff;margin:3px 6px;padding:4px;font-size:.9em}a.smallLink{font-size:.9em}textarea.block{width:250px;height:100px}.checkboxBulkSelectContainer{margin-top:6px;font-size:.8em}.checkboxBulkSelectContainer a{text-decoration:none}.ui-widget .checkboxBulkSelectContainer{font-size:1em}#licence{text-align:justify}#licence p{font-size:.9em}#licence li{font-size:.9em}.ui-widget{font-size:12px!important;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif}.watermark{color:#888!important}.ui-autocomplete-loading{background:#fff url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) right center no-repeat}.ui-autocomplete{max-height:150px;overflow-y:auto;overflow-x:hidden;padding-right:20px}* html .ui-autocomplete{height:150px}.ui-timepicker-div .ui-widget-header{margin-bottom:8px}.ui-timepicker-div dl{text-align:left}.ui-timepicker-div dl dt{height:25px;margin-bottom:-25px}.ui-timepicker-div dl dd{margin:0 10px 10px 65px}.ui-timepicker-div td{font-size:90%}.ui-tpicker-grid-label{background:none;border:none;margin:0;padding:0}.ui-progressbar-value{background-image:url(data:image/gif;base64,R0lGODlhMAAWAPMPAO+cSvfOlPfFlO/FjP+9c/+1c/e1a/+tUu+ta++tY/+lSvelQvelSu+cQv/WnAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh+QQFBwAPACwAAAAAMAAWAAAErHDISauVwenNu9cCIo5kaSIGoa5s66rGKZ/pa78xkux87/u1mxD2KxoTweHNcGzykkqc0wmNtpjTY9W6wmaLhoJ4TC6bxd4v8Mxmp9XPtpz89gHu+Pydcej7/4CBfQx6hYZ5fIKKgoSHjoiLkX+Nj48MCpiZmpucmJSVh5edo52flQ2oqQ2ipK2eqrCxsqyupAuyuLO1rre5vqi0u5y9v7kLwrbFvsfIncTKsBEAIfkEBQcADwAsAAAAADAA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)}.ui-tabs .ui-tabs-panel{padding:.5em}
\ No newline at end of file
+.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:.1px;display:block}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted #000}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin-top:2px;padding:.5em .5em .5em .7em;min-height:0}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-noicons{padding-left:.7em}.ui-accordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month-year{width:100%}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:49%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:21px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-menu{list-style:none;padding:2px;margin:0;display:block;outline:none}.ui-menu .ui-menu{margin-top:-3px;position:absolute}.ui-menu .ui-menu-item{margin:0;padding:0;width:100%;list-style-image:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}.ui-menu .ui-menu-divider{margin:5px -2px 5px -2px;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-menu-item a{text-decoration:none;display:block;padding:2px .4em;line-height:1.5;min-height:0;font-weight:normal}.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active{font-weight:normal;margin:-1px}.ui-menu .ui-state-disabled{font-weight:normal;margin:.4em 0 .2em;line-height:1.5}.ui-menu .ui-state-disabled a{cursor:default}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item a{position:relative;padding-left:2em}.ui-menu .ui-icon{position:absolute;top:.2em;left:.2em}.ui-menu .ui-menu-icon{position:static;float:right}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url(data:image/gif;base64,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);height:100%;filter:alpha(opacity=25);opacity:.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:22px}.ui-spinner-button{width:16px;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top:none;border-bottom:none;border-right:none}.ui-spinner .ui-icon{position:absolute;margin-top:-8px;top:50%;left:0}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-spinner .ui-icon-triangle-1-s{background-position:-65px -16px}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav li a{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active a,.ui-tabs .ui-tabs-nav li.ui-state-disabled a,.ui-tabs .ui-tabs-nav li.ui-tabs-loading a{cursor:text}.ui-tabs .ui-tabs-nav li a,.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #ddd;background:#eee url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABkCAYAAABHLFpgAAAAIUlEQVQYlWP48ePHfyYGBgaGIUT8//8fO5cSFn6J4UQAAJSgIpAFCJPdAAAAAElFTkSuQmCC) 50% top repeat-x;color:#333}.ui-widget-content a{color:#333}.ui-widget-header{border:1px solid #e78f08;background:#f6a828 url(data:image/png;base64,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) 50% 50% repeat-x;color:#fff;font-weight:bold}.ui-widget-header a{color:#fff}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #ccc;background:#f6f6f6 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAGQCAYAAABvWArbAAAAL0lEQVQ4je3HsQ0AIBDDwIT9F/4igpYiAyDk5mRrZvaSJAD4liT32u7bqi0APMcBiYQKDwcroFAAAAAASUVORK5CYII=) 50% 50% repeat-x;font-weight:bold;color:#1c94c4}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#1c94c4;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #fbcb09;background:#fdf5ce url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAGQCAYAAABvWArbAAAARElEQVQ4jWP4+/PhfyYGBgaGUWKUGCWGL/HnLQMTAwMjjGBkYmBiYGBiYGJgZEZlMcNlYRKMCMUQAwbcM6PEKDFKYCEAGrQJAcbElNQAAAAASUVORK5CYII=) 50% 50% repeat-x;font-weight:bold;color:#c77405}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited{color:#c77405;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #fbd850;background:#fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAGQCAYAAABvWArbAAAAMElEQVQ4je3LIQ4AIBTD0O3f/8wrFgmKhMy8pKJKwkhSKeVbbGuAPU9f4PIopTxgAeS0DRtI4yK0AAAAAElFTkSuQmCC) 50% 50% repeat-x;font-weight:bold;color:#eb8f00}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#eb8f00;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fed22f;background:#ffe45c url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABkCAYAAABHLFpgAAAASElEQVQYldWPwQmAQBADJ+m/DfuzgN2ND/WjX+HwMzAQBkL2LQb4EZLCZLAYnDSWGpO6lBSGwjy1sHjvRN+pM1oYBmv5349xADIyLQUayPX/AAAAAElFTkSuQmCC) 50% top repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#b81900 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAy0lEQVRYhe3XQQrCMBSE4d8svIH0Ft5/5X3EG7jRTYUYk5ekackgb5alDF8LbZjT7bq8SPJ83NNLPzlfluo9e/SFPctyGe37AqrhIAIq4mAFquIAgjIOMh/JSNkRD2sCZ+PAeIMKOCgAVXCQASrhIAGq4SACKuJgBariAIIyDhp+1D1lRzxsE3DmcVgFzj6rTeBsHBhABRwUgCo48E3im6Sv7BPfJFvLfJOMllnxTdJSlotvkp6yOL5JtpSBb5Kxstb4JimV1fKXm+QNcHvyUkD/BIAAAAAASUVORK5CYII=) 50% 50% repeat;color:#fff}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#fff}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#fff}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url(data:image/png;base64,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)}.ui-widget-header .ui-icon{background-image:url(data:image/png;base64,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)}.ui-state-default .ui-icon{background-image:url(data:image/png;base64,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)}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url(data:image/png;base64,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)}.ui-state-active .ui-icon{background-image:url(data:image/png;base64,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)}.ui-state-highlight .ui-icon{background-image:url(data:image/png;base64,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)}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAADwCAMAAADYSUr5AAAA7VBMVEX80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nz80nzkx5/eAAAATnRSTlMAGBAyBAhQv4OZLiJUcEBmYBoSzQwgPBZCSEoeWiYwUiyFNIeBw2rJz8c4RBy9uXyrtaWNqa2zKP2fJO8KBgKPo2KVoa9s351GPm5+kWho0kj9AAAPhUlEQVR4nO1djWLbthEGyUiq5YSSLXtp7FpLOmfzkmxr126tmi2p03RJ1/Xe/3EGgARxPyAgRbIk2/hkSz4CJO4+HsE7AJSVysjI2AMUUOxahZ2iANhzBtZWr4BoIRSYAVN5u4QwDwQDRbcwfUi5KS3wFuDmFnQLa4Dtb//cqktwD5QEFFwfUs7PoCCA7y4bEJVFizcIob8KmhAplwwqVjt+9FBl3uINQniwEiryEyw9JHqGpQdEFNi+B4QQ7QOiHhysIPoAxUqxvdvvA9K42bsAv4S2fxfYOe57IJSRkZGRkZGxx7jxSHDHcRBXQMTyIjInBgHwBJ/bEx8PEANC+uhbpSSggCBAVODVabpI1S/k4WLZpTn6NpMhoX9Y40hxYERFpMcqUs4AloCtDQdID1YhnyXZ2hLjAYWiO9Dy1PDB7tPhIqLx+uMB8grZaR+Qxl2/C2RkZGRkZGRk7A7rBf7J0DR5/LUTjzUPIPSPGvQJiVJiB7kcQCiUOJrcFNtDZIf2xarQ3aGvLNxAVIFAabz90BFiBIlycTBhgWwOWCH0FLYHlPqwHaCvcIn2ZbosCevfPTRiFFcgvHukCjWwrc3GrGh1fsAof8EaUReKXkCB4/MzFNo97qLpFiKFYv/kNR5YQxQbQEofkZ2OuEOHqqT6gFTpru8CN7x/+jaZkZGRkZGRcV+x/rLUNcMM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)}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#666 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAwklEQVRYhe3XXQqDMBhE0dtsIKvNwrOC+mIhTfNrlAzlm0eR4ShomFcI4U2WGGN+6Sfe++49d/S5O8tKWe37AqrhIAEq4uAEquIAnDIOCh/JStkTD9sE7sZB4w0q4KACVMFBAaiEgwyohoMEqIiDE6iKA3DKOBj4Uc+UPfGwQ8Cdx2EXuPusbgJ346ABVMBBBaiCA9sktknmyj6xTXK1zDbJalkrtklGykqxTTJTlsY2yZUysE2yVjYa2yS1sl7+cpMcegPyrqBRcaoAAAAASUVORK5CYII=) 50% 50% repeat;opacity:.5;filter:Alpha(Opacity=50)}.ui-widget-shadow{margin:-5px 0 0 -5px;padding:5px;background:#000 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAABkCAYAAAD0ZHJ6AAAAeUlEQVRoge3OMQHAIBAAsQf/nlsJDDfAkCjImplvHrZvB04EK8FKsBKsBCvBSrASrAQrwUqwEqwEK8FKsBKsBCvBSrASrAQrwUqwEqwEK8FKsBKsBCvBSrASrAQrwUqwEqwEK8FKsBKsBCvBSrASrAQrwUqwEqwEqx92LQHHRpDUNwAAAABJRU5ErkJggg==) 50% 50% repeat-x;opacity:.2;filter:Alpha(Opacity=20);border-radius:5px}.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}body{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;margin:0;padding:0 10px;color:#333}body.layout{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAFvCAMAAABEoqrSAAADAFBMVEVRUVFUVFRYWFhbW1tfX19iYmJmZmZpaWltbW1wcHB0dHR3d3d7e3t/f3/MzMzNzc3Ozs7Pz8/Q0NDR0dHS0tLT09PU1NTV1dXW1tbX19fY2NjZ2dna2trb29vc3Nzd3d3e3t7f39/g4ODh4eHi4uLj4+Pk5OTl5eXm5ubn5+fo6Ojp6enq6urr6+vs7Ozt7e3u7u7v7+/w8PDx8fHy8vLz8/P09PT19fX29vb39/f4+Pj5+fn6+vr7+/v8/Pz9/f3+/v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD28iAmAAAAbklEQVRIx2NUZ4ABlv9kMZkYRrXhYUphMwzZXEYCogQV0FfbUHMOrSxGAoyMBEygM/M/zZnMjFiZDPQEjCYEsin2/EYKk6qGDTVzR7TnRwN1NFBHPT8aqKOBOur5Uc+PBip1zWVkYGCBCv2nhrkAr7hI+jpl4KUAAAAASUVORK5CYII=) left top repeat-x #d1d1d1}.page{max-width:1230px;min-width:750px;margin-left:auto;margin-right:auto}header,#header{position:relative;margin:0;padding:0;height:110px}header #headerMenu,#header #headerMenu{height:24px;padding:4px;line-height:22px;text-align:right}header #headerMenu a,#header #headerMenu a{color:#000;text-decoration:none}header #headerMenu a:hover,#header #headerMenu a:hover{text-decoration:underline}header #heading,#header #heading{float:left;height:75px}header #heading img,#header #heading img{height:75px;width:300px}header nav,#header nav{padding:0;margin:0;font-size:1.1em}header nav ul#menu,#header nav ul#menu{height:29px;padding:3px 6px;margin:0;list-style:none;z-index:100000}header nav ul#menu>li,#header nav ul#menu>li{display:inline-block;z-index:100000;margin-bottom:-4px}header nav ul#menu>li a,#header nav ul#menu>li a{padding:4px 10px;text-decoration:none;color:#fff;display:inline-block;height:21px}header nav ul#menu>li a:hover,#header nav ul#menu>li a:hover{color:#ffd5ba;text-decoration:none}header nav ul#menu>li a:active,#header nav ul#menu>li a:active{text-decoration:none}header nav ul#menu>li.sep,#header nav ul#menu>li.sep{margin-top:4px;height:21px;border-left:1px solid #777}header nav ul#menu>li.moveRight,#header nav ul#menu>li.moveRight{margin-left:40px}header nav ul#menu>li>ul,#header nav ul#menu>li>ul{z-index:100000;display:none;list-style:none;position:absolute;margin:2px 0 0 0;-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0;border-left:1px solid #ecab72;border-bottom:2px solid #ecab72;border-right:1px solid #ecab72;padding:0;min-width:180px}header nav ul#menu>li>ul li,#header nav ul#menu>li>ul li{position:relative;background-color:rgba(242,242,242,.9);background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAUCAYAAABMDlehAAAAIUlEQVQI12NgYGBQYGJgYPgLJ/6gciEEMwMDAyMzA1kAAB/mByD2JQzYAAAAAElFTkSuQmCC);background-position:top;background-repeat:repeat-x}header nav ul#menu>li>ul li:hover,#header nav ul#menu>li>ul li:hover{background-color:rgba(249,228,210,.75)}header nav ul#menu>li>ul li.hasSubMenu,#header nav ul#menu>li>ul li.hasSubMenu{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAANCAYAAACgu+4kAAAAa0lEQVQoz2NgGBRg8uTJO4BYhxIDVgPxHyCeDcQS5BpiAcSHgfgzENcBMRe5BgUC8U0gfgrEiUDMRI4hLEBcA8T/gfgCqZolgLgb6pUDQOxArEY5IJ4CxN9J0gjVPBeIf5GsEckA8jQOCgAAAvdRUNet20oAAAAASUVORK5CYII=),url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAUCAYAAABMDlehAAAAIUlEQVQI12NgYGBQYGJgYPgLJ/6gciEEMwMDAyMzA1kAAB/mByD2JQzYAAAAAElFTkSuQmCC);background-position:center right,top;background-repeat:no-repeat,repeat-x;padding-right:14px}header nav ul#menu>li>ul li a,#header nav ul#menu>li>ul li a{display:block;padding:4px 10px;text-decoration:none;color:#000}header nav ul#menu>li>ul li a:active,#header nav ul#menu>li>ul li a:active{text-decoration:none}header nav ul#menu>li>ul li a:hover,#header nav ul#menu>li>ul li a:hover{color:#5a300c;text-decoration:none}header nav ul#menu>li>ul li:last-child,#header nav ul#menu>li>ul li:last-child{-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0}header nav ul#menu>li>ul ul,#header nav ul#menu>li>ul ul{display:none;list-style:none;position:absolute;top:-1px;left:180px;-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0;border-top:1px solid #eaa161;border-left:1px solid #eaa161;border-bottom:2px solid #eaa161;border-right:1px solid #eaa161;padding:0;min-width:180px}header #SearchQuery,#header #SearchQuery{font-size:.9em;margin-left:10px}header .watermark,#header .watermark{background-color:#eee}#layout_PageHeading{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAA8CAYAAABfESsNAAAAOUlEQVRIx+2SuREAIAzDFELL/uOSFVLx3Mm1C8nnABaNDJq5WJzAVkZGZXyPMg7+jUwCIeNZmdcZC2pxCZOpoRNgAAAAAElFTkSuQmCC) left top repeat-x #fff;height:50px;padding:6px 20px 4px 20px;font-size:2em;color:#000;line-height:50px;position:relative}#layout_PageHeading a{text-decoration:none}#layout_Page{background-color:#fff;overflow:auto;padding:0 30px 15px 30px;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}#layout_uiExtensions{display:none}footer,#footer{color:#777;padding:10px 0;text-align:center;margin:0;font-size:.9em}footer a:link,#footer a:link,footer a:visited,#footer a:visited,footer a:active,#footer a:active{color:#777}footer a:link,#footer a:link,footer a:active,#footer a:active{text-decoration:underline}footer a:hover,#footer a:hover{color:#4f81bd;text-decoration:none}p,ul{margin:0 0 20px 0;line-height:1.6em}ul{margin:0;line-height:1.6em}header,footer,nav,section{display:block}form{display:inline}img{border:none;padding:0;margin:0;vertical-align:bottom}code{font-family:Consolas,"Courier New",monospace}hr{border:none;border-bottom:1px dashed #aaa;margin-top:15px}a:link{color:#335a87;text-decoration:none}a:visited{color:#335a87}a:hover{color:#4f81bd;text-decoration:underline}a:active{color:#335a87}a.button{display:inline-block;padding:4px 10px;margin:2px;border:1px solid #875a33;background:#db761d;color:#fff;font-weight:bold;text-transform:uppercase;cursor:pointer;white-space:nowrap;text-decoration:none}a.button[disabled],a.button.disabled{background:#9e9e9e;border:1px solid #696969;cursor:default}a.button.alert{border-color:#900;background-color:#e90000}a.button.small{padding:2px 5px;font-size:.9em}a.button:hover{border:1px solid #696969;background:#9e9e9e}div.actionBar{margin:0 -30px 0 -30px;padding:10px;border-top:1px solid #e5bd99;text-align:right;background-color:#f2f2f2}div.actionBar:not(:first-child){margin-top:10px}div.actionBar:last-child{margin-bottom:-15px;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}h1,h2,h3,h4,h5,h6{color:#000;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-weight:lighter;font-stretch:condensed;margin:0}h1:first-child,h2:first-child,h3:first-child,h4:first-child,h5:first-child,h6:first-child{margin-top:0!important;padding-top:0!important}h1>a:link,h2>a:link,h3>a:link,h4>a:link,h5>a:link,h6>a:link{text-decoration:none}h1{font-size:24px}h2{font-size:20px;padding:8px 0 4px 0}h3{font-size:18px}h4{font-size:14px}h5,h6{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-stretch:normal;font-weight:bold}table{border:none;border-collapse:collapse;width:100%}table td{padding:5px;margin:0;border:none;vertical-align:top}table th{padding:5px;margin:0;text-align:left;font-weight:bold;vertical-align:top}table.none{border:none!important}table.none tr,table.none td,table.none th{padding:0!important;margin:0!important;background:none!important;border:none!important}table.genericData{border:solid 1px #e8eef4;border-collapse:collapse}table.genericData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}table.genericData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}table.genericData>thead>tr>th,table.genericData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}table.genericData>tbody>tr:hover>td{background-color:#e8eef4}table.genericData>tfoot>tr>th,table.genericData>tfoot>tr>td{background-color:#e8eef4}table.genericData td.id{text-align:center}table.genericData td.id a{padding:0 6px}.smallTable th,.smallTable td{font-size:.9em}.dataTables_wrapper{position:relative}.dataTables_wrapper .dataTables_filter{position:absolute;height:20px;margin-top:-20px;right:0;font-size:.9em;-moz-opacity:.3;opacity:.3}.dataTables_wrapper .dataTables_filter input{font-size:.95em;padding:0;height:1.4em;width:150px}.dataTables_wrapper .dataTables_length{position:absolute;height:20px;margin-top:-20px;right:200px;font-size:.9em;-moz-opacity:.3;opacity:.3}.dataTables_wrapper .dataTables_length select{font-size:.95em;padding:0;height:1.4em}.dataTables_wrapper .dataTables_showStatusClosed{display:block;position:absolute;height:20px;margin-top:-20px;right:320px;font-weight:bold}.dataTables_wrapper .dataTables_paginate{text-align:right;background-color:#e8eef4;padding:2px 4px;font-size:.9em}.dataTables_wrapper .dataTables_paginate a{cursor:pointer;padding:2px;margin:0 3px;color:#335a87;background-repeat:no-repeat;-moz-opacity:.3;opacity:.3;text-transform:uppercase}.dataTables_wrapper .dataTables_paginate .first{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAKklEQVQI12NgQALGUe0SQPwfnY0iCcVwNjZJFAxT8J+QAvwmEHQDPl8AAAYqTAY6Jng6AAAAAElFTkSuQmCC);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .first.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAKklEQVQI12NgQAKxsbESQPwfnY0iCcVwNjZJFAxT8J+QAvwmEHQDPl8AAEm8TIFT3+fIAAAAAElFTkSuQmCC)}.dataTables_wrapper .dataTables_paginate .previous{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAGMo9olgPg/XkmsCpAlcSn4T0gBfhMIugFdEQCMVyg5CPiC8wAAAABJRU5ErkJggg==);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .previous.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAH6+vokgPg/XkmsCpAlcSn4T0gBfhMIugFdEQDzojUdMBAGjgAAAABJRU5ErkJggg==)}.dataTables_wrapper .dataTables_paginate .next{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Mwjmr/D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwCZ1Cg5w6CPqwAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper .dataTables_paginate .next.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Po6+v7D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwDwPjUdLMfQ6AAAAABJRU5ErkJggg==)}.dataTables_wrapper .dataTables_paginate .last{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAK0lEQVQI12Mwjmr/D8QSDECAzIYDqCBYApmNTQE6liCk4D/JJuB1A05fAABJ/EwGJKVDGAAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper .dataTables_paginate .last.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAK0lEQVQI12OIjY39D8QSDECAzIYDqCBYApmNTQE6liCk4D/JJuB1A05fAACQykyB48rZCQAAAABJRU5ErkJggg==)}.dataTables_wrapper .dataTables_paginate .paginate_active{font-weight:bold;color:#db761d}.dataTables_wrapper .dataTables_paginate .paginate_button_disabled{color:#ccc;cursor:default}.dataTables_wrapper .dataTables_paginate .paginate_enabled_previous{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAGMo9olgPg/XkmsCpAlcSn4T0gBfhMIugFdEQCMVyg5CPiC8wAAAABJRU5ErkJggg==);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .paginate_disabled_previous{color:#ccc;cursor:default;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAH6+vokgPg/XkmsCpAlcSn4T0gBfhMIugFdEQDzojUdMBAGjgAAAABJRU5ErkJggg==);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .paginate_enabled_next{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Mwjmr/D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwCZ1Cg5w6CPqwAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper .dataTables_paginate .paginate_disabled_next{color:#ccc;cursor:default;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Po6+v7D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwDwPjUdLMfQ6AAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper:hover .dataTables_filter,.dataTables_wrapper:hover .dataTables_length,.dataTables_wrapper:hover .dataTables_paginate a{-moz-opacity:1;opacity:1}.dataTables_wrapper table>thead tr>th{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAD6CAYAAACoLMeFAAAAdElEQVRo3u3bOwqAMBAFwBwjh/CUluKRhfVTiil0UYjMwJLqLfmUYUuBtw3jUreKfc2E43aTi/C9Jo3wUR4WAAAAAAAAejBPc90q9jUTjkdNTuGjPj9/bgfpO0i/AgAAAAAAAPQnPZ6YHpBsNEnNefrt4+9Wmn6nW/cZ1MQAAAAASUVORK5CYII=);background-repeat:no-repeat}.dataTables_wrapper table>thead tr>th.sorting{background-position:right center;cursor:pointer}.dataTables_wrapper table>thead tr>th.sorting_desc{background-position:right bottom;cursor:pointer}.dataTables_wrapper table>thead tr>th.sorting_asc{background-position:right top;cursor:pointer}.dataTables_wrapper table>thead tr>th.sorting_disabled{background-image:none}span.icon{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;cursor:default}span.icon.JobStatusClosed,span.icon.DeviceStatusDecommissioned{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACg0lEQVQ4y3VTTWsaURR9M35EDWqMxhBoUIrFD0h+QIuIWLPrrkhWiuAiuHCRIsmuaaEEau0yUFDX/oIuQjZBLBbsQhtSqEiLIFqDiVFj/RjHnvdoili9MMzMnXvPOXPufRyZH3KNRuMwGAyboijy19fX1Xa7/RX5wWwhN/u+tbW1HwwGw06n86Fer2fJZrNJstlsJZVKfSgWi2+REv4DkEgkBjSmo9GoB+zk9vZ2LJfLJRzHkeFwKOp0Oh45Eo/HPyUSieeCINSmAWSBQODjwcHB01arNVpaWpLRRlbw9z6ZTMhgMBAAJI3FYp+TyaQb6d/s6/b29v7x8XG83++PZAhaPN14HzzPk/F4LIBAenh4eFQoFF5xSMojkch3h8NhAgBrvG+eF/QbAAi8qJ+cnDziIMkWDoe/3d3diSDn4QVjWhSYChmNRiI84NPp9GPOYrF43G73GXUappHl5WUilUrnNkM+9YHdaS0ms8vZbDaP1Wo9q9VqRKFQkNXVVQIlcwHATKCUqaC/Uq1Wdzmz2bzp9Xor+Xx+AukcBVikALLvAUS1Ws1XKpUn1AOJ3+/vnJ6eKldWVphBVB71YXoSlBX7QKjRdB+wcL9yuZyFVezs7LxwuVzvMpmMCJm8Uqkk9KJKKAj9Z9rY7XYpkADVUsh/DdKXDGBtbY3b29urgn2jXC6LaOQhkahUKqaEGocFI71ejy0SgPIgc5VKpd6/gZtMJnkoFPppNBo3rq6uCA7SRKvV0j2hkicwmT03Go0v5+fnz7AHtXmHifh8vihMPbLb7SoAsNzNzQ25vLxsg/U9tu/NxcWFsOg0soBBkvX19Qc4jRaw8p1Op1Kv139gUsPZ2j85BjJj8dYkIwAAAABJRU5ErkJggg==)}span.icon.JobStatusOpen,span.icon.DeviceStatusActive{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACs0lEQVQ4y4WTXUiTURjHJ9Wi6PKc9z3vtnebm9vcNNM0v2fldKI2tS7SyqRMceRXS8qlhjgpUjQ0KlAsow+yboq6iKwb+wCjvOkqLxKVsC686UIL5/bvrMIwZj3w48Dz/5/nOTycR6EIE4QQpWgm8YZM2WXI0BSLFpLEcxsV/wtuirDtiWyqfXLw48BCF+5jEPcwgMvfOuEeLZ2xuSJbuGd9+MuMkLze5Ofn4cElnEM32pb74EM/OtGL9sANXOFZD/L6k18TiUh/d96Q3RX/rBlH4V4sW6pfrkBj4AjqgxWoRTnqcBjHg4dQ832//wyqsLtn2zihZNNKAWuR9mT5fDaKpuxLrtksuGY4/CyczUTBbMYKrk92FE/v9JfNO2Apkdt/XqYiVdpvGqcTJnRIHItC4gsTxxyWpJdm7HhlQeKEESnX9Z+pRLcoVFYxOuWhBuYhFjAMizDcYjDc/gdcNw2zwNZhBk2CmKaI3KV2JF5VQe8VoG6jUF+gUPWsQRfXfRS6Dgprr4jIHFaqMORqHNu9euhKBbByCuYhEJvDwzwUUjWFzDHX8QL5vIAqnckZQ/wF+4SgtJcbqwgEd3hCmnSAQC6jgZgGCXKOmK4g0WSdfUS9yJxcLOPGCgJazanhuH9T8ysX0lTcE/Im+DRfhBQ+xFDE1mmb4kYF6OtpgB3jxjre7TSnlZtbBai8IlijALGSQFNJ/XF9DNG16o4/HymWROQ9ss2ljQkwdgsBmQ9MP8gQdUcDy10dTNe00Pbwqfuo3zggIKlf+5Zm0c2rfiNNoUrnU9ucc0oN+QFB+rg1mP8hFfmTach4ExsURwhMjwlSh7XvWIEgrblQMS2GU65J68IJFOIiGjiNqA+4UPg+9mtMp9xOnGss06rdyKPrpEpRJ3tVDt1ZlivV8oUuocpw3h+OzGWzs/zxOgAAAABJRU5ErkJggg==)}span.icon.JobStatusAwaitingWarrantyRepair,span.icon.JobStatusAwaitingRepairs{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACwklEQVQ4y4WTX0jTURTHJ5pR+Hjv7/ebzqlZ6kzJhbj8N6dzmqb5J3NWOtJmav7LTBNTbNPAlVY+FGyYk0ryJfr3YJk+WAlGZlQECWkqYT340oMW6vbtmtE/Zh74cC7nfM+53HvPFYkcGCHElXj7hXjKo1Il8sg04uMfymIbResZEzn5qFKqD1r6Jkwv52GZAczTQPPYV2gt/dM+qtR6pnFxXMwJJKy6faDqDXB2HGgYw7LxLStmNL2C7fIHYCUXVtMxTHix+N+dN4RUmh7ljwI5fQuLuoFlHB60QTdoR+4gkMc4NGBH9oNvS/oxYEdl2wihdNOvBtLYvSfi7s4h2jq5qLTOQGmdxoqP6ppB5B9Ed39ETPfUkvrWHDxj05t+FFOOd/VtvDbl1foCWw1D2GZ8DD/DGjQ/gX/LU/gyrXdt1yfKi91EvK8sQGK4A6G408YftTJ/nXHjP7B8idUmHLeCl8nDRR6hKrV71RVwGXWgaQ2gWa2g+9sck2UCzTSytQG8vh2CIl4rkig0am9dHTiVFjQyFySxCiTplENoQhVobCGophB8RhmEiCStSNge4ene0AlOmWknigyQGD2IqtgxK7moA6DKHJs4uwJ8aHyEiEgDnD1aeheIPAEkMoehA1EWMnERo/gnRauxlVwU0zCtRG/8TP0VbqvPuK+smjvTD5pSbiOqIyBxZSC7a0H2nAbH4JPZETWVrEkBaFzBknDsEjzSSw2/B8k7yCnw/L1Z7uIQuLxzNprTBiHfAklJD7xKb0KqvwqBxdgFLnGFZkjLO57TQOXmv6aR+ilcAy88nPXonQQpvQ2ZacS+y/wO4eZxBJme2Ul+L8jJ+5DWWUe5ncniNT/UFm19jaxnfH4PG+uKCaDyPZA6bENQ1+svnrrmJhKc4LL+rwxOdOaVBV7uKXVqIbNRw6tL/Yk83dWR9jsKtpCP82kfBAAAAABJRU5ErkJggg==)}span.icon.JobStatusAwaitingDeviceReturn,span.icon.JobStatusAwaitingUserAction,span.icon.JobStatusAwaitingAccountingPayment,span.icon.JobStatusAwaitingAccountingCharge,span.icon.DeviceStatusNotEnrolled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACyElEQVQ4y4WTWUhUYRTHRyqj6PH77r2j46hZbgxkEOM+huPW4lqkuUzuVm5M5jg5iqm51RgpWSnagKbZU6HZovWgFSklhEbkg6JS2oNhPTiaOvPv3gKpGOnAj+9wzv+cDw7niEQWjBBi7exEPPy87MJ95ZJIFydygI9tF/3PeJHVUaVjweOu+Mmlz3XASgvwoxnLc5Xovxc7Ex7kWMxrtlos5jhC6nXyZzCqAVQBxpJ1rFcApkpgucwENPHN1Gi4KH8lFhPxvz9vq9N4DGApBca5uNX1ryqYFpNhXlQB3xJ5kng/ASvzJ9awnA69bt8wpWTHRoMIpfTcwlggpkb9V2fHFZgZU0B4Z8f9MDvmu8Gn9/6YfhewtvBBiahgu7JfxSxLrdtrnaZHB+wx2LsHQw/3YqjP2SIveF4+csHocyfcrnGYF4vpLpGbM+v6oEmC1qucyXCdRcctDndaNkfIGxp57RUO+2Wst+igj63yRqkNtHkMSjQUtRUU+hrL1F2iqNBRlBdR1OtYBPlysaLgAIlSm+mA2AgGifEU6lyCovOWUedRZKTwJFHkJLI4FMA38PHi7Fp1NogJY8zR4QTpKQSnMy0j5E4eJ4iLpqa8BDGCFKyPyNWVbOmusjWGBPKJYwSqRIKMNIKsDL4o6zeCL8SEXFwMgaCtyJV88ZTzQxQsRyUt6G9nkJtKTWkqgpyzBJoCAp2W5wIDrYZFfg6D1FMEqQl07Voxh2yVbfnGHshkxKqnyX1usI3B5VLGpOeH1dLIobNVgrsGe7TdlEJfzQkDXGvWM2jQSd8oFHTnX9vo6Umtn7a6z0312OJ+F8HwEzfzx9demBjxxsiAzNzdSdDbQWColr49HMaINz2oYvXuwok+tyVMHQEW8njyYZoMx1iv7HtloV1ZSMgmx/SnhYaSLanJrL220EZZquGCs8+wLpFRxNqS9ifnTKmvqTT0WwAAAABJRU5ErkJggg==)}span.icon.JobStatusAwaitingInsuranceProcessing{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACzElEQVQ4y4WTbUiTURTHJ9mi8OO9z/NM59Q0p2ZkEJrv1jYly7Q3Z2XLmWalqcvS+ZJDpfCVNEhwacO0NAqK+lBqQWaBkfZBiGaUqIm9+cVQC+ezf88MjGLigR/3cM7/3AvnniMS2TFCiNiLeAcEu4bFBUlD472IfKsQWyNayQSRg9Jjd97tw48+fq2axYIR4JuAbxU/cVfdPabyiCsSNI52iznCkdLAuicWHYCLgKUECygX/ApgwQAeVwGrkKsIbHgpIRLJ/y+vLgyo6rFoge9Jc/M/NAuYSeExo7FiNhmYPQrMHLFiKvGXhU8DSjfX9lNC1y5doJLtOWveMYWh8JF5c8Q43kWMwXYOh43DHPqX9+ETeBs5avmgmEKMa4JhsZilrLjW88Zor9sgHnv1omvDc3R7L0cfeuQv0Oc5iBr3658lVOIkkrO+PkbpfVzhmvkm1oQWrg0mrn1ZbPlGzsRf5kzYxG4JFoW6RCnKnBuhY/QopCW4RCtRQ2vtUkmrYKDlKKZlMLB1COOUalGUVKU45a5HAqNGMk1GLtGhgBTYRUd1SKPpSBE4xmZhO7dTLQrmQlwNzs2IZfZZ48lepJE0nCQZdrHlEskh7KdJvEaSjUhWGSLyIfJV1S6dc0oSjYMkCRqiQbogzCAnhKI/2HxbzJY7IGhs2lxp+ZcgGuS0+BNaWVZeB9ONdHqG15LjyCKZyCf5KCbFKGaKoGcLkMPkIJWkQkNTLaVcPbQumWVLc+BPNjoY/R5MtjG9KGOq+UqhYY2cEa3Sm2h368A1WQuquVpbAy31TBMMsobXETR83T/TGEQDxa1+XZNdLiO4Q+7hqW+/dWCbGW+Ch/HM/5W1k9xCJ3mIaplpIJaJlSy7UOfWF53v8R2endgFTGcL5ACf4nh0+Q9N610rDNFE6bjiVsYQ1apUVuumd9YrCrkLqkz2tDyBxIntaX8D6jqsQHV9jFEAAAAASUVORK5CYII=)}span.icon.success{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB4klEQVQ4y2P4//8/AyWYZA0ckxlYyDaAcy4Dt0SZ0FnBWP7tJBvAOZuBW7xC4MLe67v+x84L+8/ky7CFaAM4pgE1lwtc3Hl92/+o+UH/HWda/Q+c7Pmf0ZVxE1yRyFJWYZElbKbomnnnM3CLlPNd3H5ny/+oTYH/Reax/Refyv1fKFjgLrcHiwBYEftkBhGrfpO3LpPsf3LNZ3CEaZZcy8UjWS94cfvjzf8TjoT+V90u+l9hsfB/Vi+m22xuDJxgL4i2cop59ru82XV36/91t1b+N+3X/ya+mt1Gaaswm1yr+MVVj5b+z7qQ8N/8pMZ//Q1K/1l9mO+weTBwwAORPYh1SdqW2H+VF/P/L74/9//8+zP+azQrf1GtVXi04OnM/yW3M/973rD8b3vI8D9bOPNdjjSIzSixwOHPvsdgocrP+OvB/yc+6fg/7Wnf/6Wv5v+veV74P/K513+fa/b/uZM47grOZOLEmZCY/Bl3G2xU+Rn30v9/y/uK/y2fKv+nf434HwY0QCCH9672XhkOgimRJYRxr8N+sx/5/xL+V/zP/J/6IeK/WJHQXc9bVpxEJ2X2CJbd4af9fja+K/+vVKJwp+hbCgfJeYE3nmufcoP82Tn/J3CSnZnSf0Sy0iQ3omMAFlyLENN9tK8AAAAASUVORK5CYII=)}span.icon.error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}span.icon.warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC)}span.icon.information{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==)}#layout_Page>div:first-child.jobTable{padding-top:30px}table.jobTable{border:solid 1px #e8eef4;border-collapse:collapse;table-layout:fixed}table.jobTable>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}table.jobTable>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}table.jobTable>thead>tr>th,table.jobTable>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}table.jobTable>tbody>tr:hover>td{background-color:#e8eef4}table.jobTable>tfoot>tr>th,table.jobTable>tfoot>tr>td{background-color:#e8eef4}table.jobTable.hideStatusClosed tr[data-status=Closed]{display:none}table.jobTable td.id,table.jobTable th.id{width:45px;text-align:center}table.jobTable td.id a,table.jobTable th.id a{padding:0 6px}table.jobTable td.status,table.jobTable th.status{width:220px}table.jobTable td.type,table.jobTable th.type{width:45px}table.jobTable td.device,table.jobTable th.device{width:100px}table.jobTable td.user,table.jobTable th.user{width:230px}table.jobTable td.technician,table.jobTable th.technician{width:80px}table.jobTable td.location,table.jobTable th.location{width:200px}table.deviceTable tr.decommissioned{background-color:#ededed}textarea{min-height:75px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif}input[type="text"],input[type="password"],input[type="file"],input[type="number"]{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;border:1px solid #ccc;padding:2px;color:#444;width:200px}input[type="text"].small,input[type="password"].small,input[type="file"].small,input[type="number"].small{padding:0 2px;width:150px}input[type="text"].discreet,input[type="password"].discreet,input[type="file"].discreet,input[type="number"].discreet{border:1px solid #fff}input[type="text"].discreet:hover,input[type="password"].discreet:hover,input[type="file"].discreet:hover,input[type="number"].discreet:hover,input[type="text"].discreet:focus,input[type="password"].discreet:focus,input[type="file"].discreet:focus,input[type="number"].discreet:focus{border:1px solid #ccc}select{font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-size:12px;border:1px solid #ccc;padding:2px;color:#444}input[type="submit"],button{padding:5px}input[type="submit"].button,button.button{font-size:12px;padding:6px 10px 4px 10px;margin:2px;border:1px solid #875a33;background:#db761d;color:#fff;font-weight:bold;text-transform:uppercase;cursor:pointer}input[type="submit"].button.alert,button.button.alert{border-color:#900;background-color:#e90000}input[type="submit"].button.small,button.button.small{padding:2px 5px;font-size:.9em}input[type="submit"].button[disabled],button.button[disabled]{background:#9e9e9e;border:1px solid #696969;cursor:default}input[type="submit"].button:hover,button.button:hover{border:1px solid #696969;background:#9e9e9e}ul.none{list-style:none;margin:0;padding:0}ul.none li{margin:0}div.form{margin:0 auto}div.form>p.actions{text-align:right}div.form>table{border-top:6px solid #005fab;border-left:1px solid #005fab;border-right:1px solid #005fab;border-bottom:3px solid #005fab}div.form>table>tbody>tr>td,div.form>table>tbody>tr>th{background:none;border:none;margin:0;padding:8px 5px}div.form>table>tbody>tr>th{font-weight:normal;text-align:right}div.form>table>tbody>tr:nth-child(odd){background-color:#eee;margin:0;padding:0}div.form>table>tbody>tr>td.details{padding:0}div.form>table>tbody>tr>th.name{width:150px;text-align:right}div.form>table table.sub>tbody>tr:not(:first-child)>th,div.form>table table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}div.form>table table.sub>tbody>tr>th{font-weight:normal;text-align:right}div.form>table table.sub>tbody>tr>th.name{text-align:right}#pageMenu td{border-right:1px dashed #aaa;width:33%;padding:10px}#pageMenu td .pageMenuArea>a,#pageMenu td .pageMenuArea>h3{text-decoration:none;font-size:1.2em;padding-left:18px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABxElEQVQ4y52TzUsCQRjG99Ql6FBQeImKDv0XXUQCTyuRZmCWCubH7vr9tX6CoBcxUVHUUDwsHjpEXQPPhSF46VwX/4EgInx7ZoNuUbrw25ndmXnmed93huP+eCwWy7HL5Spxiz5ms1lIJpPPOp1uYyEBg8Fg63a7lM/nx1qtdm1uAZ7nT2u1Gg0GA8pmsw96vV4zl4DJZOKr1SopikL9fp/S6fQYous/EyRJ2gcnPp9PDAaDcjgcbkej0VtwH4lEHguFwku9XqdGo0GdTkclHo8/GY3G73AymYwLqhVwncvl7orF4rBcLk8qlcq01WpRs9lUF/V6PdUFC4X9TyQSI6vVus35/X4rHORBWxRFBQzBBEwxRgy4IjhiO1MqlVLbWCxGXq93xOF1AUpAATdgKAjCBEzRJ7fbTXa7nWw220/rcDjY4g+n0+nnEOcR1GNQvYStK9R8iHAm4BVZf0P5ZkwEgmwRwRlz9IlWVHOAU7YElj0ezwomrGKiBmyBHXzvIrRzoIYSCASY/VkoFBL+XUZU55DlAE5JluV3uPXOdQ6QrDOWOAb6wtwnEaFKLOMot7TQXUAIB7AeXvg2YvdNVGTvt/EvEoULbtcvb5gAAAAASUVORK5CYII=);background-repeat:no-repeat;background-position:left center}#pageMenu td .pageMenuArea>a:hover,#pageMenu td .pageMenuArea>h3:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACf0lEQVQ4y32SO4/UZRSHn3Pey/8yszNy2RmUXVxDDKgFkYTYYaKx0cKGxm+hJGhljBZgYaFQW1phYWFCNH4GTfACCSa6KhFidl0GdtiZ//u+x2LEsCg+zclJzvmdqxx973umRfBOcN5x+9dN7lzfQoMjZWNl1Lw27IcTX1++ebpqI1QBbSI0EderUO7DzIiDGlGhpAw5MzVZttXRy3Ubx6UUHsTvEijG+rlj//jxlc/ZSLodTz5xZG1P+GL94rcvplw29EGB9Xee4r+QEDAjpVsJfW7l2NrMLq1/de3VnMvv90T0yttP8zD2HF6mjTpp5sZ4AvH46omDLxy55JWRFVsUOXT22vMmrIjIfq8sOZU1VRkLtAUbHBhW450De1cjEIOwHSObl69/c+OH316Spt7ws8f2P2NwtMDB6Kj6Qfq9qPucsDys3LhY4VE6GhVaBS2Jn57c96wjf3nzl61Tvtu8M7VSbpvxZzLr7Zj1N/8eoZYCCNGBF8E5qJxwN8Nd9cd7g/pTX02nDdBg0gNawRBZzFfMSAaTmWFmIFAMggr9qN082Sd+by0bIjziRJwTllR1KIsVd+qYtuKb7/4okqIhBZzCIGje2Ulnclc+8pNJ95lBUBWngheRCqgA7TBNUU9a7T5WDw5hELD5PJ/OZucBxMweesbRBz+TVU+5GC6qGI2TWem6M3mWL+RZopul3Z/4L5qAd7KklSdmo5unNylcuD9E/y/fzFO23LB/y2GeN0op58UMimHFsFx2d3D4/R/ZrgfceH20uELnCcjV4HirE/nQx4B4B6EgVUDbarGDx9+9QhDITc12f4gUAMOAYHKoF2lTtKuL9zW4Z8z4C2DFDQO2dDsSAAAAAElFTkSuQmCC)}#pageMenu td .pageMenuArea .pageMenuBlurb{font-size:.9em;color:#888;margin-bottom:10px}#pageMenu td .pageMenuArea .pageMenuBlurb a{text-decoration:none}#pageMenu td .pageMenuArea:not(:last-child){border-bottom:1px dashed #aaa}#pageMenu td:first-child{padding-left:0}#pageMenu td:last-child{border-right:none;padding-right:0}#pageMenu td .pageMenuArea>a.noticeboard{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACAElEQVQ4y6VTy65hURCt7f1oIkQnfAEx8wkmNyIGBPGK72DqC/yECDFoE0M/YMxQjO8V1/vN7lqlj3T3VCUrZ+86u1atWvscRW+GajabOhwO03q9loTdbiebzSZPwGw20+l0ouv1Sufz+QWn00nL5ZJUuVzWj8eDFosFxeNxUkqR1WoVoBh7vL/dbgKtNY3HYwoGg8/3lUpF7/d7ikQixGuyWCzkcrlEBdYguN/vdLlcCOd2ux21222az+fk8XhIFYtFjSTGqNVqUgB5hgIEFGCM7XYr8nu9nigWgnw+rzebDQUCAapWqy8CdAcQKDocDkKCETqdjijx+XxPApgB2aVS6R8jTSaTSDfmBxEIut2u7NFUZbNZIUDnXC4nBEYxpCPggeEDCAaDgYwnBJlMRgggL5VKyQEUg9AwETlcI4AYDocyvxCk02m9Wq0IPiQSCZEGAw0VxjVCAQhANhqNyO/3Pz1IJpMa7k6nU4pGo3LAKP47DBLEZDKhWCxGXq+XFDuvIb/f70sRABXo7HA4pACkIACwBlGhUBClqtFofLM0XygUkgSu8Hg8ktvtFpkwC+YhZ3zG2M9mMyj4UujAxT/r9foHd+ec1wXwVf5gFQ6Gmbs+uMmVv4UTE+1Y4ReP8avVan2q//8uPoyc5w8wAz5HzTgy9owtk95ef+O7v/NvnbVDH4UJh38AAAAASUVORK5CYII=)}#pageMenu td .pageMenuArea>a.noticeboard:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACcElEQVQ4T6WTPW4lRRRGT1VXV78fjwfbGhAjAQEBkCMhEREgkRGTMIJdOGdCEBtwxoiYhAUgfiREhsTYJAYhojF+fm+6X3d1Vd17CewdzCedDXw6x5kZL7Lw+IvH9urDh/S7LQ6IXaSLHbHriF0kNIE5JXIp5JSY80yaM91yxWazIVxcnHP+9A/+2hbeefd9Wka6NtO1A413OOdQNWZRihjVGn7/9TfePIq4piHgHClNvP3eh3z82ecsGs/BMrBqA6F1eAdFjJSF52PlKiW2s5IufmR175CgokgtbK+37G5memeMy47YFlrvAIeYsk/CZsiMReh3PZ0IKkoQEXIplGFg1+9pUHIR2rYhhADAOFeGKZPSTDXP8HzAlcxSlQBQa6Xv9+xu9jgrxEWmjQHXeFJWqii1VuY0I9bQ9wPLUhE1gkhFRRmGPdc3OxxCFyfwAVEwByKGSKHkQrGGaZxQFVQrwcwwE8Yx8d/1Fq8VGg+uoQke5xxmRilCKQUlMO5HtDPMjFCrYGrsU+bqZkTrTNu2xBjx3oMHE0OkUkql0pCyYlGRKoRaC2Jw/fc5f/7yPc4qMXZ473B3thmgZogISsPmn3P0rWNyKYTjkxPWB2v0p5/594en+MaTixIcLBcdAGKKqqGmmBoixisffEJoA+H1197Y5ppf+vKrr4ltYLFckqaJ9XrN0fHRrcp5Zppm8pxIcyLnwuXlJYf3718F4OjbJ09ePj09/cg5DrvYrh48OFl1sTtwzi2cd03bttrFWMYxpCb4oYv1KgT/HdizW1PgmWHfAHz66JED7t2xABpub5iAPdCfnZ1V7iJ2L5rz//8JgNlI5+OxAAAAAElFTkSuQmCC)}#pageMenu td .pageMenuArea>a.report{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEUAAAAiIiIkJCQlJSUmJiYrKyssLCwuLi4zMzM3Nzc6Ojo8PDw+Pj5CQkJERERFRUVHR0dISEhJSUlOTk5QUFBRUVFWVlZeXl5gYGBjY2NlZWVmZmZpaWlqampra2tsbGxtbW1wcHBzc3N1dXV5eXl6enp8fHx+fn6AgICCgoKQkJCYmJiZmZmampqbm5ucnJydnZ2enp6fn5+goKChoaGioqKjo6OkpKS3t7e7u7u9vb3BwcHExMTFxcXIyMjJycnKysrLy8vOzs7Pz8/S0tLV1dXW1tbX19fY2Nja2trc3Nzd3d3g4ODq6urr6+vt7e3v7+/y8vL09PT19fX29vb39/f4+Pj5+fn8/Pz+/v7///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD1JbRTAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAAALFJREFUGBkFwbtKA1EUAMA5d8+yeRC0SMBgYyq19P9/QgLaiJ2NXWADWdzHdSbqW621Vogo75LTBsAHqY4/oBQPlaQ5lDiPz3cIkuU3LF1/bRyRtIeI8+ppFyCZvoaXqe+vjWOQor02063uNiUESXtZXnMevm+Pp6AwDvPStNFfKiQl0mqKv4kgWbal6bIp60aQzOtlanNuuypIbvfD3MXYZYVkvy2xF8cIQfKJECJK8A++czvTNtPiyQAAAABJRU5ErkJggg==)}#pageMenu td .pageMenuArea>a.report:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB+UlEQVQ4y42TTWsTYRDHf/Pspkkb8rJpYwI2VKkUcyg0kmPvIt4MXrz25kkvnvwAfgA9SXLy4tF+Ay8eeqlgoSxELWqrMZqaZpvuZl8eDyWLTRpwYHgGhuc3/5lhRGtNq9XSWmsmfdJEBBFBKcXW1pYAmONko9Egn8/zP9ZsNuPYBNBa0+v1sG370g9KKUzzvFatVrugLlaQzWYpl8sopRARNt9u4DgurzZfc6tYRxA0Om5lCjAcnmLbdpwcGH02cjW8dsDO5x0MwwCgXq9fUBcDLKuAZRViBV+efqeYXCb52GA9X4sBkxYDXNfj4YslnKMRz550sY4yDH4P8dohu8buBQVTLYgIC+kFep2PFKSP5+c5a5sMewGpVZNqdj1WNjkDNQ4Spsn+3h6f3r8klQCVVhznXPh5Rurefew7t+luv5kN8P2A4x8fOHE8CBVqURNcdQmVwZ+vhzw/HfFtzpw9A6UEzCtE6SohiqgijHwXSQjt/i/mR/NkRv7sNUaRprRcZSE8b8e4qXEdB0kaWMzx4GxANpWcDfA8j1LlBklHCPyAYMklqoS4ocu1lMVqKslBGM0GdDpdVq6v4R7CqXdAbtHHS2cYjk5QhSLkPCTwZ8+gWl2j+WiAYRiIlNhXg7ha9O4uSilWLlljDGi1WlOnO/mOT/lfwF9Tu75p8aEVrAAAAABJRU5ErkJggg==)}#pageMenu td .pageMenuArea>a.noIcon{padding-left:0;background-image:none}#pageMenu td .pageMenuArea>a.noIcon:hover{background-image:none}table.subtleHighlight{border:1px solid #ccc;background-color:#ededed;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}td.subtleHighlight{border:1px solid #ccc;background-color:#ededed;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.field-validation-error{color:red}.field-validation-valid{display:none}.input-validation-error{border:1px solid red;background-color:#fee}.validation-summary-errors{font-weight:bold;color:red}.validation-summary-valid{display:none}.ajaxHelperIcon{height:16px;width:16px;display:inline-block;background-repeat:no-repeat;margin-bottom:-4px}.ajaxLoading{height:11px;background-image:url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA);margin-bottom:0}.ajaxSave{cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACEUlEQVQ4y52Su05UURSGv33mzDlzc1CpBBI7fAArTWjEyyMY7U14AzsLn8DagicwEk0kEBOjYoBCQmJlSKQTSMB4IsOcy15rL4uZkQBqwd/u7C//ZbmJianbXsP87Oyt6OGD+wXgLBh/U+ScqQW3vPz2wtr653xzY+1q3C+KztjY+FS323X37t4hSVL+p19ZxsLCK9rdywDEDgtJkqpZFPtKEAVRBdyJj2ZGmiYEM8zAl+UAYAaVrwgqiBk+rxBVnDsLCOZQMzQoGnQEMFQVCYG+D/jKo/IPAI4QDFVDvB8AwhCgIVAUQpEXqCrRKUAwQ9RwzhE0IF4GAAyCKFVZYeZod7r44eNpB41mg6OjQypf4UcOLChJmrK19ZWnTx7TaLSGJYL7U6RhQBzH9I96bG9/I0nT4whxvYbXGh8/rlPkfaLIkdbTYVkBCKgEolpE2miSpilpWhs5MMQLIQSarRYzN68zfW0aNWg3m9TrMQ6oxzEbm1/48GmdPM8Jw2OLDRDxHPUOabWazM094sXL1ywuvWP++bMTPZQivF9ZxXvBReXxjCICUUVVRgDs7uyxt7N7psjsZ0ZVVqh6LMSjFUKsqjHeI/EgV6/Xo8h7ZwC+EsQLoorZMIKXar8o+lm/t3+x3WnyZnGJmZkbTE5eYWVllfHxS6gqnU6bLMv4cfCdssg5IBkuNYghnFNuZOW8+g2XUFURWZwj0wAAAABJRU5ErkJggg==)}.ajaxOk{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB5UlEQVQ4y2NgGJyAiYGZQ4pVS8JUKFrCWDCCTYxFjYERKEoM4JRjMfOab3G28V3hv75/9f/7/tb/r3uZ/89xguEhVlEmbbyaueVZLUPP2X7P/h/9P+1H+P/Ub2H/U7+H/8/4Ffk/93/Mf+/dZm9ZhRl1sOtmZ+AwXyB/2/GW4X+78/r/HS8a/Xe6ZPzf6bIxmHa4aPjf5a7Jf50OyRNY9fPrsfkoreX+L7qI/b/UKu7/cuv4/ytsFPyvCMTyGwT+y67l+y+xgvO//BLu/5zyzLYYBkiH8vQJljP/5ypj+M/TzPCftweIJwDxRCDuBYq1M/znqmH4L1TP9F/Ejb0AwwCZMJ4ZPI7M/9m9gQpTGf5zFwE1VQJxNZANNJQ7h+E/ZzTQsBCm/6LeHCUYBoh4ciYLh7P+Z3Vg+M8RDFQcBzQoBWIYZwJQLIzhP6szw3/BQNb/fLasgRgGsOkyi6s2835gDwdqSoe4AGxzGYTNlQFxgUwhxwMmdUYurAEpEceToTSZ8z9XKVATMBwEpjP/F5zJ/J+nDcivYPgv180OdAF7BN60IJnFk6u6iOubxk6B/45X9f47XzP4r7lb+L/iHM4PQnEc8USlRrYAFhnZRoEK0xVKy0yWKy2VquUrZPNjFhuc+Q4ABEOzcbMMpzIAAAAASUVORK5CYII=)}.ajaxRemove{cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC)}.ajaxRemove:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#layout_Page div.hiddenDialog{display:none}* html .clearfix{height:1%;overflow:visible}*+html .clearfix{min-height:1%}.clearfix:after{clear:both;content:".";display:block;height:0;visibility:hidden;font-size:0}div.columnHost .column50{float:left;width:50%}.error{color:red}.alert{color:#ff5e00}.smallText{font-size:.9em}.smallMessage{font-style:italic;color:#666;font-size:.9em}.nowrap{white-space:nowrap}.code{font-family:Consolas,"Courier New",monospace}div.code{border:1px dashed #bbb;background-color:#fff;margin:3px 6px;padding:4px;font-size:.9em}a.smallLink{font-size:.9em}textarea.block{width:250px;height:100px}.checkboxBulkSelectContainer{margin-top:6px;font-size:.8em}.checkboxBulkSelectContainer a{text-decoration:none}.ui-widget .checkboxBulkSelectContainer{font-size:1em}#licence{text-align:justify}#licence p{font-size:.9em}#licence li{font-size:.9em}.ui-widget{font-size:12px!important;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif}.watermark{color:#888!important}.ui-autocomplete-loading{background:#fff url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) right center no-repeat}.ui-autocomplete{max-height:150px;overflow-y:auto;overflow-x:hidden;padding-right:20px}* html .ui-autocomplete{height:150px}.ui-timepicker-div .ui-widget-header{margin-bottom:8px}.ui-timepicker-div dl{text-align:left}.ui-timepicker-div dl dt{height:25px;margin-bottom:-25px}.ui-timepicker-div dl dd{margin:0 10px 10px 65px}.ui-timepicker-div td{font-size:90%}.ui-tpicker-grid-label{background:none;border:none;margin:0;padding:0}.ui-progressbar-value{background-image:url(data:image/gif;base64,R0lGODlhMAAWAPMPAO+cSvfOlPfFlO/FjP+9c/+1c/e1a/+tUu+ta++tY/+lSvelQvelSu+cQv/WnAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh+QQFBwAPACwAAAAAMAAWAAAErHDISauVwenNu9cCIo5kaSIGoa5s66rGKZ/pa78xkux87/u1mxD2KxoTweHNcGzykkqc0wmNtpjTY9W6wmaLhoJ4TC6bxd4v8Mxmp9XPtpz89gHu+Pydcej7/4CBfQx6hYZ5fIKKgoSHjoiLkX+Nj48MCpiZmpucmJSVh5edo52flQ2oqQ2ipK2eqrCxsqyupAuyuLO1rre5vqi0u5y9v7kLwrbFvsfIncTKsBEAIfkEBQcADwAsAAAAADAA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)}.ui-tabs .ui-tabs-panel{padding:.5em}
\ No newline at end of file
diff --git a/Disco.Web/ClientSource/Style/Config.css b/Disco.Web/ClientSource/Style/Config.css
index ca456c8a..45a54aba 100644
--- a/Disco.Web/ClientSource/Style/Config.css
+++ b/Disco.Web/ClientSource/Style/Config.css
@@ -750,10 +750,12 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
   padding-bottom: 5px;
   margin-bottom: 10px;
 }
-#plugins #pageMenu td .pageMenuArea > a {
+#plugins #pageMenu td .pageMenuArea > a,
+#plugins #pageMenu td .pageMenuArea > h3 {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90CDRcZMTlpMjsAAAKbSURBVDjLbZHBS2NHHMc/82ZeXpLaiNJHDylF6KEIGxFa0Jtdi4IFqfQq2P/As4f9D0rwplIwsDlZiofHStaTVQJCj+6a9SpKL3HhkTx5cZLMTA9uHov4Pf2Y33w/fL8z4vj4mHfv3vNUHz60ouXl5VmtNScnJ3eVmZkfn96ZqVRQj6P7HXj56VwAFAqFsenp6W+73S7NZjMRUH/iPwVqnwC8nJ2drU9NTb3I5XIDpVS6u7v7qlQqEQQBxWLxq83NzX+EEIUkSYJ8Pj+xs7Pz0+cAyuXyTqPR+F5KiTEGrTVCCHzfR2v99d7eXg3AGMPGxsZb4CPwWEEIAUC73ebm5gYhBKVSiTiOcc4RBAHn5+dYa9Fas76+nvXIEvi+jzEG5xyrq6vEcczV1RW+77O2tka73WZ/f58wDHHOZQBvNEgp6ff7hGHI4eEhSinOzs64uLjg+vqaWq3GYDBASom19vkEWmuMMYyPjxNFEUtLS1hrOTg4wBiD53k4554HeJ6H1pp+v59VaTQaWGuRUqKUYjAYADwPcM6Rpim9Xg9jDFJKgiBASokQAuccDw8P5PP5ZwHOOUe1WsU5hxACz/Oy3xlplCZJkmw3Apw2m81fx8bGEEJkFay12YuPDMPhkDiOvwP+/gwgXhtjTq21Yb/fTyuVysPt7e3PW1tbf/q+T7Va/U0p9b7VahW11vlOp3Pt53JtAOI4RimFUgohRG5+fv6Po6Ojf7e3twcLCwtucXHR1ev1NIqiN3Nzc6+klEUpJVJK7u/vEXEcE4YhgJBSfjE5OfnDysrKX4VC4ctSqdQCXKfTedHr9T5GUfRLmqb/DYfDBDB3d3ePgJGSJOHy8pJOt4vneQS5HABaa6xzfFMuUy6XmZiYyDz/AxHBRmZKLqH0AAAAAElFTkSuQmCC) /*Images/Actions/pluginDownloadIcon16.png*/;
 }
-#plugins #pageMenu td .pageMenuArea > a:hover {
+#plugins #pageMenu td .pageMenuArea > a:hover,
+#plugins #pageMenu td .pageMenuArea > h3:hover {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC4klEQVQ4jWWRTWhcVRTHf/fd+958JJMw+aDFaYNUtChNTDHYFBdNm4K0IEI3lW7ErZR2IWhKi0tba6gBMRAXhaYiiJskjRgENWlVEC3VJrGFgpaIaetMM515kzfzvu51kZmhxrM6i3N+nN//iLm5OW7eXGRznXfHpg8eGui/zwqLs4X8O9kTA5tn+np7UfX+dWB/vRcAyXSidXDHSz23dIrbqugCk5v254GLDcD+/v7dkzue3L4rpdJhlAi8qanZM52ZTp4xz5FN3u46efLN7xyTSJUqawk72ZL9eHx86HEAT+S2jU98fXenUAoT2sj1LSAiElKh11u3vDuxfNGXNVS0zsixga+AAlBXEGCwuPUwxa/l4ygrINWeYdW9x0rLHYK2R0z8+Qpx1EX64QHePrq76aEa0sqWRJHGijO8+Fobzqrk+z+uUWor0PeGQ3l1Owvvu2x19qGN3ggKsBokqRTVMKAnMcrVS6vca8/z48K3/H7jNx7cCVk4l0YXziNUhNGmeUETYCuFF2jKtQpdfMQvl6s8/fyz9HTs5OfxNXTpLVA+xoDWuvGs5huRlqTqx1RCTRz7BOWzXP9sFGMewPoEMuUTBxag6wD+C8Bo3GrEWk0QaMC2SIjTWEoiOkOMsfGqGidZxfwfIIw2mm/eO4g2gBBYlkCIRsQbzlqDY2mi8v2GQfOC+R+uXX01lWlHCIsojqDuqo0BDJbYiCsKA0rFwlPAF48DLsVxPG/FfnfoB15vX2/tr5WV4ZFTI5/Yymb0woUjtrIXl5cX0zU/TD4quXdtR/0DQLFYRCmFUgohhLN3cO8HV2a//Gnsw7FwaN+QGT4wbC5PfurNTM9cGdwzeEZKmZZSIqWkUqkgisUi3d3dAEJK2dLR0fHCy4cOf55OpTPtba3LgCmV3F1e1SvMTE8d9jzv7yiKXCDO5/MbgEa5rsvS0hKlchnLskg4DgC+76ONYVsuRy6XI5vNNnf+BS/0P9OBtw+RAAAAAElFTkSuQmCC) /*Images/Actions/pluginDownloadIconHover16.png*/;
 }
 #pluginCatalog #pluginCatalogHeading {
@@ -780,3 +782,70 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
   float: right;
   font-size: 12px;
 }
+#Config_AuthRoles_Show #Config_AuthRoles_Claims_Tree span.fancytree-ico-c > span.fancytree-icon {
+  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACgklEQVQ4y5XSXUhTYRgH8OkItViSri676CIIupC6kIjIrQTNtLbhMEOLmjGsi1CiJoULZmEpW4l5RDehkR/owJNF+3DLliMd6GDWcrFNyNEceAarZZuc7d8xSNQzgx54Lt6v3/vxvBwAnI3Z0NDAJQiifWJiImgwGOIkScasVuuMWq2u3Dp3LTc15HJ5Zk9PzzhFURh79fpTr7avv4voHns/ORkJh8NQqVTX/wmIxWLZW5sNBNGt3tgvrareYzQavVqt9nt5eXnetkCTosk4OkrGWh485G7dqfXR4yvMlSCVSs9sC3z2frFOTU0vp7ur2TJe4XA4oNFoKrcFZl0us9lsodIBk44PpSaTCXa7vSwtoNPpAsxqOJ1OBAIBOhKJ0PF4nE6lUjQzTq+srKR8Ph/m5uaSS0tLLSygsbFx1ev1IhgMwuPxIBQKIRaLIZlM4m+4XC4olUp0dna+YwEKhSLh9/uxuLgIt9v9B4pGo6Bpeh1YOx1TSuj1+nEWcPfe/cSsy4fgtzB8vgX4F34wADbF/Pw81JoOGEgbG3jeVppY9jVD2XwbN+ol+BURwdBfC1ldPaL+ywi5ZTgvuYibshJQ5nNsQFxWmHCTRzHWvR88XjaeKrmgPnJw8AAPFcKdzANkQCrIQn4+H3fEWWyg4MixuOD4IdDTeWiTZyB3Nw+Wrkx4BjOxj5+LW1XZwDAHJw/vAjdnr5kNFBSsSipr0asqwcKbQlyqLkH91bOgZk6DaKlgfuAFzOpOwN5xCnw+37kOFBcX7ygqKrpWU1P7kylPqrXtGdqf6DAwMIjhkZcYGrHAZLbBYrGhT0/ixdBoSiQSfRUKhRKBQJDDSffr/id/A3fSz48XbZuBAAAAAElFTkSuQmCC') /*Images/Actions/locked.png*/;
+}
+#Config_AuthRoles_Show #Config_AuthRoles_Claims_Tree span.fancytree-ico-c.fancytree-selected > span.fancytree-icon {
+  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACWUlEQVQ4y6XRXWiSURgHcJsXa4WNNuuyiy6CoAupixERoXXhmljuxaJiFrVA1i72cVFCOSMt8rNt2YfGO5g5Z1NstWW+c4ZBq4QpqMkEbZDSCObAMprjdf90sIjxsgUdODd/zvmd5zwPCwDrf/aGB7q6utgmk8ngdruzVqt10eVyTWu1Wuk/AXK5vMpoNPpjsRgGbU8/9fbdH/J4PAuRSARKpfLKhoBYLG595nTCaDSZVjPp6TPbHQ5H0mAwfBeJRHXrAp0dna9JcqCguX2H/Xd+S625aLFYQBDE8XWBd+8/TI6Njc+vzcfGX4nLX4FOp5OuC0wGAlS53NzaPPAm2Gi32+H3+5tYJEl+pigKoVAIPp+PnpqaosPhMF1uHB2Px2mv14vya6VgMKhhHGN3d/dSMplENptFIpHA3NwcCoUCSqUSKqvScZVKBbPZHGQEFApFMZ1OI5PJIBqNrkD5fB40Ta8AlcrUajVsNpufEbh+42YxHEkh+/UbUqlZpGd/lAH8WTMzMzDd64d7NMAMDOobi/OpHqh6rqK9jcCvBQncQzK0Xm5DPn0BJ4lz6GgVIkedYAaamxqK0dEDePl4FziczehTsZGLs7BnNwdiwRac4lejvp6La83VzABv/8FF/qG9oD/WQS/fhNptHEw8rEJiuAo7ubXACAtH9m0Fu2YHxQzweEuEVIYnaiFmvQ04f1aItksi5KaP4ZFGjDB5GG/7j4LL5YYYgZYW2c/yiJbv6h/A0EvC4RjGiOsFnK4J+KgABmyjsDufL0skki8CgYCoXOLz+TWrwG+kXMkgQ6yv+QAAAABJRU5ErkJggg==') /*Images/Actions/unlocked.png*/;
+}
+#Config_AuthRoles_Show #Config_AuthRoles_Claims_Tree span.fancytree-node.fancytree-selected {
+  font-style: normal;
+}
+#Config_AuthRoles_Subjects li,
+#Config_AuthRoles_Subjects_Update_Dialog_List li {
+  padding: 4px 0 4px 24px;
+  background-position: 4px center;
+  background-repeat: no-repeat;
+  min-height: 16px;
+}
+#Config_AuthRoles_Subjects li.user,
+#Config_AuthRoles_Subjects_Update_Dialog_List li.user {
+  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNIBmxLMwAAAKCSURBVDjLjZK/axNxGMafu9yvXO5X01yaBHtpE2N/DbbURRREF3URxEIFRx1VtIPi4CC46h+gi3OpOBdRqrOYCnZITZuS5EybNklz+dXLN7lzKAiJQX3h3R6e58P7vJTruuifWGKBjRiRZ6JPupXfybIsz79tWLVH6dRyq1/LYMAEQsGnDx7feZL8toVsJgtJVe6KPhEA7vVrqX6CWGKBiibiaX8wEMttZXBQ2IVXkqEG9L1quRrd+Pra/isBTdNM0dzlM6kfoAEIigafFgHt1UQ9avAAegzofoN0apmQtr3joSlwogQtOIaAMYlQfLqw9u6+9UfgoBswHPNJHlIhSBpEfwRqMAw9MvRlkHagAbHJG8Xvb4mKBg/nhSAL4Fjn1SAtNahGAJiYWvyohYyLodgsjmrF9dXlh3P/TXBq6uYYrwyHGZZDp7GLfTOjxhILE/8kGI/fuMBy7BIvqVcCxiQ3HBkFXAclM4eSudUhR40PpN16Ccd5n95ccXsILl1der54e3FN1qPXBDnAEdtGvXKIRrWGThdQAgYj66OXlcCJVc4rveghGI9dH56Yn0+OT8+M5nNlsIIPFM2i61BwuoDrunBIB227iQ5polE2d8q5zfPpzRWTAQBBUkKVQzfo3atj9twsCHHRaHQBz3FKp+2gbXdw1GyjXrHgYfiwVcxGAZg0ALRatZOCT+IJseFSLAjpwsO4YOnj9QoUZIWFHpbRqhXgkDbfdamZ369slX+mdjPrn+tW5Ix/xBA13Q8PTaG3YQqVYgX7uUyzXsonqyVzo6cFVZ1jANrwqfrZkWj8tKaHDF6Uh2iapgixLat0kC9sp75X93NrgLNdrSYdAPgF6h0J0E7J5qMAAAAASUVORK5CYII=') /*Images/Actions/user16.png*/;
+}
+#Config_AuthRoles_Subjects li.group,
+#Config_AuthRoles_Subjects_Update_Dialog_List li.group {
+  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNJ4fVuW8AAALmSURBVDjLpZNJaBNxFMa/mUyWmTSZJM02bRpta7W1VrErBRsqCIriwV0QFQRBXC6CngRP4lGKG9IiVrxYBEGwKnhwQWtqpBate0pptUmbtEkmM5ksM/P3VNH26Du9w/f93uPxPooQgv8pZqFxtjg7eA9/UtM0TkpLj1NvU71/Cw9vrOpiLYZTJU1T1QIu9z+fGgIAekHA2rgtNy/27vXXeLuNJmb34klOF9va3BbqNtusIZrC2SUbWO3s/msPrphEUXZZXVxjx9YDB3h62bHJX/EZay56emun7Ujz5v2eoZGXcPCm+SUAMSOXIqMfEFxXjmKSd4f82+60N1Tg3Pk+sP5ViE4NypcuHEVrwAtDqaQuATCMIeKvKm9avtaL3BgXv3/rYcWArhh5TyUI5/eZCvYvATc61ghuCJ66uwu+PzewONjjcjonT7yZJdF3qRMgJGVzeSDUtaG6ZWNUKjjO6ERFPK8rA5HIjX8Ay3fWtljspr6a9YLFG3RTRUf8BBfQFL68Cg6hQjfGnuSFithVl4HDr9icOZZOXN+3ubIdAKiukxsOen387SSScPpsoBkaBU3Gz6cUmKlO2Jws9qwIg9bicFjsINCQURTMSyrGU9IhRjHK3YGmGrQL9cgTGZlkHiOP0jCLK+BbuRo5OY37b/zYWW1AQ4cXRNdQUhWIiggN0yFanMlSqUwGpjIAYhnUcAjKp2YYKQ9KOgFoDpKnCT3T63BpkIXZ4YOVr0RC0jAxkzZThBCUd3oaAw3OVnOufrtg2bEr2BBEUWVQUgk0naAglyBJOeiJH5m19EBPtpiZHJlIhF+Pzn9kAGBuKDEGYKy2/mDA20l22d1u5JUiQHQAAOUzYnYqju+Tmr0vQvckZ78ufSQAmJ/91j/6LE2L6fim4Mr6OrOFtQLQs5ls6svwi+FYdPSeWtSzf3uoxWnk+fVOzu5uE6rr1rgDNS5dU7X4xI/p2Pjn8Fzi1fvFGaH+N86/AQJNOrMW5kkPAAAAAElFTkSuQmCC') /*Images/Actions/userGroup16.png*/;
+}
+#Config_AuthRoles_Subjects_Update_Dialog {
+  display: none;
+}
+#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_None {
+  display: none;
+}
+#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_ListContainer {
+  height: 280px;
+  overflow-y: auto;
+  background-color: #fff;
+  border: 1px solid #8db2d8;
+}
+#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_None {
+  padding-top: 15px;
+  display: block;
+  text-align: center;
+}
+#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_AddContainer {
+  padding-top: 10px;
+  padding-left: 10px;
+}
+#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_List li {
+  cursor: pointer;
+}
+#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_List li:hover {
+  background-color: #e8eef4;
+}
+#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_List li:hover span.remove {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC) /*Images/Actions/removeSubtle.png*/;
+}
+#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_List li span.remove {
+  margin-top: 2px;
+  padding-right: 6px;
+  display: block;
+  float: right;
+  height: 16px;
+  width: 16px;
+  cursor: pointer;
+  background-repeat: no-repeat;
+}
+#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_List li span.remove:hover {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Actions/remove.png*/;
+}
diff --git a/Disco.Web/ClientSource/Style/Config.less b/Disco.Web/ClientSource/Style/Config.less
index 17ca9e38..f94b8f4d 100644
--- a/Disco.Web/ClientSource/Style/Config.less
+++ b/Disco.Web/ClientSource/Style/Config.less
@@ -1,18 +1,15 @@
 @import "Shared";
 
 // Page Menu Extensions
-#pageMenu td .pageMenuArea > a.config
-{
+#pageMenu td .pageMenuArea > a.config {
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACsElEQVQ4y41T3UtTcRie3QaNRhKC/4SgN4KBeSGK4EAvuzChNZQSvJgXYldCV5tMiUzEDVuZ84M0P4OmpjO3lV+bs21nH2fnbGd69mFuMz/39DunFsUadODh/Hj5vc/zPu/7/iQAJP9CQ0NDrU6nO9Lr9YnS0tKqfPdyAoODg7daWlpuqFQqYyyeQDKVQmdnp6G9vf26RqO5nZfAYDC0vZ2ezuj0es5oHEuGuQhCYQ7RWAznFxeYmpo6fmkwcCaTKfO8v1/5F4FMJrv26vUIQ7MhxOJxEYc8DzrIgItEcHB4iONkEql0Gqdn5xgdHfXnVFBXV6cNkATK54M/QMNm+4yPq2vY3NqCl8QSR0ci0icnqK6ufppDoO3t3fSRROe+C/PzCyKJ3e64CjLslZC0tLyMyMHPSjQ9PZbfBEqlslar1fIut/uS8vpgtdoQCoVB/NJSqVReWFh4b2FxkY8SW0JVQl88FHXZ19fHl5eXV0kqK++qInwU+y43duwOrJnXQVE+1NfLn2RVHigUAx7KC/P6BulLEH6aJs2No6LiTpukrKzsEcOy2HN+xfbOLlbXzOCjMajV6vdZgiGd7oswlZnZOdj3nAjQhCQQQElJiUJCPmlTU9MsGR1H/GJre0ds1uTkJEZG3nwzGo3HY+Pj4jSsNhu8/gD0w8OskCPk/rl5z1LpE7DE/wfTkjjGXWLJQRRpovhuZgYO5z4pP4iamhp1zhS6u7u572dniCcScHs8sFisWN+w4NMvWIi6QB4ku9LV1RXKIVB1dJjJX1iiDNm+TJjjRL+CqrAfRDlDFusqHDlAa2vrSg6B4KexsXGiqKjofnFx8WNSxalfbBYNyutNkvhDElfI5fIJ4W7ex5TFi4EBF0umwzAMmpubV/77NWZRUFAgI52eE0DON/Pd+wH6O+vw3ozilAAAAABJRU5ErkJggg==) /*Images/Actions/pageMenuConfigIcon.png*/;
 
-    &:hover
-    {
+    &:hover {
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACiElEQVQ4y41Ta0iTYRQe/ShCTCpJiiRIKvtTiUE3+2VRiMR+JEk3ktKMslmGJZVEf1aZhpFFS/uRQ7Jcq2jVKvKCu2S66eZl05zu5qd9m+5i28TtO73njYXyNeiDw/dyOOc5z3me9xUAgOBfUXYgNUv3+JxH/0Q0lZ22MjNWHS/R9agwsfZU+hL5hZ0vAi4HhLwsKC5lSBuLtsepbx9MignQ/bRENCC7xekkRYyx4brf6zCB194Pv1gbhGeCMNAk9pEaZlgp4Tru5xXOA0hKWLSg59kVu8dqBJyK4R+3wJSlG3xOM/iZHxD0TEDI54LZ4DQYpFdHeAyK96+rxgb3YAdMDevBoZXDaHM9jH1/R3MBt5PGjH8SzmSmiHkAmru5Omz8aWyGwbf3KAijV0YIqwg2WT7XgW9siDJR38n59hdAcjI9S1NxiGX728M4ya5uAo+tF8i+1sT4hcLk5YuPDikesLgWskJdXCZNWFt1hM3ZtjpTcDxjTen0xAiwfW04EUZbpOA2a6Eka315dMrDE2kS0gTWtgaqC7JDcXN3JIsExOMinIjUGd1HCoCA7WLhpygAuQ9d6Ir5TRWM93yhABj7NiUVCMiXUHl4s4JYx6ALTNcHKlZf400w1Jd5Sd7X+/wGdcOueQWTQ52gry12YA/2zr15NWgTsiFeUxtxpQnDVzrNJK+gLPF8dm9KJc+FlvI9zGzAR++Aa0AFNtXLeYHTERxDeXm3kwfw+uIuFReJIABHBOJwZ9yXTv0jHEf+EczX5W9t5QHgPteEG2VrV8Tlpa6KP09YhKJiEVf8JH+a5AtKszfIsDbmY4pGZ02+mVImwlYf29L6369xDqNlROn3GOS8NFbdbzB85s9H8NGVAAAAAElFTkSuQmCC) /*Images/Actions/pageMenuConfigIconHover.png*/;
     }
 }
 
-#updateAvailableContainer
-{
+#updateAvailableContainer {
     float: right;
     border: 1px dashed #ddd;
     background-color: #fff;
@@ -25,16 +22,13 @@
     background-position: 10px center;
     background-repeat: no-repeat;
 
-    a.button
-    {
+    a.button {
         margin-top: 16px;
     }
 }
 
-#expressionEditor
-{
-    #expressionEditorExceptionContainer
-    {
+#expressionEditor {
+    #expressionEditorExceptionContainer {
         display: none;
         border: 1px dashed #FF9696;
         background-color: #FFD8D8;
@@ -42,97 +36,76 @@
         padding: 10px;
     }
 
-    #expressionEditorContainer
-    {
+    #expressionEditorContainer {
         border: 1px solid @FormBorderColour;
         background-color: @TableDataBorderColour;
         height: 100px;
     }
 }
 
-.expressionTree
-{
+.expressionTree {
 
-    span.dynatree-node
-    {
-        span.dynatree-icon
-        {
+    span.dynatree-node {
+        span.dynatree-icon {
             background-image: url(data:image/png;base64,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) /*Images/AttachmentTypes/expressionBrowserIcons.png*/;
             background-position-y: 0;
         }
 
-        &.object
-        {
-            span.dynatree-icon
-            {
+        &.object {
+            span.dynatree-icon {
                 background-position-x: 0;
             }
         }
 
-        &.parameter
-        {
-            span.dynatree-icon
-            {
+        &.parameter {
+            span.dynatree-icon {
                 background-position-x: -16px;
             }
         }
 
-        &.function
-        {
-            span.dynatree-icon
-            {
+        &.function {
+            span.dynatree-icon {
                 background-position-x: -32px;
             }
         }
 
-        &.property
-        {
-            span.dynatree-icon
-            {
+        &.property {
+            span.dynatree-icon {
                 background-position-x: -48px;
             }
         }
     }
 }
 
-table.expressionsTable
-{
+table.expressionsTable {
     .tableData;
 
-    td.parseError
-    {
+    td.parseError {
         background-color: #FFD8D8;
     }
 }
 
-#AttachmentType_FilterExpression
-{
+#AttachmentType_FilterExpression {
     width: 375px;
 }
 
-#deviceComponents
-{
+#deviceComponents {
     .tableData;
 
-    tr
-    {
-        th.actions
-        {
+    tr {
+        th.actions {
             width: 20px;
         }
 
-        input.description
-        {
+        input.description {
             width: 300px;
         }
 
-        input.cost
-        {
+        input.cost {
             width: 75px;
         }
 
-        span.remove
-        {
+        span.remove {
             display: block;
             float: left;
             height: 16px;
@@ -142,20 +115,17 @@ table.expressionsTable
             cursor: pointer;
         }
 
-        span.edit
-        {
+        span.edit {
             .icon16;
             background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABNklEQVQ4y6WTMWtUURCFvzN3XrZMIUhAtJaATQRBSb/9/kkLwUYsYrONkEYRUgSx0cZutZBtdt97cyxWNJvY5OUwcDnDzGXud++Vbe6ifPl2eTnL7jGgwuy28y52C/pTHCEk7bxEefySm6HuPzt5IoDNMFBlkBh6Y0EBASggFHQNOkFrwfmni6MciVr9WgMwjgU249DTug6XyQiGoUctiRZsN1syEwR9qdLSve/fvgJw2yNYOsyD2YzF/PkkgK+WH0muXMLrs/cALOane/5/WsxPwUXK9Td59PDRXtF1f1MmfWWEF8f7Ddf9jXZBtNYmPyJFI6XpDDKTrJrOwC6y8W+G2zLAJiM8LD987iYxsMf8+WP15mDcPsU82I6Dq6CqMGCbUCOi0SQQKHBHk6l+tV6/012/828WvZILJzqIIQAAAABJRU5ErkJggg==) /*Images/Actions/list.png*/;
         }
 
-        span.editAlert
-        {
+        span.editAlert {
             .icon16;
             background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACU0lEQVQ4y6WTTUhUURTHf+e9OzPpDD4/YNLADwgiwiAkyiTSNkofi7CV1CJwUxCk6yBqGwRuWwi1qEVtCnWRSS4ywuhDDSezxFGwlziYjjOl8967t8VYMKWL6HLgcLn3/Dn/H+fAfx653/8sEVGhvYBoDAYAk498QjY/W5YgIvm7CNoE02rD1/FDDfsFYMP30dqACL5nMAIasACxwBKLkA0hAdu2ePluolIFWDqVzgAQBBqMIfA97FAIow3KsvB9D7EVlm2R28ihlAIBT4tWRqRiITkLwL9aMCKOCkcitLcdAWDx0SArY5NoNHZplLoLHYRLnW0BPhx+g8JAeuwDyWs9mNpyiu728n1thQ2ERHcXmYuXKD5z9q/i9rajYDTKdheZ6b1HrKMFNTKCWVuiPG+CODB5uwe/vISqc51b9GCQgROdevfJBglPvkeNjmInEpvmDWgNQcBAFM4vfKPIKS0ofzD8ytiXy3Zdd2Ig2SwSBOjaWnRd3e9MOAxrq7hVcWoPNhYIJOa/otT6Mn5TE/HW1i1Bua5L7FgjL95OkHoyUsBAKYXKzs1hEoltBchmMUXFxByHyuqaQgJGo5ZKojT29bE6NAShECgFInn/nkc0l2PK8mk83kz9vpo/GBrUj9Ongo9P++098TgmEsmLbD7ieaRXlvkcr8CJ72X49VThIhkTqGxzy+OZT+Ot624yVn/gcL4Dy4IgwF2Y5fn8OBXdN/0l1zUIiIUJYYtBe6lMZvDXlHK1jK6S6I4rlTur62Ixh+TcNF8y6TvAjVspkttN40/KW/4x6YnETgAAAABJRU5ErkJggg==) /*Images/Actions/listAlert.png*/;
         }
 
-        input.updating
-        {
+        input.updating {
             background-position: right center;
             background-repeat: no-repeat;
             background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
@@ -163,102 +133,84 @@ table.expressionsTable
     }
 }
 
-#organisationAddresses
-{
+#organisationAddresses {
     font-size: 0.9em;
 
-    tr:not(:last-child)
-    {
+    tr:not(:last-child) {
         border-bottom: 1px dashed #aaa;
     }
 
-    th
-    {
+    th {
         padding: 2px;
         font-weight: bold;
         width: 200px;
     }
 
-    td
-    {
+    td {
         padding: 2px;
         vertical-align: middle;
     }
 
-    tr:nth-child(even)
-    {
+    tr:nth-child(even) {
         background-color: #fff;
     }
 
-    span.delete
-    {
+    span.delete {
         .icon16;
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC) /*Images/Actions/removeSubtle.png*/;
     }
 
-    span.edit
-    {
+    span.edit {
         .icon16;
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACQElEQVQ4EQXBT4uVVRwA4Od3znnn3pkmi4poFQRFNYuMoAyirAnqI7Rr20dxX7iUFkmLaNNCglaRGGRaQUSZCFLUwlD8MzN6733P+fU8cer02TOHh/dfnue+mnvXx9DnYYw0j05QS1GjmLaqxdZkqpWIxUM7yx/bVNvrx/ee37u/Wtn0ofdu3gzzPMyjE7RStFoc2922WExaqaZFc/Xa9dZ6xjMvvfCsu4dHNn2Y+9DnbrMeNqMTTKWordpeTJbLyaJVOztbrlz7+7l272jt8u9/2WxmBAEASEgiJACmWt05XGvbuw/n/jsnLCcEoCNQkIAAQNIH/3x+I9sYaXuLY/MN7qPN7D5Obrh7Dw2BBCRL1ssnQYtIPXHxlLHztfHf09p7X8l5Zfy0Lx6tDACMmYM39P0zQmo50hhoa2XvirzwFDBmlkN58Q9mAHTylxPGIHNotVVTo6+O+P4D+gElKI2D4/qFV4CxZnqEfkQtAqVUrQQxqPufAjBWYmtbff8LAAAAuaa2hTbG0OHyx/rRVR7cUt89Ix/cMS58xM4TAMCYWd/m7c9EDK2WYmp48Kf62mn9u5OMoC1xXX31LDMABnnpQ5JAK0EUcr0xvt0XuUtM5BCxNn54iwTA6MxdFJTQosRyQpz8RF0V2kwtoj4m3jxPVgBAsjVMhVCW7c7tm79+ee783qabQZLZpSCCJEqkJDMjSmQRWjHdvPHvb+3w4O43ly79fKuPXMuUSIxMMkEpNTOHzIwoJVvUjLAs1cX/AdqeHE5xuOGdAAAAAElFTkSuQmCC) /*Images/Actions/editForm.png*/;
     }
 }
 
 // Used in WirelessCertificate/Index
-ul#loggingEntries
-{
+ul#loggingEntries {
     overflow: auto;
     max-height: 230px;
     padding-left: 20px;
 }
 
-table.deviceProfileTable
-{
-    th.name
-    {
+table.deviceProfileTable {
+    th.name {
         width: 300px;
     }
 
-    th.type
-    {
+    th.type {
         width: 120px;
     }
 
-    th.deviceCount
-    {
+    th.deviceCount {
         width: 120px;
     }
 }
 
-#configurationDeviceProfileShow
-{
-    #ComputerNameTemplate
-    {
+#configurationDeviceProfileShow {
+    #ComputerNameTemplate {
         width: 300px;
     }
 
-    #expressionBrowserAnchor
-    {
+    #expressionBrowserAnchor {
         .icon16;
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACKUlEQVQ4jaWTTU4UURDHf/W6gXFgJlHZKFvEe3gBvYhewXgGTXRpOILhGESGgEuNjB9N/BgCTJjufvXhonsQ176kkqpFVf2q6v8kIvifV77b2wsAU6MsCop/LCEpISIkEUAoioSZYWZczOeUp6en1ZPHT+4FQXgQERDBMrZlHACOpIKcM23bMN3fr0pEcDfub21x9/YdIhwR6QoJWFY8wF2JAHfH3fh8MoUISoGugxnPnj1lZ2eHg/cHTL9MMTdy09K0LVkVy8rsbMZkMukpoRQRRBIAZ2czNjbWWV1bZXY2I6WCpq5pmgY1ZXoypaoqAEQSsSQQ6Tb67es3Xr9+Q103PHy4w+Fkgpoxn1/y8eMn6rq+3v4yp0TkOvpeVaytreHuHB4egggXFxdUVUVZrrKxXmJuLBYLut15PwIwGo1IqTuTSGJlJfj1+xdXV1eMx2PCnTZn3B1VRZY6kJ5gc3MTEenO1Cy4nF9SpILxaIya4maUqrgqdU8QEd0IArgbOStFmVFVNCuqirtjalgYboa5A3KDIAJEGA7XiQiauiZnZTgcXhdwM7RXX1ZlsbgCEUTkL8GD7W3UjMGtAUUqMDMiosf3niqTVbk1GLDUT5nV5Oj4A293d1G1647m3qvOb/hGBLRty9HxB8xM5OWrV49+/vj5wuk07x4CEZ2clxcWUuqclFIgiSIJo9Houdz8zufn56siMgBKoACkNwdcRDIRzWg8bpY5fwBYR4lbku/2TAAAAABJRU5ErkJggg==) /*Images/Actions/expressionBrowser.png*/;
         text-decoration: none;
     }
 }
 
-#configurationDocumentTemplateExpressionBrowser
-{
+#configurationDocumentTemplateExpressionBrowser {
     padding-right: 275px;
     background-image: url(data:image/png;base64,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) /*Images/Actions/expressionBrowser256.png*/;
     background-position: right top;
     background-repeat: no-repeat;
 }
 
-#scheduledTaskStatus
-{
+#scheduledTaskStatus {
     width: 520px;
     margin: 40px auto 60px auto;
 
-    th.process
-    {
+    th.process {
         text-align: left;
         font-weight: bold;
         background-color: @TableDataBorderColour;
@@ -266,133 +218,109 @@ table.deviceProfileTable
         vertical-align: middle;
     }
 
-    td.description
-    {
+    td.description {
         font-size: 0.9em;
         min-height: 60px;
     }
 
-    td.progress
-    {
+    td.progress {
         padding: 8px 10px;
     }
 
-    td.finishedRedirect
-    {
+    td.finishedRedirect {
         background-position: right center;
         background-repeat: no-repeat;
         background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
         padding-right: 20px;
     }
 
-    td.exception
-    {
+    td.exception {
         background-color: #FFD8D8;
     }
 }
 
-div.logEventsViewport
-{
+div.logEventsViewport {
     border: 1px solid #bbb;
     -moz-border-radius: 4px 4px 0 0;
     -webkit-border-radius: 4px 4px 0 0;
     border-radius: 4px 4px 0 0;
 
-    div.logEventsViewportContainer
-    {
+    div.logEventsViewportContainer {
         overflow-y: auto;
         overflow-x: hidden;
 
-        .logEventsViewportNoLogs
-        {
+        .logEventsViewportNoLogs {
             padding-top: 20px;
             text-align: center;
             font-style: italic;
         }
     }
 
-    table.logEventsViewport
-    {
+    table.logEventsViewport {
         padding: 0;
         margin: 0;
         background-color: #bbb;
         table-layout: fixed;
 
-        & > thead
-        {
-            & > tr
-            {
+        & > thead {
+            & > tr {
                 background-color: #eee;
 
-                & > th
-                {
+                & > th {
                     padding: 4px 2px;
                     font-weight: bold;
                     border-bottom: 1px solid #bbb;
 
-                    &.icon
-                    {
+                    &.icon {
                         width: 20px;
                     }
 
-                    &.timestamp
-                    {
+                    &.timestamp {
                         width: 155px;
                     }
 
-                    &.eventType
-                    {
+                    &.eventType {
                         width: 180px;
                     }
                 }
             }
         }
 
-        & > tbody
-        {
-            & > tr
-            {
+        & > tbody {
+            & > tr {
                 background-color: #fff;
 
-                &:nth-child(even)
-                {
+                &:nth-child(even) {
                     background-color: #eee;
                 }
 
-                & > td
-                {
+                & > td {
                     padding: 2px;
 
-                    &.icon
-                    {
+                    &.icon {
                         width: 20px;
                         min-height: 16px;
                         background-repeat: no-repeat;
                         background-position: center center;
 
-                        &.information
-                        {
+                        &.information {
                             background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==) /*Images/Status/information.png*/;
                         }
 
-                        &.warning
-                        {
+                        &.warning {
                             background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC) /*Images/Status/warning.png*/;
                         }
 
-                        &.error
-                        {
+                        &.error {
                             background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Status/error.png*/;
                         }
                     }
 
-                    &.timestamp
-                    {
+                    &.timestamp {
                         width: 155px;
                     }
 
-                    &.eventType
-                    {
+                    &.eventType {
                         width: 180px;
                     }
                 }
@@ -402,12 +330,9 @@ div.logEventsViewport
 }
 
 // Enrolment
-#enrolStatus
-{
-    #sessions
-    {
-        .session
-        {
+#enrolStatus {
+    #sessions {
+        .session {
             width: 280px;
             padding: 4px 4px 4px 72px;
             margin: 8px;
@@ -425,26 +350,22 @@ div.logEventsViewport
             min-height: 72px;
             cursor: pointer;
 
-            & > h3
-            {
+            & > h3 {
                 padding-bottom: 3px;
                 border-bottom: 1px dashed #ccc;
 
-                span.details
-                {
+                span.details {
                     font-size: .8em;
                 }
             }
 
-            & > p.sessionStart
-            {
+            & > p.sessionStart {
                 color: #888;
                 font-size: .8em;
                 margin-bottom: 2px;
             }
 
-            & > p.sessionStatus
-            {
+            & > p.sessionStatus {
                 font-size: .9em;
                 height: 1.6em;
                 overflow: hidden;
@@ -452,18 +373,15 @@ div.logEventsViewport
             }
         }
 
-            .session:hover
-            {
+            .session:hover {
                 border: 5px solid #6C7A87;
                 background-color: #DFE1F8;
             }
     }
 }
 
-#dialogSession
-{
-    .sessionHeader
-    {
+#dialogSession {
+    .sessionHeader {
         width: 400px;
         float: left;
         padding: 0 0 0 134px;
@@ -475,59 +393,49 @@ div.logEventsViewport
         background-size: 32px, 128px;
         min-height: 134px;
 
-        & > h2
-        {
+        & > h2 {
             padding-bottom: 0;
         }
 
-        & > table
-        {
+        & > table {
             margin-top: 4px;
 
-            th
-            {
+            th {
                 width: 128px;
                 text-align: right;
             }
 
-            td, th
-            {
+            td, th {
                 padding: 1px 2px;
             }
         }
     }
 
-    .sessionProgress
-    {
+    .sessionProgress {
         width: 320px;
         float: right;
         text-align: right;
 
-        & > p.sessionStart
-        {
+        & > p.sessionStart {
             color: #888;
             margin-bottom: 2px;
         }
 
-        & > p.sessionStatus
-        {
+        & > p.sessionStatus {
             height: 1.6em;
             overflow: hidden;
             margin-bottom: 3px;
         }
     }
 
-    .sessionInfoContainer
-    {
-        & > div
-        {
+    .sessionInfoContainer {
+        & > div {
             float: left;
             width: 428px;
             overflow: auto;
         }
 
-        .sessionInfoMessages
-        {
+        .sessionInfoMessages {
             height: 440px;
             border: 1px solid #bbb;
             -moz-border-radius: 4px;
@@ -535,99 +443,80 @@ div.logEventsViewport
             border-radius: 4px;
             background-color: #fff;
 
-            div.logEventsViewportContainer
-            {
+            div.logEventsViewportContainer {
                 overflow: auto;
 
-                .logEventsViewportNoLogs
-                {
+                .logEventsViewportNoLogs {
                     padding-top: 20px;
                     text-align: center;
                     font-style: italic;
                 }
             }
 
-            table.logEventsViewport
-            {
+            table.logEventsViewport {
                 padding: 0;
                 margin: 0;
                 background-color: #fff;
 
-                & > thead
-                {
-                    & > tr
-                    {
+                & > thead {
+                    & > tr {
                         background-color: #eee;
 
-                        & > th
-                        {
+                        & > th {
                             padding: 4px 2px;
                             font-weight: bold;
                             border-bottom: 1px solid #bbb;
 
-                            &.icon
-                            {
+                            &.icon {
                                 width: 20px;
                             }
 
-                            &.timestamp
-                            {
+                            &.timestamp {
                                 width: 155px;
                             }
 
-                            &.eventType
-                            {
+                            &.eventType {
                                 width: 180px;
                             }
                         }
                     }
                 }
 
-                & > tbody
-                {
-                    & > tr
-                    {
+                & > tbody {
+                    & > tr {
                         background-color: #fff;
 
-                        &:nth-child(even)
-                        {
+                        &:nth-child(even) {
                             background-color: #eee;
                         }
 
-                        & > td
-                        {
+                        & > td {
                             padding: 2px;
 
-                            &.icon
-                            {
+                            &.icon {
                                 width: 20px;
                                 min-height: 16px;
                                 background-repeat: no-repeat;
                                 background-position: center center;
 
-                                &.information
-                                {
+                                &.information {
                                     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==) /*Images/Status/information.png*/;
                                 }
 
-                                &.warning
-                                {
+                                &.warning {
                                     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC) /*Images/Status/warning.png*/;
                                 }
 
-                                &.error
-                                {
+                                &.error {
                                     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Status/error.png*/;
                                 }
                             }
 
-                            &.timestamp
-                            {
+                            &.timestamp {
                                 width: 155px;
                             }
 
-                            &.eventType
-                            {
+                            &.eventType {
                                 width: 180px;
                             }
                         }
@@ -636,8 +525,7 @@ div.logEventsViewport
             }
         }
 
-        .sessionInfoConsole
-        {
+        .sessionInfoConsole {
             margin-left: 6px;
             background-color: #222;
             color: #0F0;
@@ -653,12 +541,9 @@ div.logEventsViewport
 }
 
 // Document Templates - Import Status
-#importStatus
-{
-    #sessions
-    {
-        .session
-        {
+#importStatus {
+    #sessions {
+        .session {
             padding: 4px;
             margin-bottom: 10px;
             border: 1px solid #EFEFEF;
@@ -668,38 +553,32 @@ div.logEventsViewport
             background-color: #F5F5F5;
             min-height: 72px;
 
-            .sessionLeftPane
-            {
+            .sessionLeftPane {
                 width: 48%;
                 float: left;
 
-                & > h3
-                {
+                & > h3 {
                     padding-bottom: 3px;
                     border-bottom: 1px dashed #ccc;
 
-                    span.details
-                    {
+                    span.details {
                         font-size: .8em;
                     }
                 }
             }
 
-            .sessionRightPane
-            {
+            .sessionRightPane {
                 width: 48%;
                 float: right;
                 text-align: right;
 
-                & > p.sessionStart
-                {
+                & > p.sessionStart {
                     color: #888;
                     font-size: .8em;
                     margin-bottom: 2px;
                 }
 
-                & > p.sessionStatus
-                {
+                & > p.sessionStatus {
                     font-size: .9em;
                     height: 1.6em;
                     overflow: hidden;
@@ -707,10 +586,8 @@ div.logEventsViewport
                 }
             }
 
-            .sessionPages
-            {
-                & > .sessionPage
-                {
+            .sessionPages {
+                & > .sessionPage {
                     min-height: 56px;
                     min-width: 256px;
                     float: left;
@@ -724,14 +601,12 @@ div.logEventsViewport
                     background-repeat: no-repeat;
                     background-position: center top;
 
-                    & > .sessionPageDetails
-                    {
+                    & > .sessionPageDetails {
                         height: 84px;
                         padding: 2px 4px 0 4px;
                         background-color: rgba(255, 255, 255, 0.8);
 
-                        p.sessionStatus
-                        {
+                        p.sessionStatus {
                             font-size: .9em;
                             height: 1.6em;
                             margin-bottom: 3px;
@@ -740,8 +615,7 @@ div.logEventsViewport
                 }
             }
 
-            .sessionInfoMessages
-            {
+            .sessionInfoMessages {
                 margin-top: 6px;
                 border: 1px solid #bbb;
                 -moz-border-radius: 4px;
@@ -749,100 +623,81 @@ div.logEventsViewport
                 border-radius: 4px;
                 background-color: #fff;
 
-                div.logEventsViewportContainer
-                {
+                div.logEventsViewportContainer {
                     max-height: 220px;
                     overflow: auto;
 
-                    .logEventsViewportNoLogs
-                    {
+                    .logEventsViewportNoLogs {
                         padding-top: 20px;
                         text-align: center;
                         font-style: italic;
                     }
                 }
 
-                table.logEventsViewport
-                {
+                table.logEventsViewport {
                     padding: 0;
                     margin: 0;
                     background-color: #fff;
 
-                    & > thead
-                    {
-                        & > tr
-                        {
+                    & > thead {
+                        & > tr {
                             background-color: #eee;
 
-                            & > th
-                            {
+                            & > th {
                                 padding: 4px 2px;
                                 font-weight: bold;
                                 border-bottom: 1px solid #bbb;
 
-                                &.icon
-                                {
+                                &.icon {
                                     width: 20px;
                                 }
 
-                                &.timestamp
-                                {
+                                &.timestamp {
                                     width: 155px;
                                 }
 
-                                &.eventType
-                                {
+                                &.eventType {
                                     width: 180px;
                                 }
                             }
                         }
                     }
 
-                    & > tbody
-                    {
-                        & > tr
-                        {
+                    & > tbody {
+                        & > tr {
                             background-color: #fff;
 
-                            &:nth-child(even)
-                            {
+                            &:nth-child(even) {
                                 background-color: #eee;
                             }
 
-                            & > td
-                            {
+                            & > td {
                                 padding: 2px;
 
-                                &.icon
-                                {
+                                &.icon {
                                     width: 20px;
                                     min-height: 16px;
                                     background-repeat: no-repeat;
                                     background-position: center center;
 
-                                    &.information
-                                    {
+                                    &.information {
                                         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==) /*Images/Status/information.png*/;
                                     }
 
-                                    &.warning
-                                    {
+                                    &.warning {
                                         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC) /*Images/Status/warning.png*/;
                                     }
 
-                                    &.error
-                                    {
+                                    &.error {
                                         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Status/error.png*/;
                                     }
                                 }
 
-                                &.timestamp
-                                {
+                                &.timestamp {
                                     width: 155px;
                                 }
 
-                                &.eventType
-                                {
+                                &.eventType {
                                     width: 180px;
                                 }
                             }
@@ -854,16 +709,13 @@ div.logEventsViewport
     }
 }
 
-#undetectedPagesContainer
-{
-    #undetectedPages
-    {
+#undetectedPagesContainer {
+    #undetectedPages {
         list-style: none;
         margin: 0;
         padding: 0;
 
-        & > .undetectedPage
-        {
+        & > .undetectedPage {
             float: left;
             margin: 4px;
             border: 1px solid #bbb;
@@ -877,15 +729,13 @@ div.logEventsViewport
             background-repeat: no-repeat;
             cursor: pointer;
 
-            & > .pageDetails
-            {
+            & > .pageDetails {
                 margin-top: 232px;
                 height: 24px;
                 text-align: center;
             }
 
-            &:hover
-            {
+            &:hover {
                 border: 1px solid #6C7A87;
                 background-color: #DFE1F8;
             }
@@ -893,17 +743,14 @@ div.logEventsViewport
     }
 }
 
-#undetectedPageDialog
-{
-    & > .pagePreview
-    {
+#undetectedPageDialog {
+    & > .pagePreview {
         height: 700px;
         background-position: top center;
         background-repeat: no-repeat;
     }
 
-    .actions
-    {
+    .actions {
         border-top: 1px solid #e5bd99;
         padding-top: 8px;
         margin-top: 8px;
@@ -912,43 +759,35 @@ div.logEventsViewport
 }
 
 // Device Batches
-.deviceBatches
-{
-    #DeviceBatch_PurchaseDetails_Container
-    {
+.deviceBatches {
+    #DeviceBatch_PurchaseDetails_Container {
         padding: 5px 0 5px 5px;
     }
 
-    #DeviceBatch_PurchaseDetails
-    {
+    #DeviceBatch_PurchaseDetails {
         width: 570px;
         height: 200px;
     }
 
-    #DeviceBatch_WarrantyDetails_Container
-    {
+    #DeviceBatch_WarrantyDetails_Container {
         padding: 5px 0 5px 5px;
     }
 
-    #DeviceBatch_WarrantyDetails
-    {
+    #DeviceBatch_WarrantyDetails {
         width: 570px;
         height: 200px;
     }
 
-    #DeviceBatch_InsuranceDetails_Container
-    {
+    #DeviceBatch_InsuranceDetails_Container {
         padding: 5px 0 5px 5px;
     }
 
-    #DeviceBatch_InsuranceDetails
-    {
+    #DeviceBatch_InsuranceDetails {
         width: 570px;
         height: 200px;
     }
 
-    #DeviceBatch_Comments
-    {
+    #DeviceBatch_Comments {
         width: 570px;
         height: 200px;
     }
@@ -956,15 +795,12 @@ div.logEventsViewport
 
 // Plugins
 
-#plugins
-{
-    .pageMenuArea a > h3
-    {
+#plugins {
+    .pageMenuArea a > h3 {
         display: inline;
         color: @HyperLinkColour;
 
-        &:hover
-        {
+        &:hover {
             color: @HyperLinkHoverColour;
         }
     }
@@ -973,59 +809,137 @@ div.logEventsViewport
         padding-left: 18px;
     }
 
-    #pageMenu td .pageMenuArea:not(:last-child)
-    {
+    #pageMenu td .pageMenuArea:not(:last-child) {
         padding-bottom: 5px;
         margin-bottom: 10px;
     }
 
-    #pageMenu td .pageMenuArea > a
-    {
+    #pageMenu td .pageMenuArea > a, #pageMenu td .pageMenuArea > h3 {
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90CDRcZMTlpMjsAAAKbSURBVDjLbZHBS2NHHMc/82ZeXpLaiNJHDylF6KEIGxFa0Jtdi4IFqfQq2P/As4f9D0rwplIwsDlZiofHStaTVQJCj+6a9SpKL3HhkTx5cZLMTA9uHov4Pf2Y33w/fL8z4vj4mHfv3vNUHz60ouXl5VmtNScnJ3eVmZkfn96ZqVRQj6P7HXj56VwAFAqFsenp6W+73S7NZjMRUH/iPwVqnwC8nJ2drU9NTb3I5XIDpVS6u7v7qlQqEQQBxWLxq83NzX+EEIUkSYJ8Pj+xs7Pz0+cAyuXyTqPR+F5KiTEGrTVCCHzfR2v99d7eXg3AGMPGxsZb4CPwWEEIAUC73ebm5gYhBKVSiTiOcc4RBAHn5+dYa9Fas76+nvXIEvi+jzEG5xyrq6vEcczV1RW+77O2tka73WZ/f58wDHHOZQBvNEgp6ff7hGHI4eEhSinOzs64uLjg+vqaWq3GYDBASom19vkEWmuMMYyPjxNFEUtLS1hrOTg4wBiD53k4554HeJ6H1pp+v59VaTQaWGuRUqKUYjAYADwPcM6Rpim9Xg9jDFJKgiBASokQAuccDw8P5PP5ZwHOOUe1WsU5hxACz/Oy3xlplCZJkmw3Apw2m81fx8bGEEJkFay12YuPDMPhkDiOvwP+/gwgXhtjTq21Yb/fTyuVysPt7e3PW1tbf/q+T7Va/U0p9b7VahW11vlOp3Pt53JtAOI4RimFUgohRG5+fv6Po6Ojf7e3twcLCwtucXHR1ev1NIqiN3Nzc6+klEUpJVJK7u/vEXEcE4YhgJBSfjE5OfnDysrKX4VC4ctSqdQCXKfTedHr9T5GUfRLmqb/DYfDBDB3d3ePgJGSJOHy8pJOt4vneQS5HABaa6xzfFMuUy6XmZiYyDz/AxHBRmZKLqH0AAAAAElFTkSuQmCC) /*Images/Actions/pluginDownloadIcon16.png*/;
 
-        &:hover
-        {
+        &:hover {
             background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC4klEQVQ4jWWRTWhcVRTHf/fd+958JJMw+aDFaYNUtChNTDHYFBdNm4K0IEI3lW7ErZR2IWhKi0tba6gBMRAXhaYiiJskjRgENWlVEC3VJrGFgpaIaetMM515kzfzvu51kZmhxrM6i3N+nN//iLm5OW7eXGRznXfHpg8eGui/zwqLs4X8O9kTA5tn+np7UfX+dWB/vRcAyXSidXDHSz23dIrbqugCk5v254GLDcD+/v7dkzue3L4rpdJhlAi8qanZM52ZTp4xz5FN3u46efLN7xyTSJUqawk72ZL9eHx86HEAT+S2jU98fXenUAoT2sj1LSAiElKh11u3vDuxfNGXNVS0zsixga+AAlBXEGCwuPUwxa/l4ygrINWeYdW9x0rLHYK2R0z8+Qpx1EX64QHePrq76aEa0sqWRJHGijO8+Fobzqrk+z+uUWor0PeGQ3l1Owvvu2x19qGN3ggKsBokqRTVMKAnMcrVS6vca8/z48K3/H7jNx7cCVk4l0YXziNUhNGmeUETYCuFF2jKtQpdfMQvl6s8/fyz9HTs5OfxNXTpLVA+xoDWuvGs5huRlqTqx1RCTRz7BOWzXP9sFGMewPoEMuUTBxag6wD+C8Bo3GrEWk0QaMC2SIjTWEoiOkOMsfGqGidZxfwfIIw2mm/eO4g2gBBYlkCIRsQbzlqDY2mi8v2GQfOC+R+uXX01lWlHCIsojqDuqo0BDJbYiCsKA0rFwlPAF48DLsVxPG/FfnfoB15vX2/tr5WV4ZFTI5/Yymb0woUjtrIXl5cX0zU/TD4quXdtR/0DQLFYRCmFUgohhLN3cO8HV2a//Gnsw7FwaN+QGT4wbC5PfurNTM9cGdwzeEZKmZZSIqWkUqkgisUi3d3dAEJK2dLR0fHCy4cOf55OpTPtba3LgCmV3F1e1SvMTE8d9jzv7yiKXCDO5/MbgEa5rsvS0hKlchnLskg4DgC+76ONYVsuRy6XI5vNNnf+BS/0P9OBtw+RAAAAAElFTkSuQmCC) /*Images/Actions/pluginDownloadIconHover16.png*/;
         }
     }
 }
 
-#pluginCatalog
-{
-    #pluginCatalogHeading
-    {
+#pluginCatalog {
+    #pluginCatalogHeading {
         margin-bottom: 20px;
         text-align: right;
     }
 
-    .pluginItem
-    {
-        .pluginItemBlurb
-        {
+    .pluginItem {
+        .pluginItemBlurb {
             margin: 4px 0 4px 2px;
             padding: 0 4px;
             border-left: 4px solid @TableDataBorderColour;
 
-            *
-            {
+            * {
                 padding: 0;
                 margin: 0;
             }
         }
 
-        & > h2:first-child
-        {
+        & > h2:first-child {
             padding-left: 20px;
             background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC4klEQVQ4jWWRTWhcVRTHf/fd+958JJMw+aDFaYNUtChNTDHYFBdNm4K0IEI3lW7ErZR2IWhKi0tba6gBMRAXhaYiiJskjRgENWlVEC3VJrGFgpaIaetMM515kzfzvu51kZmhxrM6i3N+nN//iLm5OW7eXGRznXfHpg8eGui/zwqLs4X8O9kTA5tn+np7UfX+dWB/vRcAyXSidXDHSz23dIrbqugCk5v254GLDcD+/v7dkzue3L4rpdJhlAi8qanZM52ZTp4xz5FN3u46efLN7xyTSJUqawk72ZL9eHx86HEAT+S2jU98fXenUAoT2sj1LSAiElKh11u3vDuxfNGXNVS0zsixga+AAlBXEGCwuPUwxa/l4ygrINWeYdW9x0rLHYK2R0z8+Qpx1EX64QHePrq76aEa0sqWRJHGijO8+Fobzqrk+z+uUWor0PeGQ3l1Owvvu2x19qGN3ggKsBokqRTVMKAnMcrVS6vca8/z48K3/H7jNx7cCVk4l0YXziNUhNGmeUETYCuFF2jKtQpdfMQvl6s8/fyz9HTs5OfxNXTpLVA+xoDWuvGs5huRlqTqx1RCTRz7BOWzXP9sFGMewPoEMuUTBxag6wD+C8Bo3GrEWk0QaMC2SIjTWEoiOkOMsfGqGidZxfwfIIw2mm/eO4g2gBBYlkCIRsQbzlqDY2mi8v2GQfOC+R+uXX01lWlHCIsojqDuqo0BDJbYiCsKA0rFwlPAF48DLsVxPG/FfnfoB15vX2/tr5WV4ZFTI5/Yymb0woUjtrIXl5cX0zU/TD4quXdtR/0DQLFYRCmFUgohhLN3cO8HV2a//Gnsw7FwaN+QGT4wbC5PfurNTM9cGdwzeEZKmZZSIqWkUqkgisUi3d3dAEJK2dLR0fHCy4cOf55OpTPtba3LgCmV3F1e1SvMTE8d9jzv7yiKXCDO5/MbgEa5rsvS0hKlchnLskg4DgC+76ONYVsuRy6XI5vNNnf+BS/0P9OBtw+RAAAAAElFTkSuQmCC) /*Images/Actions/pluginDownloadIconHover16.png*/;
             background-position: left center;
             background-repeat: no-repeat;
             min-height: 22px;
 
-            a
-            {
+            a {
                 float: right;
                 font-size: 12px;
             }
         }
     }
 }
+
+#Config_AuthRoles_Show {
+    #Config_AuthRoles_Claims_Tree {
+        span.fancytree-ico-c > span.fancytree-icon {
+            background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACgklEQVQ4y5XSXUhTYRgH8OkItViSri676CIIupC6kIjIrQTNtLbhMEOLmjGsi1CiJoULZmEpW4l5RDehkR/owJNF+3DLliMd6GDWcrFNyNEceAarZZuc7d8xSNQzgx54Lt6v3/vxvBwAnI3Z0NDAJQiifWJiImgwGOIkScasVuuMWq2u3Dp3LTc15HJ5Zk9PzzhFURh79fpTr7avv4voHns/ORkJh8NQqVTX/wmIxWLZW5sNBNGt3tgvrareYzQavVqt9nt5eXnetkCTosk4OkrGWh485G7dqfXR4yvMlSCVSs9sC3z2frFOTU0vp7ur2TJe4XA4oNFoKrcFZl0us9lsodIBk44PpSaTCXa7vSwtoNPpAsxqOJ1OBAIBOhKJ0PF4nE6lUjQzTq+srKR8Ph/m5uaSS0tLLSygsbFx1ev1IhgMwuPxIBQKIRaLIZlM4m+4XC4olUp0dna+YwEKhSLh9/uxuLgIt9v9B4pGo6Bpeh1YOx1TSuj1+nEWcPfe/cSsy4fgtzB8vgX4F34wADbF/Pw81JoOGEgbG3jeVppY9jVD2XwbN+ol+BURwdBfC1ldPaL+ywi5ZTgvuYibshJQ5nNsQFxWmHCTRzHWvR88XjaeKrmgPnJw8AAPFcKdzANkQCrIQn4+H3fEWWyg4MixuOD4IdDTeWiTZyB3Nw+Wrkx4BjOxj5+LW1XZwDAHJw/vAjdnr5kNFBSsSipr0asqwcKbQlyqLkH91bOgZk6DaKlgfuAFzOpOwN5xCnw+37kOFBcX7ygqKrpWU1P7kylPqrXtGdqf6DAwMIjhkZcYGrHAZLbBYrGhT0/ixdBoSiQSfRUKhRKBQJDDSffr/id/A3fSz48XbZuBAAAAAElFTkSuQmCC') /*Images/Actions/locked.png*/;
+        }
+
+        span.fancytree-ico-c.fancytree-selected > span.fancytree-icon {
+            background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACWUlEQVQ4y6XRXWiSURgHcJsXa4WNNuuyiy6CoAupixERoXXhmljuxaJiFrVA1i72cVFCOSMt8rNt2YfGO5g5Z1NstWW+c4ZBq4QpqMkEbZDSCObAMprjdf90sIjxsgUdODd/zvmd5zwPCwDrf/aGB7q6utgmk8ngdruzVqt10eVyTWu1Wuk/AXK5vMpoNPpjsRgGbU8/9fbdH/J4PAuRSARKpfLKhoBYLG595nTCaDSZVjPp6TPbHQ5H0mAwfBeJRHXrAp0dna9JcqCguX2H/Xd+S625aLFYQBDE8XWBd+8/TI6Njc+vzcfGX4nLX4FOp5OuC0wGAlS53NzaPPAm2Gi32+H3+5tYJEl+pigKoVAIPp+PnpqaosPhMF1uHB2Px2mv14vya6VgMKhhHGN3d/dSMplENptFIpHA3NwcCoUCSqUSKqvScZVKBbPZHGQEFApFMZ1OI5PJIBqNrkD5fB40Ta8AlcrUajVsNpufEbh+42YxHEkh+/UbUqlZpGd/lAH8WTMzMzDd64d7NMAMDOobi/OpHqh6rqK9jcCvBQncQzK0Xm5DPn0BJ4lz6GgVIkedYAaamxqK0dEDePl4FziczehTsZGLs7BnNwdiwRac4lejvp6La83VzABv/8FF/qG9oD/WQS/fhNptHEw8rEJiuAo7ubXACAtH9m0Fu2YHxQzweEuEVIYnaiFmvQ04f1aItksi5KaP4ZFGjDB5GG/7j4LL5YYYgZYW2c/yiJbv6h/A0EvC4RjGiOsFnK4J+KgABmyjsDufL0skki8CgYCoXOLz+TWrwG+kXMkgQ6yv+QAAAABJRU5ErkJggg==') /*Images/Actions/unlocked.png*/;
+        }
+
+        span.fancytree-node.fancytree-selected {
+            font-style: normal;
+        }
+    }
+}
+
+#Config_AuthRoles_Subjects, #Config_AuthRoles_Subjects_Update_Dialog_List {
+    li {
+        padding: 4px 0 4px 24px;
+        background-position: 4px center;
+        background-repeat: no-repeat;
+        min-height: 16px;
+    }
+
+        li.user {
+            background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNIBmxLMwAAAKCSURBVDjLjZK/axNxGMafu9yvXO5X01yaBHtpE2N/DbbURRREF3URxEIFRx1VtIPi4CC46h+gi3OpOBdRqrOYCnZITZuS5EybNklz+dXLN7lzKAiJQX3h3R6e58P7vJTruuifWGKBjRiRZ6JPupXfybIsz79tWLVH6dRyq1/LYMAEQsGnDx7feZL8toVsJgtJVe6KPhEA7vVrqX6CWGKBiibiaX8wEMttZXBQ2IVXkqEG9L1quRrd+Pra/isBTdNM0dzlM6kfoAEIigafFgHt1UQ9avAAegzofoN0apmQtr3joSlwogQtOIaAMYlQfLqw9u6+9UfgoBswHPNJHlIhSBpEfwRqMAw9MvRlkHagAbHJG8Xvb4mKBg/nhSAL4Fjn1SAtNahGAJiYWvyohYyLodgsjmrF9dXlh3P/TXBq6uYYrwyHGZZDp7GLfTOjxhILE/8kGI/fuMBy7BIvqVcCxiQ3HBkFXAclM4eSudUhR40PpN16Ccd5n95ccXsILl1der54e3FN1qPXBDnAEdtGvXKIRrWGThdQAgYj66OXlcCJVc4rveghGI9dH56Yn0+OT8+M5nNlsIIPFM2i61BwuoDrunBIB227iQ5polE2d8q5zfPpzRWTAQBBUkKVQzfo3atj9twsCHHRaHQBz3FKp+2gbXdw1GyjXrHgYfiwVcxGAZg0ALRatZOCT+IJseFSLAjpwsO4YOnj9QoUZIWFHpbRqhXgkDbfdamZ369slX+mdjPrn+tW5Ix/xBA13Q8PTaG3YQqVYgX7uUyzXsonqyVzo6cFVZ1jANrwqfrZkWj8tKaHDF6Uh2iapgixLat0kC9sp75X93NrgLNdrSYdAPgF6h0J0E7J5qMAAAAASUVORK5CYII=') /*Images/Actions/user16.png*/;
+        }
+
+        li.group {
+            background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNJ4fVuW8AAALmSURBVDjLpZNJaBNxFMa/mUyWmTSZJM02bRpta7W1VrErBRsqCIriwV0QFQRBXC6CngRP4lGKG9IiVrxYBEGwKnhwQWtqpBate0pptUmbtEkmM5ksM/P3VNH26Du9w/f93uPxPooQgv8pZqFxtjg7eA9/UtM0TkpLj1NvU71/Cw9vrOpiLYZTJU1T1QIu9z+fGgIAekHA2rgtNy/27vXXeLuNJmb34klOF9va3BbqNtusIZrC2SUbWO3s/msPrphEUXZZXVxjx9YDB3h62bHJX/EZay56emun7Ujz5v2eoZGXcPCm+SUAMSOXIqMfEFxXjmKSd4f82+60N1Tg3Pk+sP5ViE4NypcuHEVrwAtDqaQuATCMIeKvKm9avtaL3BgXv3/rYcWArhh5TyUI5/eZCvYvATc61ghuCJ66uwu+PzewONjjcjonT7yZJdF3qRMgJGVzeSDUtaG6ZWNUKjjO6ERFPK8rA5HIjX8Ay3fWtljspr6a9YLFG3RTRUf8BBfQFL68Cg6hQjfGnuSFithVl4HDr9icOZZOXN+3ubIdAKiukxsOen387SSScPpsoBkaBU3Gz6cUmKlO2Jws9qwIg9bicFjsINCQURTMSyrGU9IhRjHK3YGmGrQL9cgTGZlkHiOP0jCLK+BbuRo5OY37b/zYWW1AQ4cXRNdQUhWIiggN0yFanMlSqUwGpjIAYhnUcAjKp2YYKQ9KOgFoDpKnCT3T63BpkIXZ4YOVr0RC0jAxkzZThBCUd3oaAw3OVnOufrtg2bEr2BBEUWVQUgk0naAglyBJOeiJH5m19EBPtpiZHJlIhF+Pzn9kAGBuKDEGYKy2/mDA20l22d1u5JUiQHQAAOUzYnYqju+Tmr0vQvckZ78ufSQAmJ/91j/6LE2L6fim4Mr6OrOFtQLQs5ls6svwi+FYdPSeWtSzf3uoxWnk+fVOzu5uE6rr1rgDNS5dU7X4xI/p2Pjn8Fzi1fvFGaH+N86/AQJNOrMW5kkPAAAAAElFTkSuQmCC') /*Images/Actions/userGroup16.png*/;
+        }
+}
+
+#Config_AuthRoles_Subjects_Update_Dialog {
+    display: none;
+
+    #Config_AuthRoles_Subjects_Update_Dialog_None {
+        display: none;
+    }
+
+    #Config_AuthRoles_Subjects_Update_Dialog_ListContainer {
+        height: 280px;
+        overflow-y: auto;
+        background-color: #fff;
+        border: 1px solid @TableDataDarkBorderColour;
+    }
+
+    #Config_AuthRoles_Subjects_Update_Dialog_None {
+        padding-top: 15px;
+        display: block;
+        text-align: center;
+    }
+
+    #Config_AuthRoles_Subjects_Update_Dialog_AddContainer {
+        padding-top: 10px;
+        padding-left: 10px;
+    }
+
+    #Config_AuthRoles_Subjects_Update_Dialog_List {
+        li {
+            cursor: pointer;
+
+            &:hover {
+                background-color: @TableDataBorderColour;
+
+                span.remove {
+                    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC) /*Images/Actions/removeSubtle.png*/;
+                }
+            }
+
+            span.remove {
+                margin-top: 2px;
+                padding-right: 6px;
+                display: block;
+                float: right;
+                height: 16px;
+                width: 16px;
+                cursor: pointer;
+                background-repeat: no-repeat;
+
+                &:hover {
+                    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Actions/remove.png*/;
+                }
+            }
+        }
+    }
+}
diff --git a/Disco.Web/ClientSource/Style/Config.min.css b/Disco.Web/ClientSource/Style/Config.min.css
index 466f3117..f056a17c 100644
--- a/Disco.Web/ClientSource/Style/Config.min.css
+++ b/Disco.Web/ClientSource/Style/Config.min.css
@@ -1 +1 @@
-.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}#pageMenu td .pageMenuArea>a.config{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACsElEQVQ4y41T3UtTcRie3QaNRhKC/4SgN4KBeSGK4EAvuzChNZQSvJgXYldCV5tMiUzEDVuZ84M0P4OmpjO3lV+bs21nH2fnbGd69mFuMz/39DunFsUadODh/Hj5vc/zPu/7/iQAJP9CQ0NDrU6nO9Lr9YnS0tKqfPdyAoODg7daWlpuqFQqYyyeQDKVQmdnp6G9vf26RqO5nZfAYDC0vZ2ezuj0es5oHEuGuQhCYQ7RWAznFxeYmpo6fmkwcCaTKfO8v1/5F4FMJrv26vUIQ7MhxOJxEYc8DzrIgItEcHB4iONkEql0Gqdn5xgdHfXnVFBXV6cNkATK54M/QMNm+4yPq2vY3NqCl8QSR0ci0icnqK6ufppDoO3t3fSRROe+C/PzCyKJ3e64CjLslZC0tLyMyMHPSjQ9PZbfBEqlslar1fIut/uS8vpgtdoQCoVB/NJSqVReWFh4b2FxkY8SW0JVQl88FHXZ19fHl5eXV0kqK++qInwU+y43duwOrJnXQVE+1NfLn2RVHigUAx7KC/P6BulLEH6aJs2No6LiTpukrKzsEcOy2HN+xfbOLlbXzOCjMajV6vdZgiGd7oswlZnZOdj3nAjQhCQQQElJiUJCPmlTU9MsGR1H/GJre0ds1uTkJEZG3nwzGo3HY+Pj4jSsNhu8/gD0w8OskCPk/rl5z1LpE7DE/wfTkjjGXWLJQRRpovhuZgYO5z4pP4iamhp1zhS6u7u572dniCcScHs8sFisWN+w4NMvWIi6QB4ku9LV1RXKIVB1dJjJX1iiDNm+TJjjRL+CqrAfRDlDFusqHDlAa2vrSg6B4KexsXGiqKjofnFx8WNSxalfbBYNyutNkvhDElfI5fIJ4W7ex5TFi4EBF0umwzAMmpubV/77NWZRUFAgI52eE0DON/Pd+wH6O+vw3ozilAAAAABJRU5ErkJggg==)}#pageMenu td .pageMenuArea>a.config:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACiElEQVQ4y41Ta0iTYRQe/ShCTCpJiiRIKvtTiUE3+2VRiMR+JEk3ktKMslmGJZVEf1aZhpFFS/uRQ7Jcq2jVKvKCu2S66eZl05zu5qd9m+5i28TtO73njYXyNeiDw/dyOOc5z3me9xUAgOBfUXYgNUv3+JxH/0Q0lZ22MjNWHS/R9agwsfZU+hL5hZ0vAi4HhLwsKC5lSBuLtsepbx9MignQ/bRENCC7xekkRYyx4brf6zCB194Pv1gbhGeCMNAk9pEaZlgp4Tru5xXOA0hKWLSg59kVu8dqBJyK4R+3wJSlG3xOM/iZHxD0TEDI54LZ4DQYpFdHeAyK96+rxgb3YAdMDevBoZXDaHM9jH1/R3MBt5PGjH8SzmSmiHkAmru5Omz8aWyGwbf3KAijV0YIqwg2WT7XgW9siDJR38n59hdAcjI9S1NxiGX728M4ya5uAo+tF8i+1sT4hcLk5YuPDikesLgWskJdXCZNWFt1hM3ZtjpTcDxjTen0xAiwfW04EUZbpOA2a6Eka315dMrDE2kS0gTWtgaqC7JDcXN3JIsExOMinIjUGd1HCoCA7WLhpygAuQ9d6Ir5TRWM93yhABj7NiUVCMiXUHl4s4JYx6ALTNcHKlZf400w1Jd5Sd7X+/wGdcOueQWTQ52gry12YA/2zr15NWgTsiFeUxtxpQnDVzrNJK+gLPF8dm9KJc+FlvI9zGzAR++Aa0AFNtXLeYHTERxDeXm3kwfw+uIuFReJIABHBOJwZ9yXTv0jHEf+EczX5W9t5QHgPteEG2VrV8Tlpa6KP09YhKJiEVf8JH+a5AtKszfIsDbmY4pGZ02+mVImwlYf29L6369xDqNlROn3GOS8NFbdbzB85s9H8NGVAAAAAElFTkSuQmCC)}#updateAvailableContainer{float:right;border:1px dashed #ddd;background-color:#fff;font-size:.6em;line-height:1em;padding:4px 10px 4px 70px;text-align:right;height:64px;background-image:url(data:image/png;base64,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);background-position:10px center;background-repeat:no-repeat}#updateAvailableContainer a.button{margin-top:16px}#expressionEditor #expressionEditorExceptionContainer{display:none;border:1px dashed #ff9696;background-color:#ffd8d8;margin:10px 0;padding:10px}#expressionEditor #expressionEditorContainer{border:1px solid #005fab;background-color:#e8eef4;height:100px}.expressionTree span.dynatree-node span.dynatree-icon{background-image:url(data:image/png;base64,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);background-position-y:0}.expressionTree span.dynatree-node.object span.dynatree-icon{background-position-x:0}.expressionTree span.dynatree-node.parameter span.dynatree-icon{background-position-x:-16px}.expressionTree span.dynatree-node.function span.dynatree-icon{background-position-x:-32px}.expressionTree span.dynatree-node.property span.dynatree-icon{background-position-x:-48px}table.expressionsTable{border:solid 1px #e8eef4;border-collapse:collapse}table.expressionsTable>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}table.expressionsTable>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}table.expressionsTable>thead>tr>th,table.expressionsTable>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}table.expressionsTable>tbody>tr:hover>td{background-color:#e8eef4}table.expressionsTable>tfoot>tr>th,table.expressionsTable>tfoot>tr>td{background-color:#e8eef4}table.expressionsTable td.parseError{background-color:#ffd8d8}#AttachmentType_FilterExpression{width:375px}#deviceComponents{border:solid 1px #e8eef4;border-collapse:collapse}#deviceComponents>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}#deviceComponents>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}#deviceComponents>thead>tr>th,#deviceComponents>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}#deviceComponents>tbody>tr:hover>td{background-color:#e8eef4}#deviceComponents>tfoot>tr>th,#deviceComponents>tfoot>tr>td{background-color:#e8eef4}#deviceComponents tr th.actions{width:20px}#deviceComponents tr input.description{width:300px}#deviceComponents tr input.cost{width:75px}#deviceComponents tr span.remove{display:block;float:left;height:16px;width:16px;margin-left:2px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC);cursor:pointer}#deviceComponents tr span.edit{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABNklEQVQ4y6WTMWtUURCFvzN3XrZMIUhAtJaATQRBSb/9/kkLwUYsYrONkEYRUgSx0cZutZBtdt97cyxWNJvY5OUwcDnDzGXud++Vbe6ifPl2eTnL7jGgwuy28y52C/pTHCEk7bxEefySm6HuPzt5IoDNMFBlkBh6Y0EBASggFHQNOkFrwfmni6MciVr9WgMwjgU249DTug6XyQiGoUctiRZsN1syEwR9qdLSve/fvgJw2yNYOsyD2YzF/PkkgK+WH0muXMLrs/cALOane/5/WsxPwUXK9Td59PDRXtF1f1MmfWWEF8f7Ddf9jXZBtNYmPyJFI6XpDDKTrJrOwC6y8W+G2zLAJiM8LD987iYxsMf8+WP15mDcPsU82I6Dq6CqMGCbUCOi0SQQKHBHk6l+tV6/012/828WvZILJzqIIQAAAABJRU5ErkJggg==)}#deviceComponents tr span.editAlert{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACU0lEQVQ4y6WTTUhUURTHf+e9OzPpDD4/YNLADwgiwiAkyiTSNkofi7CV1CJwUxCk6yBqGwRuWwi1qEVtCnWRSS4ywuhDDSezxFGwlziYjjOl8967t8VYMKWL6HLgcLn3/Dn/H+fAfx653/8sEVGhvYBoDAYAk498QjY/W5YgIvm7CNoE02rD1/FDDfsFYMP30dqACL5nMAIasACxwBKLkA0hAdu2ePluolIFWDqVzgAQBBqMIfA97FAIow3KsvB9D7EVlm2R28ihlAIBT4tWRqRiITkLwL9aMCKOCkcitLcdAWDx0SArY5NoNHZplLoLHYRLnW0BPhx+g8JAeuwDyWs9mNpyiu728n1thQ2ERHcXmYuXKD5z9q/i9rajYDTKdheZ6b1HrKMFNTKCWVuiPG+CODB5uwe/vISqc51b9GCQgROdevfJBglPvkeNjmInEpvmDWgNQcBAFM4vfKPIKS0ofzD8ytiXy3Zdd2Ig2SwSBOjaWnRd3e9MOAxrq7hVcWoPNhYIJOa/otT6Mn5TE/HW1i1Bua5L7FgjL95OkHoyUsBAKYXKzs1hEoltBchmMUXFxByHyuqaQgJGo5ZKojT29bE6NAShECgFInn/nkc0l2PK8mk83kz9vpo/GBrUj9Ongo9P++098TgmEsmLbD7ieaRXlvkcr8CJ72X49VThIhkTqGxzy+OZT+Ot624yVn/gcL4Dy4IgwF2Y5fn8OBXdN/0l1zUIiIUJYYtBe6lMZvDXlHK1jK6S6I4rlTur62Ixh+TcNF8y6TvAjVspkttN40/KW/4x6YnETgAAAABJRU5ErkJggg==)}#deviceComponents tr input.updating{background-position:right center;background-repeat:no-repeat;background-image:url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA)}#organisationAddresses{font-size:.9em}#organisationAddresses tr:not(:last-child){border-bottom:1px dashed #aaa}#organisationAddresses th{padding:2px;font-weight:bold;width:200px}#organisationAddresses td{padding:2px;vertical-align:middle}#organisationAddresses tr:nth-child(even){background-color:#fff}#organisationAddresses span.delete{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC)}#organisationAddresses span.edit{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACQElEQVQ4EQXBT4uVVRwA4Od3znnn3pkmi4poFQRFNYuMoAyirAnqI7Rr20dxX7iUFkmLaNNCglaRGGRaQUSZCFLUwlD8MzN6733P+fU8cer02TOHh/dfnue+mnvXx9DnYYw0j05QS1GjmLaqxdZkqpWIxUM7yx/bVNvrx/ee37u/Wtn0ofdu3gzzPMyjE7RStFoc2922WExaqaZFc/Xa9dZ6xjMvvfCsu4dHNn2Y+9DnbrMeNqMTTKWordpeTJbLyaJVOztbrlz7+7l272jt8u9/2WxmBAEASEgiJACmWt05XGvbuw/n/jsnLCcEoCNQkIAAQNIH/3x+I9sYaXuLY/MN7qPN7D5Obrh7Dw2BBCRL1ssnQYtIPXHxlLHztfHf09p7X8l5Zfy0Lx6tDACMmYM39P0zQmo50hhoa2XvirzwFDBmlkN58Q9mAHTylxPGIHNotVVTo6+O+P4D+gElKI2D4/qFV4CxZnqEfkQtAqVUrQQxqPufAjBWYmtbff8LAAAAuaa2hTbG0OHyx/rRVR7cUt89Ix/cMS58xM4TAMCYWd/m7c9EDK2WYmp48Kf62mn9u5OMoC1xXX31LDMABnnpQ5JAK0EUcr0xvt0XuUtM5BCxNn54iwTA6MxdFJTQosRyQpz8RF0V2kwtoj4m3jxPVgBAsjVMhVCW7c7tm79+ee783qabQZLZpSCCJEqkJDMjSmQRWjHdvPHvb+3w4O43ly79fKuPXMuUSIxMMkEpNTOHzIwoJVvUjLAs1cX/AdqeHE5xuOGdAAAAAElFTkSuQmCC)}ul#loggingEntries{overflow:auto;max-height:230px;padding-left:20px}table.deviceProfileTable th.name{width:300px}table.deviceProfileTable th.type{width:120px}table.deviceProfileTable th.deviceCount{width:120px}#configurationDeviceProfileShow #ComputerNameTemplate{width:300px}#configurationDeviceProfileShow #expressionBrowserAnchor{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACKUlEQVQ4jaWTTU4UURDHf/W6gXFgJlHZKFvEe3gBvYhewXgGTXRpOILhGESGgEuNjB9N/BgCTJjufvXhonsQ176kkqpFVf2q6v8kIvifV77b2wsAU6MsCop/LCEpISIkEUAoioSZYWZczOeUp6en1ZPHT+4FQXgQERDBMrZlHACOpIKcM23bMN3fr0pEcDfub21x9/YdIhwR6QoJWFY8wF2JAHfH3fh8MoUISoGugxnPnj1lZ2eHg/cHTL9MMTdy09K0LVkVy8rsbMZkMukpoRQRRBIAZ2czNjbWWV1bZXY2I6WCpq5pmgY1ZXoypaoqAEQSsSQQ6Tb67es3Xr9+Q103PHy4w+Fkgpoxn1/y8eMn6rq+3v4yp0TkOvpeVaytreHuHB4egggXFxdUVUVZrrKxXmJuLBYLut15PwIwGo1IqTuTSGJlJfj1+xdXV1eMx2PCnTZn3B1VRZY6kJ5gc3MTEenO1Cy4nF9SpILxaIya4maUqrgqdU8QEd0IArgbOStFmVFVNCuqirtjalgYboa5A3KDIAJEGA7XiQiauiZnZTgcXhdwM7RXX1ZlsbgCEUTkL8GD7W3UjMGtAUUqMDMiosf3niqTVbk1GLDUT5nV5Oj4A293d1G1647m3qvOb/hGBLRty9HxB8xM5OWrV49+/vj5wuk07x4CEZ2clxcWUuqclFIgiSIJo9Houdz8zufn56siMgBKoACkNwdcRDIRzWg8bpY5fwBYR4lbku/2TAAAAABJRU5ErkJggg==);text-decoration:none}#configurationDocumentTemplateExpressionBrowser{padding-right:275px;background-image:url(data:image/png;base64,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);background-position:right top;background-repeat:no-repeat}#scheduledTaskStatus{width:520px;margin:40px auto 60px auto}#scheduledTaskStatus th.process{text-align:left;font-weight:bold;background-color:#e8eef4;min-height:30px;vertical-align:middle}#scheduledTaskStatus td.description{font-size:.9em;min-height:60px}#scheduledTaskStatus td.progress{padding:8px 10px}#scheduledTaskStatus td.finishedRedirect{background-position:right center;background-repeat:no-repeat;background-image:url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA);padding-right:20px}#scheduledTaskStatus td.exception{background-color:#ffd8d8}div.logEventsViewport{border:1px solid #bbb;-moz-border-radius:4px 4px 0 0;-webkit-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}div.logEventsViewport div.logEventsViewportContainer{overflow-y:auto;overflow-x:hidden}div.logEventsViewport div.logEventsViewportContainer .logEventsViewportNoLogs{padding-top:20px;text-align:center;font-style:italic}div.logEventsViewport table.logEventsViewport{padding:0;margin:0;background-color:#bbb;table-layout:fixed}div.logEventsViewport table.logEventsViewport>thead>tr{background-color:#eee}div.logEventsViewport table.logEventsViewport>thead>tr>th{padding:4px 2px;font-weight:bold;border-bottom:1px solid #bbb}div.logEventsViewport table.logEventsViewport>thead>tr>th.icon{width:20px}div.logEventsViewport table.logEventsViewport>thead>tr>th.timestamp{width:155px}div.logEventsViewport table.logEventsViewport>thead>tr>th.eventType{width:180px}div.logEventsViewport table.logEventsViewport>tbody>tr{background-color:#fff}div.logEventsViewport table.logEventsViewport>tbody>tr:nth-child(even){background-color:#eee}div.logEventsViewport table.logEventsViewport>tbody>tr>td{padding:2px}div.logEventsViewport table.logEventsViewport>tbody>tr>td.icon{width:20px;min-height:16px;background-repeat:no-repeat;background-position:center center}div.logEventsViewport table.logEventsViewport>tbody>tr>td.icon.information{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==)}div.logEventsViewport table.logEventsViewport>tbody>tr>td.icon.warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC)}div.logEventsViewport table.logEventsViewport>tbody>tr>td.icon.error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}div.logEventsViewport table.logEventsViewport>tbody>tr>td.timestamp{width:155px}div.logEventsViewport table.logEventsViewport>tbody>tr>td.eventType{width:180px}#enrolStatus #sessions .session{width:280px;padding:4px 4px 4px 72px;margin:8px;border:5px solid #efefef;-moz-border-radius:0 20px 0 0;-webkit-border-radius:0 20px 0 0;border-radius:0 20px 0 0;background-color:#f5f5f5;background-repeat:no-repeat,no-repeat;background-position:36px 36px,4px 4px;-moz-background-size:32px,64px;-o-background-size:32px,64px;-webkit-background-size:32px,64px;background-size:32px,64px;min-height:72px;cursor:pointer}#enrolStatus #sessions .session>h3{padding-bottom:3px;border-bottom:1px dashed #ccc}#enrolStatus #sessions .session>h3 span.details{font-size:.8em}#enrolStatus #sessions .session>p.sessionStart{color:#888;font-size:.8em;margin-bottom:2px}#enrolStatus #sessions .session>p.sessionStatus{font-size:.9em;height:1.6em;overflow:hidden;margin-bottom:3px}#enrolStatus #sessions .session:hover{border:5px solid #6c7a87;background-color:#dfe1f8}#dialogSession .sessionHeader{width:400px;float:left;padding:0 0 0 134px;background-repeat:no-repeat,no-repeat;background-position:96px 96px,0 0;-moz-background-size:32px,128px;-o-background-size:32px,128px;-webkit-background-size:32px,128px;background-size:32px,128px;min-height:134px}#dialogSession .sessionHeader>h2{padding-bottom:0}#dialogSession .sessionHeader>table{margin-top:4px}#dialogSession .sessionHeader>table th{width:128px;text-align:right}#dialogSession .sessionHeader>table td,#dialogSession .sessionHeader>table th{padding:1px 2px}#dialogSession .sessionProgress{width:320px;float:right;text-align:right}#dialogSession .sessionProgress>p.sessionStart{color:#888;margin-bottom:2px}#dialogSession .sessionProgress>p.sessionStatus{height:1.6em;overflow:hidden;margin-bottom:3px}#dialogSession .sessionInfoContainer>div{float:left;width:428px;overflow:auto}#dialogSession .sessionInfoContainer .sessionInfoMessages{height:440px;border:1px solid #bbb;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;background-color:#fff}#dialogSession .sessionInfoContainer .sessionInfoMessages div.logEventsViewportContainer{overflow:auto}#dialogSession .sessionInfoContainer .sessionInfoMessages div.logEventsViewportContainer .logEventsViewportNoLogs{padding-top:20px;text-align:center;font-style:italic}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport{padding:0;margin:0;background-color:#fff}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>thead>tr{background-color:#eee}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>thead>tr>th{padding:4px 2px;font-weight:bold;border-bottom:1px solid #bbb}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>thead>tr>th.icon{width:20px}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>thead>tr>th.timestamp{width:155px}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>thead>tr>th.eventType{width:180px}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr{background-color:#fff}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr:nth-child(even){background-color:#eee}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td{padding:2px}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon{width:20px;min-height:16px;background-repeat:no-repeat;background-position:center center}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon.information{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==)}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon.warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC)}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon.error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td.timestamp{width:155px}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td.eventType{width:180px}#dialogSession .sessionInfoContainer .sessionInfoConsole{margin-left:6px;background-color:#222;color:#0f0;font-family:Consolas,"Courier New",monospace;border:4px solid #ccc;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;padding:2px;height:430px}#importStatus #sessions .session{padding:4px;margin-bottom:10px;border:1px solid #efefef;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;background-color:#f5f5f5;min-height:72px}#importStatus #sessions .session .sessionLeftPane{width:48%;float:left}#importStatus #sessions .session .sessionLeftPane>h3{padding-bottom:3px;border-bottom:1px dashed #ccc}#importStatus #sessions .session .sessionLeftPane>h3 span.details{font-size:.8em}#importStatus #sessions .session .sessionRightPane{width:48%;float:right;text-align:right}#importStatus #sessions .session .sessionRightPane>p.sessionStart{color:#888;font-size:.8em;margin-bottom:2px}#importStatus #sessions .session .sessionRightPane>p.sessionStatus{font-size:.9em;height:1.6em;overflow:hidden;margin-bottom:3px}#importStatus #sessions .session .sessionPages>.sessionPage{min-height:56px;min-width:256px;float:left;margin:3px 0 3px 0;padding:170px 0 0 0;background-color:#fff;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;border:1px solid #eee;background-repeat:no-repeat;background-position:center top}#importStatus #sessions .session .sessionPages>.sessionPage>.sessionPageDetails{height:84px;padding:2px 4px 0 4px;background-color:rgba(255,255,255,.8)}#importStatus #sessions .session .sessionPages>.sessionPage>.sessionPageDetails p.sessionStatus{font-size:.9em;height:1.6em;margin-bottom:3px}#importStatus #sessions .session .sessionInfoMessages{margin-top:6px;border:1px solid #bbb;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;background-color:#fff}#importStatus #sessions .session .sessionInfoMessages div.logEventsViewportContainer{max-height:220px;overflow:auto}#importStatus #sessions .session .sessionInfoMessages div.logEventsViewportContainer .logEventsViewportNoLogs{padding-top:20px;text-align:center;font-style:italic}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport{padding:0;margin:0;background-color:#fff}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>thead>tr{background-color:#eee}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>thead>tr>th{padding:4px 2px;font-weight:bold;border-bottom:1px solid #bbb}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>thead>tr>th.icon{width:20px}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>thead>tr>th.timestamp{width:155px}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>thead>tr>th.eventType{width:180px}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr{background-color:#fff}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr:nth-child(even){background-color:#eee}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td{padding:2px}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon{width:20px;min-height:16px;background-repeat:no-repeat;background-position:center center}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon.information{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==)}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon.warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC)}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon.error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td.timestamp{width:155px}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td.eventType{width:180px}#undetectedPagesContainer #undetectedPages{list-style:none;margin:0;padding:0}#undetectedPagesContainer #undetectedPages>.undetectedPage{float:left;margin:4px;border:1px solid #bbb;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;background-color:#eee;height:256px;width:256px;background-position:top center;background-repeat:no-repeat;cursor:pointer}#undetectedPagesContainer #undetectedPages>.undetectedPage>.pageDetails{margin-top:232px;height:24px;text-align:center}#undetectedPagesContainer #undetectedPages>.undetectedPage:hover{border:1px solid #6c7a87;background-color:#dfe1f8}#undetectedPageDialog>.pagePreview{height:700px;background-position:top center;background-repeat:no-repeat}#undetectedPageDialog .actions{border-top:1px solid #e5bd99;padding-top:8px;margin-top:8px;text-align:right}.deviceBatches #DeviceBatch_PurchaseDetails_Container{padding:5px 0 5px 5px}.deviceBatches #DeviceBatch_PurchaseDetails{width:570px;height:200px}.deviceBatches #DeviceBatch_WarrantyDetails_Container{padding:5px 0 5px 5px}.deviceBatches #DeviceBatch_WarrantyDetails{width:570px;height:200px}.deviceBatches #DeviceBatch_InsuranceDetails_Container{padding:5px 0 5px 5px}.deviceBatches #DeviceBatch_InsuranceDetails{width:570px;height:200px}.deviceBatches #DeviceBatch_Comments{width:570px;height:200px}#plugins .pageMenuArea a>h3{display:inline;color:#335a87}#plugins .pageMenuArea a>h3:hover{color:#4f81bd}#plugins .pageMenuArea .pageMenuBlurb{padding-left:18px}#plugins #pageMenu td .pageMenuArea:not(:last-child){padding-bottom:5px;margin-bottom:10px}#plugins #pageMenu td .pageMenuArea>a{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90CDRcZMTlpMjsAAAKbSURBVDjLbZHBS2NHHMc/82ZeXpLaiNJHDylF6KEIGxFa0Jtdi4IFqfQq2P/As4f9D0rwplIwsDlZiofHStaTVQJCj+6a9SpKL3HhkTx5cZLMTA9uHov4Pf2Y33w/fL8z4vj4mHfv3vNUHz60ouXl5VmtNScnJ3eVmZkfn96ZqVRQj6P7HXj56VwAFAqFsenp6W+73S7NZjMRUH/iPwVqnwC8nJ2drU9NTb3I5XIDpVS6u7v7qlQqEQQBxWLxq83NzX+EEIUkSYJ8Pj+xs7Pz0+cAyuXyTqPR+F5KiTEGrTVCCHzfR2v99d7eXg3AGMPGxsZb4CPwWEEIAUC73ebm5gYhBKVSiTiOcc4RBAHn5+dYa9Fas76+nvXIEvi+jzEG5xyrq6vEcczV1RW+77O2tka73WZ/f58wDHHOZQBvNEgp6ff7hGHI4eEhSinOzs64uLjg+vqaWq3GYDBASom19vkEWmuMMYyPjxNFEUtLS1hrOTg4wBiD53k4554HeJ6H1pp+v59VaTQaWGuRUqKUYjAYADwPcM6Rpim9Xg9jDFJKgiBASokQAuccDw8P5PP5ZwHOOUe1WsU5hxACz/Oy3xlplCZJkmw3Apw2m81fx8bGEEJkFay12YuPDMPhkDiOvwP+/gwgXhtjTq21Yb/fTyuVysPt7e3PW1tbf/q+T7Va/U0p9b7VahW11vlOp3Pt53JtAOI4RimFUgohRG5+fv6Po6Ojf7e3twcLCwtucXHR1ev1NIqiN3Nzc6+klEUpJVJK7u/vEXEcE4YhgJBSfjE5OfnDysrKX4VC4ctSqdQCXKfTedHr9T5GUfRLmqb/DYfDBDB3d3ePgJGSJOHy8pJOt4vneQS5HABaa6xzfFMuUy6XmZiYyDz/AxHBRmZKLqH0AAAAAElFTkSuQmCC)}#plugins #pageMenu td .pageMenuArea>a:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC4klEQVQ4jWWRTWhcVRTHf/fd+958JJMw+aDFaYNUtChNTDHYFBdNm4K0IEI3lW7ErZR2IWhKi0tba6gBMRAXhaYiiJskjRgENWlVEC3VJrGFgpaIaetMM515kzfzvu51kZmhxrM6i3N+nN//iLm5OW7eXGRznXfHpg8eGui/zwqLs4X8O9kTA5tn+np7UfX+dWB/vRcAyXSidXDHSz23dIrbqugCk5v254GLDcD+/v7dkzue3L4rpdJhlAi8qanZM52ZTp4xz5FN3u46efLN7xyTSJUqawk72ZL9eHx86HEAT+S2jU98fXenUAoT2sj1LSAiElKh11u3vDuxfNGXNVS0zsixga+AAlBXEGCwuPUwxa/l4ygrINWeYdW9x0rLHYK2R0z8+Qpx1EX64QHePrq76aEa0sqWRJHGijO8+Fobzqrk+z+uUWor0PeGQ3l1Owvvu2x19qGN3ggKsBokqRTVMKAnMcrVS6vca8/z48K3/H7jNx7cCVk4l0YXziNUhNGmeUETYCuFF2jKtQpdfMQvl6s8/fyz9HTs5OfxNXTpLVA+xoDWuvGs5huRlqTqx1RCTRz7BOWzXP9sFGMewPoEMuUTBxag6wD+C8Bo3GrEWk0QaMC2SIjTWEoiOkOMsfGqGidZxfwfIIw2mm/eO4g2gBBYlkCIRsQbzlqDY2mi8v2GQfOC+R+uXX01lWlHCIsojqDuqo0BDJbYiCsKA0rFwlPAF48DLsVxPG/FfnfoB15vX2/tr5WV4ZFTI5/Yymb0woUjtrIXl5cX0zU/TD4quXdtR/0DQLFYRCmFUgohhLN3cO8HV2a//Gnsw7FwaN+QGT4wbC5PfurNTM9cGdwzeEZKmZZSIqWkUqkgisUi3d3dAEJK2dLR0fHCy4cOf55OpTPtba3LgCmV3F1e1SvMTE8d9jzv7yiKXCDO5/MbgEa5rsvS0hKlchnLskg4DgC+76ONYVsuRy6XI5vNNnf+BS/0P9OBtw+RAAAAAElFTkSuQmCC)}#pluginCatalog #pluginCatalogHeading{margin-bottom:20px;text-align:right}#pluginCatalog .pluginItem .pluginItemBlurb{margin:4px 0 4px 2px;padding:0 4px;border-left:4px solid #e8eef4}#pluginCatalog .pluginItem .pluginItemBlurb *{padding:0;margin:0}#pluginCatalog .pluginItem>h2:first-child{padding-left:20px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC4klEQVQ4jWWRTWhcVRTHf/fd+958JJMw+aDFaYNUtChNTDHYFBdNm4K0IEI3lW7ErZR2IWhKi0tba6gBMRAXhaYiiJskjRgENWlVEC3VJrGFgpaIaetMM515kzfzvu51kZmhxrM6i3N+nN//iLm5OW7eXGRznXfHpg8eGui/zwqLs4X8O9kTA5tn+np7UfX+dWB/vRcAyXSidXDHSz23dIrbqugCk5v254GLDcD+/v7dkzue3L4rpdJhlAi8qanZM52ZTp4xz5FN3u46efLN7xyTSJUqawk72ZL9eHx86HEAT+S2jU98fXenUAoT2sj1LSAiElKh11u3vDuxfNGXNVS0zsixga+AAlBXEGCwuPUwxa/l4ygrINWeYdW9x0rLHYK2R0z8+Qpx1EX64QHePrq76aEa0sqWRJHGijO8+Fobzqrk+z+uUWor0PeGQ3l1Owvvu2x19qGN3ggKsBokqRTVMKAnMcrVS6vca8/z48K3/H7jNx7cCVk4l0YXziNUhNGmeUETYCuFF2jKtQpdfMQvl6s8/fyz9HTs5OfxNXTpLVA+xoDWuvGs5huRlqTqx1RCTRz7BOWzXP9sFGMewPoEMuUTBxag6wD+C8Bo3GrEWk0QaMC2SIjTWEoiOkOMsfGqGidZxfwfIIw2mm/eO4g2gBBYlkCIRsQbzlqDY2mi8v2GQfOC+R+uXX01lWlHCIsojqDuqo0BDJbYiCsKA0rFwlPAF48DLsVxPG/FfnfoB15vX2/tr5WV4ZFTI5/Yymb0woUjtrIXl5cX0zU/TD4quXdtR/0DQLFYRCmFUgohhLN3cO8HV2a//Gnsw7FwaN+QGT4wbC5PfurNTM9cGdwzeEZKmZZSIqWkUqkgisUi3d3dAEJK2dLR0fHCy4cOf55OpTPtba3LgCmV3F1e1SvMTE8d9jzv7yiKXCDO5/MbgEa5rsvS0hKlchnLskg4DgC+76ONYVsuRy6XI5vNNnf+BS/0P9OBtw+RAAAAAElFTkSuQmCC);background-position:left center;background-repeat:no-repeat;min-height:22px}#pluginCatalog .pluginItem>h2:first-child a{float:right;font-size:12px}
\ No newline at end of file
+.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}#pageMenu td .pageMenuArea>a.config{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACsElEQVQ4y41T3UtTcRie3QaNRhKC/4SgN4KBeSGK4EAvuzChNZQSvJgXYldCV5tMiUzEDVuZ84M0P4OmpjO3lV+bs21nH2fnbGd69mFuMz/39DunFsUadODh/Hj5vc/zPu/7/iQAJP9CQ0NDrU6nO9Lr9YnS0tKqfPdyAoODg7daWlpuqFQqYyyeQDKVQmdnp6G9vf26RqO5nZfAYDC0vZ2ezuj0es5oHEuGuQhCYQ7RWAznFxeYmpo6fmkwcCaTKfO8v1/5F4FMJrv26vUIQ7MhxOJxEYc8DzrIgItEcHB4iONkEql0Gqdn5xgdHfXnVFBXV6cNkATK54M/QMNm+4yPq2vY3NqCl8QSR0ci0icnqK6ufppDoO3t3fSRROe+C/PzCyKJ3e64CjLslZC0tLyMyMHPSjQ9PZbfBEqlslar1fIut/uS8vpgtdoQCoVB/NJSqVReWFh4b2FxkY8SW0JVQl88FHXZ19fHl5eXV0kqK++qInwU+y43duwOrJnXQVE+1NfLn2RVHigUAx7KC/P6BulLEH6aJs2No6LiTpukrKzsEcOy2HN+xfbOLlbXzOCjMajV6vdZgiGd7oswlZnZOdj3nAjQhCQQQElJiUJCPmlTU9MsGR1H/GJre0ds1uTkJEZG3nwzGo3HY+Pj4jSsNhu8/gD0w8OskCPk/rl5z1LpE7DE/wfTkjjGXWLJQRRpovhuZgYO5z4pP4iamhp1zhS6u7u572dniCcScHs8sFisWN+w4NMvWIi6QB4ku9LV1RXKIVB1dJjJX1iiDNm+TJjjRL+CqrAfRDlDFusqHDlAa2vrSg6B4KexsXGiqKjofnFx8WNSxalfbBYNyutNkvhDElfI5fIJ4W7ex5TFi4EBF0umwzAMmpubV/77NWZRUFAgI52eE0DON/Pd+wH6O+vw3ozilAAAAABJRU5ErkJggg==)}#pageMenu td .pageMenuArea>a.config:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACiElEQVQ4y41Ta0iTYRQe/ShCTCpJiiRIKvtTiUE3+2VRiMR+JEk3ktKMslmGJZVEf1aZhpFFS/uRQ7Jcq2jVKvKCu2S66eZl05zu5qd9m+5i28TtO73njYXyNeiDw/dyOOc5z3me9xUAgOBfUXYgNUv3+JxH/0Q0lZ22MjNWHS/R9agwsfZU+hL5hZ0vAi4HhLwsKC5lSBuLtsepbx9MignQ/bRENCC7xekkRYyx4brf6zCB194Pv1gbhGeCMNAk9pEaZlgp4Tru5xXOA0hKWLSg59kVu8dqBJyK4R+3wJSlG3xOM/iZHxD0TEDI54LZ4DQYpFdHeAyK96+rxgb3YAdMDevBoZXDaHM9jH1/R3MBt5PGjH8SzmSmiHkAmru5Omz8aWyGwbf3KAijV0YIqwg2WT7XgW9siDJR38n59hdAcjI9S1NxiGX728M4ya5uAo+tF8i+1sT4hcLk5YuPDikesLgWskJdXCZNWFt1hM3ZtjpTcDxjTen0xAiwfW04EUZbpOA2a6Eka315dMrDE2kS0gTWtgaqC7JDcXN3JIsExOMinIjUGd1HCoCA7WLhpygAuQ9d6Ir5TRWM93yhABj7NiUVCMiXUHl4s4JYx6ALTNcHKlZf400w1Jd5Sd7X+/wGdcOueQWTQ52gry12YA/2zr15NWgTsiFeUxtxpQnDVzrNJK+gLPF8dm9KJc+FlvI9zGzAR++Aa0AFNtXLeYHTERxDeXm3kwfw+uIuFReJIABHBOJwZ9yXTv0jHEf+EczX5W9t5QHgPteEG2VrV8Tlpa6KP09YhKJiEVf8JH+a5AtKszfIsDbmY4pGZ02+mVImwlYf29L6369xDqNlROn3GOS8NFbdbzB85s9H8NGVAAAAAElFTkSuQmCC)}#updateAvailableContainer{float:right;border:1px dashed #ddd;background-color:#fff;font-size:.6em;line-height:1em;padding:4px 10px 4px 70px;text-align:right;height:64px;background-image:url(data:image/png;base64,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);background-position:10px center;background-repeat:no-repeat}#updateAvailableContainer a.button{margin-top:16px}#expressionEditor #expressionEditorExceptionContainer{display:none;border:1px dashed #ff9696;background-color:#ffd8d8;margin:10px 0;padding:10px}#expressionEditor #expressionEditorContainer{border:1px solid #005fab;background-color:#e8eef4;height:100px}.expressionTree span.dynatree-node span.dynatree-icon{background-image:url(data:image/png;base64,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);background-position-y:0}.expressionTree span.dynatree-node.object span.dynatree-icon{background-position-x:0}.expressionTree span.dynatree-node.parameter span.dynatree-icon{background-position-x:-16px}.expressionTree span.dynatree-node.function span.dynatree-icon{background-position-x:-32px}.expressionTree span.dynatree-node.property span.dynatree-icon{background-position-x:-48px}table.expressionsTable{border:solid 1px #e8eef4;border-collapse:collapse}table.expressionsTable>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}table.expressionsTable>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}table.expressionsTable>thead>tr>th,table.expressionsTable>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}table.expressionsTable>tbody>tr:hover>td{background-color:#e8eef4}table.expressionsTable>tfoot>tr>th,table.expressionsTable>tfoot>tr>td{background-color:#e8eef4}table.expressionsTable td.parseError{background-color:#ffd8d8}#AttachmentType_FilterExpression{width:375px}#deviceComponents{border:solid 1px #e8eef4;border-collapse:collapse}#deviceComponents>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}#deviceComponents>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}#deviceComponents>thead>tr>th,#deviceComponents>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}#deviceComponents>tbody>tr:hover>td{background-color:#e8eef4}#deviceComponents>tfoot>tr>th,#deviceComponents>tfoot>tr>td{background-color:#e8eef4}#deviceComponents tr th.actions{width:20px}#deviceComponents tr input.description{width:300px}#deviceComponents tr input.cost{width:75px}#deviceComponents tr span.remove{display:block;float:left;height:16px;width:16px;margin-left:2px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC);cursor:pointer}#deviceComponents tr span.edit{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABNklEQVQ4y6WTMWtUURCFvzN3XrZMIUhAtJaATQRBSb/9/kkLwUYsYrONkEYRUgSx0cZutZBtdt97cyxWNJvY5OUwcDnDzGXud++Vbe6ifPl2eTnL7jGgwuy28y52C/pTHCEk7bxEefySm6HuPzt5IoDNMFBlkBh6Y0EBASggFHQNOkFrwfmni6MciVr9WgMwjgU249DTug6XyQiGoUctiRZsN1syEwR9qdLSve/fvgJw2yNYOsyD2YzF/PkkgK+WH0muXMLrs/cALOane/5/WsxPwUXK9Td59PDRXtF1f1MmfWWEF8f7Ddf9jXZBtNYmPyJFI6XpDDKTrJrOwC6y8W+G2zLAJiM8LD987iYxsMf8+WP15mDcPsU82I6Dq6CqMGCbUCOi0SQQKHBHk6l+tV6/012/828WvZILJzqIIQAAAABJRU5ErkJggg==)}#deviceComponents tr span.editAlert{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACU0lEQVQ4y6WTTUhUURTHf+e9OzPpDD4/YNLADwgiwiAkyiTSNkofi7CV1CJwUxCk6yBqGwRuWwi1qEVtCnWRSS4ywuhDDSezxFGwlziYjjOl8967t8VYMKWL6HLgcLn3/Dn/H+fAfx653/8sEVGhvYBoDAYAk498QjY/W5YgIvm7CNoE02rD1/FDDfsFYMP30dqACL5nMAIasACxwBKLkA0hAdu2ePluolIFWDqVzgAQBBqMIfA97FAIow3KsvB9D7EVlm2R28ihlAIBT4tWRqRiITkLwL9aMCKOCkcitLcdAWDx0SArY5NoNHZplLoLHYRLnW0BPhx+g8JAeuwDyWs9mNpyiu728n1thQ2ERHcXmYuXKD5z9q/i9rajYDTKdheZ6b1HrKMFNTKCWVuiPG+CODB5uwe/vISqc51b9GCQgROdevfJBglPvkeNjmInEpvmDWgNQcBAFM4vfKPIKS0ofzD8ytiXy3Zdd2Ig2SwSBOjaWnRd3e9MOAxrq7hVcWoPNhYIJOa/otT6Mn5TE/HW1i1Bua5L7FgjL95OkHoyUsBAKYXKzs1hEoltBchmMUXFxByHyuqaQgJGo5ZKojT29bE6NAShECgFInn/nkc0l2PK8mk83kz9vpo/GBrUj9Ongo9P++098TgmEsmLbD7ieaRXlvkcr8CJ72X49VThIhkTqGxzy+OZT+Ot624yVn/gcL4Dy4IgwF2Y5fn8OBXdN/0l1zUIiIUJYYtBe6lMZvDXlHK1jK6S6I4rlTur62Ixh+TcNF8y6TvAjVspkttN40/KW/4x6YnETgAAAABJRU5ErkJggg==)}#deviceComponents tr input.updating{background-position:right center;background-repeat:no-repeat;background-image:url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA)}#organisationAddresses{font-size:.9em}#organisationAddresses tr:not(:last-child){border-bottom:1px dashed #aaa}#organisationAddresses th{padding:2px;font-weight:bold;width:200px}#organisationAddresses td{padding:2px;vertical-align:middle}#organisationAddresses tr:nth-child(even){background-color:#fff}#organisationAddresses span.delete{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC)}#organisationAddresses span.edit{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACQElEQVQ4EQXBT4uVVRwA4Od3znnn3pkmi4poFQRFNYuMoAyirAnqI7Rr20dxX7iUFkmLaNNCglaRGGRaQUSZCFLUwlD8MzN6733P+fU8cer02TOHh/dfnue+mnvXx9DnYYw0j05QS1GjmLaqxdZkqpWIxUM7yx/bVNvrx/ee37u/Wtn0ofdu3gzzPMyjE7RStFoc2922WExaqaZFc/Xa9dZ6xjMvvfCsu4dHNn2Y+9DnbrMeNqMTTKWordpeTJbLyaJVOztbrlz7+7l272jt8u9/2WxmBAEASEgiJACmWt05XGvbuw/n/jsnLCcEoCNQkIAAQNIH/3x+I9sYaXuLY/MN7qPN7D5Obrh7Dw2BBCRL1ssnQYtIPXHxlLHztfHf09p7X8l5Zfy0Lx6tDACMmYM39P0zQmo50hhoa2XvirzwFDBmlkN58Q9mAHTylxPGIHNotVVTo6+O+P4D+gElKI2D4/qFV4CxZnqEfkQtAqVUrQQxqPufAjBWYmtbff8LAAAAuaa2hTbG0OHyx/rRVR7cUt89Ix/cMS58xM4TAMCYWd/m7c9EDK2WYmp48Kf62mn9u5OMoC1xXX31LDMABnnpQ5JAK0EUcr0xvt0XuUtM5BCxNn54iwTA6MxdFJTQosRyQpz8RF0V2kwtoj4m3jxPVgBAsjVMhVCW7c7tm79+ee783qabQZLZpSCCJEqkJDMjSmQRWjHdvPHvb+3w4O43ly79fKuPXMuUSIxMMkEpNTOHzIwoJVvUjLAs1cX/AdqeHE5xuOGdAAAAAElFTkSuQmCC)}ul#loggingEntries{overflow:auto;max-height:230px;padding-left:20px}table.deviceProfileTable th.name{width:300px}table.deviceProfileTable th.type{width:120px}table.deviceProfileTable th.deviceCount{width:120px}#configurationDeviceProfileShow #ComputerNameTemplate{width:300px}#configurationDeviceProfileShow #expressionBrowserAnchor{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACKUlEQVQ4jaWTTU4UURDHf/W6gXFgJlHZKFvEe3gBvYhewXgGTXRpOILhGESGgEuNjB9N/BgCTJjufvXhonsQ176kkqpFVf2q6v8kIvifV77b2wsAU6MsCop/LCEpISIkEUAoioSZYWZczOeUp6en1ZPHT+4FQXgQERDBMrZlHACOpIKcM23bMN3fr0pEcDfub21x9/YdIhwR6QoJWFY8wF2JAHfH3fh8MoUISoGugxnPnj1lZ2eHg/cHTL9MMTdy09K0LVkVy8rsbMZkMukpoRQRRBIAZ2czNjbWWV1bZXY2I6WCpq5pmgY1ZXoypaoqAEQSsSQQ6Tb67es3Xr9+Q103PHy4w+Fkgpoxn1/y8eMn6rq+3v4yp0TkOvpeVaytreHuHB4egggXFxdUVUVZrrKxXmJuLBYLut15PwIwGo1IqTuTSGJlJfj1+xdXV1eMx2PCnTZn3B1VRZY6kJ5gc3MTEenO1Cy4nF9SpILxaIya4maUqrgqdU8QEd0IArgbOStFmVFVNCuqirtjalgYboa5A3KDIAJEGA7XiQiauiZnZTgcXhdwM7RXX1ZlsbgCEUTkL8GD7W3UjMGtAUUqMDMiosf3niqTVbk1GLDUT5nV5Oj4A293d1G1647m3qvOb/hGBLRty9HxB8xM5OWrV49+/vj5wuk07x4CEZ2clxcWUuqclFIgiSIJo9Houdz8zufn56siMgBKoACkNwdcRDIRzWg8bpY5fwBYR4lbku/2TAAAAABJRU5ErkJggg==);text-decoration:none}#configurationDocumentTemplateExpressionBrowser{padding-right:275px;background-image:url(data:image/png;base64,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);background-position:right top;background-repeat:no-repeat}#scheduledTaskStatus{width:520px;margin:40px auto 60px auto}#scheduledTaskStatus th.process{text-align:left;font-weight:bold;background-color:#e8eef4;min-height:30px;vertical-align:middle}#scheduledTaskStatus td.description{font-size:.9em;min-height:60px}#scheduledTaskStatus td.progress{padding:8px 10px}#scheduledTaskStatus td.finishedRedirect{background-position:right center;background-repeat:no-repeat;background-image:url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA);padding-right:20px}#scheduledTaskStatus td.exception{background-color:#ffd8d8}div.logEventsViewport{border:1px solid #bbb;-moz-border-radius:4px 4px 0 0;-webkit-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}div.logEventsViewport div.logEventsViewportContainer{overflow-y:auto;overflow-x:hidden}div.logEventsViewport div.logEventsViewportContainer .logEventsViewportNoLogs{padding-top:20px;text-align:center;font-style:italic}div.logEventsViewport table.logEventsViewport{padding:0;margin:0;background-color:#bbb;table-layout:fixed}div.logEventsViewport table.logEventsViewport>thead>tr{background-color:#eee}div.logEventsViewport table.logEventsViewport>thead>tr>th{padding:4px 2px;font-weight:bold;border-bottom:1px solid #bbb}div.logEventsViewport table.logEventsViewport>thead>tr>th.icon{width:20px}div.logEventsViewport table.logEventsViewport>thead>tr>th.timestamp{width:155px}div.logEventsViewport table.logEventsViewport>thead>tr>th.eventType{width:180px}div.logEventsViewport table.logEventsViewport>tbody>tr{background-color:#fff}div.logEventsViewport table.logEventsViewport>tbody>tr:nth-child(even){background-color:#eee}div.logEventsViewport table.logEventsViewport>tbody>tr>td{padding:2px}div.logEventsViewport table.logEventsViewport>tbody>tr>td.icon{width:20px;min-height:16px;background-repeat:no-repeat;background-position:center center}div.logEventsViewport table.logEventsViewport>tbody>tr>td.icon.information{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==)}div.logEventsViewport table.logEventsViewport>tbody>tr>td.icon.warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC)}div.logEventsViewport table.logEventsViewport>tbody>tr>td.icon.error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}div.logEventsViewport table.logEventsViewport>tbody>tr>td.timestamp{width:155px}div.logEventsViewport table.logEventsViewport>tbody>tr>td.eventType{width:180px}#enrolStatus #sessions .session{width:280px;padding:4px 4px 4px 72px;margin:8px;border:5px solid #efefef;-moz-border-radius:0 20px 0 0;-webkit-border-radius:0 20px 0 0;border-radius:0 20px 0 0;background-color:#f5f5f5;background-repeat:no-repeat,no-repeat;background-position:36px 36px,4px 4px;-moz-background-size:32px,64px;-o-background-size:32px,64px;-webkit-background-size:32px,64px;background-size:32px,64px;min-height:72px;cursor:pointer}#enrolStatus #sessions .session>h3{padding-bottom:3px;border-bottom:1px dashed #ccc}#enrolStatus #sessions .session>h3 span.details{font-size:.8em}#enrolStatus #sessions .session>p.sessionStart{color:#888;font-size:.8em;margin-bottom:2px}#enrolStatus #sessions .session>p.sessionStatus{font-size:.9em;height:1.6em;overflow:hidden;margin-bottom:3px}#enrolStatus #sessions .session:hover{border:5px solid #6c7a87;background-color:#dfe1f8}#dialogSession .sessionHeader{width:400px;float:left;padding:0 0 0 134px;background-repeat:no-repeat,no-repeat;background-position:96px 96px,0 0;-moz-background-size:32px,128px;-o-background-size:32px,128px;-webkit-background-size:32px,128px;background-size:32px,128px;min-height:134px}#dialogSession .sessionHeader>h2{padding-bottom:0}#dialogSession .sessionHeader>table{margin-top:4px}#dialogSession .sessionHeader>table th{width:128px;text-align:right}#dialogSession .sessionHeader>table td,#dialogSession .sessionHeader>table th{padding:1px 2px}#dialogSession .sessionProgress{width:320px;float:right;text-align:right}#dialogSession .sessionProgress>p.sessionStart{color:#888;margin-bottom:2px}#dialogSession .sessionProgress>p.sessionStatus{height:1.6em;overflow:hidden;margin-bottom:3px}#dialogSession .sessionInfoContainer>div{float:left;width:428px;overflow:auto}#dialogSession .sessionInfoContainer .sessionInfoMessages{height:440px;border:1px solid #bbb;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;background-color:#fff}#dialogSession .sessionInfoContainer .sessionInfoMessages div.logEventsViewportContainer{overflow:auto}#dialogSession .sessionInfoContainer .sessionInfoMessages div.logEventsViewportContainer .logEventsViewportNoLogs{padding-top:20px;text-align:center;font-style:italic}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport{padding:0;margin:0;background-color:#fff}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>thead>tr{background-color:#eee}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>thead>tr>th{padding:4px 2px;font-weight:bold;border-bottom:1px solid #bbb}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>thead>tr>th.icon{width:20px}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>thead>tr>th.timestamp{width:155px}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>thead>tr>th.eventType{width:180px}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr{background-color:#fff}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr:nth-child(even){background-color:#eee}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td{padding:2px}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon{width:20px;min-height:16px;background-repeat:no-repeat;background-position:center center}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon.information{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==)}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon.warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC)}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon.error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td.timestamp{width:155px}#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport>tbody>tr>td.eventType{width:180px}#dialogSession .sessionInfoContainer .sessionInfoConsole{margin-left:6px;background-color:#222;color:#0f0;font-family:Consolas,"Courier New",monospace;border:4px solid #ccc;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;padding:2px;height:430px}#importStatus #sessions .session{padding:4px;margin-bottom:10px;border:1px solid #efefef;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;background-color:#f5f5f5;min-height:72px}#importStatus #sessions .session .sessionLeftPane{width:48%;float:left}#importStatus #sessions .session .sessionLeftPane>h3{padding-bottom:3px;border-bottom:1px dashed #ccc}#importStatus #sessions .session .sessionLeftPane>h3 span.details{font-size:.8em}#importStatus #sessions .session .sessionRightPane{width:48%;float:right;text-align:right}#importStatus #sessions .session .sessionRightPane>p.sessionStart{color:#888;font-size:.8em;margin-bottom:2px}#importStatus #sessions .session .sessionRightPane>p.sessionStatus{font-size:.9em;height:1.6em;overflow:hidden;margin-bottom:3px}#importStatus #sessions .session .sessionPages>.sessionPage{min-height:56px;min-width:256px;float:left;margin:3px 0 3px 0;padding:170px 0 0 0;background-color:#fff;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;border:1px solid #eee;background-repeat:no-repeat;background-position:center top}#importStatus #sessions .session .sessionPages>.sessionPage>.sessionPageDetails{height:84px;padding:2px 4px 0 4px;background-color:rgba(255,255,255,.8)}#importStatus #sessions .session .sessionPages>.sessionPage>.sessionPageDetails p.sessionStatus{font-size:.9em;height:1.6em;margin-bottom:3px}#importStatus #sessions .session .sessionInfoMessages{margin-top:6px;border:1px solid #bbb;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;background-color:#fff}#importStatus #sessions .session .sessionInfoMessages div.logEventsViewportContainer{max-height:220px;overflow:auto}#importStatus #sessions .session .sessionInfoMessages div.logEventsViewportContainer .logEventsViewportNoLogs{padding-top:20px;text-align:center;font-style:italic}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport{padding:0;margin:0;background-color:#fff}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>thead>tr{background-color:#eee}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>thead>tr>th{padding:4px 2px;font-weight:bold;border-bottom:1px solid #bbb}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>thead>tr>th.icon{width:20px}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>thead>tr>th.timestamp{width:155px}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>thead>tr>th.eventType{width:180px}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr{background-color:#fff}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr:nth-child(even){background-color:#eee}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td{padding:2px}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon{width:20px;min-height:16px;background-repeat:no-repeat;background-position:center center}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon.information{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==)}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon.warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC)}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td.icon.error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td.timestamp{width:155px}#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport>tbody>tr>td.eventType{width:180px}#undetectedPagesContainer #undetectedPages{list-style:none;margin:0;padding:0}#undetectedPagesContainer #undetectedPages>.undetectedPage{float:left;margin:4px;border:1px solid #bbb;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;background-color:#eee;height:256px;width:256px;background-position:top center;background-repeat:no-repeat;cursor:pointer}#undetectedPagesContainer #undetectedPages>.undetectedPage>.pageDetails{margin-top:232px;height:24px;text-align:center}#undetectedPagesContainer #undetectedPages>.undetectedPage:hover{border:1px solid #6c7a87;background-color:#dfe1f8}#undetectedPageDialog>.pagePreview{height:700px;background-position:top center;background-repeat:no-repeat}#undetectedPageDialog .actions{border-top:1px solid #e5bd99;padding-top:8px;margin-top:8px;text-align:right}.deviceBatches #DeviceBatch_PurchaseDetails_Container{padding:5px 0 5px 5px}.deviceBatches #DeviceBatch_PurchaseDetails{width:570px;height:200px}.deviceBatches #DeviceBatch_WarrantyDetails_Container{padding:5px 0 5px 5px}.deviceBatches #DeviceBatch_WarrantyDetails{width:570px;height:200px}.deviceBatches #DeviceBatch_InsuranceDetails_Container{padding:5px 0 5px 5px}.deviceBatches #DeviceBatch_InsuranceDetails{width:570px;height:200px}.deviceBatches #DeviceBatch_Comments{width:570px;height:200px}#plugins .pageMenuArea a>h3{display:inline;color:#335a87}#plugins .pageMenuArea a>h3:hover{color:#4f81bd}#plugins .pageMenuArea .pageMenuBlurb{padding-left:18px}#plugins #pageMenu td .pageMenuArea:not(:last-child){padding-bottom:5px;margin-bottom:10px}#plugins #pageMenu td .pageMenuArea>a,#plugins #pageMenu td .pageMenuArea>h3{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90CDRcZMTlpMjsAAAKbSURBVDjLbZHBS2NHHMc/82ZeXpLaiNJHDylF6KEIGxFa0Jtdi4IFqfQq2P/As4f9D0rwplIwsDlZiofHStaTVQJCj+6a9SpKL3HhkTx5cZLMTA9uHov4Pf2Y33w/fL8z4vj4mHfv3vNUHz60ouXl5VmtNScnJ3eVmZkfn96ZqVRQj6P7HXj56VwAFAqFsenp6W+73S7NZjMRUH/iPwVqnwC8nJ2drU9NTb3I5XIDpVS6u7v7qlQqEQQBxWLxq83NzX+EEIUkSYJ8Pj+xs7Pz0+cAyuXyTqPR+F5KiTEGrTVCCHzfR2v99d7eXg3AGMPGxsZb4CPwWEEIAUC73ebm5gYhBKVSiTiOcc4RBAHn5+dYa9Fas76+nvXIEvi+jzEG5xyrq6vEcczV1RW+77O2tka73WZ/f58wDHHOZQBvNEgp6ff7hGHI4eEhSinOzs64uLjg+vqaWq3GYDBASom19vkEWmuMMYyPjxNFEUtLS1hrOTg4wBiD53k4554HeJ6H1pp+v59VaTQaWGuRUqKUYjAYADwPcM6Rpim9Xg9jDFJKgiBASokQAuccDw8P5PP5ZwHOOUe1WsU5hxACz/Oy3xlplCZJkmw3Apw2m81fx8bGEEJkFay12YuPDMPhkDiOvwP+/gwgXhtjTq21Yb/fTyuVysPt7e3PW1tbf/q+T7Va/U0p9b7VahW11vlOp3Pt53JtAOI4RimFUgohRG5+fv6Po6Ojf7e3twcLCwtucXHR1ev1NIqiN3Nzc6+klEUpJVJK7u/vEXEcE4YhgJBSfjE5OfnDysrKX4VC4ctSqdQCXKfTedHr9T5GUfRLmqb/DYfDBDB3d3ePgJGSJOHy8pJOt4vneQS5HABaa6xzfFMuUy6XmZiYyDz/AxHBRmZKLqH0AAAAAElFTkSuQmCC)}#plugins #pageMenu td .pageMenuArea>a:hover,#plugins #pageMenu td .pageMenuArea>h3:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC4klEQVQ4jWWRTWhcVRTHf/fd+958JJMw+aDFaYNUtChNTDHYFBdNm4K0IEI3lW7ErZR2IWhKi0tba6gBMRAXhaYiiJskjRgENWlVEC3VJrGFgpaIaetMM515kzfzvu51kZmhxrM6i3N+nN//iLm5OW7eXGRznXfHpg8eGui/zwqLs4X8O9kTA5tn+np7UfX+dWB/vRcAyXSidXDHSz23dIrbqugCk5v254GLDcD+/v7dkzue3L4rpdJhlAi8qanZM52ZTp4xz5FN3u46efLN7xyTSJUqawk72ZL9eHx86HEAT+S2jU98fXenUAoT2sj1LSAiElKh11u3vDuxfNGXNVS0zsixga+AAlBXEGCwuPUwxa/l4ygrINWeYdW9x0rLHYK2R0z8+Qpx1EX64QHePrq76aEa0sqWRJHGijO8+Fobzqrk+z+uUWor0PeGQ3l1Owvvu2x19qGN3ggKsBokqRTVMKAnMcrVS6vca8/z48K3/H7jNx7cCVk4l0YXziNUhNGmeUETYCuFF2jKtQpdfMQvl6s8/fyz9HTs5OfxNXTpLVA+xoDWuvGs5huRlqTqx1RCTRz7BOWzXP9sFGMewPoEMuUTBxag6wD+C8Bo3GrEWk0QaMC2SIjTWEoiOkOMsfGqGidZxfwfIIw2mm/eO4g2gBBYlkCIRsQbzlqDY2mi8v2GQfOC+R+uXX01lWlHCIsojqDuqo0BDJbYiCsKA0rFwlPAF48DLsVxPG/FfnfoB15vX2/tr5WV4ZFTI5/Yymb0woUjtrIXl5cX0zU/TD4quXdtR/0DQLFYRCmFUgohhLN3cO8HV2a//Gnsw7FwaN+QGT4wbC5PfurNTM9cGdwzeEZKmZZSIqWkUqkgisUi3d3dAEJK2dLR0fHCy4cOf55OpTPtba3LgCmV3F1e1SvMTE8d9jzv7yiKXCDO5/MbgEa5rsvS0hKlchnLskg4DgC+76ONYVsuRy6XI5vNNnf+BS/0P9OBtw+RAAAAAElFTkSuQmCC)}#pluginCatalog #pluginCatalogHeading{margin-bottom:20px;text-align:right}#pluginCatalog .pluginItem .pluginItemBlurb{margin:4px 0 4px 2px;padding:0 4px;border-left:4px solid #e8eef4}#pluginCatalog .pluginItem .pluginItemBlurb *{padding:0;margin:0}#pluginCatalog .pluginItem>h2:first-child{padding-left:20px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC4klEQVQ4jWWRTWhcVRTHf/fd+958JJMw+aDFaYNUtChNTDHYFBdNm4K0IEI3lW7ErZR2IWhKi0tba6gBMRAXhaYiiJskjRgENWlVEC3VJrGFgpaIaetMM515kzfzvu51kZmhxrM6i3N+nN//iLm5OW7eXGRznXfHpg8eGui/zwqLs4X8O9kTA5tn+np7UfX+dWB/vRcAyXSidXDHSz23dIrbqugCk5v254GLDcD+/v7dkzue3L4rpdJhlAi8qanZM52ZTp4xz5FN3u46efLN7xyTSJUqawk72ZL9eHx86HEAT+S2jU98fXenUAoT2sj1LSAiElKh11u3vDuxfNGXNVS0zsixga+AAlBXEGCwuPUwxa/l4ygrINWeYdW9x0rLHYK2R0z8+Qpx1EX64QHePrq76aEa0sqWRJHGijO8+Fobzqrk+z+uUWor0PeGQ3l1Owvvu2x19qGN3ggKsBokqRTVMKAnMcrVS6vca8/z48K3/H7jNx7cCVk4l0YXziNUhNGmeUETYCuFF2jKtQpdfMQvl6s8/fyz9HTs5OfxNXTpLVA+xoDWuvGs5huRlqTqx1RCTRz7BOWzXP9sFGMewPoEMuUTBxag6wD+C8Bo3GrEWk0QaMC2SIjTWEoiOkOMsfGqGidZxfwfIIw2mm/eO4g2gBBYlkCIRsQbzlqDY2mi8v2GQfOC+R+uXX01lWlHCIsojqDuqo0BDJbYiCsKA0rFwlPAF48DLsVxPG/FfnfoB15vX2/tr5WV4ZFTI5/Yymb0woUjtrIXl5cX0zU/TD4quXdtR/0DQLFYRCmFUgohhLN3cO8HV2a//Gnsw7FwaN+QGT4wbC5PfurNTM9cGdwzeEZKmZZSIqWkUqkgisUi3d3dAEJK2dLR0fHCy4cOf55OpTPtba3LgCmV3F1e1SvMTE8d9jzv7yiKXCDO5/MbgEa5rsvS0hKlchnLskg4DgC+76ONYVsuRy6XI5vNNnf+BS/0P9OBtw+RAAAAAElFTkSuQmCC);background-position:left center;background-repeat:no-repeat;min-height:22px}#pluginCatalog .pluginItem>h2:first-child a{float:right;font-size:12px}#Config_AuthRoles_Show #Config_AuthRoles_Claims_Tree span.fancytree-ico-c>span.fancytree-icon{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACgklEQVQ4y5XSXUhTYRgH8OkItViSri676CIIupC6kIjIrQTNtLbhMEOLmjGsi1CiJoULZmEpW4l5RDehkR/owJNF+3DLliMd6GDWcrFNyNEceAarZZuc7d8xSNQzgx54Lt6v3/vxvBwAnI3Z0NDAJQiifWJiImgwGOIkScasVuuMWq2u3Dp3LTc15HJ5Zk9PzzhFURh79fpTr7avv4voHns/ORkJh8NQqVTX/wmIxWLZW5sNBNGt3tgvrareYzQavVqt9nt5eXnetkCTosk4OkrGWh485G7dqfXR4yvMlSCVSs9sC3z2frFOTU0vp7ur2TJe4XA4oNFoKrcFZl0us9lsodIBk44PpSaTCXa7vSwtoNPpAsxqOJ1OBAIBOhKJ0PF4nE6lUjQzTq+srKR8Ph/m5uaSS0tLLSygsbFx1ev1IhgMwuPxIBQKIRaLIZlM4m+4XC4olUp0dna+YwEKhSLh9/uxuLgIt9v9B4pGo6Bpeh1YOx1TSuj1+nEWcPfe/cSsy4fgtzB8vgX4F34wADbF/Pw81JoOGEgbG3jeVppY9jVD2XwbN+ol+BURwdBfC1ldPaL+ywi5ZTgvuYibshJQ5nNsQFxWmHCTRzHWvR88XjaeKrmgPnJw8AAPFcKdzANkQCrIQn4+H3fEWWyg4MixuOD4IdDTeWiTZyB3Nw+Wrkx4BjOxj5+LW1XZwDAHJw/vAjdnr5kNFBSsSipr0asqwcKbQlyqLkH91bOgZk6DaKlgfuAFzOpOwN5xCnw+37kOFBcX7ygqKrpWU1P7kylPqrXtGdqf6DAwMIjhkZcYGrHAZLbBYrGhT0/ixdBoSiQSfRUKhRKBQJDDSffr/id/A3fSz48XbZuBAAAAAElFTkSuQmCC')}#Config_AuthRoles_Show #Config_AuthRoles_Claims_Tree span.fancytree-ico-c.fancytree-selected>span.fancytree-icon{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACWUlEQVQ4y6XRXWiSURgHcJsXa4WNNuuyiy6CoAupixERoXXhmljuxaJiFrVA1i72cVFCOSMt8rNt2YfGO5g5Z1NstWW+c4ZBq4QpqMkEbZDSCObAMprjdf90sIjxsgUdODd/zvmd5zwPCwDrf/aGB7q6utgmk8ngdruzVqt10eVyTWu1Wuk/AXK5vMpoNPpjsRgGbU8/9fbdH/J4PAuRSARKpfLKhoBYLG595nTCaDSZVjPp6TPbHQ5H0mAwfBeJRHXrAp0dna9JcqCguX2H/Xd+S625aLFYQBDE8XWBd+8/TI6Njc+vzcfGX4nLX4FOp5OuC0wGAlS53NzaPPAm2Gi32+H3+5tYJEl+pigKoVAIPp+PnpqaosPhMF1uHB2Px2mv14vya6VgMKhhHGN3d/dSMplENptFIpHA3NwcCoUCSqUSKqvScZVKBbPZHGQEFApFMZ1OI5PJIBqNrkD5fB40Ta8AlcrUajVsNpufEbh+42YxHEkh+/UbUqlZpGd/lAH8WTMzMzDd64d7NMAMDOobi/OpHqh6rqK9jcCvBQncQzK0Xm5DPn0BJ4lz6GgVIkedYAaamxqK0dEDePl4FziczehTsZGLs7BnNwdiwRac4lejvp6La83VzABv/8FF/qG9oD/WQS/fhNptHEw8rEJiuAo7ubXACAtH9m0Fu2YHxQzweEuEVIYnaiFmvQ04f1aItksi5KaP4ZFGjDB5GG/7j4LL5YYYgZYW2c/yiJbv6h/A0EvC4RjGiOsFnK4J+KgABmyjsDufL0skki8CgYCoXOLz+TWrwG+kXMkgQ6yv+QAAAABJRU5ErkJggg==')}#Config_AuthRoles_Show #Config_AuthRoles_Claims_Tree span.fancytree-node.fancytree-selected{font-style:normal}#Config_AuthRoles_Subjects li,#Config_AuthRoles_Subjects_Update_Dialog_List li{padding:4px 0 4px 24px;background-position:4px center;background-repeat:no-repeat;min-height:16px}#Config_AuthRoles_Subjects li.user,#Config_AuthRoles_Subjects_Update_Dialog_List li.user{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNIBmxLMwAAAKCSURBVDjLjZK/axNxGMafu9yvXO5X01yaBHtpE2N/DbbURRREF3URxEIFRx1VtIPi4CC46h+gi3OpOBdRqrOYCnZITZuS5EybNklz+dXLN7lzKAiJQX3h3R6e58P7vJTruuifWGKBjRiRZ6JPupXfybIsz79tWLVH6dRyq1/LYMAEQsGnDx7feZL8toVsJgtJVe6KPhEA7vVrqX6CWGKBiibiaX8wEMttZXBQ2IVXkqEG9L1quRrd+Pra/isBTdNM0dzlM6kfoAEIigafFgHt1UQ9avAAegzofoN0apmQtr3joSlwogQtOIaAMYlQfLqw9u6+9UfgoBswHPNJHlIhSBpEfwRqMAw9MvRlkHagAbHJG8Xvb4mKBg/nhSAL4Fjn1SAtNahGAJiYWvyohYyLodgsjmrF9dXlh3P/TXBq6uYYrwyHGZZDp7GLfTOjxhILE/8kGI/fuMBy7BIvqVcCxiQ3HBkFXAclM4eSudUhR40PpN16Ccd5n95ccXsILl1der54e3FN1qPXBDnAEdtGvXKIRrWGThdQAgYj66OXlcCJVc4rveghGI9dH56Yn0+OT8+M5nNlsIIPFM2i61BwuoDrunBIB227iQ5polE2d8q5zfPpzRWTAQBBUkKVQzfo3atj9twsCHHRaHQBz3FKp+2gbXdw1GyjXrHgYfiwVcxGAZg0ALRatZOCT+IJseFSLAjpwsO4YOnj9QoUZIWFHpbRqhXgkDbfdamZ369slX+mdjPrn+tW5Ix/xBA13Q8PTaG3YQqVYgX7uUyzXsonqyVzo6cFVZ1jANrwqfrZkWj8tKaHDF6Uh2iapgixLat0kC9sp75X93NrgLNdrSYdAPgF6h0J0E7J5qMAAAAASUVORK5CYII=')}#Config_AuthRoles_Subjects li.group,#Config_AuthRoles_Subjects_Update_Dialog_List li.group{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNJ4fVuW8AAALmSURBVDjLpZNJaBNxFMa/mUyWmTSZJM02bRpta7W1VrErBRsqCIriwV0QFQRBXC6CngRP4lGKG9IiVrxYBEGwKnhwQWtqpBate0pptUmbtEkmM5ksM/P3VNH26Du9w/f93uPxPooQgv8pZqFxtjg7eA9/UtM0TkpLj1NvU71/Cw9vrOpiLYZTJU1T1QIu9z+fGgIAekHA2rgtNy/27vXXeLuNJmb34klOF9va3BbqNtusIZrC2SUbWO3s/msPrphEUXZZXVxjx9YDB3h62bHJX/EZay56emun7Ujz5v2eoZGXcPCm+SUAMSOXIqMfEFxXjmKSd4f82+60N1Tg3Pk+sP5ViE4NypcuHEVrwAtDqaQuATCMIeKvKm9avtaL3BgXv3/rYcWArhh5TyUI5/eZCvYvATc61ghuCJ66uwu+PzewONjjcjonT7yZJdF3qRMgJGVzeSDUtaG6ZWNUKjjO6ERFPK8rA5HIjX8Ay3fWtljspr6a9YLFG3RTRUf8BBfQFL68Cg6hQjfGnuSFithVl4HDr9icOZZOXN+3ubIdAKiukxsOen387SSScPpsoBkaBU3Gz6cUmKlO2Jws9qwIg9bicFjsINCQURTMSyrGU9IhRjHK3YGmGrQL9cgTGZlkHiOP0jCLK+BbuRo5OY37b/zYWW1AQ4cXRNdQUhWIiggN0yFanMlSqUwGpjIAYhnUcAjKp2YYKQ9KOgFoDpKnCT3T63BpkIXZ4YOVr0RC0jAxkzZThBCUd3oaAw3OVnOufrtg2bEr2BBEUWVQUgk0naAglyBJOeiJH5m19EBPtpiZHJlIhF+Pzn9kAGBuKDEGYKy2/mDA20l22d1u5JUiQHQAAOUzYnYqju+Tmr0vQvckZ78ufSQAmJ/91j/6LE2L6fim4Mr6OrOFtQLQs5ls6svwi+FYdPSeWtSzf3uoxWnk+fVOzu5uE6rr1rgDNS5dU7X4xI/p2Pjn8Fzi1fvFGaH+N86/AQJNOrMW5kkPAAAAAElFTkSuQmCC')}#Config_AuthRoles_Subjects_Update_Dialog{display:none}#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_None{display:none}#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_ListContainer{height:280px;overflow-y:auto;background-color:#fff;border:1px solid #8db2d8}#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_None{padding-top:15px;display:block;text-align:center}#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_AddContainer{padding-top:10px;padding-left:10px}#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_List li{cursor:pointer}#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_List li:hover{background-color:#e8eef4}#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_List li:hover span.remove{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC)}#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_List li span.remove{margin-top:2px;padding-right:6px;display:block;float:right;height:16px;width:16px;cursor:pointer;background-repeat:no-repeat}#Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_List li span.remove:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}
\ No newline at end of file
diff --git a/Disco.Web/ClientSource/Style/Fancytree/icons.gif b/Disco.Web/ClientSource/Style/Fancytree/icons.gif
new file mode 100644
index 00000000..6e237a0f
Binary files /dev/null and b/Disco.Web/ClientSource/Style/Fancytree/icons.gif differ
diff --git a/Disco.Web/ClientSource/Style/Fancytree/loading.gif b/Disco.Web/ClientSource/Style/Fancytree/loading.gif
new file mode 100644
index 00000000..ef88497c
Binary files /dev/null and b/Disco.Web/ClientSource/Style/Fancytree/loading.gif differ
diff --git a/Disco.Web/ClientSource/Style/Fancytree/ui.fancytree.css b/Disco.Web/ClientSource/Style/Fancytree/ui.fancytree.css
new file mode 100644
index 00000000..21d67e80
--- /dev/null
+++ b/Disco.Web/ClientSource/Style/Fancytree/ui.fancytree.css
@@ -0,0 +1,588 @@
+/*
+ * Fancytree Win8 styles
+
+Borders have NO radius and NO gradients are used!
+
+both:
+   unselected background: white
+   hover bar (unselected, inactive): #E5F3FB (border: #70C0E7) 'very light blue'
+   active node: #CBE8F6 (border: #26A0DA)  'light blue'
+   active node with hover: wie active node
+
+Tree view:
+   active node, tree inactive: #F7F7F7 (border: #DEDEDE) 'light gray, selected, but tree not active'
+
+List view:
+   selected bar: --> active bar
+   focus  bar: transparent(white) + border 1px solid #3399FF  ()
+
+   table left/right border: #EDEDED 'light gray'
+ */
+.ui-helper-hidden {
+	display: none;
+}
+
+.fancytree-container
+{
+	font-family: tahoma, arial, helvetica;
+	font-size: 10pt; /* font size should not be too big */
+	white-space: nowrap;
+	padding: 3px;
+	margin: 0; /* issue 201 */
+	background-color: white;
+	border: 1px dotted gray;
+	overflow: auto;
+	height: 100%; /* issue 263 */
+}
+
+ul.fancytree-container ul
+{
+	padding: 0 0 0 16px;
+	margin: 0;
+}
+
+ul.fancytree-container li
+{
+	list-style-image: none;
+	list-style-position: outside;
+	list-style-type: none;
+	-moz-background-clip:border;
+	-moz-background-inline-policy: continuous;
+	-moz-background-origin: padding;
+	background-attachment: scroll;
+	background-color: transparent;
+	background-position: 0 0;
+	background-repeat: repeat-y;
+	background-image: none;  /* no v-lines */
+
+	margin:0;
+	padding:1px 0 0 0;
+}
+/* Suppress lines for last child node */
+ul.fancytree-container li.fancytree-lastsib
+{
+	background-image: none;
+}
+/* Suppress lines if level is fixed expanded (option minExpandLevel) */
+ul.fancytree-no-connector > li
+{
+	background-image: none;
+}
+
+/* Style, when control is disabled */
+.ui-fancytree-disabled ul.fancytree-container
+{
+	opacity: 0.5;
+/*	filter: alpha(opacity=50); /* Yields a css warning */
+	background-color: silver;
+}
+
+
+span.fancytree-node
+{
+	display: inline-block;
+	width: 100%;
+	border: 1px solid transparent;
+}
+
+/*******************************************************************************
+ * Common icon definitions
+ */
+span.fancytree-empty,
+span.fancytree-vline,
+/*span.fancytree-connector,*/
+span.fancytree-expander,
+span.fancytree-icon,
+span.fancytree-checkbox,
+span.fancytree-radio,
+span.fancytree-drag-helper-img,
+#fancytree-drop-marker
+{
+	width: 16px;
+	height: 16px;
+/*	display: -moz-inline-box; /* @ FF 1+2 removed for issue 221*/
+/*	-moz-box-align: start; /* issue 221 */
+	display: inline-block; /* Required to make a span sizeable */
+	vertical-align: top;
+	background-repeat: no-repeat;
+	background-position: left;
+	background-image: url(data:image/gif;base64,R0lGODlhYADIAOf/AAABABUFagAQdAgZep8AAAAplyoxQh8wjQQ5p/8AAP8ACABCrkFIWhtShf8bFP8eHg5ayP8jJ0pVbABiyVlbWABr2FFhfQB04P8+RACFhEBznACA5lVxkv9ITBmVHEl7klV6mlZ6rf9RVACN+USElACU+v9ZVxilGVSFr1+EpHp7tUyMln+BfgCc/3mFhf9iYIOFgiatI2iMrWyMp2uMtE+ZiwSl/f9qaE+U1laZlouNimuUrm+TtHWUo3aWsoyUm5KUkW6cr/95e1WrgXGtLYmdnEW9RXGmqzrDMJudmf+Chnmi1li1g3CtpaKfo1+2i2G1mHmtpn65N6WlnMelPsalRWu9ZWm9a6Smo4Wtu/+PjnK9bXu1poiuyULOYXi9dMStQnS8mcisSqqtnV+93SDO9om1vHm17autqsWtX421tna+p43CQqytt3DHZ8+tVJG1vXLGc5W1xEzXU0zWaP+cmaW1u++uMKW1yM22S9C0WYa77n7Gol/G/8+1X9W2RpbJSbS2s7S1vo3HhozHi7W02P+kpKK+1ZzA1a29xJjFs9W9UtS9Wc+9bK690bu9upPC/92+TdW9dLW835POk7y9x5vOlJnOmnrO/VzX/77BvdfFWPHFH+DGTN/GU7bGzN7GWtfFepbL/93GYdzGaLbG2aHL8+HGcJ7N+8XHxMXG0KjWogD///+8unbe/d/OZ73O1JTW/+bOYcHN29vPe83Lz6jS++bPaenNd+XPcIPf/83Py6vfo5LnpufWbrTY/Lfdy+nWg/3KyO3Xd/DVhNTW09LX4Lfc/7Hf/9nW6O7efL/f/aPo//Ldi+7fhKzn/7Xn/93f3OHd7+Te3bXvv7Lwxt/g6v3a2rvwx6/u/8To/+7nkPbni/nmmdLq/efn3ebo5c3v/+Lr8+Ds+/nvpvfvrOTw3c/31+/v5dT44O7w7e7v+d/25+zx9Pn2q973/Oj26vj2xf/3tP33uvD37Pf27fH3+vb2//b49P339uj/8PD+8e7/+f//9v7//P///yH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEKAP8ALAAAAABgAMgAAAj+AP/900SwoEGBCAcaXJhQ4EKGDR8ejCiRYEOFFS9qytfPn0d/HVM9isjxI0h/Ikl2/BhyZMKNKz22VGly5suSLFG6RKgJH86PqfDtHOgzpsegQ3v+PCr0ZVGTKJvyfGoSqdOlUYc+wkfV46NAgXZu7erva1iEY5eaFctVLVi2ZNeibWtUrsCxZMFNg5t371y6JvXyXSr4b9/BRgvf5QrYZCDDZP09XswY6+R/eCNfzmwZcmeBgRg39ng5tOilpUWTTX3aKOvKrhGahu1YtmquMV+Lzm37Nm/Qt/H9/jd790fdjIcX390RefLmvX1DBx6833TiwYVfX/5cMkI02bX+o/ke3vp4geCzmyevvt/5f+mru2cv/3384Pnsh/epP3x++vj1l91/6O1HIHz74SNgdgsG1+BtD6oWoWjvJZFgEghZuB+GAmkYHof/eJgdiCIGR+KFCAGRIBAprtjifiwKpCKML4YX4z8z2ogQDAnCsGOPP+7no0A8ChlkeEP+UySSCLHg5JNQPtlklFSyMGWVUF6JpZNabtkllglxw00zzpBJDDHDBHORmGSaiaaaDbFZpjNnprnmmHPWCWeYeLppZ5x90vlmnO70040ztMyj6Dzy7PkPN4UemuiijYYZKaKLMuoopIZiSumml06qaKUIcSpppqQKxI088nj0Sij+5YyaS5isugqrrLS26s+rsTI6a6m17nqrr7na2qs8v6oaLK+4AlvrKJIEI0855bySa6vQSkuttc5iG+201V7rT7bgcqvss99uKy656nbrzyaS4FIOOd2QIi688tJrr7v4zlvvvfH6u++5rfarL8D5/utsoYw0kks32zQz8KOsMuwwxBLnavHDEU+8qjwbY+xxxf00zHHGC5d8cccJOQNyOf0s4gcpzTRDjLn/uOwOzDLTbDPOOvM8c803t/xyzEP/bPTOSPtcNEJBN0000DuTE0/PaPpyyyhQV331zFlv3fW8X5MSNtcCOeM11sNojXbOa4Pdtthpx2323G87M+/+NtvkoccoWsuiTt579/134INDXbjfgN8iOOHk8M044pBLfrjjiae9+OWPI6RM5NsEk8cbjMgiCyiZ//M536KTbjrqb68e+uiln5667K3XDrvnoOf++u290/77276wLroYi4DiiSfqMIJQ8aEfn/zyzT9vfB7IK8+88wJBH4z02lff/fXZU8/9P96Db77139MCRhWLeNJJJ2ScX3z778c/f/3sB+M+/PKjn/2i9z/9CbB/BQwg/8aHPwDu73y3aB8pwECFP8zvgAKJoP8mWMELLvAfGqQF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) /*icons.gif*/;
+	background-position: 0 0;
+}
+/** Used by iconclass option */
+span.fancytree-custom-icon {
+	display: inline-block;
+}
+/** Used by 'icon' node option: */
+.fancytree-container img
+{
+	width: 16px;
+	height: 16px;
+	margin-left: 3px;
+	vertical-align: top;
+	border-style: none;
+}
+
+
+/*******************************************************************************
+ * Lines and connectors
+ */
+/* span.fancytree-connector
+{
+	background-image: none;
+}
+ */
+/*******************************************************************************
+ * Expander icon
+ * Note: IE6 doesn't correctly evaluate multiples class names,
+ *		 so we create combined class names that can be used in the CSS.
+ *
+ * Prefix: fancytree-exp-
+ * 1st character: 'e': expanded, 'c': collapsed, 'n': no children
+ * 2nd character (optional): 'd': lazy (Delayed)
+ * 3rd character (optional): 'l': Last sibling
+ */
+
+span.fancytree-expander
+{
+	background-position: 0px -80px;
+	cursor: pointer;
+}
+span.fancytree-expander:hover
+{
+	background-position: -16px -80px;
+}
+.fancytree-exp-n span.fancytree-expander:hover /* Collapsed, not delayed, not last sibling */
+{
+	background-position: -16px -80px;
+}
+.fancytree-exp-cl span.fancytree-expander /* Collapsed, not delayed, last sibling */
+{
+}
+.fancytree-exp-cd span.fancytree-expander /* Collapsed, delayed, not last sibling */
+{
+}
+.fancytree-exp-cdl span.fancytree-expander /* Collapsed, delayed, last sibling */
+{
+}
+.fancytree-exp-e span.fancytree-expander,  /* Expanded, not delayed, not last sibling */
+.fancytree-exp-ed span.fancytree-expander,  /* Expanded, delayed, not last sibling */
+.fancytree-exp-el span.fancytree-expander,  /* Expanded, not delayed, last sibling */
+.fancytree-exp-edl span.fancytree-expander  /* Expanded, delayed, last sibling */
+{
+	background-position: -32px -80px;
+}
+.fancytree-exp-e span.fancytree-expander:hover,  /* Expanded, not delayed, not last sibling */
+.fancytree-exp-ed span.fancytree-expander:hover,  /* Expanded, delayed, not last sibling */
+.fancytree-exp-el span.fancytree-expander:hover,  /* Expanded, not delayed, last sibling */
+.fancytree-exp-edl span.fancytree-expander:hover  /* Expanded, delayed, last sibling */
+{
+	background-position: -48px -80px;
+}
+.fancytree-loading span.fancytree-expander  /* 'Loading' status overrides all others */
+{
+	background-position: 0 0;
+	background-image: url(data:image/gif;base64,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) /*loading.gif*/;
+}
+
+.fancytree-exp-n span.fancytree-expander, /* Connector instead of expander, if node has no children */
+.fancytree-exp-nl span.fancytree-expander
+{
+	background-image: none;
+	cursor: default;
+}
+
+
+/*******************************************************************************
+ * Checkbox icon
+ */
+span.fancytree-checkbox
+{
+	margin-left: 3px;
+	background-position: 0px -32px;
+}
+span.fancytree-checkbox:hover
+{
+	background-position: -16px -32px;
+}
+
+.fancytree-partsel span.fancytree-checkbox
+{
+	background-position: -64px -32px;
+}
+.fancytree-partsel span.fancytree-checkbox:hover
+{
+	background-position: -80px -32px;
+}
+
+.fancytree-selected span.fancytree-checkbox
+{
+	background-position: -32px -32px;
+}
+.fancytree-selected span.fancytree-checkbox:hover
+{
+	background-position: -48px -32px;
+}
+
+/*******************************************************************************
+ * Radiobutton icon
+ * This is a customization, that may be activated by overriding the 'checkbox'
+ * class name as 'fancytree-radio' in the tree options.
+ */
+.fancytree-radio span.fancytree-checkbox
+{
+	margin-left: 3px;
+	background-position: 0px -48px;
+}
+.fancytree-radio span.fancytree-checkbox:hover
+{
+	background-position: -16px -48px;
+}
+
+.fancytree-radio .fancytree-partsel span.fancytree-checkbox
+{
+	background-position: -64px -48px;
+}
+.fancytree-radio .fancytree-partsel span.fancytree-checkbox:hover
+{
+	background-position: -80px -48px;
+}
+
+.fancytree-radio .fancytree-selected span.fancytree-checkbox
+{
+	background-position: -32px -48px;
+}
+.fancytree-radio .fancytree-selected span.fancytree-checkbox:hover
+{
+	background-position: -48px -48px;
+}
+
+
+/*******************************************************************************
+ * Node type icon
+ * Note: IE6 doesn't correctly evaluate multiples class names,
+ *		 so we create combined class names that can be used in the CSS.
+ *
+ * Prefix: fancytree-ico-
+ * 1st character: 'e': expanded, 'c': collapsed
+ * 2nd character (optional): 'f': folder
+ */
+
+span.fancytree-icon /* Default icon */
+{
+	margin-left: 3px;
+	background-position: 0px 0px;
+}
+
+.fancytree-has-children span.fancytree-icon /* Default icon */
+{
+/*    background-position: 0px -16px; */
+}
+
+.fancytree-ico-cf span.fancytree-icon  /* Collapsed Folder */
+{
+	background-position: 0px -16px;
+}
+
+.fancytree-ico-ef span.fancytree-icon  /* Expanded Folder */
+{
+	background-position: -64px -16px;
+}
+
+/* Status node icons */
+
+.fancytree-statusnode-wait span.fancytree-icon
+{
+	background-image: url(data:image/gif;base64,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) /*loading.gif*/;
+}
+
+.fancytree-statusnode-error span.fancytree-icon
+{
+	background-position: 0px -112px;
+/*	background-image: url("ltError.gif");*/
+}
+
+/*******************************************************************************
+ * Node titles
+ */
+
+span.fancytree-title
+{
+	display: inline-block;
+}
+/* Remove blue color and underline from title links */
+a.fancytree-title
+{
+	text-decoration: none;
+}
+
+.fancytree-title
+{
+	display: inline-block; /* Better alignment, when title contains <br> */
+/*	vertical-align: top;*/
+	padding-left: 3px;
+	padding-right: 3px; /* Otherwise italic font will be outside bounds */
+	/*	line-height: 16px; /* should be the same as img height, in case 16 px */
+	color: black; /* inherit doesn't work on IE */
+	vertical-align: top;
+	margin: 0px;
+	margin-left: 3px;
+/*  outline: 0; /* @ Firefox, prevent dotted border after click */
+	/* Set transparent border to prevent jumping when active node gets a border
+	   (we can do this, because this theme doesn't use vertical lines)
+	   */
+/*	border: 1px solid white; /* Note: 'transparent' would not work in IE6 */
+	cursor: pointer;
+}
+span.fancytree-node:hover
+{
+	background-color: #E5F3FB;
+	border-color: #70C0E7;
+}
+.fancytree-container.fancytree-focused span.fancytree-node.fancytree-focused
+{
+	border-color: #3399FF;
+/*	outline: 1px solid #3399FF; */
+}
+span.fancytree-node.fancytree-active,
+span.fancytree-node.fancytree-selected
+{ /* active/selcted nodes inside inactive tree */
+	background-color: #F7F7F7;
+	border-color: #DEDEDE;
+}
+.fancytree-container.fancytree-focused span.fancytree-node.fancytree-active,
+.fancytree-container.fancytree-focused span.fancytree-node.fancytree-selected,
+span.fancytree-node.fancytree-active:hover,
+span.fancytree-node.fancytree-selected:hover
+{
+	background-color: #CBE8F6;
+	border-color: #26A0DA;
+}
+span.fancytree-node.fancytree-selected
+{
+	font-style: italic;
+}
+
+
+/*******************************************************************************
+ * 'table' extension
+ */
+
+/*
+table.fancytree-ext-table {
+	border-collapse: collapse;
+	width: 100%;
+}
+table.fancytree-ext-table tbody tr:nth-child(even){
+	background-color: #f4f4f8;
+}
+table.fancytree-ext-table tbody tr td {
+	border: 1px solid lightgray;
+}
+*/
+table.fancytree-ext-table {
+	border-collapse: collapse;
+}
+table.fancytree-ext-table tbody tr:hover {
+	background-color: #E5F3FB;
+	outline: 1px solid #70C0E7;
+}
+table.fancytree-ext-table.fancytree-container.fancytree-focused span.fancytree-node.fancytree-focused
+{
+	outline: 1px solid #3399FF;
+}
+table.fancytree-ext-table.fancytree-focused tbody tr.fancytree-focused {
+	outline: 1px solid #26A0DA;
+}
+table.fancytree-ext-table.fancytree-focused tbody tr.fancytree-active,
+table.fancytree-ext-table.fancytree-focused tbody tr.fancytree-selected
+{
+	background-color: #CBE8F6;
+	outline: 1px solid #26A0DA;
+}
+table.fancytree-ext-table tbody tr.fancytree-active,
+table.fancytree-ext-table tbody tr.fancytree-selected
+{
+	background-color: #F7F7F7;
+	outline: 1px solid #DEDEDE;
+}
+
+/*******************************************************************************
+ * 'columnview' extension
+ */
+
+/*
+table.fancytree-ext-columnview {
+	border-collapse: collapse;
+	width: 100%;
+}
+*/
+table.fancytree-ext-columnview td
+{
+	position: relative;
+}
+table.fancytree-ext-columnview td >ul
+{
+	padding: 0;
+}
+table.fancytree-ext-columnview td >ul li
+{
+	list-style-image: none;
+	list-style-position: outside;
+	list-style-type: none;
+	-moz-background-clip:border;
+	-moz-background-inline-policy: continuous;
+	-moz-background-origin: padding;
+	background-attachment: scroll;
+	background-color: transparent;
+	background-position: 0 0;
+	background-repeat: repeat-y;
+	background-image: none;  /* no v-lines */
+
+	margin: 0;
+	padding: 1px 0 0 0;
+}
+/*
+table.fancytree-ext-columnview tbody tr[0] {
+	height: 200px;
+}
+*/
+table.fancytree-ext-columnview tbody tr td {
+	border: 1px solid gray;
+	vertical-align: top;
+	overflow: auto;
+}
+table.fancytree-ext-columnview span.fancytree-node {
+	position: relative; /* allow positioning of embedded spans*/
+}
+table.fancytree-ext-columnview span.fancytree-node.fancytree-expanded {
+	background-color: #CBE8F6;
+}
+/*
+table.fancytree-ext-columnview span.fancytree-node.fancytree-active {
+	background-color: royalblue;
+}
+*/
+table.fancytree-ext-columnview span.fancytree-cv-right {
+	background-position: 0px -80px;
+	position: absolute;
+	right: 3px;
+}
+
+/*******************************************************************************
+ * 'filter' extension
+ */
+.fancytree-ext-filter span.fancytree-node .fancytree-title {
+	color: silver;
+	font-weight: lighter;
+}
+.fancytree-ext-filter span.fancytree-node.fancytree-submatch .fancytree-title {
+	color: black;
+	font-weight: normal;
+}
+.fancytree-ext-filter span.fancytree-node.fancytree-match .fancytree-title {
+	color: black;
+	font-weight: bold;
+}
+
+
+/*******************************************************************************
+ * Drag'n'drop support
+ */
+
+/*** Helper object ************************************************************/
+div.fancytree-drag-helper
+{
+}
+div.fancytree-drag-helper a
+{
+	border: 1px solid gray;
+	background-color: white;
+	padding-left: 5px;
+	padding-right: 5px;
+	opacity: 0.8;
+}
+span.fancytree-drag-helper-img
+{
+	/*
+	position: relative;
+	left: -16px;
+	*/
+}
+div.fancytree-drag-helper /*.fancytree-drop-accept*/
+{
+/*    border-color: green;
+	background-color: red;*/
+}
+div.fancytree-drop-accept span.fancytree-drag-helper-img
+{
+	background-position: -32px -112px;
+}
+div.fancytree-drag-helper.fancytree-drop-reject
+{
+	border-color: red;
+}
+div.fancytree-drop-reject span.fancytree-drag-helper-img
+{
+	background-position: -16px -112px;
+}
+
+/*** Drop marker icon *********************************************************/
+
+#fancytree-drop-marker
+{
+	width: 24px;
+	position: absolute;
+	background-position: 0 -128px;
+	margin: 0;
+}
+#fancytree-drop-marker.fancytree-drop-after,
+#fancytree-drop-marker.fancytree-drop-before
+{
+	width:64px;
+	background-position: 0 -144px;
+}
+#fancytree-drop-marker.fancytree-drop-copy
+{
+	background-position: -64px -128px;
+}
+#fancytree-drop-marker.fancytree-drop-move
+{
+	background-position: -64px -128px;
+}
+
+/*** Source node while dragging ***********************************************/
+
+span.fancytree-drag-source
+{
+	/* border: 1px dotted gray; */
+	background-color: #e0e0e0;
+}
+span.fancytree-drag-source a
+{
+	color: gray;
+}
+
+/*** Target node while dragging cursor is over it *****************************/
+
+span.fancytree-drop-target
+{
+	/*border: 1px solid gray;*/
+}
+span.fancytree-drop-target a
+{
+}
+span.fancytree-drop-target.fancytree-drop-accept a
+{
+	/*border: 1px solid green;*/
+	background-color: #3169C6 !important;
+	color: white !important; /* @ IE6 */
+	text-decoration: none;
+}
+span.fancytree-drop-target.fancytree-drop-reject
+{
+	/*border: 1px solid red;*/
+}
+span.fancytree-drop-target.fancytree-drop-after a
+{
+}
diff --git a/Disco.Web/ClientSource/Style/Fancytree/ui.fancytree.min.css b/Disco.Web/ClientSource/Style/Fancytree/ui.fancytree.min.css
new file mode 100644
index 00000000..5250556a
--- /dev/null
+++ b/Disco.Web/ClientSource/Style/Fancytree/ui.fancytree.min.css
@@ -0,0 +1 @@
+.ui-helper-hidden{display:none}.fancytree-container{font-family:tahoma,arial,helvetica;font-size:10pt;white-space:nowrap;padding:3px;margin:0;background-color:#fff;border:1px dotted gray;overflow:auto;height:100%}ul.fancytree-container ul{padding:0 0 0 16px;margin:0}ul.fancytree-container li{list-style-image:none;list-style-position:outside;list-style-type:none;-moz-background-clip:border;-moz-background-inline-policy:continuous;-moz-background-origin:padding;background-attachment:scroll;background-color:transparent;background-position:0 0;background-repeat:repeat-y;background-image:none;margin:0;padding:1px 0 0 0}ul.fancytree-container li.fancytree-lastsib{background-image:none}ul.fancytree-no-connector>li{background-image:none}.ui-fancytree-disabled ul.fancytree-container{opacity:.5;background-color:silver}span.fancytree-node{display:inline-block;width:100%;border:1px solid transparent}span.fancytree-empty,span.fancytree-vline,span.fancytree-expander,span.fancytree-icon,span.fancytree-checkbox,span.fancytree-radio,span.fancytree-drag-helper-img,#fancytree-drop-marker{width:16px;height:16px;display:inline-block;vertical-align:top;background-repeat:no-repeat;background-position:left;background-image:url(data:image/gif;base64,R0lGODlhYADIAOf/AAABABUFagAQdAgZep8AAAAplyoxQh8wjQQ5p/8AAP8ACABCrkFIWhtShf8bFP8eHg5ayP8jJ0pVbABiyVlbWABr2FFhfQB04P8+RACFhEBznACA5lVxkv9ITBmVHEl7klV6mlZ6rf9RVACN+USElACU+v9ZVxilGVSFr1+EpHp7tUyMln+BfgCc/3mFhf9iYIOFgiatI2iMrWyMp2uMtE+ZiwSl/f9qaE+U1laZlouNimuUrm+TtHWUo3aWsoyUm5KUkW6cr/95e1WrgXGtLYmdnEW9RXGmqzrDMJudmf+Chnmi1li1g3CtpaKfo1+2i2G1mHmtpn65N6WlnMelPsalRWu9ZWm9a6Smo4Wtu/+PjnK9bXu1poiuyULOYXi9dMStQnS8mcisSqqtnV+93SDO9om1vHm17autqsWtX421tna+p43CQqytt3DHZ8+tVJG1vXLGc5W1xEzXU0zWaP+cmaW1u++uMKW1yM22S9C0WYa77n7Gol/G/8+1X9W2RpbJSbS2s7S1vo3HhozHi7W02P+kpKK+1ZzA1a29xJjFs9W9UtS9Wc+9bK690bu9upPC/92+TdW9dLW835POk7y9x5vOlJnOmnrO/VzX/77BvdfFWPHFH+DGTN/GU7bGzN7GWtfFepbL/93GYdzGaLbG2aHL8+HGcJ7N+8XHxMXG0KjWogD///+8unbe/d/OZ73O1JTW/+bOYcHN29vPe83Lz6jS++bPaenNd+XPcIPf/83Py6vfo5LnpufWbrTY/Lfdy+nWg/3KyO3Xd/DVhNTW09LX4Lfc/7Hf/9nW6O7efL/f/aPo//Ldi+7fhKzn/7Xn/93f3OHd7+Te3bXvv7Lwxt/g6v3a2rvwx6/u/8To/+7nkPbni/nmmdLq/efn3ebo5c3v/+Lr8+Ds+/nvpvfvrOTw3c/31+/v5dT44O7w7e7v+d/25+zx9Pn2q973/Oj26vj2xf/3tP33uvD37Pf27fH3+vb2//b49P339uj/8PD+8e7/+f//9v7//P///yH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEKAP8ALAAAAABgAMgAAAj+AP/900SwoEGBCAcaXJhQ4EKGDR8ejCiRYEOFFS9qytfPn0d/HVM9isjxI0h/Ikl2/BhyZMKNKz22VGly5suSLFG6RKgJH86PqfDtHOgzpsegQ3v+PCr0ZVGTKJvyfGoSqdOlUYc+wkfV46NAgXZu7erva1iEY5eaFctVLVi2ZNeibWtUrsCxZMFNg5t371y6JvXyXSr4b9/BRgvf5QrYZCDDZP09XswY6+R/eCNfzmwZcmeBgRg39ng5tOilpUWTTX3aKOvKrhGahu1YtmquMV+Lzm37Nm/Qt/H9/jd790fdjIcX390RefLmvX1DBx6833TiwYVfX/5cMkI02bX+o/ke3vp4geCzmyevvt/5f+mru2cv/3384Pnsh/epP3x++vj1l91/6O1HIHz74SNgdgsG1+BtD6oWoWjvJZFgEghZuB+GAmkYHof/eJgdiCIGR+KFCAGRIBAprtjifiwKpCKML4YX4z8z2ogQDAnCsGOPP+7no0A8ChlkeEP+UySSCLHg5JNQPtlklFSyMGWVUF6JpZNabtkllglxw00zzpBJDDHDBHORmGSaiaaaDbFZpjNnprnmmHPWCWeYeLppZ5x90vlmnO70040ztMyj6Dzy7PkPN4UemuiijYYZKaKLMuoopIZiSumml06qaKUIcSpppqQKxI088nj0Sij+5YyaS5isugqrrLS26s+rsTI6a6m17nqrr7na2qs8v6oaLK+4AlvrKJIEI0855bySa6vQSkuttc5iG+201V7rT7bgcqvss99uKy656nbrzyaS4FIOOd2QIi688tJrr7v4zlvvvfH6u++5rfarL8D5/utsoYw0kks32zQz8KOsMuwwxBLnavHDEU+8qjwbY+xxxf00zHHGC5d8cccJOQNyOf0s4gcpzTRDjLn/uOwOzDLTbDPOOvM8c803t/xyzEP/bPTOSPtcNEJBN0000DuTE0/PaPpyyyhQV331zFlv3fW8X5MSNtcCOeM11sNojXbOa4Pdtthpx2323G87M+/+NtvkoccoWsuiTt579/134INDXbjfgN8iOOHk8M044pBLfrjjiae9+OWPI6RM5NsEk8cbjMgiCyiZ//M536KTbjrqb68e+uiln5667K3XDrvnoOf++u290/77276wLroYi4DiiSfqMIJQ8aEfn/zyzT9vfB7IK8+88wJBH4z02lff/fXZU8/9P96Db77139MCRhWLeNJJJ2ScX3z778c/f/3sB+M+/PKjn/2i9z/9CbB/BQwg/8aHPwDu73y3aB8pwECFP8zvgAKJoP8mWMELLvAfGqQF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);background-position:0 0}span.fancytree-custom-icon{display:inline-block}.fancytree-container img{width:16px;height:16px;margin-left:3px;vertical-align:top;border-style:none}span.fancytree-expander{background-position:0 -80px;cursor:pointer}span.fancytree-expander:hover{background-position:-16px -80px}.fancytree-exp-n span.fancytree-expander:hover{background-position:-16px -80px}.fancytree-exp-cl span.fancytree-expander{}.fancytree-exp-cd span.fancytree-expander{}.fancytree-exp-cdl span.fancytree-expander{}.fancytree-exp-e span.fancytree-expander,.fancytree-exp-ed span.fancytree-expander,.fancytree-exp-el span.fancytree-expander,.fancytree-exp-edl span.fancytree-expander{background-position:-32px -80px}.fancytree-exp-e span.fancytree-expander:hover,.fancytree-exp-ed span.fancytree-expander:hover,.fancytree-exp-el span.fancytree-expander:hover,.fancytree-exp-edl span.fancytree-expander:hover{background-position:-48px -80px}.fancytree-loading span.fancytree-expander{background-position:0 0;background-image:url(data:image/gif;base64,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)}.fancytree-exp-n span.fancytree-expander,.fancytree-exp-nl span.fancytree-expander{background-image:none;cursor:default}span.fancytree-checkbox{margin-left:3px;background-position:0 -32px}span.fancytree-checkbox:hover{background-position:-16px -32px}.fancytree-partsel span.fancytree-checkbox{background-position:-64px -32px}.fancytree-partsel span.fancytree-checkbox:hover{background-position:-80px -32px}.fancytree-selected span.fancytree-checkbox{background-position:-32px -32px}.fancytree-selected span.fancytree-checkbox:hover{background-position:-48px -32px}.fancytree-radio span.fancytree-checkbox{margin-left:3px;background-position:0 -48px}.fancytree-radio span.fancytree-checkbox:hover{background-position:-16px -48px}.fancytree-radio .fancytree-partsel span.fancytree-checkbox{background-position:-64px -48px}.fancytree-radio .fancytree-partsel span.fancytree-checkbox:hover{background-position:-80px -48px}.fancytree-radio .fancytree-selected span.fancytree-checkbox{background-position:-32px -48px}.fancytree-radio .fancytree-selected span.fancytree-checkbox:hover{background-position:-48px -48px}span.fancytree-icon{margin-left:3px;background-position:0 0}.fancytree-has-children span.fancytree-icon{}.fancytree-ico-cf span.fancytree-icon{background-position:0 -16px}.fancytree-ico-ef span.fancytree-icon{background-position:-64px -16px}.fancytree-statusnode-wait span.fancytree-icon{background-image:url(data:image/gif;base64,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)}.fancytree-statusnode-error span.fancytree-icon{background-position:0 -112px}span.fancytree-title{display:inline-block}a.fancytree-title{text-decoration:none}.fancytree-title{display:inline-block;padding-left:3px;padding-right:3px;color:#000;vertical-align:top;margin:0;margin-left:3px;cursor:pointer}span.fancytree-node:hover{background-color:#e5f3fb;border-color:#70c0e7}.fancytree-container.fancytree-focused span.fancytree-node.fancytree-focused{border-color:#39f}span.fancytree-node.fancytree-active,span.fancytree-node.fancytree-selected{background-color:#f7f7f7;border-color:#dedede}.fancytree-container.fancytree-focused span.fancytree-node.fancytree-active,.fancytree-container.fancytree-focused span.fancytree-node.fancytree-selected,span.fancytree-node.fancytree-active:hover,span.fancytree-node.fancytree-selected:hover{background-color:#cbe8f6;border-color:#26a0da}span.fancytree-node.fancytree-selected{font-style:italic}table.fancytree-ext-table{border-collapse:collapse}table.fancytree-ext-table tbody tr:hover{background-color:#e5f3fb;outline:1px solid #70c0e7}table.fancytree-ext-table.fancytree-container.fancytree-focused span.fancytree-node.fancytree-focused{outline:1px solid #39f}table.fancytree-ext-table.fancytree-focused tbody tr.fancytree-focused{outline:1px solid #26a0da}table.fancytree-ext-table.fancytree-focused tbody tr.fancytree-active,table.fancytree-ext-table.fancytree-focused tbody tr.fancytree-selected{background-color:#cbe8f6;outline:1px solid #26a0da}table.fancytree-ext-table tbody tr.fancytree-active,table.fancytree-ext-table tbody tr.fancytree-selected{background-color:#f7f7f7;outline:1px solid #dedede}table.fancytree-ext-columnview td{position:relative}table.fancytree-ext-columnview td>ul{padding:0}table.fancytree-ext-columnview td>ul li{list-style-image:none;list-style-position:outside;list-style-type:none;-moz-background-clip:border;-moz-background-inline-policy:continuous;-moz-background-origin:padding;background-attachment:scroll;background-color:transparent;background-position:0 0;background-repeat:repeat-y;background-image:none;margin:0;padding:1px 0 0 0}table.fancytree-ext-columnview tbody tr td{border:1px solid gray;vertical-align:top;overflow:auto}table.fancytree-ext-columnview span.fancytree-node{position:relative}table.fancytree-ext-columnview span.fancytree-node.fancytree-expanded{background-color:#cbe8f6}table.fancytree-ext-columnview span.fancytree-cv-right{background-position:0 -80px;position:absolute;right:3px}.fancytree-ext-filter span.fancytree-node .fancytree-title{color:silver;font-weight:lighter}.fancytree-ext-filter span.fancytree-node.fancytree-submatch .fancytree-title{color:#000;font-weight:normal}.fancytree-ext-filter span.fancytree-node.fancytree-match .fancytree-title{color:#000;font-weight:bold}div.fancytree-drag-helper{}div.fancytree-drag-helper a{border:1px solid gray;background-color:#fff;padding-left:5px;padding-right:5px;opacity:.8}span.fancytree-drag-helper-img{}div.fancytree-drag-helper{}div.fancytree-drop-accept span.fancytree-drag-helper-img{background-position:-32px -112px}div.fancytree-drag-helper.fancytree-drop-reject{border-color:red}div.fancytree-drop-reject span.fancytree-drag-helper-img{background-position:-16px -112px}#fancytree-drop-marker{width:24px;position:absolute;background-position:0 -128px;margin:0}#fancytree-drop-marker.fancytree-drop-after,#fancytree-drop-marker.fancytree-drop-before{width:64px;background-position:0 -144px}#fancytree-drop-marker.fancytree-drop-copy{background-position:-64px -128px}#fancytree-drop-marker.fancytree-drop-move{background-position:-64px -128px}span.fancytree-drag-source{background-color:#e0e0e0}span.fancytree-drag-source a{color:gray}span.fancytree-drop-target{}span.fancytree-drop-target a{}span.fancytree-drop-target.fancytree-drop-accept a{background-color:#3169c6!important;color:#fff!important;text-decoration:none}span.fancytree-drop-target.fancytree-drop-reject{}span.fancytree-drop-target.fancytree-drop-after a{}
\ No newline at end of file
diff --git a/Disco.Web/ClientSource/Style/Images/Actions/installPlugin.png b/Disco.Web/ClientSource/Style/Images/Actions/installPlugin.png
deleted file mode 100644
index d5ea1b2c..00000000
Binary files a/Disco.Web/ClientSource/Style/Images/Actions/installPlugin.png and /dev/null differ
diff --git a/Disco.Web/ClientSource/Style/Images/Actions/installPluginHover.png b/Disco.Web/ClientSource/Style/Images/Actions/installPluginHover.png
deleted file mode 100644
index 74d87ea3..00000000
Binary files a/Disco.Web/ClientSource/Style/Images/Actions/installPluginHover.png and /dev/null differ
diff --git a/Disco.Web/ClientSource/Style/Images/Actions/user16.png b/Disco.Web/ClientSource/Style/Images/Actions/user16.png
new file mode 100644
index 00000000..138b306c
Binary files /dev/null and b/Disco.Web/ClientSource/Style/Images/Actions/user16.png differ
diff --git a/Disco.Web/ClientSource/Style/Images/Actions/userGroup16.png b/Disco.Web/ClientSource/Style/Images/Actions/userGroup16.png
new file mode 100644
index 00000000..e28de26f
Binary files /dev/null and b/Disco.Web/ClientSource/Style/Images/Actions/userGroup16.png differ
diff --git a/Disco.Web/ClientSource/Style/Job.css b/Disco.Web/ClientSource/Style/Job.css
index dd1773e2..b9ecebcd 100644
--- a/Disco.Web/ClientSource/Style/Job.css
+++ b/Disco.Web/ClientSource/Style/Job.css
@@ -181,9 +181,6 @@
 #Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_DeviceHeld table > tbody > tr > td:first-child {
   width: 62px;
 }
-#Job_Show #Job_Show_Subjects #Job_Show_User #Job_Show_User_Type {
-  font-style: italic;
-}
 #Job_Show #Job_Show_Subjects #Job_Show_Subjects_Actions > td {
   padding-top: 4px;
 }
@@ -290,6 +287,9 @@
 #jobShowResources #Comments div.commentOutput > div:last-child {
   border-bottom: none;
 }
+#jobShowResources #Comments.cannotAddLogs div.commentOutput {
+  height: 300px;
+}
 #jobShowResources #Comments div.commentInput {
   border-top: 1px solid #cccccc;
   height: 40px;
@@ -406,6 +406,9 @@
 #jobShowResources #Attachments div.attachmentOutput > a span.remove:hover {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Actions/remove.png*/;
 }
+#jobShowResources #Attachments.cannotAddAttachments div.attachmentOutput {
+  height: 300px;
+}
 #jobShowResources #Attachments div.attachmentInput {
   border-top: 1px solid #cccccc;
   height: 40px;
diff --git a/Disco.Web/ClientSource/Style/Job.less b/Disco.Web/ClientSource/Style/Job.less
index fcac579e..c707579e 100644
--- a/Disco.Web/ClientSource/Style/Job.less
+++ b/Disco.Web/ClientSource/Style/Job.less
@@ -170,14 +170,6 @@
             }
         }
 
-        #Job_Show_User
-        {
-            #Job_Show_User_Type
-            {
-                font-style: italic;
-            }
-        }
-
         #Job_Show_Subjects_Actions
         {
             &>td
@@ -324,6 +316,10 @@
             }
         }
 
+        &.cannotAddLogs div.commentOutput {
+            height: 300px;
+        }
+
         div.commentInput
         {
             border-top: 1px solid @SubtleBorderColour;
@@ -470,6 +466,10 @@
             }
         }
 
+        &.cannotAddAttachments div.attachmentOutput {
+            height: 300px;
+        }
+
         div.attachmentInput
         {
             border-top: 1px solid @SubtleBorderColour;
diff --git a/Disco.Web/ClientSource/Style/Job.min.css b/Disco.Web/ClientSource/Style/Job.min.css
index 0ae495c6..049e5e88 100644
--- a/Disco.Web/ClientSource/Style/Job.min.css
+++ b/Disco.Web/ClientSource/Style/Job.min.css
@@ -1 +1 @@
-.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}#layout_PageHeading #Job_Show_Status{margin-left:20px;display:inline-block;height:50px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-weight:lighter;font-stretch:condensed;font-size:.7em;text-transform:uppercase}#layout_PageHeading #Job_Show_Status span.icon{margin-right:6px}#Job_Show #Job_Show_Subjects{table-layout:fixed}#Job_Show #Job_Show_Subjects>tbody>tr>td{padding-top:0;height:100%}#Job_Show #Job_Show_Subjects>tbody>tr>td>div{position:relative}#Job_Show #Job_Show_Subjects>tbody>tr>td>div div.status{margin-top:2px;padding-top:2px;border-top:1px dashed #ddd}#Job_Show #Job_Show_Subjects>tbody>tr>td>div input.discreet{margin-left:-2px}#Job_Show #Job_Show_Subjects>tbody>tr>td:not(:last-child){border-right:1px dashed #aaa}#Job_Show #Job_Show_Subjects .dialog{display:none}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_Type>table{table-layout:fixed}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_SubTypes_1,#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_SubTypes_2{padding-left:16px;font-weight:bold}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_SubTypes_Update{margin-left:16px;font-size:.9em}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_SubTypes_Update_Dialog{display:none}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_Dates{padding-bottom:6px}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_Dates table{table-layout:fixed}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_Dates table>tbody>tr>td{vertical-align:middle}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_Dates table>tbody>tr>td:first-child{font-weight:bold;width:60px}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_GenerateDocument_Container{padding-top:4px}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_GenerateDocument_Container #Job_Show_GenerateDocument{padding:0}#Job_Show #Job_Show_Subjects #Job_Show_Device>div{padding-left:102px;min-height:100px}#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Model_Image{position:absolute;left:0;top:0;height:96px;width:96px}#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details{float:left}#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details_HWar,#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details_HNWar{float:right;border-left:1px dashed #ddd;padding-left:4px;margin-right:2px}#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details_HWar_Details_Button,#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details_HNWar_Details_Button{font-size:.9em}#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_DeviceHeld table{table-layout:fixed}#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_DeviceHeld table>tbody>tr>td:first-child{width:62px}#Job_Show #Job_Show_Subjects #Job_Show_User #Job_Show_User_Type{font-style:italic}#Job_Show #Job_Show_Subjects #Job_Show_Subjects_Actions>td{padding-top:4px}#Job_Show #Job_Show_Subjects #Job_Show_Subjects_Actions #Job_Show_Device_Actions{padding-left:111px}#jobDetailTabs{margin-top:10px;border-radius:0;background-image:none;background-color:#fff;border:none;padding:0}#jobDetailTabs #jobDetailTabItems{border-radius:0;border-top:1px solid #ddd;border-right:1px solid #ddd;border-left:1px solid #ddd;border-bottom:none;padding:2px 0 0 4px;background-image:none;background-color:#eee;display:table}#jobDetailTabs #jobDetailTabItems>li{top:0;border-radius:0;margin:0 5px 0 0;padding:0;line-height:normal;margin-right:4px}#jobDetailTabs #jobDetailTabItems>li>a{padding:5px 8px}#jobDetailTabs div.ui-tabs-panel{border-radius:0;padding:4px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;border-left:1px solid #ddd;border-top:none;background-color:#eee}#jobShowResources #Comments{width:375px;height:300px;padding:0;border:1px solid #ccc;background-color:#fff}#jobShowResources #Comments div.commentOutput{height:249px;overflow:auto;background-color:#f4f4f4;color:#000}#jobShowResources #Comments div.commentOutput>div{padding:3px;margin:4px 6px;border-bottom:1px solid #ccc}#jobShowResources #Comments div.commentOutput>div span.author{color:#444;display:block;font-weight:bold;font-size:.95em;float:left}#jobShowResources #Comments div.commentOutput>div span.timestamp{display:block;float:right;font-size:.9em;font-style:italic}#jobShowResources #Comments div.commentOutput>div span.comment{clear:both;display:block;margin-left:4px}#jobShowResources #Comments div.commentOutput>div:hover span.remove{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC)}#jobShowResources #Comments div.commentOutput>div span.remove{margin-left:6px;display:block;float:left;height:16px;width:16px;cursor:pointer}#jobShowResources #Comments div.commentOutput>div span.remove:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#jobShowResources #Comments div.commentOutput>div:last-child{border-bottom:none}#jobShowResources #Comments div.commentInput{border-top:1px solid #ccc;height:40px;padding:5px}#jobShowResources #Comments div.commentInput textarea.commentInput{border:0;padding:0;margin:0;width:325px;height:40px;min-height:40px;overflow:auto;float:left;resize:none}#jobShowResources #Comments div.commentInput div.commentInputPost{margin-top:4px;height:32px;width:32px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFCElEQVRYw+WXT2gdVRTGf+femXl/Ek3bvLRNGgO1wRZtY8VINyJUrQURKbpQUMF/iCCi4MKNblyJoCBF0IULEV25EEQtalG01tqoaXxpm9AmTdI0iU2aNHkvyXvO3HtcvLQa0lRr+3DhheEOs5jvu+c757vniKryXy7Df7wCgLa2tu3OuajaYCLiM5nM2Y6Ojo7zBIwx8ulnn79x5x23b6maHKoogvde29rablsSgdnZ4towDG0cJ5enpwhOLG9/UyAbgvcgRrBGefDmENQraLSEQJIkznsljuPLImCN4IxgrJA4ZbbkMIGlJgXl0jxBEKiI6BICVzDWCNCQy7K5yVAnCd/2FpmalXNKVLcKxAjqPeb3EoemYNXKgFvWhQiKcw5VX/0ydF4pxzGFWUgUDv/ajY71MVcqV98HvKtIMDMvuMki7302yOmajdTXRwwMDON1GR+4IuDek3hPOSmz63qHFWF0rERzc444bqa/7xhcQIJgIXcuG9x7j3MOi0eMcvDAMO3tDQwc7yXxSnNTI97rkkRcJMHk5CT9/f3n3y8VvLJ7ksSRH5rn9ff7EamhuWk13nsqRqfLE8jl6mltbUVEyOXqEZF/Bv6XXdWTJJ4hF9G4fSu7955lfGwGEY+/QBIYEKw1GCP09vbS03OU8fHT9PT0cOzYMQqFGcIwwFqLtebCJ3euQsJVnsR5Sgiv9Fnsjnbe/GqaibEigl8iQSAiWGMBWL/+WiqHFurqVhAElRQpl8tEUYS1AeAWalorJFT/BPcL39WBEQL1fDljuWvHNnbv7eA5O65GFlMwoPiF7Dx69Ajd3YcpFgt0d3dTLpeYmBgnn88zPT3N8ePHOXGiH+8cI6dOMT83h7oYK4rBEYgnFEdKPMZUnM8k8MWUJbxjG6/tmcSGm1YsioCqkiQO75XNm7egqogIW7duRURIpzM0NFSSqLExjfdK4hwrcw2UE2VwuMDo+By/TZSYjz2lxFMoe4jqWBUqxWIZq8qeOcPdd26z7vCjz29pf6sz/9Mzw+fLMJPJpI0Ramqyf+tybkHvuBQz83vMXO1VnHFZBgKlrwCDRRjF4MRgSwmQ4BZK/ZOisOuZe27/+r0f3r3xpt2PdXU+OyLGGHnp5ZffabmmZX0cx7q8yyW4uIwiouqJM6vsbDoXFW1tdEauzk5otvaMS9ec9VFmxgXpWMVW7r3Fv1Qj7GqJ2PvBwY+ivqEXRFXZuXNn06Waz2R6XXZ6xcZcObt6dZzNbdCo9joN0q1xdnWzIC0CWZapYjWG7c0Rhz78/kX5t13QmlcHa/BujaquRf1GlBtANwGtKC2IZpxfCICcv61BIGOFTOfR/eHE1EOXdBe0vNInjSsCMRl0Qz0GCQxgBKyiFiVAJBLRyM8LQ9MJZVO5oM7xyIaG6Mf8/vTJ0QfyB58eviQCtmSYT9DSvBI7nVNlOPvtzxavtYDRVDSiUXBATVg3d3VTe7LuqltNpKAgCDWhEO3v2h8NjTyQP/j0MIBUqxG99vG9n8zeuPGec5HPWkj98GtXMDh67+F9TwxVdS5Y8+awtc5lJLAQWlKpgNSP3V1mfOq+v4JXoSdcaM0CKxiBVECEkvmu85Adm7jvyJcPn6haQ7KIQGhJwmycmTKken7+xZw6ff+Rrx4ZWHYyuvKDiCU6UxgPzh7YY0ZGn8rve/LkRUezK45vcKmh/o8lcQe6Op8duWi0/vfT8R81FrV4fklnMAAAAABJRU5ErkJggg==);cursor:pointer;float:left}#jobShowResources #Comments div.commentInput span.action{display:block;margin:0;height:32px;width:32px;cursor:pointer;float:left;border:1px solid #fff;padding:3px;background-repeat:no-repeat;background-position:2px 3px}#jobShowResources #Comments div.commentInput span.action:hover{background-color:#ededed;border:1px solid #ccc;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}#jobShowResources #Comments div.commentInput span.post{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFCElEQVRYw+WXT2gdVRTGf+femXl/Ek3bvLRNGgO1wRZtY8VINyJUrQURKbpQUMF/iCCi4MKNblyJoCBF0IULEV25EEQtalG01tqoaXxpm9AmTdI0iU2aNHkvyXvO3HtcvLQa0lRr+3DhheEOs5jvu+c757vniKryXy7Df7wCgLa2tu3OuajaYCLiM5nM2Y6Ojo7zBIwx8ulnn79x5x23b6maHKoogvde29rablsSgdnZ4towDG0cJ5enpwhOLG9/UyAbgvcgRrBGefDmENQraLSEQJIkznsljuPLImCN4IxgrJA4ZbbkMIGlJgXl0jxBEKiI6BICVzDWCNCQy7K5yVAnCd/2FpmalXNKVLcKxAjqPeb3EoemYNXKgFvWhQiKcw5VX/0ydF4pxzGFWUgUDv/ajY71MVcqV98HvKtIMDMvuMki7302yOmajdTXRwwMDON1GR+4IuDek3hPOSmz63qHFWF0rERzc444bqa/7xhcQIJgIXcuG9x7j3MOi0eMcvDAMO3tDQwc7yXxSnNTI97rkkRcJMHk5CT9/f3n3y8VvLJ7ksSRH5rn9ff7EamhuWk13nsqRqfLE8jl6mltbUVEyOXqEZF/Bv6XXdWTJJ4hF9G4fSu7955lfGwGEY+/QBIYEKw1GCP09vbS03OU8fHT9PT0cOzYMQqFGcIwwFqLtebCJ3euQsJVnsR5Sgiv9Fnsjnbe/GqaibEigl8iQSAiWGMBWL/+WiqHFurqVhAElRQpl8tEUYS1AeAWalorJFT/BPcL39WBEQL1fDljuWvHNnbv7eA5O65GFlMwoPiF7Dx69Ajd3YcpFgt0d3dTLpeYmBgnn88zPT3N8ePHOXGiH+8cI6dOMT83h7oYK4rBEYgnFEdKPMZUnM8k8MWUJbxjG6/tmcSGm1YsioCqkiQO75XNm7egqogIW7duRURIpzM0NFSSqLExjfdK4hwrcw2UE2VwuMDo+By/TZSYjz2lxFMoe4jqWBUqxWIZq8qeOcPdd26z7vCjz29pf6sz/9Mzw+fLMJPJpI0Ramqyf+tybkHvuBQz83vMXO1VnHFZBgKlrwCDRRjF4MRgSwmQ4BZK/ZOisOuZe27/+r0f3r3xpt2PdXU+OyLGGHnp5ZffabmmZX0cx7q8yyW4uIwiouqJM6vsbDoXFW1tdEauzk5otvaMS9ec9VFmxgXpWMVW7r3Fv1Qj7GqJ2PvBwY+ivqEXRFXZuXNn06Waz2R6XXZ6xcZcObt6dZzNbdCo9joN0q1xdnWzIC0CWZapYjWG7c0Rhz78/kX5t13QmlcHa/BujaquRf1GlBtANwGtKC2IZpxfCICcv61BIGOFTOfR/eHE1EOXdBe0vNInjSsCMRl0Qz0GCQxgBKyiFiVAJBLRyM8LQ9MJZVO5oM7xyIaG6Mf8/vTJ0QfyB58eviQCtmSYT9DSvBI7nVNlOPvtzxavtYDRVDSiUXBATVg3d3VTe7LuqltNpKAgCDWhEO3v2h8NjTyQP/j0MIBUqxG99vG9n8zeuPGec5HPWkj98GtXMDh67+F9TwxVdS5Y8+awtc5lJLAQWlKpgNSP3V1mfOq+v4JXoSdcaM0CKxiBVECEkvmu85Adm7jvyJcPn6haQ7KIQGhJwmycmTKken7+xZw6ff+Rrx4ZWHYyuvKDiCU6UxgPzh7YY0ZGn8rve/LkRUezK45vcKmh/o8lcQe6Op8duWi0/vfT8R81FrV4fklnMAAAAABJRU5ErkJggg==)}#jobShowResources #Attachments{height:300px;padding:0;border:1px solid #ccc;background-color:#fff}#jobShowResources #Attachments div.attachmentOutput{height:249px;overflow:auto}#jobShowResources #Attachments div.attachmentOutput>a{display:block;float:left;height:48px;width:221px;padding:2px;margin:2px;font-size:.95em;border:1px solid #fff;color:#000;text-decoration:none;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}#jobShowResources #Attachments div.attachmentOutput>a span.comments,#jobShowResources #Attachments div.attachmentOutput>a span.author,#jobShowResources #Attachments div.attachmentOutput>a span.timestamp{display:block;float:left;width:168px;overflow:hidden;height:16px}#jobShowResources #Attachments div.attachmentOutput>a span.author{color:#888;width:150px}#jobShowResources #Attachments div.attachmentOutput>a span.timestamp{color:#888;font-style:italic}#jobShowResources #Attachments div.attachmentOutput>a span.icon{display:block;float:left;height:48px;width:48px;margin-right:2px}#jobShowResources #Attachments div.attachmentOutput>a span.icon img{height:48px;width:48px}#jobShowResources #Attachments div.attachmentOutput>a:hover{background-color:#ededed;border:1px solid #ccc}#jobShowResources #Attachments div.attachmentOutput>a:hover span.remove{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC)}#jobShowResources #Attachments div.attachmentOutput>a span.remove{display:block;float:left;height:16px;width:16px;margin-left:2px}#jobShowResources #Attachments div.attachmentOutput>a span.remove:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#jobShowResources #Attachments div.attachmentInput{border-top:1px solid #ccc;height:40px;background-color:#fff;padding:5px}#jobShowResources #Attachments div.attachmentInput span.action{display:block;margin:0 4px 0 0;height:32px;width:32px;cursor:pointer;float:right;border:1px solid #fff;padding:3px;background-repeat:no-repeat;background-position:2px 3px}#jobShowResources #Attachments div.attachmentInput span.action:hover{background-color:#ededed;border:1px solid #ccc;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}#jobShowResources #Attachments div.attachmentInput span.upload{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFPUlEQVRYw7VXayzkVxRfy4yKTj0aj6JWJISuR9EiWj5IFZt4pB+kLYmdbEJEJpp2daeIJkRNMx7xqFcl0iXxaKwVj8ishhG+eARr10wY6hVMx3gM1mNxeo7YRDfzNr3Jyfzn/u/939899/x+59xbAHDLEIbNxNHRMSQ5OTmvuLi4pbS0tDU1NbXA3d09FN8ZqZxniMVZLJZvSUnJ0NHREVA7PDwEhUIBb1pNTU2PtbW1+/8CwMvLiz07O/uKFqqrq9sNDAzstLCw4Jubm/Pd3NyeZGdnb56dncH09LQUQfgaFIC9vX30+vr6uUwmg5CQkD509Rdo75HL0W6jWaJF+/n5CRcXF0EgEEiMjIw+MAgAbM7d3d1/y6QywAU68b+NmrFeYWFhwtPTU8jIyKi/MQDaXU5OjoDcHhsb+4x2fdX/jqqAwxbf0dFxNj4+vofPtjcCgO7+gRbn8/lSS0vLjPT09KrOp09F/f39S9XV1QOhoaFsXITxFoD3cfcv8MgA2RKuNwAzM7MgsVh8MDAwAAkJCRI8230CIxKJYHh4GLa2ti4jv6CggI7F7BoABlJ0cHNzEzA4v9ELADar1tZWkVQqBS6Xe4G/F/Pz8xAdHT2KwZWN7zkODg7NVVVVr87PzyErK6vp2lxTnDO2vLwMOCZeLwBsNvu3K9fDxMQEjI2NgZ2dXSl+3OnaQtZo3Pr6+qNt+TZ4enreu+q/09nZuUdeQrA+OgNwdXX9en9/H5qbm+Hx48dAO/fw8PiddqbEUyyMg66VlRVg379fQ32+vr4Z5Lnc3Nzn/zkabRY3MTHxmJmZ2UExgfz8fKBAiomJ+Usd9fCcc+fm5gDluB3HOSLwtcnJSXB2dv5JJxoS5crLy58dHx9DXl4eLCwsAMquFPs/VjcvPDy8dHV1FeLi4v7E6O+V4e7j4+MHiQ06AYiIiPiRzh2TC/T19YFQKASUWo4G0GZlZWUvpqamyAOLBATnb2N/sE5S7OTk9KVcLn/d09MDlZWVl+fu4+PTSIKjbh7GRuqCZIGSEAwNDV2gPgDmgYc6J6PMzMxW0nDk9MXa2hqkpaW9vB7xyozBYNzt7e3dHRkZuQxYiURCUv2HKtBqzx75yk1MTFwmFzY1Nb1G+sRrcL1RFpcr2NzYgNraWlheWgIOhyOmvKFXPYDtM3S/ggLP1tb2F3WFBZm/v/93BLaxsRFGR0ehoaHhBEF/pXYNdRUOj8cTUgCi0hHlWGqLEgvW5+j2EwrS9vb2SwB29vY/a2SZqhcoJFxaHClH0fuppqjHceO0exKpJXQ96kQ/9r+rFwAmkxmMCeeIdoGUe6gFVX8lnpPrUbCAV8iT4eKfaJVflHUidxtp9ygiAk2Uo927uLhUFBUVnVDkd3V1nZuamj7QOsEpy3iYNJZINq2srBK0zJKeKDT/EGVR8yk/3L4JgLuDg4PHLS0tB/j8oTYfSUpKqtuWyyElJeWltnPUAfDHKD5FEaHgs9T0gYCAAA4lJ6yEdnF8hM7lnRIAd1D5VijfI/eDNVRH/pjfD0jzsS54pFd9qQQAMygoqJ3Eh1dYSKU2U0WKdseiQ0QlVmRkJI0zNwiAKxAxWD5t7ezsAGa1IaTiR9dLK6xyvu3q7pYeHhwAFqQktZ56l/cqAJgaGxt/z+cXHSr2FEA3n8qKihEsRnoxOCUbqPVkmOdXcGzoje6U6vhNRWZUVNTztra2szmxGIhmVAei6u17e3s/wfchN77UarrxknvRHuAFtMjGxqacwWQ8omjXlBsMAuAtMMYEyFDX+Tf2LzGXbu1DZYkMAAAAAElFTkSuQmCC)}#jobShowResources #Attachments div.attachmentInput span.photo{background-image:url(data:image/png;base64,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)}#jobComponents{border:solid 1px #8db2d8;border-collapse:collapse}#jobComponents td{border:solid 1px #8db2d8;background-color:#fff}#jobComponents th{background-color:#8db2d8;border:solid 1px #8db2d8}#jobComponents tr th.actions{width:20px}#jobComponents tr input.description{width:400px}#jobComponents tr input.cost{width:150px}#jobComponents tr span.remove{display:block;float:left;height:16px;width:16px;margin-left:2px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC);cursor:pointer}#jobComponents tr input.updating{background-position:right center;background-repeat:no-repeat;background-image:url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA)}#jobComponents tr .totalCost{font-weight:bold}#jobNonWarrantyFinance{border:solid 1px #8db2d8;border-collapse:collapse}#jobNonWarrantyFinance td{border:solid 1px #8db2d8;background-color:#fff}#jobNonWarrantyFinance th{background-color:#8db2d8;border:solid 1px #8db2d8}#jobNonWarrantyFinance tr th{width:200px;text-align:right}#jobNonWarrantyRepairs{border:solid 1px #8db2d8;border-collapse:collapse}#jobNonWarrantyRepairs td{border:solid 1px #8db2d8;background-color:#fff}#jobNonWarrantyRepairs th{background-color:#8db2d8;border:solid 1px #8db2d8}#jobNonWarrantyRepairs tr th{width:200px;text-align:right}#jobNonWarrantyInsurance{border:solid 1px #8db2d8;border-collapse:collapse}#jobNonWarrantyInsurance td{border:solid 1px #8db2d8;background-color:#fff}#jobNonWarrantyInsurance th{background-color:#8db2d8;border:solid 1px #8db2d8}#jobNonWarrantyInsurance tr th{width:200px;text-align:right}#jobNonWarrantyInsurance tr td textarea{width:400px}#jobFlags{border:solid 1px #8db2d8;border-collapse:collapse}#jobFlags td{border:solid 1px #8db2d8;background-color:#fff}#jobFlags th{background-color:#8db2d8;border:solid 1px #8db2d8}#jobFlags tr th{width:200px;text-align:right}#warrantyJobForm #warrantyDisclosedInformation table{font-size:.9em}#warrantyJobForm #warrantyDisclosedInformation table tr:not(:last-child){border-bottom:1px dashed #aaa}#warrantyJobForm #warrantyDisclosedInformation table th{padding:2px;font-weight:bold;width:200px}#warrantyJobForm #warrantyDisclosedInformation table td{padding:2px}#warrantyJobFaultDescription #FaultDescription{width:600px;height:250px}#createJob_Container img.modelImage{width:64px;height:64px}#createJob_Container .createJob_Component{margin:0 10px;padding:5px 0;border-bottom:1px dashed #ccc}#createJob_Container .createJob_Component:last-child{border-bottom:none}#createJob_Container #createJob_Type{border:1px solid #ccc;background-color:#f2f2f2;padding:2px 4px;-moz-border-radius:0 0 0 6px;-webkit-border-radius:0 0 0 6px;border-radius:0 0 0 6px}#createJob_Container #createJob_SubTypes{margin:-1px 0 0 35px;border:1px solid #ccc;border-top:none;padding:2px 4px;background-color:#f2f2f2;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}#createJob_Container #createJob_SubTypes .createJob_SubType{display:none}#createJob_Container #createJob_Type li,#createJob_Container #createJob_SubTypes li{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;margin:2px 8px 2px 0;padding:0 0 0 4px}#createJob_Container #createJob_Type li.highlight,#createJob_Container #createJob_SubTypes li.highlight{background-color:#f6cd8a;color:#000}#createJob_Container #createJob_CommentsContainer #Comments{width:600px}#createJob_Container #createJob_QuickLogAutoCloseContainer{border:1px solid #ccc;background-color:#f2f2f2;padding:2px 4px;-moz-border-radius:0 0 0 6px;-webkit-border-radius:0 0 0 6px;border-radius:0 0 0 6px}#createJob_Container #createJob_QuickLogAutoCloseContainer h3{margin-bottom:4px}#createJob_Container #createJob_QuickLogAutoCloseContainer input{margin-left:4px}#createJob_Container #createJob_QuickLogTaskTimeContainer{display:none;margin:-1px 0 0 35px;border:1px solid #ccc;border-top:none;padding:2px 4px;background-color:#f2f2f2;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}#createJob_Container #createJob_QuickLogTaskTimeContainer h3{margin-bottom:4px}#createJob_Container #createJob_QuickLogTaskTimeContainer label{margin-right:20px}#createJob_Container #createJob_QuickLogTaskTimeContainer #createJob_TaskTimeOtherMinutesContainer{display:none}#createJob_Container #createJob_QuickLogTaskTimeContainer #createJob_TaskTimeOtherMinutes{width:50px}
\ No newline at end of file
+.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}#layout_PageHeading #Job_Show_Status{margin-left:20px;display:inline-block;height:50px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-weight:lighter;font-stretch:condensed;font-size:.7em;text-transform:uppercase}#layout_PageHeading #Job_Show_Status span.icon{margin-right:6px}#Job_Show #Job_Show_Subjects{table-layout:fixed}#Job_Show #Job_Show_Subjects>tbody>tr>td{padding-top:0;height:100%}#Job_Show #Job_Show_Subjects>tbody>tr>td>div{position:relative}#Job_Show #Job_Show_Subjects>tbody>tr>td>div div.status{margin-top:2px;padding-top:2px;border-top:1px dashed #ddd}#Job_Show #Job_Show_Subjects>tbody>tr>td>div input.discreet{margin-left:-2px}#Job_Show #Job_Show_Subjects>tbody>tr>td:not(:last-child){border-right:1px dashed #aaa}#Job_Show #Job_Show_Subjects .dialog{display:none}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_Type>table{table-layout:fixed}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_SubTypes_1,#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_SubTypes_2{padding-left:16px;font-weight:bold}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_SubTypes_Update{margin-left:16px;font-size:.9em}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_SubTypes_Update_Dialog{display:none}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_Dates{padding-bottom:6px}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_Dates table{table-layout:fixed}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_Dates table>tbody>tr>td{vertical-align:middle}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_Dates table>tbody>tr>td:first-child{font-weight:bold;width:60px}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_GenerateDocument_Container{padding-top:4px}#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_GenerateDocument_Container #Job_Show_GenerateDocument{padding:0}#Job_Show #Job_Show_Subjects #Job_Show_Device>div{padding-left:102px;min-height:100px}#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Model_Image{position:absolute;left:0;top:0;height:96px;width:96px}#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details{float:left}#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details_HWar,#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details_HNWar{float:right;border-left:1px dashed #ddd;padding-left:4px;margin-right:2px}#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details_HWar_Details_Button,#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details_HNWar_Details_Button{font-size:.9em}#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_DeviceHeld table{table-layout:fixed}#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_DeviceHeld table>tbody>tr>td:first-child{width:62px}#Job_Show #Job_Show_Subjects #Job_Show_Subjects_Actions>td{padding-top:4px}#Job_Show #Job_Show_Subjects #Job_Show_Subjects_Actions #Job_Show_Device_Actions{padding-left:111px}#jobDetailTabs{margin-top:10px;border-radius:0;background-image:none;background-color:#fff;border:none;padding:0}#jobDetailTabs #jobDetailTabItems{border-radius:0;border-top:1px solid #ddd;border-right:1px solid #ddd;border-left:1px solid #ddd;border-bottom:none;padding:2px 0 0 4px;background-image:none;background-color:#eee;display:table}#jobDetailTabs #jobDetailTabItems>li{top:0;border-radius:0;margin:0 5px 0 0;padding:0;line-height:normal;margin-right:4px}#jobDetailTabs #jobDetailTabItems>li>a{padding:5px 8px}#jobDetailTabs div.ui-tabs-panel{border-radius:0;padding:4px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;border-left:1px solid #ddd;border-top:none;background-color:#eee}#jobShowResources #Comments{width:375px;height:300px;padding:0;border:1px solid #ccc;background-color:#fff}#jobShowResources #Comments div.commentOutput{height:249px;overflow:auto;background-color:#f4f4f4;color:#000}#jobShowResources #Comments div.commentOutput>div{padding:3px;margin:4px 6px;border-bottom:1px solid #ccc}#jobShowResources #Comments div.commentOutput>div span.author{color:#444;display:block;font-weight:bold;font-size:.95em;float:left}#jobShowResources #Comments div.commentOutput>div span.timestamp{display:block;float:right;font-size:.9em;font-style:italic}#jobShowResources #Comments div.commentOutput>div span.comment{clear:both;display:block;margin-left:4px}#jobShowResources #Comments div.commentOutput>div:hover span.remove{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC)}#jobShowResources #Comments div.commentOutput>div span.remove{margin-left:6px;display:block;float:left;height:16px;width:16px;cursor:pointer}#jobShowResources #Comments div.commentOutput>div span.remove:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#jobShowResources #Comments div.commentOutput>div:last-child{border-bottom:none}#jobShowResources #Comments.cannotAddLogs div.commentOutput{height:300px}#jobShowResources #Comments div.commentInput{border-top:1px solid #ccc;height:40px;padding:5px}#jobShowResources #Comments div.commentInput textarea.commentInput{border:0;padding:0;margin:0;width:325px;height:40px;min-height:40px;overflow:auto;float:left;resize:none}#jobShowResources #Comments div.commentInput div.commentInputPost{margin-top:4px;height:32px;width:32px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFCElEQVRYw+WXT2gdVRTGf+femXl/Ek3bvLRNGgO1wRZtY8VINyJUrQURKbpQUMF/iCCi4MKNblyJoCBF0IULEV25EEQtalG01tqoaXxpm9AmTdI0iU2aNHkvyXvO3HtcvLQa0lRr+3DhheEOs5jvu+c757vniKryXy7Df7wCgLa2tu3OuajaYCLiM5nM2Y6Ojo7zBIwx8ulnn79x5x23b6maHKoogvde29rablsSgdnZ4towDG0cJ5enpwhOLG9/UyAbgvcgRrBGefDmENQraLSEQJIkznsljuPLImCN4IxgrJA4ZbbkMIGlJgXl0jxBEKiI6BICVzDWCNCQy7K5yVAnCd/2FpmalXNKVLcKxAjqPeb3EoemYNXKgFvWhQiKcw5VX/0ydF4pxzGFWUgUDv/ajY71MVcqV98HvKtIMDMvuMki7302yOmajdTXRwwMDON1GR+4IuDek3hPOSmz63qHFWF0rERzc444bqa/7xhcQIJgIXcuG9x7j3MOi0eMcvDAMO3tDQwc7yXxSnNTI97rkkRcJMHk5CT9/f3n3y8VvLJ7ksSRH5rn9ff7EamhuWk13nsqRqfLE8jl6mltbUVEyOXqEZF/Bv6XXdWTJJ4hF9G4fSu7955lfGwGEY+/QBIYEKw1GCP09vbS03OU8fHT9PT0cOzYMQqFGcIwwFqLtebCJ3euQsJVnsR5Sgiv9Fnsjnbe/GqaibEigl8iQSAiWGMBWL/+WiqHFurqVhAElRQpl8tEUYS1AeAWalorJFT/BPcL39WBEQL1fDljuWvHNnbv7eA5O65GFlMwoPiF7Dx69Ajd3YcpFgt0d3dTLpeYmBgnn88zPT3N8ePHOXGiH+8cI6dOMT83h7oYK4rBEYgnFEdKPMZUnM8k8MWUJbxjG6/tmcSGm1YsioCqkiQO75XNm7egqogIW7duRURIpzM0NFSSqLExjfdK4hwrcw2UE2VwuMDo+By/TZSYjz2lxFMoe4jqWBUqxWIZq8qeOcPdd26z7vCjz29pf6sz/9Mzw+fLMJPJpI0Ramqyf+tybkHvuBQz83vMXO1VnHFZBgKlrwCDRRjF4MRgSwmQ4BZK/ZOisOuZe27/+r0f3r3xpt2PdXU+OyLGGHnp5ZffabmmZX0cx7q8yyW4uIwiouqJM6vsbDoXFW1tdEauzk5otvaMS9ec9VFmxgXpWMVW7r3Fv1Qj7GqJ2PvBwY+ivqEXRFXZuXNn06Waz2R6XXZ6xcZcObt6dZzNbdCo9joN0q1xdnWzIC0CWZapYjWG7c0Rhz78/kX5t13QmlcHa/BujaquRf1GlBtANwGtKC2IZpxfCICcv61BIGOFTOfR/eHE1EOXdBe0vNInjSsCMRl0Qz0GCQxgBKyiFiVAJBLRyM8LQ9MJZVO5oM7xyIaG6Mf8/vTJ0QfyB58eviQCtmSYT9DSvBI7nVNlOPvtzxavtYDRVDSiUXBATVg3d3VTe7LuqltNpKAgCDWhEO3v2h8NjTyQP/j0MIBUqxG99vG9n8zeuPGec5HPWkj98GtXMDh67+F9TwxVdS5Y8+awtc5lJLAQWlKpgNSP3V1mfOq+v4JXoSdcaM0CKxiBVECEkvmu85Adm7jvyJcPn6haQ7KIQGhJwmycmTKken7+xZw6ff+Rrx4ZWHYyuvKDiCU6UxgPzh7YY0ZGn8rve/LkRUezK45vcKmh/o8lcQe6Op8duWi0/vfT8R81FrV4fklnMAAAAABJRU5ErkJggg==);cursor:pointer;float:left}#jobShowResources #Comments div.commentInput span.action{display:block;margin:0;height:32px;width:32px;cursor:pointer;float:left;border:1px solid #fff;padding:3px;background-repeat:no-repeat;background-position:2px 3px}#jobShowResources #Comments div.commentInput span.action:hover{background-color:#ededed;border:1px solid #ccc;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}#jobShowResources #Comments div.commentInput span.post{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFCElEQVRYw+WXT2gdVRTGf+femXl/Ek3bvLRNGgO1wRZtY8VINyJUrQURKbpQUMF/iCCi4MKNblyJoCBF0IULEV25EEQtalG01tqoaXxpm9AmTdI0iU2aNHkvyXvO3HtcvLQa0lRr+3DhheEOs5jvu+c757vniKryXy7Df7wCgLa2tu3OuajaYCLiM5nM2Y6Ojo7zBIwx8ulnn79x5x23b6maHKoogvde29rablsSgdnZ4towDG0cJ5enpwhOLG9/UyAbgvcgRrBGefDmENQraLSEQJIkznsljuPLImCN4IxgrJA4ZbbkMIGlJgXl0jxBEKiI6BICVzDWCNCQy7K5yVAnCd/2FpmalXNKVLcKxAjqPeb3EoemYNXKgFvWhQiKcw5VX/0ydF4pxzGFWUgUDv/ajY71MVcqV98HvKtIMDMvuMki7302yOmajdTXRwwMDON1GR+4IuDek3hPOSmz63qHFWF0rERzc444bqa/7xhcQIJgIXcuG9x7j3MOi0eMcvDAMO3tDQwc7yXxSnNTI97rkkRcJMHk5CT9/f3n3y8VvLJ7ksSRH5rn9ff7EamhuWk13nsqRqfLE8jl6mltbUVEyOXqEZF/Bv6XXdWTJJ4hF9G4fSu7955lfGwGEY+/QBIYEKw1GCP09vbS03OU8fHT9PT0cOzYMQqFGcIwwFqLtebCJ3euQsJVnsR5Sgiv9Fnsjnbe/GqaibEigl8iQSAiWGMBWL/+WiqHFurqVhAElRQpl8tEUYS1AeAWalorJFT/BPcL39WBEQL1fDljuWvHNnbv7eA5O65GFlMwoPiF7Dx69Ajd3YcpFgt0d3dTLpeYmBgnn88zPT3N8ePHOXGiH+8cI6dOMT83h7oYK4rBEYgnFEdKPMZUnM8k8MWUJbxjG6/tmcSGm1YsioCqkiQO75XNm7egqogIW7duRURIpzM0NFSSqLExjfdK4hwrcw2UE2VwuMDo+By/TZSYjz2lxFMoe4jqWBUqxWIZq8qeOcPdd26z7vCjz29pf6sz/9Mzw+fLMJPJpI0Ramqyf+tybkHvuBQz83vMXO1VnHFZBgKlrwCDRRjF4MRgSwmQ4BZK/ZOisOuZe27/+r0f3r3xpt2PdXU+OyLGGHnp5ZffabmmZX0cx7q8yyW4uIwiouqJM6vsbDoXFW1tdEauzk5otvaMS9ec9VFmxgXpWMVW7r3Fv1Qj7GqJ2PvBwY+ivqEXRFXZuXNn06Waz2R6XXZ6xcZcObt6dZzNbdCo9joN0q1xdnWzIC0CWZapYjWG7c0Rhz78/kX5t13QmlcHa/BujaquRf1GlBtANwGtKC2IZpxfCICcv61BIGOFTOfR/eHE1EOXdBe0vNInjSsCMRl0Qz0GCQxgBKyiFiVAJBLRyM8LQ9MJZVO5oM7xyIaG6Mf8/vTJ0QfyB58eviQCtmSYT9DSvBI7nVNlOPvtzxavtYDRVDSiUXBATVg3d3VTe7LuqltNpKAgCDWhEO3v2h8NjTyQP/j0MIBUqxG99vG9n8zeuPGec5HPWkj98GtXMDh67+F9TwxVdS5Y8+awtc5lJLAQWlKpgNSP3V1mfOq+v4JXoSdcaM0CKxiBVECEkvmu85Adm7jvyJcPn6haQ7KIQGhJwmycmTKken7+xZw6ff+Rrx4ZWHYyuvKDiCU6UxgPzh7YY0ZGn8rve/LkRUezK45vcKmh/o8lcQe6Op8duWi0/vfT8R81FrV4fklnMAAAAABJRU5ErkJggg==)}#jobShowResources #Attachments{height:300px;padding:0;border:1px solid #ccc;background-color:#fff}#jobShowResources #Attachments div.attachmentOutput{height:249px;overflow:auto}#jobShowResources #Attachments div.attachmentOutput>a{display:block;float:left;height:48px;width:221px;padding:2px;margin:2px;font-size:.95em;border:1px solid #fff;color:#000;text-decoration:none;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}#jobShowResources #Attachments div.attachmentOutput>a span.comments,#jobShowResources #Attachments div.attachmentOutput>a span.author,#jobShowResources #Attachments div.attachmentOutput>a span.timestamp{display:block;float:left;width:168px;overflow:hidden;height:16px}#jobShowResources #Attachments div.attachmentOutput>a span.author{color:#888;width:150px}#jobShowResources #Attachments div.attachmentOutput>a span.timestamp{color:#888;font-style:italic}#jobShowResources #Attachments div.attachmentOutput>a span.icon{display:block;float:left;height:48px;width:48px;margin-right:2px}#jobShowResources #Attachments div.attachmentOutput>a span.icon img{height:48px;width:48px}#jobShowResources #Attachments div.attachmentOutput>a:hover{background-color:#ededed;border:1px solid #ccc}#jobShowResources #Attachments div.attachmentOutput>a:hover span.remove{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC)}#jobShowResources #Attachments div.attachmentOutput>a span.remove{display:block;float:left;height:16px;width:16px;margin-left:2px}#jobShowResources #Attachments div.attachmentOutput>a span.remove:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#jobShowResources #Attachments.cannotAddAttachments div.attachmentOutput{height:300px}#jobShowResources #Attachments div.attachmentInput{border-top:1px solid #ccc;height:40px;background-color:#fff;padding:5px}#jobShowResources #Attachments div.attachmentInput span.action{display:block;margin:0 4px 0 0;height:32px;width:32px;cursor:pointer;float:right;border:1px solid #fff;padding:3px;background-repeat:no-repeat;background-position:2px 3px}#jobShowResources #Attachments div.attachmentInput span.action:hover{background-color:#ededed;border:1px solid #ccc;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}#jobShowResources #Attachments div.attachmentInput span.upload{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFPUlEQVRYw7VXayzkVxRfy4yKTj0aj6JWJISuR9EiWj5IFZt4pB+kLYmdbEJEJpp2daeIJkRNMx7xqFcl0iXxaKwVj8ishhG+eARr10wY6hVMx3gM1mNxeo7YRDfzNr3Jyfzn/u/939899/x+59xbAHDLEIbNxNHRMSQ5OTmvuLi4pbS0tDU1NbXA3d09FN8ZqZxniMVZLJZvSUnJ0NHREVA7PDwEhUIBb1pNTU2PtbW1+/8CwMvLiz07O/uKFqqrq9sNDAzstLCw4Jubm/Pd3NyeZGdnb56dncH09LQUQfgaFIC9vX30+vr6uUwmg5CQkD509Rdo75HL0W6jWaJF+/n5CRcXF0EgEEiMjIw+MAgAbM7d3d1/y6QywAU68b+NmrFeYWFhwtPTU8jIyKi/MQDaXU5OjoDcHhsb+4x2fdX/jqqAwxbf0dFxNj4+vofPtjcCgO7+gRbn8/lSS0vLjPT09KrOp09F/f39S9XV1QOhoaFsXITxFoD3cfcv8MgA2RKuNwAzM7MgsVh8MDAwAAkJCRI8230CIxKJYHh4GLa2ti4jv6CggI7F7BoABlJ0cHNzEzA4v9ELADar1tZWkVQqBS6Xe4G/F/Pz8xAdHT2KwZWN7zkODg7NVVVVr87PzyErK6vp2lxTnDO2vLwMOCZeLwBsNvu3K9fDxMQEjI2NgZ2dXSl+3OnaQtZo3Pr6+qNt+TZ4enreu+q/09nZuUdeQrA+OgNwdXX9en9/H5qbm+Hx48dAO/fw8PiddqbEUyyMg66VlRVg379fQ32+vr4Z5Lnc3Nzn/zkabRY3MTHxmJmZ2UExgfz8fKBAiomJ+Usd9fCcc+fm5gDluB3HOSLwtcnJSXB2dv5JJxoS5crLy58dHx9DXl4eLCwsAMquFPs/VjcvPDy8dHV1FeLi4v7E6O+V4e7j4+MHiQ06AYiIiPiRzh2TC/T19YFQKASUWo4G0GZlZWUvpqamyAOLBATnb2N/sE5S7OTk9KVcLn/d09MDlZWVl+fu4+PTSIKjbh7GRuqCZIGSEAwNDV2gPgDmgYc6J6PMzMxW0nDk9MXa2hqkpaW9vB7xyozBYNzt7e3dHRkZuQxYiURCUv2HKtBqzx75yk1MTFwmFzY1Nb1G+sRrcL1RFpcr2NzYgNraWlheWgIOhyOmvKFXPYDtM3S/ggLP1tb2F3WFBZm/v/93BLaxsRFGR0ehoaHhBEF/pXYNdRUOj8cTUgCi0hHlWGqLEgvW5+j2EwrS9vb2SwB29vY/a2SZqhcoJFxaHClH0fuppqjHceO0exKpJXQ96kQ/9r+rFwAmkxmMCeeIdoGUe6gFVX8lnpPrUbCAV8iT4eKfaJVflHUidxtp9ygiAk2Uo927uLhUFBUVnVDkd3V1nZuamj7QOsEpy3iYNJZINq2srBK0zJKeKDT/EGVR8yk/3L4JgLuDg4PHLS0tB/j8oTYfSUpKqtuWyyElJeWltnPUAfDHKD5FEaHgs9T0gYCAAA4lJ6yEdnF8hM7lnRIAd1D5VijfI/eDNVRH/pjfD0jzsS54pFd9qQQAMygoqJ3Eh1dYSKU2U0WKdseiQ0QlVmRkJI0zNwiAKxAxWD5t7ezsAGa1IaTiR9dLK6xyvu3q7pYeHhwAFqQktZ56l/cqAJgaGxt/z+cXHSr2FEA3n8qKihEsRnoxOCUbqPVkmOdXcGzoje6U6vhNRWZUVNTztra2szmxGIhmVAei6u17e3s/wfchN77UarrxknvRHuAFtMjGxqacwWQ8omjXlBsMAuAtMMYEyFDX+Tf2LzGXbu1DZYkMAAAAAElFTkSuQmCC)}#jobShowResources #Attachments div.attachmentInput span.photo{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAALH0lEQVRYw8WXa4xd11XHf2vvfc59zJ33y+PxYzyel2dsx48hdnCaNMFNFUGgkKCoKLxCE1EJKgoBCbW0fACpoihSUVBQUgW1FCRaJURRcF4iL8eJkzbYY0+Sie3YHs/kzvt13/eeffbmwx07IMFnjnTO3ufonL3+67/W2ue/xHvP/+chfX27+J3ffoCRwV307x5ibP8hWluauf22YwwNDjA2tofBgSFuOniYP/rjR8jOXqO7u4utPVvYu3eM4ZFh9u0/THNLKzftHWXfvlFGR4YZ3bOHA4cOc9udd+nmpsb23i1do4PDI7f+60+eebparX6ktQHA/O+4fP30vj4Azjni2BLbCBvVcHGEjy0+jolrFfp39TU1ZBq2490hH9vDcVQZK2ys9p0/826HSbWlK16FTcmApcWl9kQq/fUgCBBRGO/hRhi8wzmHtZYoqhHHFu8sOIuLa7S0tISlQr7TaHWT4Mdxdr+3lYFSYbVn8sMPm7wEYcWJym54Li96XsoWyE6VWVhf4NN1y7d+Yyf7R3cPtbZ3kEyl0VpjnItxLt40FGOjCsPDw23JRLIfH497Zw8R1/bUSvkdj373r1slbE7FXpnFKlxZ9ExlK7z4swJzqwus5S2lmsM7h1YKEyiSRhEYoTVlWM7Dvn37+u657zdvcG2SyeQRG9XudbHd4+Jqf7W41v3+mXMZLyosOpHpZc+lOcsPP8ox+2aR5Y1VCuWYWuxQogi0kAyEQCtSgZBJBCjxiFZoJSjRKOUx1jC/DneP7esCNBADmC/dc/cjf/Wdv73v+XOWdxdLPP1mkfm1LLliRLEa47xDI+hAERoIlaKtMUBrUAhKQIkgIoholN6cK6k/VwpBIVqxVPB0HxpobGrMtBQLhZUwkcCcnzjzdrnq7/vOM9MkxZJJKRJGSCWEhoSpLwTIDUMKJR6tQLzgtUFwiNKIEjSC1/URrRC1+Y0SChWPMsmwo615sLU5sxImkpjL12bf0xL7Pb2NUigWSASCEoUClNQvSkA8eBGUEgRBhLqnWvBiEJE65Urwqs6CUmrzfUVCacqxB6Vlx7atB5U2p4MgxKysrF9wtlbb0Z1JXLxWIxF4tBLwgjJqs0IEUSAIKI9gEPGIZtOwBhFEeYySzXndEa3qcy0aGynKwPDQ4IEwkSJIJDDr6+ura/OfFPt6RhOXsgFBSL3+xaEDjfebxqXuNQqMaLwCBegbLAkaj9KgUIjWmwwotBZAExvFmoOxvXv3tLV3kEynMbFz8fnzk4u7D+9tezVhCBP1eHtfX72eSCBKoUXQOkTCEGVriLcgghKP2qRfXQ+TaLRWiCh0KKTS0BJCycPBQ+PbP3fHXfUyfPzvvsuZsxNXHvjil0fCRIAJPUrxWYzFo8UgClSYAlvCzU6QHhhHfIi3MXIdwH/Lfq0FZYRME+gEzF5Z5+RzP+KN2lW+962vtxljEtbaqnnn9E+pVSvn2zV3N6YSJE1cz3L9Ge2iFNqESACJt39EfvJNXn31MPc88idQEbxjE7TURw3pRggzMHXmAm/+8/eYm3iNteVZerZvJ5X5drqrs6uzWCzOmo+mPsZ7f0bhaG0KIBa0Bu2lnmTXyyijUGdfJly8QFN/P1vfPc3Vc5e49RcHcDVwFrwDrcEkYebyIuf/8Sny504yZgz7bxplobqdy3Oz4L3p7ure7/Gz5sLFT2hsajrr4yjubg31ak4T1pMaLXUAOqlwuXXspVPM5xxDXQ388p0H+P7TT6LNvSx/cpEdg6P07uqjEpWYPfsWc//+E3oyhsMHb2ZhYZG55RVaMhlWK/MsLM+xe2hoPBEGJ8xGvkA1qs1uLM7UtjQPpIplRTqsU+kFRIFJQfWnLxHbKtZrenq7efGt95n/9D1W/uYVJqYu4pXHJDOkUoYH77iVge42yk746Mo0nQ0NSOxYWFvkC7vHafUwsmdkf3NzMya2ltmZ6cKpk2+sbj0+0DtZKqBrVbwWkqlmdGAoTk2RnjlD2BAyVyryzcf+iYnJ89z1uT6KJUGMQaihraXBG05+NMVY1wgd6QZev/oetaLl/i98nl628s7rpzh35jKHDx0a+NUv/Qpmfm6B+cWlp44c+3zXlk7YMbxIXC6ighSJ1hCco5CEcPh+onQHTR98zM4DBzk2fgjjoUKVXKmIjzyGkPWlZZ58+imWN1bI56rcOn4bP/y3E7x2Psfgni7W2gLm3Qzjo8d7AJGrly+rnbt2VYCgLj3qm8D7b59kOvspnVs78Klmpi5+yi+MHyA7c5XHHn+MB379t5hfXeDnjx6je0s3yTBJmA6p1ark8wUKG2s8+vhfkExamtOQnZnFN6+wlM/S2d7Oo9/4uNyzZdtWc25ycteOnTuNKIV1UMitkG5sYq1iKKokPq9JVIuszF9h9lorG6t55pbXCDJp+lt2kCvlKF4tkUw00NXZRjqTpJAvo2iA5qu8eOY/6U8JnSnD4rylsOHJXl4AHyU6O7v6zfMnThw7fvy4pFIpquUy1YrF2Tx33P5ziCjwELuYu24ep1gtASmOf/FOfnb6XWreUKlUWVtfYvqTKxw8dICWjg7KhQKN6XZuG/t9XjnxMBdCz3ImIt1h2NLdTG/PdhKJlBocGLjDXLp4uVqulEmlUhTLJYqVIuJhY22DyFapuhqFYo1qLcKWKpSVxZYKFIolhvqHmF5Y4S//4M+4NHeJIAh48MGv8mv330tHe8D2LSP8+df+lP7Rg/R1DaJMiy2vx+WZ2ez6k0/8IDv18YfnzPLSkirlirS1tkEc46wH8XjxeCXEFY94j3EWZ2JSTjOfy3H77bfR0dZD9toLTM1fpOXHY6x/bZIf/8sPeOirD9O7tR0jjpdebjh54tnnTszOzJyfX8yeW1xcWHr99VcryVSCYrGEKRRLUq5WN0W6oLQC71FaEfkIYwQVORweFwveR5gwIG2SOGcp5PNohPXvT8I2xda5bnL5dYJEPyjhwsUP/hDUhPeOjY0clUqJIDBordBaYSJbpRZFAFhncXG8+TcUrLVUqxFRFOOcx+OJHTQkM0ycPUfL1h4uzkzzjUe+zbsvv4YkNYO/NMbk2XMM7t7NxMQZ29rcvIj3XLkS31DfIvKZKBWluH6fNElIQxiGWGuJ45ggGYKAUnKdJJRJsby8TMXG7O7bRSqT5sixo7z21huUygUyjQ18+MEkL77wwsW5uexcGIQsLS2Sy60CEEUR3nu895hCLn8DjXWWUqlELpcjjmNEhEKuQKVSJrIWFzu8jwFFKt3A2toKx245ShgGvPjKf9Da2sTIyCANqTQfTE7aI0eOfPl3v/J7/7MVE6FQyGOtrQN46KGvJFZX68gaGxspFIo4F2GMwQQB6XSNKLKI1rgophJVcJsfb+vbzrVr0zQ3NjE6MkAutxWjNesb6/HNR49+s1DIT9R3Nm40oNfDcOHCP9QBPfHEE52nTp169ZYjRwfzubxGeVFKS2ytVKpVbGTBQ6lSxsYWnMM5X++g4gjn6osGWhMkEiTCRGVwePDN0bHRv49tnI3j+HIqlVrz1FW1MYYwDGlpaWF8fBzp6uoyDz38cIez8eHTp9/ZeW1mZqCQz2+LarU2B+nYxaEgOo5jtenNZr/ovYh4rXVstLZ4V1UmyLW2tMwEYfhJ9tPsVKlcOq+UWq5UKsX/szvu3bYjfP7557p7e3srb508GU5OTmamp6cbs9lsx/LySls+n2uslCsNNrYJ55xxzmkQH8c2NsZEqWS61NbeWtBWrzvxK80dLRvDQ0OV3f27q88++8zSLUePFvWmxpPPEmFTOyr+C6xPNMD6P8TnAAAAAElFTkSuQmCC)}#jobComponents{border:solid 1px #8db2d8;border-collapse:collapse}#jobComponents td{border:solid 1px #8db2d8;background-color:#fff}#jobComponents th{background-color:#8db2d8;border:solid 1px #8db2d8}#jobComponents tr th.actions{width:20px}#jobComponents tr input.description{width:400px}#jobComponents tr input.cost{width:150px}#jobComponents tr span.remove{display:block;float:left;height:16px;width:16px;margin-left:2px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC);cursor:pointer}#jobComponents tr input.updating{background-position:right center;background-repeat:no-repeat;background-image:url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA)}#jobComponents tr .totalCost{font-weight:bold}#jobNonWarrantyFinance{border:solid 1px #8db2d8;border-collapse:collapse}#jobNonWarrantyFinance td{border:solid 1px #8db2d8;background-color:#fff}#jobNonWarrantyFinance th{background-color:#8db2d8;border:solid 1px #8db2d8}#jobNonWarrantyFinance tr th{width:200px;text-align:right}#jobNonWarrantyRepairs{border:solid 1px #8db2d8;border-collapse:collapse}#jobNonWarrantyRepairs td{border:solid 1px #8db2d8;background-color:#fff}#jobNonWarrantyRepairs th{background-color:#8db2d8;border:solid 1px #8db2d8}#jobNonWarrantyRepairs tr th{width:200px;text-align:right}#jobNonWarrantyInsurance{border:solid 1px #8db2d8;border-collapse:collapse}#jobNonWarrantyInsurance td{border:solid 1px #8db2d8;background-color:#fff}#jobNonWarrantyInsurance th{background-color:#8db2d8;border:solid 1px #8db2d8}#jobNonWarrantyInsurance tr th{width:200px;text-align:right}#jobNonWarrantyInsurance tr td textarea{width:400px}#jobFlags{border:solid 1px #8db2d8;border-collapse:collapse}#jobFlags td{border:solid 1px #8db2d8;background-color:#fff}#jobFlags th{background-color:#8db2d8;border:solid 1px #8db2d8}#jobFlags tr th{width:200px;text-align:right}#warrantyJobForm #warrantyDisclosedInformation table{font-size:.9em}#warrantyJobForm #warrantyDisclosedInformation table tr:not(:last-child){border-bottom:1px dashed #aaa}#warrantyJobForm #warrantyDisclosedInformation table th{padding:2px;font-weight:bold;width:200px}#warrantyJobForm #warrantyDisclosedInformation table td{padding:2px}#warrantyJobFaultDescription #FaultDescription{width:600px;height:250px}#createJob_Container img.modelImage{width:64px;height:64px}#createJob_Container .createJob_Component{margin:0 10px;padding:5px 0;border-bottom:1px dashed #ccc}#createJob_Container .createJob_Component:last-child{border-bottom:none}#createJob_Container #createJob_Type{border:1px solid #ccc;background-color:#f2f2f2;padding:2px 4px;-moz-border-radius:0 0 0 6px;-webkit-border-radius:0 0 0 6px;border-radius:0 0 0 6px}#createJob_Container #createJob_SubTypes{margin:-1px 0 0 35px;border:1px solid #ccc;border-top:none;padding:2px 4px;background-color:#f2f2f2;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}#createJob_Container #createJob_SubTypes .createJob_SubType{display:none}#createJob_Container #createJob_Type li,#createJob_Container #createJob_SubTypes li{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;margin:2px 8px 2px 0;padding:0 0 0 4px}#createJob_Container #createJob_Type li.highlight,#createJob_Container #createJob_SubTypes li.highlight{background-color:#f6cd8a;color:#000}#createJob_Container #createJob_CommentsContainer #Comments{width:600px}#createJob_Container #createJob_QuickLogAutoCloseContainer{border:1px solid #ccc;background-color:#f2f2f2;padding:2px 4px;-moz-border-radius:0 0 0 6px;-webkit-border-radius:0 0 0 6px;border-radius:0 0 0 6px}#createJob_Container #createJob_QuickLogAutoCloseContainer h3{margin-bottom:4px}#createJob_Container #createJob_QuickLogAutoCloseContainer input{margin-left:4px}#createJob_Container #createJob_QuickLogTaskTimeContainer{display:none;margin:-1px 0 0 35px;border:1px solid #ccc;border-top:none;padding:2px 4px;background-color:#f2f2f2;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}#createJob_Container #createJob_QuickLogTaskTimeContainer h3{margin-bottom:4px}#createJob_Container #createJob_QuickLogTaskTimeContainer label{margin-right:20px}#createJob_Container #createJob_QuickLogTaskTimeContainer #createJob_TaskTimeOtherMinutesContainer{display:none}#createJob_Container #createJob_QuickLogTaskTimeContainer #createJob_TaskTimeOtherMinutes{width:50px}
\ No newline at end of file
diff --git a/Disco.Web/ClientSource/Style/Site.css b/Disco.Web/ClientSource/Style/Site.css
index f87addc0..c3902bd4 100644
--- a/Disco.Web/ClientSource/Style/Site.css
+++ b/Disco.Web/ClientSource/Style/Site.css
@@ -903,7 +903,8 @@ div.form > table table.sub > tbody > tr > th.name {
   width: 33%;
   padding: 10px;
 }
-#pageMenu td .pageMenuArea > a {
+#pageMenu td .pageMenuArea > a,
+#pageMenu td .pageMenuArea > h3 {
   text-decoration: none;
   font-size: 1.2em;
   padding-left: 18px;
@@ -911,7 +912,8 @@ div.form > table table.sub > tbody > tr > th.name {
   background-repeat: no-repeat;
   background-position: left center;
 }
-#pageMenu td .pageMenuArea > a:hover {
+#pageMenu td .pageMenuArea > a:hover,
+#pageMenu td .pageMenuArea > h3:hover {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACf0lEQVQ4y32SO4/UZRSHn3Pey/8yszNy2RmUXVxDDKgFkYTYYaKx0cKGxm+hJGhljBZgYaFQW1phYWFCNH4GTfACCSa6KhFidl0GdtiZ//u+x2LEsCg+zclJzvmdqxx973umRfBOcN5x+9dN7lzfQoMjZWNl1Lw27IcTX1++ebpqI1QBbSI0EderUO7DzIiDGlGhpAw5MzVZttXRy3Ubx6UUHsTvEijG+rlj//jxlc/ZSLodTz5xZG1P+GL94rcvplw29EGB9Xee4r+QEDAjpVsJfW7l2NrMLq1/de3VnMvv90T0yttP8zD2HF6mjTpp5sZ4AvH46omDLxy55JWRFVsUOXT22vMmrIjIfq8sOZU1VRkLtAUbHBhW450De1cjEIOwHSObl69/c+OH316Spt7ws8f2P2NwtMDB6Kj6Qfq9qPucsDys3LhY4VE6GhVaBS2Jn57c96wjf3nzl61Tvtu8M7VSbpvxZzLr7Zj1N/8eoZYCCNGBF8E5qJxwN8Nd9cd7g/pTX02nDdBg0gNawRBZzFfMSAaTmWFmIFAMggr9qN082Sd+by0bIjziRJwTllR1KIsVd+qYtuKb7/4okqIhBZzCIGje2Ulnclc+8pNJ95lBUBWngheRCqgA7TBNUU9a7T5WDw5hELD5PJ/OZucBxMweesbRBz+TVU+5GC6qGI2TWem6M3mWL+RZopul3Z/4L5qAd7KklSdmo5unNylcuD9E/y/fzFO23LB/y2GeN0op58UMimHFsFx2d3D4/R/ZrgfceH20uELnCcjV4HirE/nQx4B4B6EgVUDbarGDx9+9QhDITc12f4gUAMOAYHKoF2lTtKuL9zW4Z8z4C2DFDQO2dDsSAAAAAElFTkSuQmCC) /*Images/Actions/pageMenuIconHover.png*/;
 }
 #pageMenu td .pageMenuArea .pageMenuBlurb {
diff --git a/Disco.Web/ClientSource/Style/Site.less b/Disco.Web/ClientSource/Style/Site.less
index df0a94d1..79b1672c 100644
--- a/Disco.Web/ClientSource/Style/Site.less
+++ b/Disco.Web/ClientSource/Style/Site.less
@@ -1024,7 +1024,7 @@ div.form
 
         .pageMenuArea
         {
-            &>a
+            &>a, &>h3
             {
                 text-decoration: none;
                 font-size: 1.2em;
diff --git a/Disco.Web/ClientSource/Style/Site.min.css b/Disco.Web/ClientSource/Style/Site.min.css
index 9c071540..526d57bf 100644
--- a/Disco.Web/ClientSource/Style/Site.min.css
+++ b/Disco.Web/ClientSource/Style/Site.min.css
@@ -1 +1 @@
-.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}body{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;margin:0;padding:0 10px;color:#333}body.layout{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAFvCAMAAABEoqrSAAADAFBMVEVRUVFUVFRYWFhbW1tfX19iYmJmZmZpaWltbW1wcHB0dHR3d3d7e3t/f3/MzMzNzc3Ozs7Pz8/Q0NDR0dHS0tLT09PU1NTV1dXW1tbX19fY2NjZ2dna2trb29vc3Nzd3d3e3t7f39/g4ODh4eHi4uLj4+Pk5OTl5eXm5ubn5+fo6Ojp6enq6urr6+vs7Ozt7e3u7u7v7+/w8PDx8fHy8vLz8/P09PT19fX29vb39/f4+Pj5+fn6+vr7+/v8/Pz9/f3+/v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD28iAmAAAAbklEQVRIx2NUZ4ABlv9kMZkYRrXhYUphMwzZXEYCogQV0FfbUHMOrSxGAoyMBEygM/M/zZnMjFiZDPQEjCYEsin2/EYKk6qGDTVzR7TnRwN1NFBHPT8aqKOBOur5Uc+PBip1zWVkYGCBCv2nhrkAr7hI+jpl4KUAAAAASUVORK5CYII=) left top repeat-x #d1d1d1}.page{max-width:1230px;min-width:750px;margin-left:auto;margin-right:auto}header,#header{position:relative;margin:0;padding:0;height:110px}header #headerMenu,#header #headerMenu{height:24px;padding:4px;line-height:22px;text-align:right}header #headerMenu a,#header #headerMenu a{color:#000;text-decoration:none}header #headerMenu a:hover,#header #headerMenu a:hover{text-decoration:underline}header #heading,#header #heading{float:left;height:75px}header #heading img,#header #heading img{height:75px;width:300px}header nav,#header nav{padding:0;margin:0;font-size:1.1em}header nav ul#menu,#header nav ul#menu{height:29px;padding:3px 6px;margin:0;list-style:none;z-index:100000}header nav ul#menu>li,#header nav ul#menu>li{display:inline-block;z-index:100000;margin-bottom:-4px}header nav ul#menu>li a,#header nav ul#menu>li a{padding:4px 10px;text-decoration:none;color:#fff;display:inline-block;height:21px}header nav ul#menu>li a:hover,#header nav ul#menu>li a:hover{color:#ffd5ba;text-decoration:none}header nav ul#menu>li a:active,#header nav ul#menu>li a:active{text-decoration:none}header nav ul#menu>li.sep,#header nav ul#menu>li.sep{margin-top:4px;height:21px;border-left:1px solid #777}header nav ul#menu>li.moveRight,#header nav ul#menu>li.moveRight{margin-left:40px}header nav ul#menu>li>ul,#header nav ul#menu>li>ul{z-index:100000;display:none;list-style:none;position:absolute;margin:2px 0 0 0;-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0;border-left:1px solid #ecab72;border-bottom:2px solid #ecab72;border-right:1px solid #ecab72;padding:0;min-width:180px}header nav ul#menu>li>ul li,#header nav ul#menu>li>ul li{position:relative;background-color:rgba(242,242,242,.9);background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAUCAYAAABMDlehAAAAIUlEQVQI12NgYGBQYGJgYPgLJ/6gciEEMwMDAyMzA1kAAB/mByD2JQzYAAAAAElFTkSuQmCC);background-position:top;background-repeat:repeat-x}header nav ul#menu>li>ul li:hover,#header nav ul#menu>li>ul li:hover{background-color:rgba(249,228,210,.75)}header nav ul#menu>li>ul li.hasSubMenu,#header nav ul#menu>li>ul li.hasSubMenu{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAANCAYAAACgu+4kAAAAa0lEQVQoz2NgGBRg8uTJO4BYhxIDVgPxHyCeDcQS5BpiAcSHgfgzENcBMRe5BgUC8U0gfgrEiUDMRI4hLEBcA8T/gfgCqZolgLgb6pUDQOxArEY5IJ4CxN9J0gjVPBeIf5GsEckA8jQOCgAAAvdRUNet20oAAAAASUVORK5CYII=),url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAUCAYAAABMDlehAAAAIUlEQVQI12NgYGBQYGJgYPgLJ/6gciEEMwMDAyMzA1kAAB/mByD2JQzYAAAAAElFTkSuQmCC);background-position:center right,top;background-repeat:no-repeat,repeat-x;padding-right:14px}header nav ul#menu>li>ul li a,#header nav ul#menu>li>ul li a{display:block;padding:4px 10px;text-decoration:none;color:#000}header nav ul#menu>li>ul li a:active,#header nav ul#menu>li>ul li a:active{text-decoration:none}header nav ul#menu>li>ul li a:hover,#header nav ul#menu>li>ul li a:hover{color:#5a300c;text-decoration:none}header nav ul#menu>li>ul li:last-child,#header nav ul#menu>li>ul li:last-child{-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0}header nav ul#menu>li>ul ul,#header nav ul#menu>li>ul ul{display:none;list-style:none;position:absolute;top:-1px;left:180px;-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0;border-top:1px solid #eaa161;border-left:1px solid #eaa161;border-bottom:2px solid #eaa161;border-right:1px solid #eaa161;padding:0;min-width:180px}header #SearchQuery,#header #SearchQuery{font-size:.9em;margin-left:10px}header .watermark,#header .watermark{background-color:#eee}#layout_PageHeading{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAA8CAYAAABfESsNAAAAOUlEQVRIx+2SuREAIAzDFELL/uOSFVLx3Mm1C8nnABaNDJq5WJzAVkZGZXyPMg7+jUwCIeNZmdcZC2pxCZOpoRNgAAAAAElFTkSuQmCC) left top repeat-x #fff;height:50px;padding:6px 20px 4px 20px;font-size:2em;color:#000;line-height:50px;position:relative}#layout_PageHeading a{text-decoration:none}#layout_Page{background-color:#fff;overflow:auto;padding:0 30px 15px 30px;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}#layout_uiExtensions{display:none}footer,#footer{color:#777;padding:10px 0;text-align:center;margin:0;font-size:.9em}footer a:link,#footer a:link,footer a:visited,#footer a:visited,footer a:active,#footer a:active{color:#777}footer a:link,#footer a:link,footer a:active,#footer a:active{text-decoration:underline}footer a:hover,#footer a:hover{color:#4f81bd;text-decoration:none}p,ul{margin:0 0 20px 0;line-height:1.6em}ul{margin:0;line-height:1.6em}header,footer,nav,section{display:block}form{display:inline}img{border:none;padding:0;margin:0;vertical-align:bottom}code{font-family:Consolas,"Courier New",monospace}hr{border:none;border-bottom:1px dashed #aaa;margin-top:15px}a:link{color:#335a87;text-decoration:none}a:visited{color:#335a87}a:hover{color:#4f81bd;text-decoration:underline}a:active{color:#335a87}a.button{display:inline-block;padding:4px 10px;margin:2px;border:1px solid #875a33;background:#db761d;color:#fff;font-weight:bold;text-transform:uppercase;cursor:pointer;white-space:nowrap;text-decoration:none}a.button[disabled],a.button.disabled{background:#9e9e9e;border:1px solid #696969;cursor:default}a.button.alert{border-color:#900;background-color:#e90000}a.button.small{padding:2px 5px;font-size:.9em}a.button:hover{border:1px solid #696969;background:#9e9e9e}div.actionBar{margin:0 -30px 0 -30px;padding:10px;border-top:1px solid #e5bd99;text-align:right;background-color:#f2f2f2}div.actionBar:not(:first-child){margin-top:10px}div.actionBar:last-child{margin-bottom:-15px;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}h1,h2,h3,h4,h5,h6{color:#000;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-weight:lighter;font-stretch:condensed;margin:0}h1:first-child,h2:first-child,h3:first-child,h4:first-child,h5:first-child,h6:first-child{margin-top:0!important;padding-top:0!important}h1>a:link,h2>a:link,h3>a:link,h4>a:link,h5>a:link,h6>a:link{text-decoration:none}h1{font-size:24px}h2{font-size:20px;padding:8px 0 4px 0}h3{font-size:18px}h4{font-size:14px}h5,h6{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-stretch:normal;font-weight:bold}table{border:none;border-collapse:collapse;width:100%}table td{padding:5px;margin:0;border:none;vertical-align:top}table th{padding:5px;margin:0;text-align:left;font-weight:bold;vertical-align:top}table.none{border:none!important}table.none tr,table.none td,table.none th{padding:0!important;margin:0!important;background:none!important;border:none!important}table.genericData{border:solid 1px #e8eef4;border-collapse:collapse}table.genericData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}table.genericData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}table.genericData>thead>tr>th,table.genericData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}table.genericData>tbody>tr:hover>td{background-color:#e8eef4}table.genericData>tfoot>tr>th,table.genericData>tfoot>tr>td{background-color:#e8eef4}table.genericData td.id{text-align:center}table.genericData td.id a{padding:0 6px}.smallTable th,.smallTable td{font-size:.9em}.dataTables_wrapper{position:relative}.dataTables_wrapper .dataTables_filter{position:absolute;height:20px;margin-top:-20px;right:0;font-size:.9em;-moz-opacity:.3;opacity:.3}.dataTables_wrapper .dataTables_filter input{font-size:.95em;padding:0;height:1.4em;width:150px}.dataTables_wrapper .dataTables_length{position:absolute;height:20px;margin-top:-20px;right:200px;font-size:.9em;-moz-opacity:.3;opacity:.3}.dataTables_wrapper .dataTables_length select{font-size:.95em;padding:0;height:1.4em}.dataTables_wrapper .dataTables_showStatusClosed{display:block;position:absolute;height:20px;margin-top:-20px;right:320px;font-weight:bold}.dataTables_wrapper .dataTables_paginate{text-align:right;background-color:#e8eef4;padding:2px 4px;font-size:.9em}.dataTables_wrapper .dataTables_paginate a{cursor:pointer;padding:2px;margin:0 3px;color:#335a87;background-repeat:no-repeat;-moz-opacity:.3;opacity:.3;text-transform:uppercase}.dataTables_wrapper .dataTables_paginate .first{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAKklEQVQI12NgQALGUe0SQPwfnY0iCcVwNjZJFAxT8J+QAvwmEHQDPl8AAAYqTAY6Jng6AAAAAElFTkSuQmCC);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .first.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAKklEQVQI12NgQAKxsbESQPwfnY0iCcVwNjZJFAxT8J+QAvwmEHQDPl8AAEm8TIFT3+fIAAAAAElFTkSuQmCC)}.dataTables_wrapper .dataTables_paginate .previous{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAGMo9olgPg/XkmsCpAlcSn4T0gBfhMIugFdEQCMVyg5CPiC8wAAAABJRU5ErkJggg==);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .previous.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAH6+vokgPg/XkmsCpAlcSn4T0gBfhMIugFdEQDzojUdMBAGjgAAAABJRU5ErkJggg==)}.dataTables_wrapper .dataTables_paginate .next{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Mwjmr/D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwCZ1Cg5w6CPqwAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper .dataTables_paginate .next.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Po6+v7D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwDwPjUdLMfQ6AAAAABJRU5ErkJggg==)}.dataTables_wrapper .dataTables_paginate .last{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAK0lEQVQI12Mwjmr/D8QSDECAzIYDqCBYApmNTQE6liCk4D/JJuB1A05fAABJ/EwGJKVDGAAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper .dataTables_paginate .last.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAK0lEQVQI12OIjY39D8QSDECAzIYDqCBYApmNTQE6liCk4D/JJuB1A05fAACQykyB48rZCQAAAABJRU5ErkJggg==)}.dataTables_wrapper .dataTables_paginate .paginate_active{font-weight:bold;color:#db761d}.dataTables_wrapper .dataTables_paginate .paginate_button_disabled{color:#ccc;cursor:default}.dataTables_wrapper .dataTables_paginate .paginate_enabled_previous{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAGMo9olgPg/XkmsCpAlcSn4T0gBfhMIugFdEQCMVyg5CPiC8wAAAABJRU5ErkJggg==);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .paginate_disabled_previous{color:#ccc;cursor:default;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAH6+vokgPg/XkmsCpAlcSn4T0gBfhMIugFdEQDzojUdMBAGjgAAAABJRU5ErkJggg==);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .paginate_enabled_next{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Mwjmr/D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwCZ1Cg5w6CPqwAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper .dataTables_paginate .paginate_disabled_next{color:#ccc;cursor:default;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Po6+v7D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwDwPjUdLMfQ6AAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper:hover .dataTables_filter,.dataTables_wrapper:hover .dataTables_length,.dataTables_wrapper:hover .dataTables_paginate a{-moz-opacity:1;opacity:1}.dataTables_wrapper table>thead tr>th{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAD6CAYAAACoLMeFAAAAdElEQVRo3u3bOwqAMBAFwBwjh/CUluKRhfVTiil0UYjMwJLqLfmUYUuBtw3jUreKfc2E43aTi/C9Jo3wUR4WAAAAAAAAejBPc90q9jUTjkdNTuGjPj9/bgfpO0i/AgAAAAAAAPQnPZ6YHpBsNEnNefrt4+9Wmn6nW/cZ1MQAAAAASUVORK5CYII=);background-repeat:no-repeat}.dataTables_wrapper table>thead tr>th.sorting{background-position:right center;cursor:pointer}.dataTables_wrapper table>thead tr>th.sorting_desc{background-position:right bottom;cursor:pointer}.dataTables_wrapper table>thead tr>th.sorting_asc{background-position:right top;cursor:pointer}.dataTables_wrapper table>thead tr>th.sorting_disabled{background-image:none}span.icon{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;cursor:default}span.icon.JobStatusClosed,span.icon.DeviceStatusDecommissioned{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACg0lEQVQ4y3VTTWsaURR9M35EDWqMxhBoUIrFD0h+QIuIWLPrrkhWiuAiuHCRIsmuaaEEau0yUFDX/oIuQjZBLBbsQhtSqEiLIFqDiVFj/RjHnvdoili9MMzMnXvPOXPufRyZH3KNRuMwGAyboijy19fX1Xa7/RX5wWwhN/u+tbW1HwwGw06n86Fer2fJZrNJstlsJZVKfSgWi2+REv4DkEgkBjSmo9GoB+zk9vZ2LJfLJRzHkeFwKOp0Oh45Eo/HPyUSieeCINSmAWSBQODjwcHB01arNVpaWpLRRlbw9z6ZTMhgMBAAJI3FYp+TyaQb6d/s6/b29v7x8XG83++PZAhaPN14HzzPk/F4LIBAenh4eFQoFF5xSMojkch3h8NhAgBrvG+eF/QbAAi8qJ+cnDziIMkWDoe/3d3diSDn4QVjWhSYChmNRiI84NPp9GPOYrF43G73GXUappHl5WUilUrnNkM+9YHdaS0ms8vZbDaP1Wo9q9VqRKFQkNXVVQIlcwHATKCUqaC/Uq1Wdzmz2bzp9Xor+Xx+AukcBVikALLvAUS1Ws1XKpUn1AOJ3+/vnJ6eKldWVphBVB71YXoSlBX7QKjRdB+wcL9yuZyFVezs7LxwuVzvMpmMCJm8Uqkk9KJKKAj9Z9rY7XYpkADVUsh/DdKXDGBtbY3b29urgn2jXC6LaOQhkahUKqaEGocFI71ejy0SgPIgc5VKpd6/gZtMJnkoFPppNBo3rq6uCA7SRKvV0j2hkicwmT03Go0v5+fnz7AHtXmHifh8vihMPbLb7SoAsNzNzQ25vLxsg/U9tu/NxcWFsOg0soBBkvX19Qc4jRaw8p1Op1Kv139gUsPZ2j85BjJj8dYkIwAAAABJRU5ErkJggg==)}span.icon.JobStatusOpen,span.icon.DeviceStatusActive{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACs0lEQVQ4y4WTXUiTURjHJ9Wi6PKc9z3vtnebm9vcNNM0v2fldKI2tS7SyqRMceRXS8qlhjgpUjQ0KlAsow+yboq6iKwb+wCjvOkqLxKVsC686UIL5/bvrMIwZj3w48Dz/5/nOTycR6EIE4QQpWgm8YZM2WXI0BSLFpLEcxsV/wtuirDtiWyqfXLw48BCF+5jEPcwgMvfOuEeLZ2xuSJbuGd9+MuMkLze5Ofn4cElnEM32pb74EM/OtGL9sANXOFZD/L6k18TiUh/d96Q3RX/rBlH4V4sW6pfrkBj4AjqgxWoRTnqcBjHg4dQ832//wyqsLtn2zihZNNKAWuR9mT5fDaKpuxLrtksuGY4/CyczUTBbMYKrk92FE/v9JfNO2Apkdt/XqYiVdpvGqcTJnRIHItC4gsTxxyWpJdm7HhlQeKEESnX9Z+pRLcoVFYxOuWhBuYhFjAMizDcYjDc/gdcNw2zwNZhBk2CmKaI3KV2JF5VQe8VoG6jUF+gUPWsQRfXfRS6Dgprr4jIHFaqMORqHNu9euhKBbByCuYhEJvDwzwUUjWFzDHX8QL5vIAqnckZQ/wF+4SgtJcbqwgEd3hCmnSAQC6jgZgGCXKOmK4g0WSdfUS9yJxcLOPGCgJazanhuH9T8ysX0lTcE/Im+DRfhBQ+xFDE1mmb4kYF6OtpgB3jxjre7TSnlZtbBai8IlijALGSQFNJ/XF9DNG16o4/HymWROQ9ss2ljQkwdgsBmQ9MP8gQdUcDy10dTNe00Pbwqfuo3zggIKlf+5Zm0c2rfiNNoUrnU9ucc0oN+QFB+rg1mP8hFfmTach4ExsURwhMjwlSh7XvWIEgrblQMS2GU65J68IJFOIiGjiNqA+4UPg+9mtMp9xOnGss06rdyKPrpEpRJ3tVDt1ZlivV8oUuocpw3h+OzGWzs/zxOgAAAABJRU5ErkJggg==)}span.icon.JobStatusAwaitingWarrantyRepair,span.icon.JobStatusAwaitingRepairs{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACwklEQVQ4y4WTX0jTURTHJ5pR+Hjv7/ebzqlZ6kzJhbj8N6dzmqb5J3NWOtJmav7LTBNTbNPAlVY+FGyYk0ryJfr3YJk+WAlGZlQECWkqYT340oMW6vbtmtE/Zh74cC7nfM+53HvPFYkcGCHElXj7hXjKo1Il8sg04uMfymIbResZEzn5qFKqD1r6Jkwv52GZAczTQPPYV2gt/dM+qtR6pnFxXMwJJKy6faDqDXB2HGgYw7LxLStmNL2C7fIHYCUXVtMxTHix+N+dN4RUmh7ljwI5fQuLuoFlHB60QTdoR+4gkMc4NGBH9oNvS/oxYEdl2wihdNOvBtLYvSfi7s4h2jq5qLTOQGmdxoqP6ppB5B9Ed39ETPfUkvrWHDxj05t+FFOOd/VtvDbl1foCWw1D2GZ8DD/DGjQ/gX/LU/gyrXdt1yfKi91EvK8sQGK4A6G408YftTJ/nXHjP7B8idUmHLeCl8nDRR6hKrV71RVwGXWgaQ2gWa2g+9sck2UCzTSytQG8vh2CIl4rkig0am9dHTiVFjQyFySxCiTplENoQhVobCGophB8RhmEiCStSNge4ene0AlOmWknigyQGD2IqtgxK7moA6DKHJs4uwJ8aHyEiEgDnD1aeheIPAEkMoehA1EWMnERo/gnRauxlVwU0zCtRG/8TP0VbqvPuK+smjvTD5pSbiOqIyBxZSC7a0H2nAbH4JPZETWVrEkBaFzBknDsEjzSSw2/B8k7yCnw/L1Z7uIQuLxzNprTBiHfAklJD7xKb0KqvwqBxdgFLnGFZkjLO57TQOXmv6aR+ilcAy88nPXonQQpvQ2ZacS+y/wO4eZxBJme2Ul+L8jJ+5DWWUe5ncniNT/UFm19jaxnfH4PG+uKCaDyPZA6bENQ1+svnrrmJhKc4LL+rwxOdOaVBV7uKXVqIbNRw6tL/Yk83dWR9jsKtpCP82kfBAAAAABJRU5ErkJggg==)}span.icon.JobStatusAwaitingDeviceReturn,span.icon.JobStatusAwaitingUserAction,span.icon.JobStatusAwaitingAccountingPayment,span.icon.JobStatusAwaitingAccountingCharge,span.icon.DeviceStatusNotEnrolled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACyElEQVQ4y4WTWUhUYRTHRyqj6PH77r2j46hZbgxkEOM+huPW4lqkuUzuVm5M5jg5iqm51RgpWSnagKbZU6HZovWgFSklhEbkg6JS2oNhPTiaOvPv3gKpGOnAj+9wzv+cDw7niEQWjBBi7exEPPy87MJ95ZJIFydygI9tF/3PeJHVUaVjweOu+Mmlz3XASgvwoxnLc5Xovxc7Ex7kWMxrtlos5jhC6nXyZzCqAVQBxpJ1rFcApkpgucwENPHN1Gi4KH8lFhPxvz9vq9N4DGApBca5uNX1ryqYFpNhXlQB3xJ5kng/ASvzJ9awnA69bt8wpWTHRoMIpfTcwlggpkb9V2fHFZgZU0B4Z8f9MDvmu8Gn9/6YfhewtvBBiahgu7JfxSxLrdtrnaZHB+wx2LsHQw/3YqjP2SIveF4+csHocyfcrnGYF4vpLpGbM+v6oEmC1qucyXCdRcctDndaNkfIGxp57RUO+2Wst+igj63yRqkNtHkMSjQUtRUU+hrL1F2iqNBRlBdR1OtYBPlysaLgAIlSm+mA2AgGifEU6lyCovOWUedRZKTwJFHkJLI4FMA38PHi7Fp1NogJY8zR4QTpKQSnMy0j5E4eJ4iLpqa8BDGCFKyPyNWVbOmusjWGBPKJYwSqRIKMNIKsDL4o6zeCL8SEXFwMgaCtyJV88ZTzQxQsRyUt6G9nkJtKTWkqgpyzBJoCAp2W5wIDrYZFfg6D1FMEqQl07Voxh2yVbfnGHshkxKqnyX1usI3B5VLGpOeH1dLIobNVgrsGe7TdlEJfzQkDXGvWM2jQSd8oFHTnX9vo6Umtn7a6z0312OJ+F8HwEzfzx9demBjxxsiAzNzdSdDbQWColr49HMaINz2oYvXuwok+tyVMHQEW8njyYZoMx1iv7HtloV1ZSMgmx/SnhYaSLanJrL220EZZquGCs8+wLpFRxNqS9ifnTKmvqTT0WwAAAABJRU5ErkJggg==)}span.icon.JobStatusAwaitingInsuranceProcessing{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACzElEQVQ4y4WTbUiTURTHJ9mi8OO9z/NM59Q0p2ZkEJrv1jYly7Q3Z2XLmWalqcvS+ZJDpfCVNEhwacO0NAqK+lBqQWaBkfZBiGaUqIm9+cVQC+ezf88MjGLigR/3cM7/3AvnniMS2TFCiNiLeAcEu4bFBUlD472IfKsQWyNayQSRg9Jjd97tw48+fq2axYIR4JuAbxU/cVfdPabyiCsSNI52iznCkdLAuicWHYCLgKUECygX/ApgwQAeVwGrkKsIbHgpIRLJ/y+vLgyo6rFoge9Jc/M/NAuYSeExo7FiNhmYPQrMHLFiKvGXhU8DSjfX9lNC1y5doJLtOWveMYWh8JF5c8Q43kWMwXYOh43DHPqX9+ETeBs5avmgmEKMa4JhsZilrLjW88Zor9sgHnv1omvDc3R7L0cfeuQv0Oc5iBr3658lVOIkkrO+PkbpfVzhmvkm1oQWrg0mrn1ZbPlGzsRf5kzYxG4JFoW6RCnKnBuhY/QopCW4RCtRQ2vtUkmrYKDlKKZlMLB1COOUalGUVKU45a5HAqNGMk1GLtGhgBTYRUd1SKPpSBE4xmZhO7dTLQrmQlwNzs2IZfZZ48lepJE0nCQZdrHlEskh7KdJvEaSjUhWGSLyIfJV1S6dc0oSjYMkCRqiQbogzCAnhKI/2HxbzJY7IGhs2lxp+ZcgGuS0+BNaWVZeB9ONdHqG15LjyCKZyCf5KCbFKGaKoGcLkMPkIJWkQkNTLaVcPbQumWVLc+BPNjoY/R5MtjG9KGOq+UqhYY2cEa3Sm2h368A1WQuquVpbAy31TBMMsobXETR83T/TGEQDxa1+XZNdLiO4Q+7hqW+/dWCbGW+Ch/HM/5W1k9xCJ3mIaplpIJaJlSy7UOfWF53v8R2endgFTGcL5ACf4nh0+Q9N610rDNFE6bjiVsYQ1apUVuumd9YrCrkLqkz2tDyBxIntaX8D6jqsQHV9jFEAAAAASUVORK5CYII=)}span.icon.success{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB4klEQVQ4y2P4//8/AyWYZA0ckxlYyDaAcy4Dt0SZ0FnBWP7tJBvAOZuBW7xC4MLe67v+x84L+8/ky7CFaAM4pgE1lwtc3Hl92/+o+UH/HWda/Q+c7Pmf0ZVxE1yRyFJWYZElbKbomnnnM3CLlPNd3H5ny/+oTYH/Reax/Refyv1fKFjgLrcHiwBYEftkBhGrfpO3LpPsf3LNZ3CEaZZcy8UjWS94cfvjzf8TjoT+V90u+l9hsfB/Vi+m22xuDJxgL4i2cop59ru82XV36/91t1b+N+3X/ya+mt1Gaaswm1yr+MVVj5b+z7qQ8N/8pMZ//Q1K/1l9mO+weTBwwAORPYh1SdqW2H+VF/P/L74/9//8+zP+azQrf1GtVXi04OnM/yW3M/973rD8b3vI8D9bOPNdjjSIzSixwOHPvsdgocrP+OvB/yc+6fg/7Wnf/6Wv5v+veV74P/K513+fa/b/uZM47grOZOLEmZCY/Bl3G2xU+Rn30v9/y/uK/y2fKv+nf434HwY0QCCH9672XhkOgimRJYRxr8N+sx/5/xL+V/zP/J/6IeK/WJHQXc9bVpxEJ2X2CJbd4af9fja+K/+vVKJwp+hbCgfJeYE3nmufcoP82Tn/J3CSnZnSf0Sy0iQ3omMAFlyLENN9tK8AAAAASUVORK5CYII=)}span.icon.error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}span.icon.warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC)}span.icon.information{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==)}#layout_Page>div:first-child.jobTable{padding-top:30px}table.jobTable{border:solid 1px #e8eef4;border-collapse:collapse;table-layout:fixed}table.jobTable>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}table.jobTable>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}table.jobTable>thead>tr>th,table.jobTable>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}table.jobTable>tbody>tr:hover>td{background-color:#e8eef4}table.jobTable>tfoot>tr>th,table.jobTable>tfoot>tr>td{background-color:#e8eef4}table.jobTable.hideStatusClosed tr[data-status=Closed]{display:none}table.jobTable td.id,table.jobTable th.id{width:45px;text-align:center}table.jobTable td.id a,table.jobTable th.id a{padding:0 6px}table.jobTable td.status,table.jobTable th.status{width:220px}table.jobTable td.type,table.jobTable th.type{width:45px}table.jobTable td.device,table.jobTable th.device{width:100px}table.jobTable td.user,table.jobTable th.user{width:230px}table.jobTable td.technician,table.jobTable th.technician{width:80px}table.jobTable td.location,table.jobTable th.location{width:200px}table.deviceTable tr.decommissioned{background-color:#ededed}textarea{min-height:75px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif}input[type="text"],input[type="password"],input[type="file"],input[type="number"]{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;border:1px solid #ccc;padding:2px;color:#444;width:200px}input[type="text"].small,input[type="password"].small,input[type="file"].small,input[type="number"].small{padding:0 2px;width:150px}input[type="text"].discreet,input[type="password"].discreet,input[type="file"].discreet,input[type="number"].discreet{border:1px solid #fff}input[type="text"].discreet:hover,input[type="password"].discreet:hover,input[type="file"].discreet:hover,input[type="number"].discreet:hover,input[type="text"].discreet:focus,input[type="password"].discreet:focus,input[type="file"].discreet:focus,input[type="number"].discreet:focus{border:1px solid #ccc}select{font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-size:12px;border:1px solid #ccc;padding:2px;color:#444}input[type="submit"],button{padding:5px}input[type="submit"].button,button.button{font-size:12px;padding:6px 10px 4px 10px;margin:2px;border:1px solid #875a33;background:#db761d;color:#fff;font-weight:bold;text-transform:uppercase;cursor:pointer}input[type="submit"].button.alert,button.button.alert{border-color:#900;background-color:#e90000}input[type="submit"].button.small,button.button.small{padding:2px 5px;font-size:.9em}input[type="submit"].button[disabled],button.button[disabled]{background:#9e9e9e;border:1px solid #696969;cursor:default}input[type="submit"].button:hover,button.button:hover{border:1px solid #696969;background:#9e9e9e}ul.none{list-style:none;margin:0;padding:0}ul.none li{margin:0}div.form{margin:0 auto}div.form>p.actions{text-align:right}div.form>table{border-top:6px solid #005fab;border-left:1px solid #005fab;border-right:1px solid #005fab;border-bottom:3px solid #005fab}div.form>table>tbody>tr>td,div.form>table>tbody>tr>th{background:none;border:none;margin:0;padding:8px 5px}div.form>table>tbody>tr>th{font-weight:normal;text-align:right}div.form>table>tbody>tr:nth-child(odd){background-color:#eee;margin:0;padding:0}div.form>table>tbody>tr>td.details{padding:0}div.form>table>tbody>tr>th.name{width:150px;text-align:right}div.form>table table.sub>tbody>tr:not(:first-child)>th,div.form>table table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}div.form>table table.sub>tbody>tr>th{font-weight:normal;text-align:right}div.form>table table.sub>tbody>tr>th.name{text-align:right}#pageMenu td{border-right:1px dashed #aaa;width:33%;padding:10px}#pageMenu td .pageMenuArea>a{text-decoration:none;font-size:1.2em;padding-left:18px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABxElEQVQ4y52TzUsCQRjG99Ql6FBQeImKDv0XXUQCTyuRZmCWCubH7vr9tX6CoBcxUVHUUDwsHjpEXQPPhSF46VwX/4EgInx7ZoNuUbrw25ndmXnmed93huP+eCwWy7HL5Spxiz5ms1lIJpPPOp1uYyEBg8Fg63a7lM/nx1qtdm1uAZ7nT2u1Gg0GA8pmsw96vV4zl4DJZOKr1SopikL9fp/S6fQYous/EyRJ2gcnPp9PDAaDcjgcbkej0VtwH4lEHguFwku9XqdGo0GdTkclHo8/GY3G73AymYwLqhVwncvl7orF4rBcLk8qlcq01WpRs9lUF/V6PdUFC4X9TyQSI6vVus35/X4rHORBWxRFBQzBBEwxRgy4IjhiO1MqlVLbWCxGXq93xOF1AUpAATdgKAjCBEzRJ7fbTXa7nWw220/rcDjY4g+n0+nnEOcR1GNQvYStK9R8iHAm4BVZf0P5ZkwEgmwRwRlz9IlWVHOAU7YElj0ezwomrGKiBmyBHXzvIrRzoIYSCASY/VkoFBL+XUZU55DlAE5JluV3uPXOdQ6QrDOWOAb6wtwnEaFKLOMot7TQXUAIB7AeXvg2YvdNVGTvt/EvEoULbtcvb5gAAAAASUVORK5CYII=);background-repeat:no-repeat;background-position:left center}#pageMenu td .pageMenuArea>a:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACf0lEQVQ4y32SO4/UZRSHn3Pey/8yszNy2RmUXVxDDKgFkYTYYaKx0cKGxm+hJGhljBZgYaFQW1phYWFCNH4GTfACCSa6KhFidl0GdtiZ//u+x2LEsCg+zclJzvmdqxx973umRfBOcN5x+9dN7lzfQoMjZWNl1Lw27IcTX1++ebpqI1QBbSI0EderUO7DzIiDGlGhpAw5MzVZttXRy3Ubx6UUHsTvEijG+rlj//jxlc/ZSLodTz5xZG1P+GL94rcvplw29EGB9Xee4r+QEDAjpVsJfW7l2NrMLq1/de3VnMvv90T0yttP8zD2HF6mjTpp5sZ4AvH46omDLxy55JWRFVsUOXT22vMmrIjIfq8sOZU1VRkLtAUbHBhW450De1cjEIOwHSObl69/c+OH316Spt7ws8f2P2NwtMDB6Kj6Qfq9qPucsDys3LhY4VE6GhVaBS2Jn57c96wjf3nzl61Tvtu8M7VSbpvxZzLr7Zj1N/8eoZYCCNGBF8E5qJxwN8Nd9cd7g/pTX02nDdBg0gNawRBZzFfMSAaTmWFmIFAMggr9qN082Sd+by0bIjziRJwTllR1KIsVd+qYtuKb7/4okqIhBZzCIGje2Ulnclc+8pNJ95lBUBWngheRCqgA7TBNUU9a7T5WDw5hELD5PJ/OZucBxMweesbRBz+TVU+5GC6qGI2TWem6M3mWL+RZopul3Z/4L5qAd7KklSdmo5unNylcuD9E/y/fzFO23LB/y2GeN0op58UMimHFsFx2d3D4/R/ZrgfceH20uELnCcjV4HirE/nQx4B4B6EgVUDbarGDx9+9QhDITc12f4gUAMOAYHKoF2lTtKuL9zW4Z8z4C2DFDQO2dDsSAAAAAElFTkSuQmCC)}#pageMenu td .pageMenuArea .pageMenuBlurb{font-size:.9em;color:#888;margin-bottom:10px}#pageMenu td .pageMenuArea .pageMenuBlurb a{text-decoration:none}#pageMenu td .pageMenuArea:not(:last-child){border-bottom:1px dashed #aaa}#pageMenu td:first-child{padding-left:0}#pageMenu td:last-child{border-right:none;padding-right:0}#pageMenu td .pageMenuArea>a.noticeboard{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACAElEQVQ4y6VTy65hURCt7f1oIkQnfAEx8wkmNyIGBPGK72DqC/yECDFoE0M/YMxQjO8V1/vN7lqlj3T3VCUrZ+86u1atWvscRW+GajabOhwO03q9loTdbiebzSZPwGw20+l0ouv1Sufz+QWn00nL5ZJUuVzWj8eDFosFxeNxUkqR1WoVoBh7vL/dbgKtNY3HYwoGg8/3lUpF7/d7ikQixGuyWCzkcrlEBdYguN/vdLlcCOd2ux21222az+fk8XhIFYtFjSTGqNVqUgB5hgIEFGCM7XYr8nu9nigWgnw+rzebDQUCAapWqy8CdAcQKDocDkKCETqdjijx+XxPApgB2aVS6R8jTSaTSDfmBxEIut2u7NFUZbNZIUDnXC4nBEYxpCPggeEDCAaDgYwnBJlMRgggL5VKyQEUg9AwETlcI4AYDocyvxCk02m9Wq0IPiQSCZEGAw0VxjVCAQhANhqNyO/3Pz1IJpMa7k6nU4pGo3LAKP47DBLEZDKhWCxGXq+XFDuvIb/f70sRABXo7HA4pACkIACwBlGhUBClqtFofLM0XygUkgSu8Hg8ktvtFpkwC+YhZ3zG2M9mMyj4UujAxT/r9foHd+ec1wXwVf5gFQ6Gmbs+uMmVv4UTE+1Y4ReP8avVan2q//8uPoyc5w8wAz5HzTgy9owtk95ef+O7v/NvnbVDH4UJh38AAAAASUVORK5CYII=)}#pageMenu td .pageMenuArea>a.noticeboard:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACcElEQVQ4T6WTPW4lRRRGT1VXV78fjwfbGhAjAQEBkCMhEREgkRGTMIJdOGdCEBtwxoiYhAUgfiREhsTYJAYhojF+fm+6X3d1Vd17CewdzCedDXw6x5kZL7Lw+IvH9urDh/S7LQ6IXaSLHbHriF0kNIE5JXIp5JSY80yaM91yxWazIVxcnHP+9A/+2hbeefd9Wka6NtO1A413OOdQNWZRihjVGn7/9TfePIq4piHgHClNvP3eh3z82ecsGs/BMrBqA6F1eAdFjJSF52PlKiW2s5IufmR175CgokgtbK+37G5memeMy47YFlrvAIeYsk/CZsiMReh3PZ0IKkoQEXIplGFg1+9pUHIR2rYhhADAOFeGKZPSTDXP8HzAlcxSlQBQa6Xv9+xu9jgrxEWmjQHXeFJWqii1VuY0I9bQ9wPLUhE1gkhFRRmGPdc3OxxCFyfwAVEwByKGSKHkQrGGaZxQFVQrwcwwE8Yx8d/1Fq8VGg+uoQke5xxmRilCKQUlMO5HtDPMjFCrYGrsU+bqZkTrTNu2xBjx3oMHE0OkUkql0pCyYlGRKoRaC2Jw/fc5f/7yPc4qMXZ473B3thmgZogISsPmn3P0rWNyKYTjkxPWB2v0p5/594en+MaTixIcLBcdAGKKqqGmmBoixisffEJoA+H1197Y5ppf+vKrr4ltYLFckqaJ9XrN0fHRrcp5Zppm8pxIcyLnwuXlJYf3718F4OjbJ09ePj09/cg5DrvYrh48OFl1sTtwzi2cd03bttrFWMYxpCb4oYv1KgT/HdizW1PgmWHfAHz66JED7t2xABpub5iAPdCfnZ1V7iJ2L5rz//8JgNlI5+OxAAAAAElFTkSuQmCC)}#pageMenu td .pageMenuArea>a.report{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEUAAAAiIiIkJCQlJSUmJiYrKyssLCwuLi4zMzM3Nzc6Ojo8PDw+Pj5CQkJERERFRUVHR0dISEhJSUlOTk5QUFBRUVFWVlZeXl5gYGBjY2NlZWVmZmZpaWlqampra2tsbGxtbW1wcHBzc3N1dXV5eXl6enp8fHx+fn6AgICCgoKQkJCYmJiZmZmampqbm5ucnJydnZ2enp6fn5+goKChoaGioqKjo6OkpKS3t7e7u7u9vb3BwcHExMTFxcXIyMjJycnKysrLy8vOzs7Pz8/S0tLV1dXW1tbX19fY2Nja2trc3Nzd3d3g4ODq6urr6+vt7e3v7+/y8vL09PT19fX29vb39/f4+Pj5+fn8/Pz+/v7///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD1JbRTAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAAALFJREFUGBkFwbtKA1EUAMA5d8+yeRC0SMBgYyq19P9/QgLaiJ2NXWADWdzHdSbqW621Vogo75LTBsAHqY4/oBQPlaQ5lDiPz3cIkuU3LF1/bRyRtIeI8+ppFyCZvoaXqe+vjWOQor02063uNiUESXtZXnMevm+Pp6AwDvPStNFfKiQl0mqKv4kgWbal6bIp60aQzOtlanNuuypIbvfD3MXYZYVkvy2xF8cIQfKJECJK8A++czvTNtPiyQAAAABJRU5ErkJggg==)}#pageMenu td .pageMenuArea>a.report:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB+UlEQVQ4y42TTWsTYRDHf/Pspkkb8rJpYwI2VKkUcyg0kmPvIt4MXrz25kkvnvwAfgA9SXLy4tF+Ay8eeqlgoSxELWqrMZqaZpvuZl8eDyWLTRpwYHgGhuc3/5lhRGtNq9XSWmsmfdJEBBFBKcXW1pYAmONko9Egn8/zP9ZsNuPYBNBa0+v1sG370g9KKUzzvFatVrugLlaQzWYpl8sopRARNt9u4DgurzZfc6tYRxA0Om5lCjAcnmLbdpwcGH02cjW8dsDO5x0MwwCgXq9fUBcDLKuAZRViBV+efqeYXCb52GA9X4sBkxYDXNfj4YslnKMRz550sY4yDH4P8dohu8buBQVTLYgIC+kFep2PFKSP5+c5a5sMewGpVZNqdj1WNjkDNQ4Spsn+3h6f3r8klQCVVhznXPh5Rurefew7t+luv5kN8P2A4x8fOHE8CBVqURNcdQmVwZ+vhzw/HfFtzpw9A6UEzCtE6SohiqgijHwXSQjt/i/mR/NkRv7sNUaRprRcZSE8b8e4qXEdB0kaWMzx4GxANpWcDfA8j1LlBklHCPyAYMklqoS4ocu1lMVqKslBGM0GdDpdVq6v4R7CqXdAbtHHS2cYjk5QhSLkPCTwZ8+gWl2j+WiAYRiIlNhXg7ha9O4uSilWLlljDGi1WlOnO/mOT/lfwF9Tu75p8aEVrAAAAABJRU5ErkJggg==)}#pageMenu td .pageMenuArea>a.noIcon{padding-left:0;background-image:none}#pageMenu td .pageMenuArea>a.noIcon:hover{background-image:none}table.subtleHighlight{border:1px solid #ccc;background-color:#ededed;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}td.subtleHighlight{border:1px solid #ccc;background-color:#ededed;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.field-validation-error{color:red}.field-validation-valid{display:none}.input-validation-error{border:1px solid red;background-color:#fee}.validation-summary-errors{font-weight:bold;color:red}.validation-summary-valid{display:none}.ajaxHelperIcon{height:16px;width:16px;display:inline-block;background-repeat:no-repeat;margin-bottom:-4px}.ajaxLoading{height:11px;background-image:url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA);margin-bottom:0}.ajaxSave{cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACEUlEQVQ4y52Su05UURSGv33mzDlzc1CpBBI7fAArTWjEyyMY7U14AzsLn8DagicwEk0kEBOjYoBCQmJlSKQTSMB4IsOcy15rL4uZkQBqwd/u7C//ZbmJianbXsP87Oyt6OGD+wXgLBh/U+ScqQW3vPz2wtr653xzY+1q3C+KztjY+FS323X37t4hSVL+p19ZxsLCK9rdywDEDgtJkqpZFPtKEAVRBdyJj2ZGmiYEM8zAl+UAYAaVrwgqiBk+rxBVnDsLCOZQMzQoGnQEMFQVCYG+D/jKo/IPAI4QDFVDvB8AwhCgIVAUQpEXqCrRKUAwQ9RwzhE0IF4GAAyCKFVZYeZod7r44eNpB41mg6OjQypf4UcOLChJmrK19ZWnTx7TaLSGJYL7U6RhQBzH9I96bG9/I0nT4whxvYbXGh8/rlPkfaLIkdbTYVkBCKgEolpE2miSpilpWhs5MMQLIQSarRYzN68zfW0aNWg3m9TrMQ6oxzEbm1/48GmdPM8Jw2OLDRDxHPUOabWazM094sXL1ywuvWP++bMTPZQivF9ZxXvBReXxjCICUUVVRgDs7uyxt7N7psjsZ0ZVVqh6LMSjFUKsqjHeI/EgV6/Xo8h7ZwC+EsQLoorZMIKXar8o+lm/t3+x3WnyZnGJmZkbTE5eYWVllfHxS6gqnU6bLMv4cfCdssg5IBkuNYghnFNuZOW8+g2XUFURWZwj0wAAAABJRU5ErkJggg==)}.ajaxOk{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB5UlEQVQ4y2NgGJyAiYGZQ4pVS8JUKFrCWDCCTYxFjYERKEoM4JRjMfOab3G28V3hv75/9f/7/tb/r3uZ/89xguEhVlEmbbyaueVZLUPP2X7P/h/9P+1H+P/Ub2H/U7+H/8/4Ffk/93/Mf+/dZm9ZhRl1sOtmZ+AwXyB/2/GW4X+78/r/HS8a/Xe6ZPzf6bIxmHa4aPjf5a7Jf50OyRNY9fPrsfkoreX+L7qI/b/UKu7/cuv4/ytsFPyvCMTyGwT+y67l+y+xgvO//BLu/5zyzLYYBkiH8vQJljP/5ypj+M/TzPCftweIJwDxRCDuBYq1M/znqmH4L1TP9F/Ejb0AwwCZMJ4ZPI7M/9m9gQpTGf5zFwE1VQJxNZANNJQ7h+E/ZzTQsBCm/6LeHCUYBoh4ciYLh7P+Z3Vg+M8RDFQcBzQoBWIYZwJQLIzhP6szw3/BQNb/fLasgRgGsOkyi6s2835gDwdqSoe4AGxzGYTNlQFxgUwhxwMmdUYurAEpEceToTSZ8z9XKVATMBwEpjP/F5zJ/J+nDcivYPgv180OdAF7BN60IJnFk6u6iOubxk6B/45X9f47XzP4r7lb+L/iHM4PQnEc8USlRrYAFhnZRoEK0xVKy0yWKy2VquUrZPNjFhuc+Q4ABEOzcbMMpzIAAAAASUVORK5CYII=)}.ajaxRemove{cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC)}.ajaxRemove:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#layout_Page div.hiddenDialog{display:none}* html .clearfix{height:1%;overflow:visible}*+html .clearfix{min-height:1%}.clearfix:after{clear:both;content:".";display:block;height:0;visibility:hidden;font-size:0}div.columnHost .column50{float:left;width:50%}.error{color:red}.alert{color:#ff5e00}.smallText{font-size:.9em}.smallMessage{font-style:italic;color:#666;font-size:.9em}.nowrap{white-space:nowrap}.code{font-family:Consolas,"Courier New",monospace}div.code{border:1px dashed #bbb;background-color:#fff;margin:3px 6px;padding:4px;font-size:.9em}a.smallLink{font-size:.9em}textarea.block{width:250px;height:100px}.checkboxBulkSelectContainer{margin-top:6px;font-size:.8em}.checkboxBulkSelectContainer a{text-decoration:none}.ui-widget .checkboxBulkSelectContainer{font-size:1em}#licence{text-align:justify}#licence p{font-size:.9em}#licence li{font-size:.9em}.ui-widget{font-size:12px!important;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif}.watermark{color:#888!important}.ui-autocomplete-loading{background:#fff url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) right center no-repeat}.ui-autocomplete{max-height:150px;overflow-y:auto;overflow-x:hidden;padding-right:20px}* html .ui-autocomplete{height:150px}.ui-timepicker-div .ui-widget-header{margin-bottom:8px}.ui-timepicker-div dl{text-align:left}.ui-timepicker-div dl dt{height:25px;margin-bottom:-25px}.ui-timepicker-div dl dd{margin:0 10px 10px 65px}.ui-timepicker-div td{font-size:90%}.ui-tpicker-grid-label{background:none;border:none;margin:0;padding:0}.ui-progressbar-value{background-image:url(data:image/gif;base64,R0lGODlhMAAWAPMPAO+cSvfOlPfFlO/FjP+9c/+1c/e1a/+tUu+ta++tY/+lSvelQvelSu+cQv/WnAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh+QQFBwAPACwAAAAAMAAWAAAErHDISauVwenNu9cCIo5kaSIGoa5s66rGKZ/pa78xkux87/u1mxD2KxoTweHNcGzykkqc0wmNtpjTY9W6wmaLhoJ4TC6bxd4v8Mxmp9XPtpz89gHu+Pydcej7/4CBfQx6hYZ5fIKKgoSHjoiLkX+Nj48MCpiZmpucmJSVh5edo52flQ2oqQ2ipK2eqrCxsqyupAuyuLO1rre5vqi0u5y9v7kLwrbFvsfIncTKsBEAIfkEBQcADwAsAAAAADAA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)}.ui-tabs .ui-tabs-panel{padding:.5em}
\ No newline at end of file
+.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}body{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;margin:0;padding:0 10px;color:#333}body.layout{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAFvCAMAAABEoqrSAAADAFBMVEVRUVFUVFRYWFhbW1tfX19iYmJmZmZpaWltbW1wcHB0dHR3d3d7e3t/f3/MzMzNzc3Ozs7Pz8/Q0NDR0dHS0tLT09PU1NTV1dXW1tbX19fY2NjZ2dna2trb29vc3Nzd3d3e3t7f39/g4ODh4eHi4uLj4+Pk5OTl5eXm5ubn5+fo6Ojp6enq6urr6+vs7Ozt7e3u7u7v7+/w8PDx8fHy8vLz8/P09PT19fX29vb39/f4+Pj5+fn6+vr7+/v8/Pz9/f3+/v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD28iAmAAAAbklEQVRIx2NUZ4ABlv9kMZkYRrXhYUphMwzZXEYCogQV0FfbUHMOrSxGAoyMBEygM/M/zZnMjFiZDPQEjCYEsin2/EYKk6qGDTVzR7TnRwN1NFBHPT8aqKOBOur5Uc+PBip1zWVkYGCBCv2nhrkAr7hI+jpl4KUAAAAASUVORK5CYII=) left top repeat-x #d1d1d1}.page{max-width:1230px;min-width:750px;margin-left:auto;margin-right:auto}header,#header{position:relative;margin:0;padding:0;height:110px}header #headerMenu,#header #headerMenu{height:24px;padding:4px;line-height:22px;text-align:right}header #headerMenu a,#header #headerMenu a{color:#000;text-decoration:none}header #headerMenu a:hover,#header #headerMenu a:hover{text-decoration:underline}header #heading,#header #heading{float:left;height:75px}header #heading img,#header #heading img{height:75px;width:300px}header nav,#header nav{padding:0;margin:0;font-size:1.1em}header nav ul#menu,#header nav ul#menu{height:29px;padding:3px 6px;margin:0;list-style:none;z-index:100000}header nav ul#menu>li,#header nav ul#menu>li{display:inline-block;z-index:100000;margin-bottom:-4px}header nav ul#menu>li a,#header nav ul#menu>li a{padding:4px 10px;text-decoration:none;color:#fff;display:inline-block;height:21px}header nav ul#menu>li a:hover,#header nav ul#menu>li a:hover{color:#ffd5ba;text-decoration:none}header nav ul#menu>li a:active,#header nav ul#menu>li a:active{text-decoration:none}header nav ul#menu>li.sep,#header nav ul#menu>li.sep{margin-top:4px;height:21px;border-left:1px solid #777}header nav ul#menu>li.moveRight,#header nav ul#menu>li.moveRight{margin-left:40px}header nav ul#menu>li>ul,#header nav ul#menu>li>ul{z-index:100000;display:none;list-style:none;position:absolute;margin:2px 0 0 0;-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0;border-left:1px solid #ecab72;border-bottom:2px solid #ecab72;border-right:1px solid #ecab72;padding:0;min-width:180px}header nav ul#menu>li>ul li,#header nav ul#menu>li>ul li{position:relative;background-color:rgba(242,242,242,.9);background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAUCAYAAABMDlehAAAAIUlEQVQI12NgYGBQYGJgYPgLJ/6gciEEMwMDAyMzA1kAAB/mByD2JQzYAAAAAElFTkSuQmCC);background-position:top;background-repeat:repeat-x}header nav ul#menu>li>ul li:hover,#header nav ul#menu>li>ul li:hover{background-color:rgba(249,228,210,.75)}header nav ul#menu>li>ul li.hasSubMenu,#header nav ul#menu>li>ul li.hasSubMenu{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAANCAYAAACgu+4kAAAAa0lEQVQoz2NgGBRg8uTJO4BYhxIDVgPxHyCeDcQS5BpiAcSHgfgzENcBMRe5BgUC8U0gfgrEiUDMRI4hLEBcA8T/gfgCqZolgLgb6pUDQOxArEY5IJ4CxN9J0gjVPBeIf5GsEckA8jQOCgAAAvdRUNet20oAAAAASUVORK5CYII=),url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAUCAYAAABMDlehAAAAIUlEQVQI12NgYGBQYGJgYPgLJ/6gciEEMwMDAyMzA1kAAB/mByD2JQzYAAAAAElFTkSuQmCC);background-position:center right,top;background-repeat:no-repeat,repeat-x;padding-right:14px}header nav ul#menu>li>ul li a,#header nav ul#menu>li>ul li a{display:block;padding:4px 10px;text-decoration:none;color:#000}header nav ul#menu>li>ul li a:active,#header nav ul#menu>li>ul li a:active{text-decoration:none}header nav ul#menu>li>ul li a:hover,#header nav ul#menu>li>ul li a:hover{color:#5a300c;text-decoration:none}header nav ul#menu>li>ul li:last-child,#header nav ul#menu>li>ul li:last-child{-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0}header nav ul#menu>li>ul ul,#header nav ul#menu>li>ul ul{display:none;list-style:none;position:absolute;top:-1px;left:180px;-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0;border-top:1px solid #eaa161;border-left:1px solid #eaa161;border-bottom:2px solid #eaa161;border-right:1px solid #eaa161;padding:0;min-width:180px}header #SearchQuery,#header #SearchQuery{font-size:.9em;margin-left:10px}header .watermark,#header .watermark{background-color:#eee}#layout_PageHeading{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAA8CAYAAABfESsNAAAAOUlEQVRIx+2SuREAIAzDFELL/uOSFVLx3Mm1C8nnABaNDJq5WJzAVkZGZXyPMg7+jUwCIeNZmdcZC2pxCZOpoRNgAAAAAElFTkSuQmCC) left top repeat-x #fff;height:50px;padding:6px 20px 4px 20px;font-size:2em;color:#000;line-height:50px;position:relative}#layout_PageHeading a{text-decoration:none}#layout_Page{background-color:#fff;overflow:auto;padding:0 30px 15px 30px;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}#layout_uiExtensions{display:none}footer,#footer{color:#777;padding:10px 0;text-align:center;margin:0;font-size:.9em}footer a:link,#footer a:link,footer a:visited,#footer a:visited,footer a:active,#footer a:active{color:#777}footer a:link,#footer a:link,footer a:active,#footer a:active{text-decoration:underline}footer a:hover,#footer a:hover{color:#4f81bd;text-decoration:none}p,ul{margin:0 0 20px 0;line-height:1.6em}ul{margin:0;line-height:1.6em}header,footer,nav,section{display:block}form{display:inline}img{border:none;padding:0;margin:0;vertical-align:bottom}code{font-family:Consolas,"Courier New",monospace}hr{border:none;border-bottom:1px dashed #aaa;margin-top:15px}a:link{color:#335a87;text-decoration:none}a:visited{color:#335a87}a:hover{color:#4f81bd;text-decoration:underline}a:active{color:#335a87}a.button{display:inline-block;padding:4px 10px;margin:2px;border:1px solid #875a33;background:#db761d;color:#fff;font-weight:bold;text-transform:uppercase;cursor:pointer;white-space:nowrap;text-decoration:none}a.button[disabled],a.button.disabled{background:#9e9e9e;border:1px solid #696969;cursor:default}a.button.alert{border-color:#900;background-color:#e90000}a.button.small{padding:2px 5px;font-size:.9em}a.button:hover{border:1px solid #696969;background:#9e9e9e}div.actionBar{margin:0 -30px 0 -30px;padding:10px;border-top:1px solid #e5bd99;text-align:right;background-color:#f2f2f2}div.actionBar:not(:first-child){margin-top:10px}div.actionBar:last-child{margin-bottom:-15px;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}h1,h2,h3,h4,h5,h6{color:#000;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-weight:lighter;font-stretch:condensed;margin:0}h1:first-child,h2:first-child,h3:first-child,h4:first-child,h5:first-child,h6:first-child{margin-top:0!important;padding-top:0!important}h1>a:link,h2>a:link,h3>a:link,h4>a:link,h5>a:link,h6>a:link{text-decoration:none}h1{font-size:24px}h2{font-size:20px;padding:8px 0 4px 0}h3{font-size:18px}h4{font-size:14px}h5,h6{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-stretch:normal;font-weight:bold}table{border:none;border-collapse:collapse;width:100%}table td{padding:5px;margin:0;border:none;vertical-align:top}table th{padding:5px;margin:0;text-align:left;font-weight:bold;vertical-align:top}table.none{border:none!important}table.none tr,table.none td,table.none th{padding:0!important;margin:0!important;background:none!important;border:none!important}table.genericData{border:solid 1px #e8eef4;border-collapse:collapse}table.genericData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}table.genericData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}table.genericData>thead>tr>th,table.genericData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}table.genericData>tbody>tr:hover>td{background-color:#e8eef4}table.genericData>tfoot>tr>th,table.genericData>tfoot>tr>td{background-color:#e8eef4}table.genericData td.id{text-align:center}table.genericData td.id a{padding:0 6px}.smallTable th,.smallTable td{font-size:.9em}.dataTables_wrapper{position:relative}.dataTables_wrapper .dataTables_filter{position:absolute;height:20px;margin-top:-20px;right:0;font-size:.9em;-moz-opacity:.3;opacity:.3}.dataTables_wrapper .dataTables_filter input{font-size:.95em;padding:0;height:1.4em;width:150px}.dataTables_wrapper .dataTables_length{position:absolute;height:20px;margin-top:-20px;right:200px;font-size:.9em;-moz-opacity:.3;opacity:.3}.dataTables_wrapper .dataTables_length select{font-size:.95em;padding:0;height:1.4em}.dataTables_wrapper .dataTables_showStatusClosed{display:block;position:absolute;height:20px;margin-top:-20px;right:320px;font-weight:bold}.dataTables_wrapper .dataTables_paginate{text-align:right;background-color:#e8eef4;padding:2px 4px;font-size:.9em}.dataTables_wrapper .dataTables_paginate a{cursor:pointer;padding:2px;margin:0 3px;color:#335a87;background-repeat:no-repeat;-moz-opacity:.3;opacity:.3;text-transform:uppercase}.dataTables_wrapper .dataTables_paginate .first{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAKklEQVQI12NgQALGUe0SQPwfnY0iCcVwNjZJFAxT8J+QAvwmEHQDPl8AAAYqTAY6Jng6AAAAAElFTkSuQmCC);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .first.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAKklEQVQI12NgQAKxsbESQPwfnY0iCcVwNjZJFAxT8J+QAvwmEHQDPl8AAEm8TIFT3+fIAAAAAElFTkSuQmCC)}.dataTables_wrapper .dataTables_paginate .previous{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAGMo9olgPg/XkmsCpAlcSn4T0gBfhMIugFdEQCMVyg5CPiC8wAAAABJRU5ErkJggg==);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .previous.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAH6+vokgPg/XkmsCpAlcSn4T0gBfhMIugFdEQDzojUdMBAGjgAAAABJRU5ErkJggg==)}.dataTables_wrapper .dataTables_paginate .next{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Mwjmr/D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwCZ1Cg5w6CPqwAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper .dataTables_paginate .next.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Po6+v7D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwDwPjUdLMfQ6AAAAABJRU5ErkJggg==)}.dataTables_wrapper .dataTables_paginate .last{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAK0lEQVQI12Mwjmr/D8QSDECAzIYDqCBYApmNTQE6liCk4D/JJuB1A05fAABJ/EwGJKVDGAAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper .dataTables_paginate .last.paginate_button_disabled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAK0lEQVQI12OIjY39D8QSDECAzIYDqCBYApmNTQE6liCk4D/JJuB1A05fAACQykyB48rZCQAAAABJRU5ErkJggg==)}.dataTables_wrapper .dataTables_paginate .paginate_active{font-weight:bold;color:#db761d}.dataTables_wrapper .dataTables_paginate .paginate_button_disabled{color:#ccc;cursor:default}.dataTables_wrapper .dataTables_paginate .paginate_enabled_previous{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAGMo9olgPg/XkmsCpAlcSn4T0gBfhMIugFdEQCMVyg5CPiC8wAAAABJRU5ErkJggg==);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .paginate_disabled_previous{color:#ccc;cursor:default;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12NgwAH6+vokgPg/XkmsCpAlcSn4T0gBfhMIugFdEQDzojUdMBAGjgAAAABJRU5ErkJggg==);background-position:left center;padding-left:12px}.dataTables_wrapper .dataTables_paginate .paginate_enabled_next{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Mwjmr/D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwCZ1Cg5w6CPqwAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper .dataTables_paginate .paginate_disabled_next{color:#ccc;cursor:default;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAJUlEQVQI12Po6+v7D8QSDLgAVAFuRUgKsCtCU/CfIhPwugGnLwDwPjUdLMfQ6AAAAABJRU5ErkJggg==);background-position:right center;padding-right:12px}.dataTables_wrapper:hover .dataTables_filter,.dataTables_wrapper:hover .dataTables_length,.dataTables_wrapper:hover .dataTables_paginate a{-moz-opacity:1;opacity:1}.dataTables_wrapper table>thead tr>th{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAD6CAYAAACoLMeFAAAAdElEQVRo3u3bOwqAMBAFwBwjh/CUluKRhfVTiil0UYjMwJLqLfmUYUuBtw3jUreKfc2E43aTi/C9Jo3wUR4WAAAAAAAAejBPc90q9jUTjkdNTuGjPj9/bgfpO0i/AgAAAAAAAPQnPZ6YHpBsNEnNefrt4+9Wmn6nW/cZ1MQAAAAASUVORK5CYII=);background-repeat:no-repeat}.dataTables_wrapper table>thead tr>th.sorting{background-position:right center;cursor:pointer}.dataTables_wrapper table>thead tr>th.sorting_desc{background-position:right bottom;cursor:pointer}.dataTables_wrapper table>thead tr>th.sorting_asc{background-position:right top;cursor:pointer}.dataTables_wrapper table>thead tr>th.sorting_disabled{background-image:none}span.icon{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;cursor:default}span.icon.JobStatusClosed,span.icon.DeviceStatusDecommissioned{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACg0lEQVQ4y3VTTWsaURR9M35EDWqMxhBoUIrFD0h+QIuIWLPrrkhWiuAiuHCRIsmuaaEEau0yUFDX/oIuQjZBLBbsQhtSqEiLIFqDiVFj/RjHnvdoili9MMzMnXvPOXPufRyZH3KNRuMwGAyboijy19fX1Xa7/RX5wWwhN/u+tbW1HwwGw06n86Fer2fJZrNJstlsJZVKfSgWi2+REv4DkEgkBjSmo9GoB+zk9vZ2LJfLJRzHkeFwKOp0Oh45Eo/HPyUSieeCINSmAWSBQODjwcHB01arNVpaWpLRRlbw9z6ZTMhgMBAAJI3FYp+TyaQb6d/s6/b29v7x8XG83++PZAhaPN14HzzPk/F4LIBAenh4eFQoFF5xSMojkch3h8NhAgBrvG+eF/QbAAi8qJ+cnDziIMkWDoe/3d3diSDn4QVjWhSYChmNRiI84NPp9GPOYrF43G73GXUappHl5WUilUrnNkM+9YHdaS0ms8vZbDaP1Wo9q9VqRKFQkNXVVQIlcwHATKCUqaC/Uq1Wdzmz2bzp9Xor+Xx+AukcBVikALLvAUS1Ws1XKpUn1AOJ3+/vnJ6eKldWVphBVB71YXoSlBX7QKjRdB+wcL9yuZyFVezs7LxwuVzvMpmMCJm8Uqkk9KJKKAj9Z9rY7XYpkADVUsh/DdKXDGBtbY3b29urgn2jXC6LaOQhkahUKqaEGocFI71ejy0SgPIgc5VKpd6/gZtMJnkoFPppNBo3rq6uCA7SRKvV0j2hkicwmT03Go0v5+fnz7AHtXmHifh8vihMPbLb7SoAsNzNzQ25vLxsg/U9tu/NxcWFsOg0soBBkvX19Qc4jRaw8p1Op1Kv139gUsPZ2j85BjJj8dYkIwAAAABJRU5ErkJggg==)}span.icon.JobStatusOpen,span.icon.DeviceStatusActive{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACs0lEQVQ4y4WTXUiTURjHJ9Wi6PKc9z3vtnebm9vcNNM0v2fldKI2tS7SyqRMceRXS8qlhjgpUjQ0KlAsow+yboq6iKwb+wCjvOkqLxKVsC686UIL5/bvrMIwZj3w48Dz/5/nOTycR6EIE4QQpWgm8YZM2WXI0BSLFpLEcxsV/wtuirDtiWyqfXLw48BCF+5jEPcwgMvfOuEeLZ2xuSJbuGd9+MuMkLze5Ofn4cElnEM32pb74EM/OtGL9sANXOFZD/L6k18TiUh/d96Q3RX/rBlH4V4sW6pfrkBj4AjqgxWoRTnqcBjHg4dQ832//wyqsLtn2zihZNNKAWuR9mT5fDaKpuxLrtksuGY4/CyczUTBbMYKrk92FE/v9JfNO2Apkdt/XqYiVdpvGqcTJnRIHItC4gsTxxyWpJdm7HhlQeKEESnX9Z+pRLcoVFYxOuWhBuYhFjAMizDcYjDc/gdcNw2zwNZhBk2CmKaI3KV2JF5VQe8VoG6jUF+gUPWsQRfXfRS6Dgprr4jIHFaqMORqHNu9euhKBbByCuYhEJvDwzwUUjWFzDHX8QL5vIAqnckZQ/wF+4SgtJcbqwgEd3hCmnSAQC6jgZgGCXKOmK4g0WSdfUS9yJxcLOPGCgJazanhuH9T8ysX0lTcE/Im+DRfhBQ+xFDE1mmb4kYF6OtpgB3jxjre7TSnlZtbBai8IlijALGSQFNJ/XF9DNG16o4/HymWROQ9ss2ljQkwdgsBmQ9MP8gQdUcDy10dTNe00Pbwqfuo3zggIKlf+5Zm0c2rfiNNoUrnU9ucc0oN+QFB+rg1mP8hFfmTach4ExsURwhMjwlSh7XvWIEgrblQMS2GU65J68IJFOIiGjiNqA+4UPg+9mtMp9xOnGss06rdyKPrpEpRJ3tVDt1ZlivV8oUuocpw3h+OzGWzs/zxOgAAAABJRU5ErkJggg==)}span.icon.JobStatusAwaitingWarrantyRepair,span.icon.JobStatusAwaitingRepairs{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACwklEQVQ4y4WTX0jTURTHJ5pR+Hjv7/ebzqlZ6kzJhbj8N6dzmqb5J3NWOtJmav7LTBNTbNPAlVY+FGyYk0ryJfr3YJk+WAlGZlQECWkqYT340oMW6vbtmtE/Zh74cC7nfM+53HvPFYkcGCHElXj7hXjKo1Il8sg04uMfymIbResZEzn5qFKqD1r6Jkwv52GZAczTQPPYV2gt/dM+qtR6pnFxXMwJJKy6faDqDXB2HGgYw7LxLStmNL2C7fIHYCUXVtMxTHix+N+dN4RUmh7ljwI5fQuLuoFlHB60QTdoR+4gkMc4NGBH9oNvS/oxYEdl2wihdNOvBtLYvSfi7s4h2jq5qLTOQGmdxoqP6ppB5B9Ed39ETPfUkvrWHDxj05t+FFOOd/VtvDbl1foCWw1D2GZ8DD/DGjQ/gX/LU/gyrXdt1yfKi91EvK8sQGK4A6G408YftTJ/nXHjP7B8idUmHLeCl8nDRR6hKrV71RVwGXWgaQ2gWa2g+9sck2UCzTSytQG8vh2CIl4rkig0am9dHTiVFjQyFySxCiTplENoQhVobCGophB8RhmEiCStSNge4ene0AlOmWknigyQGD2IqtgxK7moA6DKHJs4uwJ8aHyEiEgDnD1aeheIPAEkMoehA1EWMnERo/gnRauxlVwU0zCtRG/8TP0VbqvPuK+smjvTD5pSbiOqIyBxZSC7a0H2nAbH4JPZETWVrEkBaFzBknDsEjzSSw2/B8k7yCnw/L1Z7uIQuLxzNprTBiHfAklJD7xKb0KqvwqBxdgFLnGFZkjLO57TQOXmv6aR+ilcAy88nPXonQQpvQ2ZacS+y/wO4eZxBJme2Ul+L8jJ+5DWWUe5ncniNT/UFm19jaxnfH4PG+uKCaDyPZA6bENQ1+svnrrmJhKc4LL+rwxOdOaVBV7uKXVqIbNRw6tL/Yk83dWR9jsKtpCP82kfBAAAAABJRU5ErkJggg==)}span.icon.JobStatusAwaitingDeviceReturn,span.icon.JobStatusAwaitingUserAction,span.icon.JobStatusAwaitingAccountingPayment,span.icon.JobStatusAwaitingAccountingCharge,span.icon.DeviceStatusNotEnrolled{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACyElEQVQ4y4WTWUhUYRTHRyqj6PH77r2j46hZbgxkEOM+huPW4lqkuUzuVm5M5jg5iqm51RgpWSnagKbZU6HZovWgFSklhEbkg6JS2oNhPTiaOvPv3gKpGOnAj+9wzv+cDw7niEQWjBBi7exEPPy87MJ95ZJIFydygI9tF/3PeJHVUaVjweOu+Mmlz3XASgvwoxnLc5Xovxc7Ex7kWMxrtlos5jhC6nXyZzCqAVQBxpJ1rFcApkpgucwENPHN1Gi4KH8lFhPxvz9vq9N4DGApBca5uNX1ryqYFpNhXlQB3xJ5kng/ASvzJ9awnA69bt8wpWTHRoMIpfTcwlggpkb9V2fHFZgZU0B4Z8f9MDvmu8Gn9/6YfhewtvBBiahgu7JfxSxLrdtrnaZHB+wx2LsHQw/3YqjP2SIveF4+csHocyfcrnGYF4vpLpGbM+v6oEmC1qucyXCdRcctDndaNkfIGxp57RUO+2Wst+igj63yRqkNtHkMSjQUtRUU+hrL1F2iqNBRlBdR1OtYBPlysaLgAIlSm+mA2AgGifEU6lyCovOWUedRZKTwJFHkJLI4FMA38PHi7Fp1NogJY8zR4QTpKQSnMy0j5E4eJ4iLpqa8BDGCFKyPyNWVbOmusjWGBPKJYwSqRIKMNIKsDL4o6zeCL8SEXFwMgaCtyJV88ZTzQxQsRyUt6G9nkJtKTWkqgpyzBJoCAp2W5wIDrYZFfg6D1FMEqQl07Voxh2yVbfnGHshkxKqnyX1usI3B5VLGpOeH1dLIobNVgrsGe7TdlEJfzQkDXGvWM2jQSd8oFHTnX9vo6Umtn7a6z0312OJ+F8HwEzfzx9demBjxxsiAzNzdSdDbQWColr49HMaINz2oYvXuwok+tyVMHQEW8njyYZoMx1iv7HtloV1ZSMgmx/SnhYaSLanJrL220EZZquGCs8+wLpFRxNqS9ifnTKmvqTT0WwAAAABJRU5ErkJggg==)}span.icon.JobStatusAwaitingInsuranceProcessing{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACzElEQVQ4y4WTbUiTURTHJ9mi8OO9z/NM59Q0p2ZkEJrv1jYly7Q3Z2XLmWalqcvS+ZJDpfCVNEhwacO0NAqK+lBqQWaBkfZBiGaUqIm9+cVQC+ezf88MjGLigR/3cM7/3AvnniMS2TFCiNiLeAcEu4bFBUlD472IfKsQWyNayQSRg9Jjd97tw48+fq2axYIR4JuAbxU/cVfdPabyiCsSNI52iznCkdLAuicWHYCLgKUECygX/ApgwQAeVwGrkKsIbHgpIRLJ/y+vLgyo6rFoge9Jc/M/NAuYSeExo7FiNhmYPQrMHLFiKvGXhU8DSjfX9lNC1y5doJLtOWveMYWh8JF5c8Q43kWMwXYOh43DHPqX9+ETeBs5avmgmEKMa4JhsZilrLjW88Zor9sgHnv1omvDc3R7L0cfeuQv0Oc5iBr3658lVOIkkrO+PkbpfVzhmvkm1oQWrg0mrn1ZbPlGzsRf5kzYxG4JFoW6RCnKnBuhY/QopCW4RCtRQ2vtUkmrYKDlKKZlMLB1COOUalGUVKU45a5HAqNGMk1GLtGhgBTYRUd1SKPpSBE4xmZhO7dTLQrmQlwNzs2IZfZZ48lepJE0nCQZdrHlEskh7KdJvEaSjUhWGSLyIfJV1S6dc0oSjYMkCRqiQbogzCAnhKI/2HxbzJY7IGhs2lxp+ZcgGuS0+BNaWVZeB9ONdHqG15LjyCKZyCf5KCbFKGaKoGcLkMPkIJWkQkNTLaVcPbQumWVLc+BPNjoY/R5MtjG9KGOq+UqhYY2cEa3Sm2h368A1WQuquVpbAy31TBMMsobXETR83T/TGEQDxa1+XZNdLiO4Q+7hqW+/dWCbGW+Ch/HM/5W1k9xCJ3mIaplpIJaJlSy7UOfWF53v8R2endgFTGcL5ACf4nh0+Q9N610rDNFE6bjiVsYQ1apUVuumd9YrCrkLqkz2tDyBxIntaX8D6jqsQHV9jFEAAAAASUVORK5CYII=)}span.icon.success{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB4klEQVQ4y2P4//8/AyWYZA0ckxlYyDaAcy4Dt0SZ0FnBWP7tJBvAOZuBW7xC4MLe67v+x84L+8/ky7CFaAM4pgE1lwtc3Hl92/+o+UH/HWda/Q+c7Pmf0ZVxE1yRyFJWYZElbKbomnnnM3CLlPNd3H5ny/+oTYH/Reax/Refyv1fKFjgLrcHiwBYEftkBhGrfpO3LpPsf3LNZ3CEaZZcy8UjWS94cfvjzf8TjoT+V90u+l9hsfB/Vi+m22xuDJxgL4i2cop59ru82XV36/91t1b+N+3X/ya+mt1Gaaswm1yr+MVVj5b+z7qQ8N/8pMZ//Q1K/1l9mO+weTBwwAORPYh1SdqW2H+VF/P/L74/9//8+zP+azQrf1GtVXi04OnM/yW3M/973rD8b3vI8D9bOPNdjjSIzSixwOHPvsdgocrP+OvB/yc+6fg/7Wnf/6Wv5v+veV74P/K513+fa/b/uZM47grOZOLEmZCY/Bl3G2xU+Rn30v9/y/uK/y2fKv+nf434HwY0QCCH9672XhkOgimRJYRxr8N+sx/5/xL+V/zP/J/6IeK/WJHQXc9bVpxEJ2X2CJbd4af9fja+K/+vVKJwp+hbCgfJeYE3nmufcoP82Tn/J3CSnZnSf0Sy0iQ3omMAFlyLENN9tK8AAAAASUVORK5CYII=)}span.icon.error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}span.icon.warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC)}span.icon.information{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==)}#layout_Page>div:first-child.jobTable{padding-top:30px}table.jobTable{border:solid 1px #e8eef4;border-collapse:collapse;table-layout:fixed}table.jobTable>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}table.jobTable>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}table.jobTable>thead>tr>th,table.jobTable>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}table.jobTable>tbody>tr:hover>td{background-color:#e8eef4}table.jobTable>tfoot>tr>th,table.jobTable>tfoot>tr>td{background-color:#e8eef4}table.jobTable.hideStatusClosed tr[data-status=Closed]{display:none}table.jobTable td.id,table.jobTable th.id{width:45px;text-align:center}table.jobTable td.id a,table.jobTable th.id a{padding:0 6px}table.jobTable td.status,table.jobTable th.status{width:220px}table.jobTable td.type,table.jobTable th.type{width:45px}table.jobTable td.device,table.jobTable th.device{width:100px}table.jobTable td.user,table.jobTable th.user{width:230px}table.jobTable td.technician,table.jobTable th.technician{width:80px}table.jobTable td.location,table.jobTable th.location{width:200px}table.deviceTable tr.decommissioned{background-color:#ededed}textarea{min-height:75px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif}input[type="text"],input[type="password"],input[type="file"],input[type="number"]{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;border:1px solid #ccc;padding:2px;color:#444;width:200px}input[type="text"].small,input[type="password"].small,input[type="file"].small,input[type="number"].small{padding:0 2px;width:150px}input[type="text"].discreet,input[type="password"].discreet,input[type="file"].discreet,input[type="number"].discreet{border:1px solid #fff}input[type="text"].discreet:hover,input[type="password"].discreet:hover,input[type="file"].discreet:hover,input[type="number"].discreet:hover,input[type="text"].discreet:focus,input[type="password"].discreet:focus,input[type="file"].discreet:focus,input[type="number"].discreet:focus{border:1px solid #ccc}select{font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;font-size:12px;border:1px solid #ccc;padding:2px;color:#444}input[type="submit"],button{padding:5px}input[type="submit"].button,button.button{font-size:12px;padding:6px 10px 4px 10px;margin:2px;border:1px solid #875a33;background:#db761d;color:#fff;font-weight:bold;text-transform:uppercase;cursor:pointer}input[type="submit"].button.alert,button.button.alert{border-color:#900;background-color:#e90000}input[type="submit"].button.small,button.button.small{padding:2px 5px;font-size:.9em}input[type="submit"].button[disabled],button.button[disabled]{background:#9e9e9e;border:1px solid #696969;cursor:default}input[type="submit"].button:hover,button.button:hover{border:1px solid #696969;background:#9e9e9e}ul.none{list-style:none;margin:0;padding:0}ul.none li{margin:0}div.form{margin:0 auto}div.form>p.actions{text-align:right}div.form>table{border-top:6px solid #005fab;border-left:1px solid #005fab;border-right:1px solid #005fab;border-bottom:3px solid #005fab}div.form>table>tbody>tr>td,div.form>table>tbody>tr>th{background:none;border:none;margin:0;padding:8px 5px}div.form>table>tbody>tr>th{font-weight:normal;text-align:right}div.form>table>tbody>tr:nth-child(odd){background-color:#eee;margin:0;padding:0}div.form>table>tbody>tr>td.details{padding:0}div.form>table>tbody>tr>th.name{width:150px;text-align:right}div.form>table table.sub>tbody>tr:not(:first-child)>th,div.form>table table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}div.form>table table.sub>tbody>tr>th{font-weight:normal;text-align:right}div.form>table table.sub>tbody>tr>th.name{text-align:right}#pageMenu td{border-right:1px dashed #aaa;width:33%;padding:10px}#pageMenu td .pageMenuArea>a,#pageMenu td .pageMenuArea>h3{text-decoration:none;font-size:1.2em;padding-left:18px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABxElEQVQ4y52TzUsCQRjG99Ql6FBQeImKDv0XXUQCTyuRZmCWCubH7vr9tX6CoBcxUVHUUDwsHjpEXQPPhSF46VwX/4EgInx7ZoNuUbrw25ndmXnmed93huP+eCwWy7HL5Spxiz5ms1lIJpPPOp1uYyEBg8Fg63a7lM/nx1qtdm1uAZ7nT2u1Gg0GA8pmsw96vV4zl4DJZOKr1SopikL9fp/S6fQYous/EyRJ2gcnPp9PDAaDcjgcbkej0VtwH4lEHguFwku9XqdGo0GdTkclHo8/GY3G73AymYwLqhVwncvl7orF4rBcLk8qlcq01WpRs9lUF/V6PdUFC4X9TyQSI6vVus35/X4rHORBWxRFBQzBBEwxRgy4IjhiO1MqlVLbWCxGXq93xOF1AUpAATdgKAjCBEzRJ7fbTXa7nWw220/rcDjY4g+n0+nnEOcR1GNQvYStK9R8iHAm4BVZf0P5ZkwEgmwRwRlz9IlWVHOAU7YElj0ezwomrGKiBmyBHXzvIrRzoIYSCASY/VkoFBL+XUZU55DlAE5JluV3uPXOdQ6QrDOWOAb6wtwnEaFKLOMot7TQXUAIB7AeXvg2YvdNVGTvt/EvEoULbtcvb5gAAAAASUVORK5CYII=);background-repeat:no-repeat;background-position:left center}#pageMenu td .pageMenuArea>a:hover,#pageMenu td .pageMenuArea>h3:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACf0lEQVQ4y32SO4/UZRSHn3Pey/8yszNy2RmUXVxDDKgFkYTYYaKx0cKGxm+hJGhljBZgYaFQW1phYWFCNH4GTfACCSa6KhFidl0GdtiZ//u+x2LEsCg+zclJzvmdqxx973umRfBOcN5x+9dN7lzfQoMjZWNl1Lw27IcTX1++ebpqI1QBbSI0EderUO7DzIiDGlGhpAw5MzVZttXRy3Ubx6UUHsTvEijG+rlj//jxlc/ZSLodTz5xZG1P+GL94rcvplw29EGB9Xee4r+QEDAjpVsJfW7l2NrMLq1/de3VnMvv90T0yttP8zD2HF6mjTpp5sZ4AvH46omDLxy55JWRFVsUOXT22vMmrIjIfq8sOZU1VRkLtAUbHBhW450De1cjEIOwHSObl69/c+OH316Spt7ws8f2P2NwtMDB6Kj6Qfq9qPucsDys3LhY4VE6GhVaBS2Jn57c96wjf3nzl61Tvtu8M7VSbpvxZzLr7Zj1N/8eoZYCCNGBF8E5qJxwN8Nd9cd7g/pTX02nDdBg0gNawRBZzFfMSAaTmWFmIFAMggr9qN082Sd+by0bIjziRJwTllR1KIsVd+qYtuKb7/4okqIhBZzCIGje2Ulnclc+8pNJ95lBUBWngheRCqgA7TBNUU9a7T5WDw5hELD5PJ/OZucBxMweesbRBz+TVU+5GC6qGI2TWem6M3mWL+RZopul3Z/4L5qAd7KklSdmo5unNylcuD9E/y/fzFO23LB/y2GeN0op58UMimHFsFx2d3D4/R/ZrgfceH20uELnCcjV4HirE/nQx4B4B6EgVUDbarGDx9+9QhDITc12f4gUAMOAYHKoF2lTtKuL9zW4Z8z4C2DFDQO2dDsSAAAAAElFTkSuQmCC)}#pageMenu td .pageMenuArea .pageMenuBlurb{font-size:.9em;color:#888;margin-bottom:10px}#pageMenu td .pageMenuArea .pageMenuBlurb a{text-decoration:none}#pageMenu td .pageMenuArea:not(:last-child){border-bottom:1px dashed #aaa}#pageMenu td:first-child{padding-left:0}#pageMenu td:last-child{border-right:none;padding-right:0}#pageMenu td .pageMenuArea>a.noticeboard{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACAElEQVQ4y6VTy65hURCt7f1oIkQnfAEx8wkmNyIGBPGK72DqC/yECDFoE0M/YMxQjO8V1/vN7lqlj3T3VCUrZ+86u1atWvscRW+GajabOhwO03q9loTdbiebzSZPwGw20+l0ouv1Sufz+QWn00nL5ZJUuVzWj8eDFosFxeNxUkqR1WoVoBh7vL/dbgKtNY3HYwoGg8/3lUpF7/d7ikQixGuyWCzkcrlEBdYguN/vdLlcCOd2ux21222az+fk8XhIFYtFjSTGqNVqUgB5hgIEFGCM7XYr8nu9nigWgnw+rzebDQUCAapWqy8CdAcQKDocDkKCETqdjijx+XxPApgB2aVS6R8jTSaTSDfmBxEIut2u7NFUZbNZIUDnXC4nBEYxpCPggeEDCAaDgYwnBJlMRgggL5VKyQEUg9AwETlcI4AYDocyvxCk02m9Wq0IPiQSCZEGAw0VxjVCAQhANhqNyO/3Pz1IJpMa7k6nU4pGo3LAKP47DBLEZDKhWCxGXq+XFDuvIb/f70sRABXo7HA4pACkIACwBlGhUBClqtFofLM0XygUkgSu8Hg8ktvtFpkwC+YhZ3zG2M9mMyj4UujAxT/r9foHd+ec1wXwVf5gFQ6Gmbs+uMmVv4UTE+1Y4ReP8avVan2q//8uPoyc5w8wAz5HzTgy9owtk95ef+O7v/NvnbVDH4UJh38AAAAASUVORK5CYII=)}#pageMenu td .pageMenuArea>a.noticeboard:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACcElEQVQ4T6WTPW4lRRRGT1VXV78fjwfbGhAjAQEBkCMhEREgkRGTMIJdOGdCEBtwxoiYhAUgfiREhsTYJAYhojF+fm+6X3d1Vd17CewdzCedDXw6x5kZL7Lw+IvH9urDh/S7LQ6IXaSLHbHriF0kNIE5JXIp5JSY80yaM91yxWazIVxcnHP+9A/+2hbeefd9Wka6NtO1A413OOdQNWZRihjVGn7/9TfePIq4piHgHClNvP3eh3z82ecsGs/BMrBqA6F1eAdFjJSF52PlKiW2s5IufmR175CgokgtbK+37G5memeMy47YFlrvAIeYsk/CZsiMReh3PZ0IKkoQEXIplGFg1+9pUHIR2rYhhADAOFeGKZPSTDXP8HzAlcxSlQBQa6Xv9+xu9jgrxEWmjQHXeFJWqii1VuY0I9bQ9wPLUhE1gkhFRRmGPdc3OxxCFyfwAVEwByKGSKHkQrGGaZxQFVQrwcwwE8Yx8d/1Fq8VGg+uoQke5xxmRilCKQUlMO5HtDPMjFCrYGrsU+bqZkTrTNu2xBjx3oMHE0OkUkql0pCyYlGRKoRaC2Jw/fc5f/7yPc4qMXZ473B3thmgZogISsPmn3P0rWNyKYTjkxPWB2v0p5/594en+MaTixIcLBcdAGKKqqGmmBoixisffEJoA+H1197Y5ppf+vKrr4ltYLFckqaJ9XrN0fHRrcp5Zppm8pxIcyLnwuXlJYf3718F4OjbJ09ePj09/cg5DrvYrh48OFl1sTtwzi2cd03bttrFWMYxpCb4oYv1KgT/HdizW1PgmWHfAHz66JED7t2xABpub5iAPdCfnZ1V7iJ2L5rz//8JgNlI5+OxAAAAAElFTkSuQmCC)}#pageMenu td .pageMenuArea>a.report{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEUAAAAiIiIkJCQlJSUmJiYrKyssLCwuLi4zMzM3Nzc6Ojo8PDw+Pj5CQkJERERFRUVHR0dISEhJSUlOTk5QUFBRUVFWVlZeXl5gYGBjY2NlZWVmZmZpaWlqampra2tsbGxtbW1wcHBzc3N1dXV5eXl6enp8fHx+fn6AgICCgoKQkJCYmJiZmZmampqbm5ucnJydnZ2enp6fn5+goKChoaGioqKjo6OkpKS3t7e7u7u9vb3BwcHExMTFxcXIyMjJycnKysrLy8vOzs7Pz8/S0tLV1dXW1tbX19fY2Nja2trc3Nzd3d3g4ODq6urr6+vt7e3v7+/y8vL09PT19fX29vb39/f4+Pj5+fn8/Pz+/v7///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD1JbRTAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAAALFJREFUGBkFwbtKA1EUAMA5d8+yeRC0SMBgYyq19P9/QgLaiJ2NXWADWdzHdSbqW621Vogo75LTBsAHqY4/oBQPlaQ5lDiPz3cIkuU3LF1/bRyRtIeI8+ppFyCZvoaXqe+vjWOQor02063uNiUESXtZXnMevm+Pp6AwDvPStNFfKiQl0mqKv4kgWbal6bIp60aQzOtlanNuuypIbvfD3MXYZYVkvy2xF8cIQfKJECJK8A++czvTNtPiyQAAAABJRU5ErkJggg==)}#pageMenu td .pageMenuArea>a.report:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB+UlEQVQ4y42TTWsTYRDHf/Pspkkb8rJpYwI2VKkUcyg0kmPvIt4MXrz25kkvnvwAfgA9SXLy4tF+Ay8eeqlgoSxELWqrMZqaZpvuZl8eDyWLTRpwYHgGhuc3/5lhRGtNq9XSWmsmfdJEBBFBKcXW1pYAmONko9Egn8/zP9ZsNuPYBNBa0+v1sG370g9KKUzzvFatVrugLlaQzWYpl8sopRARNt9u4DgurzZfc6tYRxA0Om5lCjAcnmLbdpwcGH02cjW8dsDO5x0MwwCgXq9fUBcDLKuAZRViBV+efqeYXCb52GA9X4sBkxYDXNfj4YslnKMRz550sY4yDH4P8dohu8buBQVTLYgIC+kFep2PFKSP5+c5a5sMewGpVZNqdj1WNjkDNQ4Spsn+3h6f3r8klQCVVhznXPh5Rurefew7t+luv5kN8P2A4x8fOHE8CBVqURNcdQmVwZ+vhzw/HfFtzpw9A6UEzCtE6SohiqgijHwXSQjt/i/mR/NkRv7sNUaRprRcZSE8b8e4qXEdB0kaWMzx4GxANpWcDfA8j1LlBklHCPyAYMklqoS4ocu1lMVqKslBGM0GdDpdVq6v4R7CqXdAbtHHS2cYjk5QhSLkPCTwZ8+gWl2j+WiAYRiIlNhXg7ha9O4uSilWLlljDGi1WlOnO/mOT/lfwF9Tu75p8aEVrAAAAABJRU5ErkJggg==)}#pageMenu td .pageMenuArea>a.noIcon{padding-left:0;background-image:none}#pageMenu td .pageMenuArea>a.noIcon:hover{background-image:none}table.subtleHighlight{border:1px solid #ccc;background-color:#ededed;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}td.subtleHighlight{border:1px solid #ccc;background-color:#ededed;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.field-validation-error{color:red}.field-validation-valid{display:none}.input-validation-error{border:1px solid red;background-color:#fee}.validation-summary-errors{font-weight:bold;color:red}.validation-summary-valid{display:none}.ajaxHelperIcon{height:16px;width:16px;display:inline-block;background-repeat:no-repeat;margin-bottom:-4px}.ajaxLoading{height:11px;background-image:url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA);margin-bottom:0}.ajaxSave{cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACEUlEQVQ4y52Su05UURSGv33mzDlzc1CpBBI7fAArTWjEyyMY7U14AzsLn8DagicwEk0kEBOjYoBCQmJlSKQTSMB4IsOcy15rL4uZkQBqwd/u7C//ZbmJianbXsP87Oyt6OGD+wXgLBh/U+ScqQW3vPz2wtr653xzY+1q3C+KztjY+FS323X37t4hSVL+p19ZxsLCK9rdywDEDgtJkqpZFPtKEAVRBdyJj2ZGmiYEM8zAl+UAYAaVrwgqiBk+rxBVnDsLCOZQMzQoGnQEMFQVCYG+D/jKo/IPAI4QDFVDvB8AwhCgIVAUQpEXqCrRKUAwQ9RwzhE0IF4GAAyCKFVZYeZod7r44eNpB41mg6OjQypf4UcOLChJmrK19ZWnTx7TaLSGJYL7U6RhQBzH9I96bG9/I0nT4whxvYbXGh8/rlPkfaLIkdbTYVkBCKgEolpE2miSpilpWhs5MMQLIQSarRYzN68zfW0aNWg3m9TrMQ6oxzEbm1/48GmdPM8Jw2OLDRDxHPUOabWazM094sXL1ywuvWP++bMTPZQivF9ZxXvBReXxjCICUUVVRgDs7uyxt7N7psjsZ0ZVVqh6LMSjFUKsqjHeI/EgV6/Xo8h7ZwC+EsQLoorZMIKXar8o+lm/t3+x3WnyZnGJmZkbTE5eYWVllfHxS6gqnU6bLMv4cfCdssg5IBkuNYghnFNuZOW8+g2XUFURWZwj0wAAAABJRU5ErkJggg==)}.ajaxOk{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB5UlEQVQ4y2NgGJyAiYGZQ4pVS8JUKFrCWDCCTYxFjYERKEoM4JRjMfOab3G28V3hv75/9f/7/tb/r3uZ/89xguEhVlEmbbyaueVZLUPP2X7P/h/9P+1H+P/Ub2H/U7+H/8/4Ffk/93/Mf+/dZm9ZhRl1sOtmZ+AwXyB/2/GW4X+78/r/HS8a/Xe6ZPzf6bIxmHa4aPjf5a7Jf50OyRNY9fPrsfkoreX+L7qI/b/UKu7/cuv4/ytsFPyvCMTyGwT+y67l+y+xgvO//BLu/5zyzLYYBkiH8vQJljP/5ypj+M/TzPCftweIJwDxRCDuBYq1M/znqmH4L1TP9F/Ejb0AwwCZMJ4ZPI7M/9m9gQpTGf5zFwE1VQJxNZANNJQ7h+E/ZzTQsBCm/6LeHCUYBoh4ciYLh7P+Z3Vg+M8RDFQcBzQoBWIYZwJQLIzhP6szw3/BQNb/fLasgRgGsOkyi6s2835gDwdqSoe4AGxzGYTNlQFxgUwhxwMmdUYurAEpEceToTSZ8z9XKVATMBwEpjP/F5zJ/J+nDcivYPgv180OdAF7BN60IJnFk6u6iOubxk6B/45X9f47XzP4r7lb+L/iHM4PQnEc8USlRrYAFhnZRoEK0xVKy0yWKy2VquUrZPNjFhuc+Q4ABEOzcbMMpzIAAAAASUVORK5CYII=)}.ajaxRemove{cursor:pointer;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC)}.ajaxRemove:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#layout_Page div.hiddenDialog{display:none}* html .clearfix{height:1%;overflow:visible}*+html .clearfix{min-height:1%}.clearfix:after{clear:both;content:".";display:block;height:0;visibility:hidden;font-size:0}div.columnHost .column50{float:left;width:50%}.error{color:red}.alert{color:#ff5e00}.smallText{font-size:.9em}.smallMessage{font-style:italic;color:#666;font-size:.9em}.nowrap{white-space:nowrap}.code{font-family:Consolas,"Courier New",monospace}div.code{border:1px dashed #bbb;background-color:#fff;margin:3px 6px;padding:4px;font-size:.9em}a.smallLink{font-size:.9em}textarea.block{width:250px;height:100px}.checkboxBulkSelectContainer{margin-top:6px;font-size:.8em}.checkboxBulkSelectContainer a{text-decoration:none}.ui-widget .checkboxBulkSelectContainer{font-size:1em}#licence{text-align:justify}#licence p{font-size:.9em}#licence li{font-size:.9em}.ui-widget{font-size:12px!important;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif}.watermark{color:#888!important}.ui-autocomplete-loading{background:#fff url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) right center no-repeat}.ui-autocomplete{max-height:150px;overflow-y:auto;overflow-x:hidden;padding-right:20px}* html .ui-autocomplete{height:150px}.ui-timepicker-div .ui-widget-header{margin-bottom:8px}.ui-timepicker-div dl{text-align:left}.ui-timepicker-div dl dt{height:25px;margin-bottom:-25px}.ui-timepicker-div dl dd{margin:0 10px 10px 65px}.ui-timepicker-div td{font-size:90%}.ui-tpicker-grid-label{background:none;border:none;margin:0;padding:0}.ui-progressbar-value{background-image:url(data:image/gif;base64,R0lGODlhMAAWAPMPAO+cSvfOlPfFlO/FjP+9c/+1c/e1a/+tUu+ta++tY/+lSvelQvelSu+cQv/WnAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh/wtYTVAgRGF0YVhNUIAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PgAh+QQFBwAPACwAAAAAMAAWAAAErHDISauVwenNu9cCIo5kaSIGoa5s66rGKZ/pa78xkux87/u1mxD2KxoTweHNcGzykkqc0wmNtpjTY9W6wmaLhoJ4TC6bxd4v8Mxmp9XPtpz89gHu+Pydcej7/4CBfQx6hYZ5fIKKgoSHjoiLkX+Nj48MCpiZmpucmJSVh5edo52flQ2oqQ2ipK2eqrCxsqyupAuyuLO1rre5vqi0u5y9v7kLwrbFvsfIncTKsBEAIfkEBQcADwAsAAAAADAA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)}.ui-tabs .ui-tabs-panel{padding:.5em}
\ No newline at end of file
diff --git a/Disco.Web/ClientSource/Style/User.css b/Disco.Web/ClientSource/Style/User.css
index edc07dd1..c5606ede 100644
--- a/Disco.Web/ClientSource/Style/User.css
+++ b/Disco.Web/ClientSource/Style/User.css
@@ -267,6 +267,9 @@
 #userShowResources #Attachments div.attachmentOutput > a span.remove:hover {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Actions/remove.png*/;
 }
+#userShowResources #Attachments.cannotAddAttachments div.attachmentOutput {
+  height: 162px;
+}
 #userShowResources #Attachments div.attachmentInput {
   border-top: 1px solid #cccccc;
   height: 40px;
diff --git a/Disco.Web/ClientSource/Style/User.less b/Disco.Web/ClientSource/Style/User.less
index ca6f7a2e..c7fcf093 100644
--- a/Disco.Web/ClientSource/Style/User.less
+++ b/Disco.Web/ClientSource/Style/User.less
@@ -239,6 +239,10 @@
             }
         }
 
+        &.cannotAddAttachments div.attachmentOutput {
+            height: 162px;
+        }
+
         div.attachmentInput {
             border-top: 1px solid @SubtleBorderColour;
             height: 40px;
diff --git a/Disco.Web/ClientSource/Style/User.min.css b/Disco.Web/ClientSource/Style/User.min.css
index bf4960e7..94caac86 100644
--- a/Disco.Web/ClientSource/Style/User.min.css
+++ b/Disco.Web/ClientSource/Style/User.min.css
@@ -1 +1 @@
-.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}#User_Show #User_Show_Subjects{table-layout:fixed}#User_Show #User_Show_Subjects>tbody>tr>td{padding-top:0;height:100%}#User_Show #User_Show_Subjects>tbody>tr>td>div{position:relative}#User_Show #User_Show_Subjects>tbody>tr>td>div div.status{margin-top:2px;padding-top:2px;border-top:1px dashed #ddd}#User_Show #User_Show_Subjects>tbody>tr>td>div input.discreet{margin-left:-2px}#User_Show #User_Show_Subjects>tbody>tr>td:not(:last-child){border-right:1px dashed #aaa}#User_Show #User_Show_Subjects .dialog{display:none}#User_Show #User_Show_Subjects #User_Show_Details{width:330px}#User_Show #User_Show_Subjects #User_Show_Details table.verticalHeadings>tbody>tr>td:first-child{width:104px;font-weight:bold}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_Details_Identity_Id{font-weight:bold}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_GenerateDocument_Container{padding-top:4px}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_GenerateDocument_Container #User_Show_GenerateDocument{padding:0}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_Details_Actions{margin-top:4px}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment{border-bottom:1px dashed #ddd;padding:4px}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment td:first-child{width:90px;font-weight:bold}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment img.User_Show_AssignedDevices_CurrentAssignment_Image{float:left;width:64px;height:64px;margin-right:6px}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment div.User_Show_AssignedDevices_CurrentAssignment_Details{float:left}#User_Show #User_Show_Subjects #User_Show_Subjects_Actions>td{padding-top:4px}#UserDetailTabs{margin-top:10px;border-radius:0;background-image:none;background-color:#fff;border:none;padding:0}#UserDetailTabs #UserDetailTabItems{border-radius:0;border-top:1px solid #ddd;border-right:1px solid #ddd;border-left:1px solid #ddd;border-bottom:none;padding:2px 0 0 4px;background-image:none;background-color:#eee;display:table}#UserDetailTabs #UserDetailTabItems>li{top:0;border-radius:0;margin:0 5px 0 0;padding:0;line-height:normal;margin-right:4px}#UserDetailTabs #UserDetailTabItems>li>a{padding:5px 8px}#UserDetailTabs div.ui-tabs-panel{border-radius:0;padding:4px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;border-left:1px solid #ddd;border-top:none;background-color:#eee}#UserDetailTab-JobsContainer div.jobTable{margin:-1px;border:1px solid #ddd}#UserDetailTab-JobsContainer .dataTables_wrapper .dataTables_filter{margin-top:-24px;-moz-opacity:1;opacity:1}#UserDetailTab-JobsContainer .dataTables_wrapper .dataTables_length{margin-top:-24px;-moz-opacity:1;opacity:1}#UserDetailTab-JobsContainer .dataTables_wrapper .dataTables_showStatusClosed{right:220px;margin-top:-24px}#userShowResources #Attachments{padding:0;border:1px solid #ccc;background-color:#fff}#userShowResources #Attachments div.attachmentOutput{height:115px;overflow:auto;font-size:.95em}#userShowResources #Attachments div.attachmentOutput>a{display:block;float:left;height:48px;width:221px;padding:2px;margin:2px;font-size:.9em;border:1px solid #fff;color:#000;text-decoration:none}#userShowResources #Attachments div.attachmentOutput>a span.comments,#userShowResources #Attachments div.attachmentOutput>a span.author,#userShowResources #Attachments div.attachmentOutput>a span.timestamp{display:block;float:left;width:168px;overflow:hidden;height:16px}#userShowResources #Attachments div.attachmentOutput>a span.author{color:#888;width:150px}#userShowResources #Attachments div.attachmentOutput>a span.timestamp{color:#888;font-style:italic}#userShowResources #Attachments div.attachmentOutput>a span.icon{display:block;float:left;height:48px;width:48px;margin-right:2px}#userShowResources #Attachments div.attachmentOutput>a span.icon img{height:48px;width:48px}#userShowResources #Attachments div.attachmentOutput>a:hover{background-color:#ededed;border:1px solid #ccc;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}#userShowResources #Attachments div.attachmentOutput>a:hover span.remove{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC)}#userShowResources #Attachments div.attachmentOutput>a span.remove{display:block;float:left;height:16px;width:16px;margin-left:2px}#userShowResources #Attachments div.attachmentOutput>a span.remove:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#userShowResources #Attachments div.attachmentInput{border-top:1px solid #ccc;height:40px;background-color:#fff;padding:3px}#userShowResources #Attachments div.attachmentInput span.action{display:block;margin:2px 4px 0 0;height:32px;width:32px;cursor:pointer;float:right;border:1px solid #fff;padding:3px;background-repeat:no-repeat;background-position:2px 3px}#userShowResources #Attachments div.attachmentInput span.action:hover{background-color:#ededed;border:1px solid #ccc;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}#userShowResources #Attachments div.attachmentInput span.upload{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFPUlEQVRYw7VXayzkVxRfy4yKTj0aj6JWJISuR9EiWj5IFZt4pB+kLYmdbEJEJpp2daeIJkRNMx7xqFcl0iXxaKwVj8ishhG+eARr10wY6hVMx3gM1mNxeo7YRDfzNr3Jyfzn/u/939899/x+59xbAHDLEIbNxNHRMSQ5OTmvuLi4pbS0tDU1NbXA3d09FN8ZqZxniMVZLJZvSUnJ0NHREVA7PDwEhUIBb1pNTU2PtbW1+/8CwMvLiz07O/uKFqqrq9sNDAzstLCw4Jubm/Pd3NyeZGdnb56dncH09LQUQfgaFIC9vX30+vr6uUwmg5CQkD509Rdo75HL0W6jWaJF+/n5CRcXF0EgEEiMjIw+MAgAbM7d3d1/y6QywAU68b+NmrFeYWFhwtPTU8jIyKi/MQDaXU5OjoDcHhsb+4x2fdX/jqqAwxbf0dFxNj4+vofPtjcCgO7+gRbn8/lSS0vLjPT09KrOp09F/f39S9XV1QOhoaFsXITxFoD3cfcv8MgA2RKuNwAzM7MgsVh8MDAwAAkJCRI8230CIxKJYHh4GLa2ti4jv6CggI7F7BoABlJ0cHNzEzA4v9ELADar1tZWkVQqBS6Xe4G/F/Pz8xAdHT2KwZWN7zkODg7NVVVVr87PzyErK6vp2lxTnDO2vLwMOCZeLwBsNvu3K9fDxMQEjI2NgZ2dXSl+3OnaQtZo3Pr6+qNt+TZ4enreu+q/09nZuUdeQrA+OgNwdXX9en9/H5qbm+Hx48dAO/fw8PiddqbEUyyMg66VlRVg379fQ32+vr4Z5Lnc3Nzn/zkabRY3MTHxmJmZ2UExgfz8fKBAiomJ+Usd9fCcc+fm5gDluB3HOSLwtcnJSXB2dv5JJxoS5crLy58dHx9DXl4eLCwsAMquFPs/VjcvPDy8dHV1FeLi4v7E6O+V4e7j4+MHiQ06AYiIiPiRzh2TC/T19YFQKASUWo4G0GZlZWUvpqamyAOLBATnb2N/sE5S7OTk9KVcLn/d09MDlZWVl+fu4+PTSIKjbh7GRuqCZIGSEAwNDV2gPgDmgYc6J6PMzMxW0nDk9MXa2hqkpaW9vB7xyozBYNzt7e3dHRkZuQxYiURCUv2HKtBqzx75yk1MTFwmFzY1Nb1G+sRrcL1RFpcr2NzYgNraWlheWgIOhyOmvKFXPYDtM3S/ggLP1tb2F3WFBZm/v/93BLaxsRFGR0ehoaHhBEF/pXYNdRUOj8cTUgCi0hHlWGqLEgvW5+j2EwrS9vb2SwB29vY/a2SZqhcoJFxaHClH0fuppqjHceO0exKpJXQ96kQ/9r+rFwAmkxmMCeeIdoGUe6gFVX8lnpPrUbCAV8iT4eKfaJVflHUidxtp9ygiAk2Uo927uLhUFBUVnVDkd3V1nZuamj7QOsEpy3iYNJZINq2srBK0zJKeKDT/EGVR8yk/3L4JgLuDg4PHLS0tB/j8oTYfSUpKqtuWyyElJeWltnPUAfDHKD5FEaHgs9T0gYCAAA4lJ6yEdnF8hM7lnRIAd1D5VijfI/eDNVRH/pjfD0jzsS54pFd9qQQAMygoqJ3Eh1dYSKU2U0WKdseiQ0QlVmRkJI0zNwiAKxAxWD5t7ezsAGa1IaTiR9dLK6xyvu3q7pYeHhwAFqQktZ56l/cqAJgaGxt/z+cXHSr2FEA3n8qKihEsRnoxOCUbqPVkmOdXcGzoje6U6vhNRWZUVNTztra2szmxGIhmVAei6u17e3s/wfchN77UarrxknvRHuAFtMjGxqacwWQ8omjXlBsMAuAtMMYEyFDX+Tf2LzGXbu1DZYkMAAAAAElFTkSuQmCC)}#userShowResources #Attachments div.attachmentInput span.photo{background-image:url(data:image/png;base64,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)}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments{margin-top:6px;background-color:#fff;line-height:1.3em;border:1px solid #ddd}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment{display:block;padding:4px;cursor:pointer}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment:not(:last-child){border-bottom:1px dashed #ddd}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment:hover{background-color:#e8eef4}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment td:first-child{width:90px;font-weight:bold}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment img.CreateJob_Assignment_Image{float:left;width:64px;height:64px;margin-right:6px}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment div.CreateJob_Assignment_Details{float:left}
\ No newline at end of file
+.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}#User_Show #User_Show_Subjects{table-layout:fixed}#User_Show #User_Show_Subjects>tbody>tr>td{padding-top:0;height:100%}#User_Show #User_Show_Subjects>tbody>tr>td>div{position:relative}#User_Show #User_Show_Subjects>tbody>tr>td>div div.status{margin-top:2px;padding-top:2px;border-top:1px dashed #ddd}#User_Show #User_Show_Subjects>tbody>tr>td>div input.discreet{margin-left:-2px}#User_Show #User_Show_Subjects>tbody>tr>td:not(:last-child){border-right:1px dashed #aaa}#User_Show #User_Show_Subjects .dialog{display:none}#User_Show #User_Show_Subjects #User_Show_Details{width:330px}#User_Show #User_Show_Subjects #User_Show_Details table.verticalHeadings>tbody>tr>td:first-child{width:104px;font-weight:bold}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_Details_Identity_Id{font-weight:bold}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_GenerateDocument_Container{padding-top:4px}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_GenerateDocument_Container #User_Show_GenerateDocument{padding:0}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_Details_Actions{margin-top:4px}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment{border-bottom:1px dashed #ddd;padding:4px}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment td:first-child{width:90px;font-weight:bold}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment img.User_Show_AssignedDevices_CurrentAssignment_Image{float:left;width:64px;height:64px;margin-right:6px}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment div.User_Show_AssignedDevices_CurrentAssignment_Details{float:left}#User_Show #User_Show_Subjects #User_Show_Subjects_Actions>td{padding-top:4px}#UserDetailTabs{margin-top:10px;border-radius:0;background-image:none;background-color:#fff;border:none;padding:0}#UserDetailTabs #UserDetailTabItems{border-radius:0;border-top:1px solid #ddd;border-right:1px solid #ddd;border-left:1px solid #ddd;border-bottom:none;padding:2px 0 0 4px;background-image:none;background-color:#eee;display:table}#UserDetailTabs #UserDetailTabItems>li{top:0;border-radius:0;margin:0 5px 0 0;padding:0;line-height:normal;margin-right:4px}#UserDetailTabs #UserDetailTabItems>li>a{padding:5px 8px}#UserDetailTabs div.ui-tabs-panel{border-radius:0;padding:4px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;border-left:1px solid #ddd;border-top:none;background-color:#eee}#UserDetailTab-JobsContainer div.jobTable{margin:-1px;border:1px solid #ddd}#UserDetailTab-JobsContainer .dataTables_wrapper .dataTables_filter{margin-top:-24px;-moz-opacity:1;opacity:1}#UserDetailTab-JobsContainer .dataTables_wrapper .dataTables_length{margin-top:-24px;-moz-opacity:1;opacity:1}#UserDetailTab-JobsContainer .dataTables_wrapper .dataTables_showStatusClosed{right:220px;margin-top:-24px}#userShowResources #Attachments{padding:0;border:1px solid #ccc;background-color:#fff}#userShowResources #Attachments div.attachmentOutput{height:115px;overflow:auto;font-size:.95em}#userShowResources #Attachments div.attachmentOutput>a{display:block;float:left;height:48px;width:221px;padding:2px;margin:2px;font-size:.9em;border:1px solid #fff;color:#000;text-decoration:none}#userShowResources #Attachments div.attachmentOutput>a span.comments,#userShowResources #Attachments div.attachmentOutput>a span.author,#userShowResources #Attachments div.attachmentOutput>a span.timestamp{display:block;float:left;width:168px;overflow:hidden;height:16px}#userShowResources #Attachments div.attachmentOutput>a span.author{color:#888;width:150px}#userShowResources #Attachments div.attachmentOutput>a span.timestamp{color:#888;font-style:italic}#userShowResources #Attachments div.attachmentOutput>a span.icon{display:block;float:left;height:48px;width:48px;margin-right:2px}#userShowResources #Attachments div.attachmentOutput>a span.icon img{height:48px;width:48px}#userShowResources #Attachments div.attachmentOutput>a:hover{background-color:#ededed;border:1px solid #ccc;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}#userShowResources #Attachments div.attachmentOutput>a:hover span.remove{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC)}#userShowResources #Attachments div.attachmentOutput>a span.remove{display:block;float:left;height:16px;width:16px;margin-left:2px}#userShowResources #Attachments div.attachmentOutput>a span.remove:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC)}#userShowResources #Attachments.cannotAddAttachments div.attachmentOutput{height:162px}#userShowResources #Attachments div.attachmentInput{border-top:1px solid #ccc;height:40px;background-color:#fff;padding:3px}#userShowResources #Attachments div.attachmentInput span.action{display:block;margin:2px 4px 0 0;height:32px;width:32px;cursor:pointer;float:right;border:1px solid #fff;padding:3px;background-repeat:no-repeat;background-position:2px 3px}#userShowResources #Attachments div.attachmentInput span.action:hover{background-color:#ededed;border:1px solid #ccc;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}#userShowResources #Attachments div.attachmentInput span.upload{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFPUlEQVRYw7VXayzkVxRfy4yKTj0aj6JWJISuR9EiWj5IFZt4pB+kLYmdbEJEJpp2daeIJkRNMx7xqFcl0iXxaKwVj8ishhG+eARr10wY6hVMx3gM1mNxeo7YRDfzNr3Jyfzn/u/939899/x+59xbAHDLEIbNxNHRMSQ5OTmvuLi4pbS0tDU1NbXA3d09FN8ZqZxniMVZLJZvSUnJ0NHREVA7PDwEhUIBb1pNTU2PtbW1+/8CwMvLiz07O/uKFqqrq9sNDAzstLCw4Jubm/Pd3NyeZGdnb56dncH09LQUQfgaFIC9vX30+vr6uUwmg5CQkD509Rdo75HL0W6jWaJF+/n5CRcXF0EgEEiMjIw+MAgAbM7d3d1/y6QywAU68b+NmrFeYWFhwtPTU8jIyKi/MQDaXU5OjoDcHhsb+4x2fdX/jqqAwxbf0dFxNj4+vofPtjcCgO7+gRbn8/lSS0vLjPT09KrOp09F/f39S9XV1QOhoaFsXITxFoD3cfcv8MgA2RKuNwAzM7MgsVh8MDAwAAkJCRI8230CIxKJYHh4GLa2ti4jv6CggI7F7BoABlJ0cHNzEzA4v9ELADar1tZWkVQqBS6Xe4G/F/Pz8xAdHT2KwZWN7zkODg7NVVVVr87PzyErK6vp2lxTnDO2vLwMOCZeLwBsNvu3K9fDxMQEjI2NgZ2dXSl+3OnaQtZo3Pr6+qNt+TZ4enreu+q/09nZuUdeQrA+OgNwdXX9en9/H5qbm+Hx48dAO/fw8PiddqbEUyyMg66VlRVg379fQ32+vr4Z5Lnc3Nzn/zkabRY3MTHxmJmZ2UExgfz8fKBAiomJ+Usd9fCcc+fm5gDluB3HOSLwtcnJSXB2dv5JJxoS5crLy58dHx9DXl4eLCwsAMquFPs/VjcvPDy8dHV1FeLi4v7E6O+V4e7j4+MHiQ06AYiIiPiRzh2TC/T19YFQKASUWo4G0GZlZWUvpqamyAOLBATnb2N/sE5S7OTk9KVcLn/d09MDlZWVl+fu4+PTSIKjbh7GRuqCZIGSEAwNDV2gPgDmgYc6J6PMzMxW0nDk9MXa2hqkpaW9vB7xyozBYNzt7e3dHRkZuQxYiURCUv2HKtBqzx75yk1MTFwmFzY1Nb1G+sRrcL1RFpcr2NzYgNraWlheWgIOhyOmvKFXPYDtM3S/ggLP1tb2F3WFBZm/v/93BLaxsRFGR0ehoaHhBEF/pXYNdRUOj8cTUgCi0hHlWGqLEgvW5+j2EwrS9vb2SwB29vY/a2SZqhcoJFxaHClH0fuppqjHceO0exKpJXQ96kQ/9r+rFwAmkxmMCeeIdoGUe6gFVX8lnpPrUbCAV8iT4eKfaJVflHUidxtp9ygiAk2Uo927uLhUFBUVnVDkd3V1nZuamj7QOsEpy3iYNJZINq2srBK0zJKeKDT/EGVR8yk/3L4JgLuDg4PHLS0tB/j8oTYfSUpKqtuWyyElJeWltnPUAfDHKD5FEaHgs9T0gYCAAA4lJ6yEdnF8hM7lnRIAd1D5VijfI/eDNVRH/pjfD0jzsS54pFd9qQQAMygoqJ3Eh1dYSKU2U0WKdseiQ0QlVmRkJI0zNwiAKxAxWD5t7ezsAGa1IaTiR9dLK6xyvu3q7pYeHhwAFqQktZ56l/cqAJgaGxt/z+cXHSr2FEA3n8qKihEsRnoxOCUbqPVkmOdXcGzoje6U6vhNRWZUVNTztra2szmxGIhmVAei6u17e3s/wfchN77UarrxknvRHuAFtMjGxqacwWQ8omjXlBsMAuAtMMYEyFDX+Tf2LzGXbu1DZYkMAAAAAElFTkSuQmCC)}#userShowResources #Attachments div.attachmentInput span.photo{background-image:url(data:image/png;base64,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)}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments{margin-top:6px;background-color:#fff;line-height:1.3em;border:1px solid #ddd}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment{display:block;padding:4px;cursor:pointer}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment:not(:last-child){border-bottom:1px dashed #ddd}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment:hover{background-color:#e8eef4}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment td:first-child{width:90px;font-weight:bold}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment img.CreateJob_Assignment_Image{float:left;width:64px;height:64px;margin-right:6px}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment div.CreateJob_Assignment_Details{float:left}
\ No newline at end of file
diff --git a/Disco.Web/Controllers/DeviceController.cs b/Disco.Web/Controllers/DeviceController.cs
index 6f5e808f..c9f148ff 100644
--- a/Disco.Web/Controllers/DeviceController.cs
+++ b/Disco.Web/Controllers/DeviceController.cs
@@ -1,22 +1,19 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using Disco.BI;
-using Disco.BI.Extensions;
-using Disco.Data.Repository;
+using Disco.BI.Extensions;
 using Disco.Models.Repository;
-using System.Data.Objects.SqlClient;
-using Disco.Web.Extensions;
-using Disco.Services.Plugins.Features.UIExtension;
 using Disco.Models.UI.Device;
+using Disco.Services.Authorization;
 using Disco.Services.Plugins;
+using Disco.Services.Plugins.Features.UIExtension;
+using Disco.Services.Users;
+using Disco.Services.Web;
+using System;
+using System.Linq;
+using System.Web.Mvc;
 
 
 namespace Disco.Web.Controllers
 {
-    public partial class DeviceController : dbAdminController
+    public partial class DeviceController : AuthorizedDatabaseController
     {
         #region Index
         public virtual ActionResult Index()
@@ -31,17 +28,24 @@ namespace Disco.Web.Controllers
         #endregion
 
         #region Add Offline
+        [DiscoAuthorize(Claims.Device.Actions.EnrolDevices)]
         public virtual ActionResult AddOffline()
         {
             var m = new Models.Device.AddOfflineModel()
             {
-                DefaultDeviceProfileId = dbContext.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId
+                DefaultDeviceProfileId = Database.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId
             };
-            m.DeviceBatches = dbContext.DeviceBatches.ToList();
-            m.DeviceProfiles = dbContext.DeviceProfiles.ToList();
-            if (m.DefaultDeviceProfileId == 0)
+            
+            if (Authorization.Has(Claims.Device.Properties.DeviceBatch))
+                m.DeviceBatches = Database.DeviceBatches.ToList();
+            
+            if (Authorization.Has(Claims.Device.Properties.DeviceProfile))
             {
-                m.DeviceProfiles.Insert(0, new DeviceProfile() { Id = 0, Name = "Select a Device Profile" });
+                m.DeviceProfiles = Database.DeviceProfiles.ToList();
+                if (m.DefaultDeviceProfileId == 0)
+                {
+                    m.DeviceProfiles.Insert(0, new DeviceProfile() { Id = 0, Name = "Select a Device Profile" });
+                }
             }
 
             // UI Extensions
@@ -49,7 +53,7 @@ namespace Disco.Web.Controllers
 
             return View(m);
         }
-        [HttpPost]
+        [DiscoAuthorize(Claims.Device.Actions.EnrolDevices), HttpPost]
         public virtual ActionResult AddOffline(Models.Device.AddOfflineModel m)
         {
             // Trim Serial Number & Error Check
@@ -61,15 +65,14 @@ namespace Disco.Web.Controllers
             else
             {
                 // Ensure Existing Device Doesn't Exist
-                if (!string.IsNullOrEmpty(m.Device.SerialNumber) && dbContext.Devices.Count(d => d.SerialNumber == m.Device.SerialNumber) > 0)
+                if (!string.IsNullOrEmpty(m.Device.SerialNumber) && Database.Devices.Count(d => d.SerialNumber == m.Device.SerialNumber) > 0)
                     ModelState.AddModelError("Device.SerialNumber", "A Device what this Serial Number already exists");
             }
 
-
             if (ModelState.IsValid)
             {
-                var d = m.Device.AddOffline(dbContext);
-                dbContext.SaveChanges();
+                var d = m.Device.AddOffline(Database);
+                Database.SaveChanges();
                 return RedirectToAction(MVC.Device.Show(d.SerialNumber));
             }
             return AddOffline();
@@ -77,21 +80,24 @@ namespace Disco.Web.Controllers
         #endregion
 
         #region Import/Export
-        [HttpGet]
+        [DiscoAuthorizeAny(Claims.Device.Actions.Import, Claims.Device.Actions.Export), HttpGet]
         public virtual ActionResult ImportExport()
         {
             Models.Device.ImportModel m = new Models.Device.ImportModel();
 
-            m.DeviceModels = dbContext.DeviceModels.ToList();
-            m.DeviceProfiles = dbContext.DeviceProfiles.ToList();
-            m.DeviceBatches = dbContext.DeviceBatches.ToList();
+            if (Authorization.Has(Claims.Device.Actions.Import))
+            {
+                m.DeviceModels = Database.DeviceModels.ToList();
+                m.DeviceProfiles = Database.DeviceProfiles.ToList();
+                m.DeviceBatches = Database.DeviceBatches.ToList();
+            }
 
             // UI Extensions
             UIExtensions.ExecuteExtensions<DeviceImportModel>(this.ControllerContext, m);
 
             return View(m);
         }
-        [HttpGet]
+        [DiscoAuthorize(Claims.Device.Actions.Import), HttpGet]
         public virtual ActionResult ImportReview(string ImportParseTaskId)
         {
             if (string.IsNullOrWhiteSpace(ImportParseTaskId))
@@ -112,25 +118,20 @@ namespace Disco.Web.Controllers
         #endregion
 
         #region Show
+        [DiscoAuthorize(Claims.Device.Show)]
         public virtual ActionResult Show(string id)
         {
             var m = new Models.Device.ShowModel();
 
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
 
-            m.Device = dbContext.Devices.Include("DeviceDetails")
-                .Where(d => d.SerialNumber == id)
-                .FirstOrDefault();
+            m.Device = Database.Devices
+                .Include("DeviceModel").Include("DeviceDetails").Include("DeviceUserAssignments.AssignedUser").Include("DeviceAttachments")
+                .FirstOrDefault(d => d.SerialNumber == id);
 
             if (m.Device == null)
                 throw new ArgumentException(string.Format("Unknown Device: [{0}]", id), "id");
 
-            // Removed 2012-07-03 G#
-            // Deferred to Ajax call - improve load performance
-            // Update Device LastNetworkLogonDate
-            //if (m.Device.UpdateLastNetworkLogonDate())
-            //    dbContext.SaveChanges();
-
             // No Necessary - Yet...
             //if (!string.IsNullOrWhiteSpace(m.Device.ComputerName))
             //{
@@ -141,27 +142,32 @@ namespace Disco.Web.Controllers
             //    }
             //}
 
-            m.DeviceProfiles = dbContext.DeviceProfiles.ToList();
+            if (Authorization.Has(Claims.Device.Properties.DeviceProfile))
+                m.DeviceProfiles = Database.DeviceProfiles.ToList();
 
-            m.DeviceBatches = dbContext.DeviceBatches.ToList();
+            if (Authorization.Has(Claims.Device.Properties.DeviceBatch))
+                m.DeviceBatches = Database.DeviceBatches.ToList();
 
-            m.Jobs = new Disco.Models.BI.Job.JobTableModel()
+            if (Authorization.Has(Claims.Device.ShowJobs))
             {
-                ShowStatus = true,
-                ShowDevice = false,
-                IsSmallTable = false,
-                HideClosedJobs = true,
-                EnablePaging = false
-            };
-            m.Jobs.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => j.DeviceSerialNumber == m.Device.SerialNumber).OrderByDescending(j => j.Id));
+                m.Jobs = new Disco.Models.BI.Job.JobTableModel()
+                {
+                    ShowStatus = true,
+                    ShowDevice = false,
+                    IsSmallTable = false,
+                    HideClosedJobs = true,
+                    EnablePaging = false
+                };
+                m.Jobs.Fill(Database, BI.JobBI.Searching.BuildJobTableModel(Database).Where(j => j.DeviceSerialNumber == m.Device.SerialNumber).OrderByDescending(j => j.Id));
+            }
 
-            m.Certificates = dbContext.DeviceCertificates.Where(c => c.DeviceSerialNumber == m.Device.SerialNumber).ToList();
+            if (Authorization.Has(Claims.Device.ShowCertificates))
+                m.Certificates = Database.DeviceCertificates.Where(c => c.DeviceSerialNumber == m.Device.SerialNumber).ToList();
 
-            //m.AttachmentTypes = dbContext.AttachmentTypes.Where(at => at.Scope == AttachmentType.AttachmentTypeScopes.Device).ToList();
-            m.DocumentTemplates = m.Device.AvailableDocumentTemplates(dbContext, DiscoApplication.CurrentUser, DateTime.Now);
-
-            m.DeviceProfileDefaultOrganisationAddress = m.Device.DeviceProfile.DefaultOrganisationAddressDetails(dbContext);
+            if (Authorization.Has(Claims.Device.Actions.GenerateDocuments))
+                m.DocumentTemplates = m.Device.AvailableDocumentTemplates(Database, UserService.CurrentUser, DateTime.Now);
 
+            m.DeviceProfileDefaultOrganisationAddress = m.Device.DeviceProfile.DefaultOrganisationAddressDetails(Database);
 
             PluginFeatureManifest deviceProfileCertificateProvider;
             if (Disco.Services.Plugins.Plugins.TryGetPluginFeature(m.Device.DeviceProfile.CertificateProviderId, out deviceProfileCertificateProvider))
diff --git a/Disco.Web/Controllers/InitialConfigController.cs b/Disco.Web/Controllers/InitialConfigController.cs
index cf0c54a3..e33f8ff5 100644
--- a/Disco.Web/Controllers/InitialConfigController.cs
+++ b/Disco.Web/Controllers/InitialConfigController.cs
@@ -159,10 +159,10 @@ namespace Disco.Web.Controllers
                     // Save Connection String
                     //Disco.Data.Repository.DiscoDatabaseConnectionFactory.SetDiscoDataContextConnectionString(model.ToConnectionString().ToString(), true);
                     // Write Organisation Name into DB
-                    using (DiscoDataContext db = new DiscoDataContext())
+                    using (DiscoDataContext database = new DiscoDataContext())
                     {
-                        db.DiscoConfiguration.OrganisationName = DiscoApplication.OrganisationName;
-                        db.SaveChanges();
+                        database.DiscoConfiguration.OrganisationName = DiscoApplication.OrganisationName;
+                        database.SaveChanges();
                     }
 
                     return RedirectToAction(MVC.InitialConfig.FileStore());
@@ -180,8 +180,8 @@ namespace Disco.Web.Controllers
             string FileStoreLocation = null;
             try
             {
-                using (DiscoDataContext db = new DiscoDataContext())
-                    FileStoreLocation = db.ConfigurationItems.Where(ci => ci.Scope == "System" && ci.Key == "DataStoreLocation").Select(ci => ci.Value).FirstOrDefault();
+                using (DiscoDataContext database = new DiscoDataContext())
+                    FileStoreLocation = database.ConfigurationItems.Where(ci => ci.Scope == "System" && ci.Key == "DataStoreLocation").Select(ci => ci.Value).FirstOrDefault();
             }
             catch (Exception) { } // Ignore All Errors
 
@@ -205,12 +205,12 @@ namespace Disco.Web.Controllers
             if (ModelState.IsValid)
             {
                 // Ensure Path Exists
-                using (DiscoDataContext db = new DiscoDataContext())
+                using (DiscoDataContext database = new DiscoDataContext())
                 {
-                    var configItem = db.ConfigurationItems.Where(ci => ci.Scope == "System" && ci.Key == "DataStoreLocation").FirstOrDefault();
+                    var configItem = database.ConfigurationItems.Where(ci => ci.Scope == "System" && ci.Key == "DataStoreLocation").FirstOrDefault();
                     if (configItem == null)
                     { // Create Config
-                        db.ConfigurationItems.Add(new Disco.Models.Repository.ConfigurationItem()
+                        database.ConfigurationItems.Add(new Disco.Models.Repository.ConfigurationItem()
                         {
                             Scope = "System",
                             Key = "DataStoreLocation",
@@ -221,7 +221,7 @@ namespace Disco.Web.Controllers
                     { // Update Config
                         configItem.Value = m.FileStoreLocation;
                     }
-                    db.SaveChanges();
+                    database.SaveChanges();
                 }
 
                 // Extract DataStore Template into FileStore
diff --git a/Disco.Web/Controllers/JobController.cs b/Disco.Web/Controllers/JobController.cs
index 9750cf3a..eafa7496 100644
--- a/Disco.Web/Controllers/JobController.cs
+++ b/Disco.Web/Controllers/JobController.cs
@@ -1,23 +1,21 @@
-using System;
+using Disco.BI.Extensions;
+using Disco.BI.JobBI;
+using Disco.Models.Repository;
+using Disco.Models.UI.Job;
+using Disco.Services.Authorization;
+using Disco.Services.Plugins.Features.UIExtension;
+using Disco.Services.Plugins.Features.WarrantyProvider;
+using Disco.Services.Users;
+using Disco.Services.Web;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
 using System.Web.Mvc;
-using Disco.Data.Repository;
-using Disco.BI;
-using Disco.BI.Extensions;
-using Disco.Models.Repository;
-using System.Web.Script.Serialization;
-using Disco.Services.Plugins.Features.WarrantyProvider;
-using Disco.Services.Plugins;
-using Disco.Models.UI.Job;
-using Disco.Services.Plugins.Features.UIExtension;
-using Disco.BI.JobBI;
-using Newtonsoft.Json;
 
 namespace Disco.Web.Controllers
 {
-    public partial class JobController : dbAdminController
+    public partial class JobController : AuthorizedDatabaseController
     {
 
         #region Index
@@ -47,7 +45,7 @@ namespace Disco.Web.Controllers
                                 && (j.DeviceHeld == null || j.DeviceReturnedDate != null || j.DeviceReadyForReturn == null)),
                             SortFunction = q => q.OrderBy(j => j.Id),
                             ShowStatus = true
-                        }.Initialize(dbContext);
+                        }.Initialize(Database);
                     }
                 }
             }
@@ -65,14 +63,17 @@ namespace Disco.Web.Controllers
                             FilterFunction = q => q.Where(j => j.ClosedDate == null && j.OpenedDate < longRunningThreshold),
                             SortFunction = q => q.OrderBy(j => j.Id),
                             ShowStatus = true
-                        }.Initialize(dbContext);
+                        }.Initialize(Database);
                     }
                 }
             }
 
-            m.OpenJobs = jobList_OpenJobs;
-            m.LongRunningJobs = jobList_LongRunning;
-            m.DailyOpenedClosedStatistics = Disco.BI.JobBI.Statistics.DailyOpenedClosed.Data(dbContext, true);
+            if (Authorization.Has(Claims.Job.Lists.AwaitingTechnicianAction))
+                m.OpenJobs = jobList_OpenJobs;
+            if (Authorization.Has(Claims.Job.Lists.LongRunningJobs))
+                m.LongRunningJobs = jobList_LongRunning;
+            if (Authorization.Has(Claims.Job.ShowDailyChart))
+                m.DailyOpenedClosedStatistics = Disco.BI.JobBI.Statistics.DailyOpenedClosed.Data(Database, true);
 
             // UI Extensions
             UIExtensions.ExecuteExtensions<JobIndexModel>(this.ControllerContext, m);
@@ -82,24 +83,27 @@ namespace Disco.Web.Controllers
         #endregion
 
         #region Lists
+        [DiscoAuthorize(Claims.Job.Lists.AllOpen)]
         public virtual ActionResult AllOpen()
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
             var m = new Models.Job.ListModel() { Title = "All Open Jobs" };
             m.JobTable = new Disco.Models.BI.Job.JobTableModel() { ShowStatus = true };
-            m.JobTable.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => j.ClosedDate == null).OrderBy(j => j.Id));
+            m.JobTable.Fill(Database, BI.JobBI.Searching.BuildJobTableModel(Database).Where(j => j.ClosedDate == null).OrderBy(j => j.Id));
 
             // UI Extensions
             UIExtensions.ExecuteExtensions<JobListModel>(this.ControllerContext, m);
 
             return View(Views.List, m);
         }
+
+        [DiscoAuthorize(Claims.Job.Lists.DevicesReadyForReturn)]
         public virtual ActionResult DevicesReadyForReturn()
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
             var m = new Models.Job.ListModel() { Title = "Jobs with Devices Ready for Return" };
             m.JobTable = new Disco.Models.BI.Job.JobTableModel() { ShowStatus = true };
-            m.JobTable.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => !j.WaitingForUserAction.HasValue
+            m.JobTable.Fill(Database, BI.JobBI.Searching.BuildJobTableModel(Database).Where(j => !j.WaitingForUserAction.HasValue
                 && j.DeviceHeld != null && j.DeviceReturnedDate == null && j.DeviceReadyForReturn != null &&
                 ((!j.JobMetaNonWarranty.AccountingChargeRequiredDate.HasValue && !j.JobMetaNonWarranty.AccountingChargeAddedDate.HasValue) || j.JobMetaNonWarranty.AccountingChargePaidDate.HasValue)
                 && j.ClosedDate == null).OrderBy(j => j.Id));
@@ -109,12 +113,14 @@ namespace Disco.Web.Controllers
 
             return View(Views.List, m);
         }
+
+        [DiscoAuthorize(Claims.Job.Lists.DevicesAwaitingRepair)]
         public virtual ActionResult DevicesAwaitingRepair()
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
             var m = new Models.Job.ListModel() { Title = "Jobs with Devices Awaiting Repair" };
             m.JobTable = new Disco.Models.BI.Job.JobTableModel() { ShowStatus = true };
-            m.JobTable.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => j.ClosedDate == null &&
+            m.JobTable.Fill(Database, BI.JobBI.Searching.BuildJobTableModel(Database).Where(j => j.ClosedDate == null &&
                 (
                 (j.JobMetaNonWarranty.RepairerLoggedDate != null && j.JobMetaNonWarranty.RepairerCompletedDate == null) ||
                 (j.JobMetaWarranty.ExternalLoggedDate != null && j.JobMetaWarranty.ExternalCompletedDate == null)
@@ -127,12 +133,13 @@ namespace Disco.Web.Controllers
         }
 
         #region "Finance Lists"
+        [DiscoAuthorize(Claims.Job.Lists.AwaitingFinance)]
         public virtual ActionResult AwaitingFinance()
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
             var m = new Models.Job.ListModel() { Title = "Jobs Awaiting Finance" };
             m.JobTable = new Disco.Models.BI.Job.JobTableModel() { ShowStatus = true };
-            m.JobTable.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => j.ClosedDate == null &&
+            m.JobTable.Fill(Database, BI.JobBI.Searching.BuildJobTableModel(Database).Where(j => j.ClosedDate == null &&
                 (
                 (j.JobTypeId == JobType.JobTypeIds.HNWar && (j.JobMetaNonWarranty.IsInsuranceClaim && !j.JobMetaInsurance.ClaimFormSentDate.HasValue)) ||
                 (j.JobTypeId == JobType.JobTypeIds.HNWar && (j.JobMetaNonWarranty.AccountingChargeRequiredDate.HasValue && (!j.JobMetaNonWarranty.AccountingChargeAddedDate.HasValue && !j.JobMetaNonWarranty.AccountingChargePaidDate.HasValue))) ||
@@ -146,12 +153,13 @@ namespace Disco.Web.Controllers
             return View(Views.List, m);
         }
 
+        [DiscoAuthorizeAll(Claims.Job.Lists.AwaitingFinance, Claims.Job.Lists.AwaitingFinanceCharge)]
         public virtual ActionResult AwaitingFinanceCharge()
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
             var m = new Models.Job.ListModel() { Title = "Jobs Awaiting Finance - Accounting Charge" };
             m.JobTable = new Disco.Models.BI.Job.JobTableModel() { ShowStatus = true };
-            m.JobTable.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => j.ClosedDate == null &&
+            m.JobTable.Fill(Database, BI.JobBI.Searching.BuildJobTableModel(Database).Where(j => j.ClosedDate == null &&
                 (j.JobTypeId == JobType.JobTypeIds.HNWar && (j.JobMetaNonWarranty.AccountingChargeRequiredDate.HasValue && (!j.JobMetaNonWarranty.AccountingChargeAddedDate.HasValue && !j.JobMetaNonWarranty.AccountingChargePaidDate.HasValue)))
                 ).OrderBy(j => j.Id));
 
@@ -160,12 +168,14 @@ namespace Disco.Web.Controllers
 
             return View(Views.List, m);
         }
+
+        [DiscoAuthorizeAll(Claims.Job.Lists.AwaitingFinance, Claims.Job.Lists.AwaitingFinancePayment)]
         public virtual ActionResult AwaitingFinancePayment()
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
             var m = new Models.Job.ListModel() { Title = "Jobs Awaiting Finance - Accounting Payment" };
             m.JobTable = new Disco.Models.BI.Job.JobTableModel() { ShowStatus = true };
-            m.JobTable.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => j.ClosedDate == null &&
+            m.JobTable.Fill(Database, BI.JobBI.Searching.BuildJobTableModel(Database).Where(j => j.ClosedDate == null &&
                 (j.JobTypeId == JobType.JobTypeIds.HNWar && (!j.JobMetaNonWarranty.AccountingChargeAddedDate.HasValue || !j.JobMetaNonWarranty.AccountingChargePaidDate.HasValue))
                 ).OrderBy(j => j.Id));
 
@@ -174,12 +184,14 @@ namespace Disco.Web.Controllers
 
             return View(Views.List, m);
         }
+
+        [DiscoAuthorizeAll(Claims.Job.Lists.AwaitingFinance, Claims.Job.Lists.AwaitingFinanceInsuranceProcessing)]
         public virtual ActionResult AwaitingFinanceInsuranceProcessing()
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
             var m = new Models.Job.ListModel() { Title = "Jobs Awaiting Finance - Insurance Processing" };
             m.JobTable = new Disco.Models.BI.Job.JobTableModel() { ShowStatus = true };
-            m.JobTable.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => j.ClosedDate == null &&
+            m.JobTable.Fill(Database, BI.JobBI.Searching.BuildJobTableModel(Database).Where(j => j.ClosedDate == null &&
                 (j.JobTypeId == JobType.JobTypeIds.HNWar && (j.JobMetaNonWarranty.IsInsuranceClaim && !j.JobMetaInsurance.ClaimFormSentDate.HasValue))
                 ).OrderBy(j => j.Id));
 
@@ -188,12 +200,14 @@ namespace Disco.Web.Controllers
 
             return View(Views.List, m);
         }
+
+        [DiscoAuthorizeAll(Claims.Job.Lists.AwaitingFinance, Claims.Job.Lists.AwaitingFinanceAgreementBreach)]
         public virtual ActionResult AwaitingFinanceAgreementBreach()
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
             var m = new Models.Job.ListModel() { Title = "Jobs Awaiting Finance - Agreement Breach" };
             m.JobTable = new Disco.Models.BI.Job.JobTableModel() { ShowStatus = true };
-            m.JobTable.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => j.ClosedDate == null &&
+            m.JobTable.Fill(Database, BI.JobBI.Searching.BuildJobTableModel(Database).Where(j => j.ClosedDate == null &&
                 (j.JobTypeId == JobType.JobTypeIds.UMgmt && Job.UserManagementFlags.Infringement_BreachFinancialAgreement == (j.Flags & Job.UserManagementFlags.Infringement_BreachFinancialAgreement))
                 ).OrderBy(j => j.Id));
 
@@ -202,15 +216,15 @@ namespace Disco.Web.Controllers
 
             return View(Views.List, m);
         }
-
         #endregion
 
+        [DiscoAuthorize(Claims.Job.Lists.AwaitingUserAction)]
         public virtual ActionResult AwaitingUserAction()
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
             var m = new Models.Job.ListModel() { Title = "Jobs Awaiting User Action" };
             m.JobTable = new Disco.Models.BI.Job.JobTableModel() { ShowStatus = true };
-            m.JobTable.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => (j.WaitingForUserAction.HasValue || (j.JobMetaNonWarranty.AccountingChargeAddedDate != null && j.JobMetaNonWarranty.AccountingChargePaidDate == null))
+            m.JobTable.Fill(Database, BI.JobBI.Searching.BuildJobTableModel(Database).Where(j => (j.WaitingForUserAction.HasValue || (j.JobMetaNonWarranty.AccountingChargeAddedDate != null && j.JobMetaNonWarranty.AccountingChargePaidDate == null))
                                                                           && j.ClosedDate == null).OrderBy(j => j.Id));
 
             // UI Extensions
@@ -218,9 +232,11 @@ namespace Disco.Web.Controllers
 
             return View(Views.List, m);
         }
+
+        [DiscoAuthorize(Claims.Job.Lists.RecentlyClosed)]
         public virtual ActionResult RecentlyClosed()
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
             var m = new Models.Job.ListModel() { Title = "Recently Closed Jobs" };
             m.JobTable = new Disco.Models.BI.Job.JobTableModel() { ShowStatus = true };
 
@@ -230,19 +246,21 @@ namespace Disco.Web.Controllers
                 closedThreshold = closedThreshold.AddDays(-2);
             if (dateTimeNow.DayOfWeek == DayOfWeek.Tuesday)
                 closedThreshold = closedThreshold.AddDays(-1);
-            m.JobTable.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => j.ClosedDate > closedThreshold).OrderBy(j => j.Id));
+            m.JobTable.Fill(Database, BI.JobBI.Searching.BuildJobTableModel(Database).Where(j => j.ClosedDate > closedThreshold).OrderBy(j => j.Id));
 
             // UI Extensions
             UIExtensions.ExecuteExtensions<JobListModel>(this.ControllerContext, m);
 
             return View(Views.List, m);
         }
+
+        [DiscoAuthorize(Claims.Job.Lists.Locations)]
         public virtual ActionResult Locations()
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
             var m = new Models.Job.ListModel() { Title = "Held Device Locations" };
             m.JobTable = new Disco.Models.BI.Job.JobTableModel() { ShowStatus = true, ShowLocation = true, ShowTechnician = false, ShowType = false };
-            m.JobTable.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => j.ClosedDate == null && j.DeviceHeld.HasValue && !j.DeviceReturnedDate.HasValue).OrderBy(j => j.DeviceHeldLocation));
+            m.JobTable.Fill(Database, BI.JobBI.Searching.BuildJobTableModel(Database).Where(j => j.ClosedDate == null && j.DeviceHeld.HasValue && !j.DeviceReturnedDate.HasValue).OrderBy(j => j.DeviceHeldLocation));
 
             // UI Extensions
             UIExtensions.ExecuteExtensions<JobListModel>(this.ControllerContext, m);
@@ -253,23 +271,57 @@ namespace Disco.Web.Controllers
         #endregion
 
         #region Show
+        [DiscoAuthorize(Claims.Job.Show)]
         public virtual ActionResult Show(int? id)
         {
             if (!id.HasValue)
                 return RedirectToAction(MVC.Job.Index());
 
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
 
             var m = new Models.Job.ShowModel();
 
-            m.Job = (from j in dbContext.Jobs.Include("Device.DeviceModel").Include("Device.DeviceBatch").Include("DeviceHeldTechUser").Include("DeviceReadyForReturnTechUser").Include("DeviceReturnedTechUser")
+            m.Job = (from j in Database.Jobs.Include("Device.DeviceModel").Include("Device.DeviceBatch").Include("DeviceHeldTechUser").Include("DeviceReadyForReturnTechUser").Include("DeviceReturnedTechUser")
                          .Include("OpenedTechUser").Include("ClosedTechUser").Include("JobType").Include("JobSubTypes").Include("User").Include("JobLogs.TechUser")
                      where (j.Id == id.Value)
                      select j).FirstOrDefault();
 
-            m.UpdatableJobSubTypes = m.Job.JobType.JobSubTypes.OrderBy(jst => jst.Description).ToList();
+            if (m.Job == null)
+                throw new ArgumentException(string.Format("Unknown Job: [{0}]", id), "id");
 
-            m.AvailableDocumentTemplates = m.Job.AvailableDocumentTemplates(dbContext, DiscoApplication.CurrentUser, DateTime.Now);
+            // Validate Authorization
+            switch (m.Job.JobTypeId)
+            {
+                case JobType.JobTypeIds.HMisc:
+                    Authorization.Require(Claims.Job.Types.ShowHMisc);
+                    break;
+                case JobType.JobTypeIds.HNWar:
+                    Authorization.Require(Claims.Job.Types.ShowHNWar);
+                    break;
+                case JobType.JobTypeIds.HWar:
+                    Authorization.Require(Claims.Job.Types.ShowHWar);
+                    break;
+                case JobType.JobTypeIds.SApp:
+                    Authorization.Require(Claims.Job.Types.ShowSApp);
+                    break;
+                case JobType.JobTypeIds.SImg:
+                    Authorization.Require(Claims.Job.Types.ShowSImg);
+                    break;
+                case JobType.JobTypeIds.SOS:
+                    Authorization.Require(Claims.Job.Types.ShowSOS);
+                    break;
+                case JobType.JobTypeIds.UMgmt:
+                    Authorization.Require(Claims.Job.Types.ShowUMgmt);
+                    break;
+                default:
+                    throw new InvalidOperationException("Unknown JobType");
+            }
+
+            if (Authorization.Has(Claims.Job.Actions.UpdateSubTypes))
+                m.UpdatableJobSubTypes = m.Job.JobType.JobSubTypes.OrderBy(jst => jst.Description).ToList();
+
+            if (Authorization.Has(Claims.Job.Actions.GenerateDocuments))
+                m.AvailableDocumentTemplates = m.Job.AvailableDocumentTemplates(Database, UserService.CurrentUser, DateTime.Now);
 
             // UI Extensions
             UIExtensions.ExecuteExtensions<JobShowModel>(this.ControllerContext, m);
@@ -279,6 +331,7 @@ namespace Disco.Web.Controllers
         #endregion
 
         #region Create
+        [DiscoAuthorize(Claims.Job.Actions.Create)]
         public virtual ActionResult Create(string DeviceSerialNumber, string UserId)
         {
             var m = new Models.Job.CreateModel()
@@ -286,17 +339,17 @@ namespace Disco.Web.Controllers
                 DeviceSerialNumber = DeviceSerialNumber,
                 UserId = UserId
             };
-            m.UpdateModel(dbContext);
+            m.UpdateModel(Database);
 
             // UI Extensions
             UIExtensions.ExecuteExtensions<JobCreateModel>(this.ControllerContext, m);
 
             return View(m);
         }
-        [HttpPost]
+        [HttpPost, DiscoAuthorize(Claims.Job.Actions.Create)]
         public virtual ActionResult Create(Models.Job.CreateModel m)
         {
-            m.UpdateModel(dbContext);
+            m.UpdateModel(Database);
 
             if (!ModelState.IsValid)
             {
@@ -308,8 +361,8 @@ namespace Disco.Web.Controllers
             else
             {
                 // Create New Job
-                var currentUser = dbContext.Users.Find(DiscoApplication.CurrentUser.Id);
-                var j = BI.JobBI.Utilities.Create(dbContext, m.Device, m.User, m.GetJobType, m.GetJobSubTypes, currentUser);
+                var currentUser = Database.Users.Find(UserService.CurrentUserId);
+                var j = BI.JobBI.Utilities.Create(Database, m.Device, m.User, m.GetJobType, m.GetJobSubTypes, currentUser);
 
                 if (m.DeviceHeld.Value)
                 {
@@ -342,10 +395,10 @@ namespace Disco.Web.Controllers
                         Timestamp = DateTime.Now,
                         Comments = m.Comments
                     };
-                    dbContext.JobLogs.Add(jl);
+                    Database.JobLogs.Add(jl);
                 }
 
-                dbContext.SaveChanges();
+                Database.SaveChanges();
 
                 // Return Dialog Redirect
                 var redirectModel = new Models.Job.CreateRedirectModel();
@@ -359,46 +412,13 @@ namespace Disco.Web.Controllers
         }
         #endregion
 
-        // Decommissioned 2012-11-28 G# - Moved to new infrastructure
-        #region Create - Old
-        //public virtual ActionResult Create(string DeviceSerialNumber, string UserId)
-        //{
-        //    var m = new Models.Job.CreateModel()
-        //    {
-        //        DeviceSerialNumber = DeviceSerialNumber,
-        //        UserId = UserId
-        //    };
-        //    m.UpdateModel(dbContext);
-
-        //    return View(m);
-        //}
-        //[HttpPost]
-        //public virtual ActionResult Create(Models.Job.CreateModel m)
-        //{
-        //    m.UpdateModel(dbContext);
-
-        //    if (!ModelState.IsValid)
-        //    {
-        //        return View(m);
-        //    }
-        //    else
-        //    {
-        //        // Create New Job
-        //        var currentUser = dbContext.Users.Find(DiscoApplication.CurrentUser.Id);
-        //        var j = BI.JobBI.Utilities.Create(dbContext, m.Device, m.User, m.GetJobType, m.GetJobSubTypes, currentUser);
-        //        dbContext.SaveChanges();
-        //        return RedirectToAction(MVC.Job.Show(j.Id));
-        //    }
-        //}
-        #endregion
-        // End Decommissioned 2012-11-28 G#
-
         #region Log Warranty
+        [DiscoAuthorize(Claims.Job.Actions.LogWarranty)]
         public virtual ActionResult LogWarranty(int id, string WarrantyProviderId, int? OrganisationAddressId)
         {
             var m = new Models.Job.LogWarrantyModel() { JobId = id, WarrantyProviderId = WarrantyProviderId, OrganisationAddressId = OrganisationAddressId };
-            m.UpdateModel(dbContext, false);
-            m.FaultDescription = m.Job.GenerateFaultDescription(dbContext);
+            m.UpdateModel(Database, false);
+            m.FaultDescription = m.Job.GenerateFaultDescription(Database);
 
             if (m.WarrantyProvider != null)
             {
@@ -407,17 +427,17 @@ namespace Disco.Web.Controllers
                     if (wp.SubmitJobViewType != null)
                     {
                         m.WarrantyProviderSubmitJobViewType = wp.SubmitJobViewType;
-                        m.WarrantyProviderSubmitJobModel = wp.SubmitJobViewModel(dbContext, this, m.Job, m.OrganisationAddress, m.TechUser);
+                        m.WarrantyProviderSubmitJobModel = wp.SubmitJobViewModel(Database, this, m.Job, m.OrganisationAddress, m.TechUser);
                     }
                 }
             }
 
             return View(m);
         }
-        [HttpPost]
+        [HttpPost, DiscoAuthorize(Claims.Job.Actions.LogWarranty)]
         public virtual ActionResult LogWarranty(Models.Job.LogWarrantyModel m, FormCollection form)
         {
-            m.UpdateModel(dbContext, true);
+            m.UpdateModel(Database, true);
 
             if (ModelState.IsValid)
             {
@@ -429,7 +449,7 @@ namespace Disco.Web.Controllers
                             Dictionary<string, string> warrantyProviderProperties;
                             try
                             {
-                                warrantyProviderProperties = p.SubmitJobParseProperties(dbContext, form, this, m.Job, m.OrganisationAddress, m.TechUser, m.FaultDescription);
+                                warrantyProviderProperties = p.SubmitJobParseProperties(Database, form, this, m.Job, m.OrganisationAddress, m.TechUser, m.FaultDescription);
                             }
                             catch (Exception ex)
                             {
@@ -443,14 +463,14 @@ namespace Disco.Web.Controllers
                             {
                                 m.WarrantyProviderPropertiesJson = JsonConvert.SerializeObject(warrantyProviderProperties);
                             }
-                            m.DiscloseProperties = p.SubmitJobDiscloseInfo(dbContext, m.Job, m.OrganisationAddress, m.TechUser, m.FaultDescription, warrantyProviderProperties);
+                            m.DiscloseProperties = p.SubmitJobDiscloseInfo(Database, m.Job, m.OrganisationAddress, m.TechUser, m.FaultDescription, warrantyProviderProperties);
                             return View(Views.LogWarrantyDisclose, m);
                         }
                     case "Submit":
                         try
                         {
-                            m.Job.OnLogWarranty(dbContext, m.FaultDescription, m.WarrantyProvider, m.OrganisationAddress, m.TechUser, m.WarrantyProviderProperties());
-                            dbContext.SaveChanges();
+                            m.Job.OnLogWarranty(Database, m.FaultDescription, m.WarrantyProvider, m.OrganisationAddress, m.TechUser, m.WarrantyProviderProperties());
+                            Database.SaveChanges();
                             return RedirectToAction(MVC.Job.Show(m.JobId));
                         }
                         catch (Exception ex)
@@ -470,11 +490,12 @@ namespace Disco.Web.Controllers
             }
         }
 
+        [DiscoAuthorize(Claims.Job.Properties.WarrantyProperties.ProviderDetails)]
         public virtual ActionResult WarrantyProviderJobDetails(int id)
         {
             Models.Job.WarrantyProviderJobDetailsModel model = new Models.Job.WarrantyProviderJobDetailsModel();
 
-            Job job = dbContext.Jobs.Include("Device.DeviceModel").Include("JobMetaWarranty").Include("JobSubTypes").Where(j => j.Id == id).FirstOrDefault();
+            Job job = Database.Jobs.Include("Device.DeviceModel").Include("JobMetaWarranty").Include("JobSubTypes").Where(j => j.Id == id).FirstOrDefault();
             if (job != null)
             {
                 if (job.JobMetaWarranty != null && !string.IsNullOrEmpty(job.JobMetaWarranty.ExternalName))
@@ -489,7 +510,7 @@ namespace Disco.Web.Controllers
                             {
                                 try
                                 {
-                                    object providerModel = providerInstance.JobDetailsViewModel(dbContext, this, job);
+                                    object providerModel = providerInstance.JobDetailsViewModel(Database, this, job);
 
                                     model.JobDetailsSupported = true;
                                     model.ViewType = providerInstance.JobDetailsViewType;
diff --git a/Disco.Web/Controllers/PluginWebHandlerController.cs b/Disco.Web/Controllers/PluginWebHandlerController.cs
index e776e189..7f4052a6 100644
--- a/Disco.Web/Controllers/PluginWebHandlerController.cs
+++ b/Disco.Web/Controllers/PluginWebHandlerController.cs
@@ -5,12 +5,13 @@ using System.Linq;
 using System.Web;
 using System.Web.Mvc;
 using Disco.Services.Plugins;
+using Disco.Services.Authorization;
 
 namespace Disco.Web.Controllers
 {
     public partial class PluginWebHandlerController : Controller
     {
-        [AuthorizeDiscoUsersAttribute(Disco.Models.Repository.User.Types.Admin)]
+        [DiscoAuthorize(Claims.DiscoAdminAccount)]
         [OutputCache(Duration = 0, Location = System.Web.UI.OutputCacheLocation.None)]
         public virtual ActionResult Index(string PluginId, string PluginAction)
         {
diff --git a/Disco.Web/Controllers/SearchController.cs b/Disco.Web/Controllers/SearchController.cs
index e402ee99..d43af44c 100644
--- a/Disco.Web/Controllers/SearchController.cs
+++ b/Disco.Web/Controllers/SearchController.cs
@@ -1,19 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using Disco.BI;
-using Disco.Data.Repository;
-using Disco.Models.Repository;
+using Disco.Models.UI.Search;
+using Disco.Services.Authorization;
 using Disco.Services.Plugins.Features.UIExtension;
-using Disco.Models.UI.Search;
+using Disco.Services.Users;
+using Disco.Services.Web;
+using System;
+using System.Linq;
+using System.Web.Mvc;
 
 namespace Disco.Web.Controllers
 {
-    public partial class SearchController : dbAdminController
+    public partial class SearchController : AuthorizedDatabaseController
     {
         #region Query
+        [DiscoAuthorizeAny(Claims.Job.Search, Claims.Device.Search, Claims.User.Search)]
         public virtual ActionResult Query(string term, string limit = null, bool searchDetails = false)
         {
             term = term.Trim();
@@ -62,23 +61,29 @@ namespace Disco.Web.Controllers
                     m.ErrorMessage = "A search term of at least two characters is required";
                     return View(m);
                 }
-                m.Devices = BI.DeviceBI.Searching.Search(dbContext, term, null, searchDetails);
-                m.Jobs = BI.JobBI.Searching.Search(dbContext, term, null, true, searchDetails);
-                m.Users = BI.UserBI.Searching.Search(dbContext, term);
+                if (Authorization.Has(Claims.Job.Search))
+                    m.Jobs = BI.JobBI.Searching.Search(Database, term, null, true, searchDetails);
+
+                if (Authorization.Has(Claims.Device.Search))
+                    m.Devices = BI.DeviceBI.Searching.Search(Database, term, null, searchDetails);
+
+                if (Authorization.Has(Claims.User.Search))
+                    m.Users = BI.UserBI.Searching.Search(Database, term);
             }
             else
             {
                 switch (limit.ToLower())
                 {
                     case "devicemodel":
+                        Authorization.Require(Claims.Device.Search);
                         int deviceModelId;
                         if (int.TryParse(term, out deviceModelId))
                         {
-                            var vm = dbContext.DeviceModels.Find(deviceModelId);
+                            var vm = Database.DeviceModels.Find(deviceModelId);
                             if (vm != null)
                             {
                                 m.FriendlyTerm = string.Format("Device Model: {0}", vm.ToString());
-                                m.Devices = BI.DeviceBI.Searching.SearchDeviceModel(dbContext, vm.Id);
+                                m.Devices = BI.DeviceBI.Searching.SearchDeviceModel(Database, vm.Id);
                                 break;
                             }
                         }
@@ -87,14 +92,15 @@ namespace Disco.Web.Controllers
                         m.ErrorMessage = "Invalid Device Model Id";
                         break;
                     case "deviceprofile":
+                        Authorization.Require(Claims.Device.Search);
                         int deviceProfileId;
                         if (int.TryParse(term, out deviceProfileId))
                         {
-                            var dp = dbContext.DeviceProfiles.Find(deviceProfileId);
+                            var dp = Database.DeviceProfiles.Find(deviceProfileId);
                             if (dp != null)
                             {
                                 m.FriendlyTerm = string.Format("Device Profile: {0}", dp.ToString());
-                                m.Devices = BI.DeviceBI.Searching.SearchDeviceProfile(dbContext, dp.Id);
+                                m.Devices = BI.DeviceBI.Searching.SearchDeviceProfile(Database, dp.Id);
                                 break;
                             }
                         }
@@ -103,14 +109,15 @@ namespace Disco.Web.Controllers
                         m.ErrorMessage = "Invalid Device Profile Id";
                         break;
                     case "devicebatch":
+                        Authorization.Require(Claims.Device.Search);
                         int deviceBatchId;
                         if (int.TryParse(term, out deviceBatchId))
                         {
-                            var db = dbContext.DeviceBatches.Find(deviceBatchId);
+                            var db = Database.DeviceBatches.Find(deviceBatchId);
                             if (db != null)
                             {
                                 m.FriendlyTerm = string.Format("Device Batch: {0}", db.ToString());
-                                m.Devices = BI.DeviceBI.Searching.SearchDeviceBatch(dbContext, db.Id);
+                                m.Devices = BI.DeviceBI.Searching.SearchDeviceBatch(Database, db.Id);
                                 break;
                             }
                         }
@@ -119,19 +126,21 @@ namespace Disco.Web.Controllers
                         m.ErrorMessage = "Invalid Device Batch Id";
                         break;
                     case "devices":
+                        Authorization.Require(Claims.Device.Search);
                         if (term.Length < 2)
                         {
                             m.Success = false;
                             m.ErrorMessage = "A search term of at least two characters is required";
                             return View(m);
                         }
-                        m.Devices = BI.DeviceBI.Searching.Search(dbContext, term, null, searchDetails);
+                        m.Devices = BI.DeviceBI.Searching.Search(Database, term, null, searchDetails);
                         if (m.Devices.Count == 1)
                         {
                             return RedirectToAction(MVC.Device.Show(m.Devices[0].SerialNumber));
                         }
                         break;
                     case "jobs":
+                        Authorization.Require(Claims.Job.Search);
                         if (term.Length < 2 && termInt < 0)
                         {
                             m.Success = false;
@@ -140,28 +149,30 @@ namespace Disco.Web.Controllers
                         }
                         if (termInt >= 0)
                         { // Term is a Number - Check for JobId
-                            if (dbContext.Jobs.Count(j => j.Id == termInt) == 1)
+                            if (Database.Jobs.Count(j => j.Id == termInt) == 1)
                             {
                                 return RedirectToAction(MVC.Job.Show(termInt));
                             }
                         }
-                        m.Jobs = BI.JobBI.Searching.Search(dbContext, term, null, true, searchDetails);
+                        m.Jobs = BI.JobBI.Searching.Search(Database, term, null, true, searchDetails);
                         break;
                     case "users":
+                        Authorization.Require(Claims.User.Search);
                         if (term.Length < 2)
                         {
                             m.Success = false;
                             m.ErrorMessage = "A search term of at least two characters is required";
                             return View(m);
                         }
-                        m.Users = BI.UserBI.Searching.Search(dbContext, term);
+                        m.Users = BI.UserBI.Searching.Search(Database, term);
                         if (m.Users.Count == 1)
                         {
                             return RedirectToAction(MVC.User.Show(m.Users[0].Id));
                         }
                         break;
                     case "deviceserialnumber":
-                        var device = dbContext.Devices.FirstOrDefault(d => d.SerialNumber == term);
+                        Authorization.Require(Claims.Device.Search);
+                        var device = Database.Devices.FirstOrDefault(d => d.SerialNumber == term);
                         if (device != null)
                             return RedirectToAction(MVC.Device.Show(term));
                         else
@@ -171,9 +182,10 @@ namespace Disco.Web.Controllers
                             return View(m);
                         }
                     case "jobid":
+                        Authorization.Require(Claims.Job.Search);
                         if (termInt >= 0)
                         {
-                            var job = dbContext.Jobs.FirstOrDefault(d => d.Id == termInt);
+                            var job = Database.Jobs.FirstOrDefault(d => d.Id == termInt);
                             if (job != null)
                                 return RedirectToAction(MVC.Job.Show(termInt));
                             else
@@ -190,14 +202,15 @@ namespace Disco.Web.Controllers
                             return View(m);
                         }
                     case "userid":
-                        var user = dbContext.Users.FirstOrDefault(u => u.Id == term);
+                        Authorization.Require(Claims.User.Search);
+                        var user = Database.Users.FirstOrDefault(u => u.Id == term);
                         if (user != null)
                             return RedirectToAction(MVC.User.Show(term));
                         else
                         {
                             try
                             {
-                                user = BI.UserBI.UserCache.GetUser(term, dbContext);
+                                user = UserService.GetUser(term, Database);
                                 if (user != null)
                                     return RedirectToAction(MVC.User.Show(term));
                                 else
diff --git a/Disco.Web/Controllers/UserController.cs b/Disco.Web/Controllers/UserController.cs
index 57877c1c..b4a1c9ff 100644
--- a/Disco.Web/Controllers/UserController.cs
+++ b/Disco.Web/Controllers/UserController.cs
@@ -1,16 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using Disco.Models.Repository;
-using Disco.BI.Extensions;
-using Disco.Services.Plugins.Features.UIExtension;
+using Disco.BI.Extensions;
 using Disco.Models.UI.User;
+using Disco.Services.Authorization;
+using Disco.Services.Authorization.Roles;
+using Disco.Services.Plugins.Features.UIExtension;
+using Disco.Services.Users;
+using Disco.Services.Web;
+using System;
+using System.Linq;
+using System.Web.Mvc;
 
 namespace Disco.Web.Controllers
 {
-    public partial class UserController : dbAdminController
+    public partial class UserController : AuthorizedDatabaseController
     {
         #region Index
         public virtual ActionResult Index()
@@ -25,40 +26,62 @@ namespace Disco.Web.Controllers
         #endregion
 
         #region Show
+        [DiscoAuthorize(Claims.User.Show)]
         public virtual ActionResult Show(string id)
         {
             var m = new Models.User.ShowModel();
 
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
 
             // Update User Cache
             // Do this first so the Database is updated if necessary
             try
             {
-                Disco.BI.UserBI.UserCache.GetUser(id, dbContext, true);
+                UserService.GetUser(id, Database, true);
             }
             catch (ArgumentException)
             {
                 // Ignore if User not in Active Directory anymore
             }
 
-            m.User = dbContext.Users.Where(um => um.Id == id).FirstOrDefault();
+            m.User = Database.Users
+                .Include("DeviceUserAssignments.Device.DeviceModel").Include("UserAttachments")
+                .FirstOrDefault(um => um.Id == id);
 
             if (m.User == null)
                 throw new ArgumentException("Unknown User Id", "id");
 
-            m.Jobs = new Disco.Models.BI.Job.JobTableModel()
+            if (Authorization.Has(Claims.User.ShowJobs))
             {
-                ShowStatus = true,
-                ShowDevice = true,
-                ShowUser = false,
-                IsSmallTable = false,
-                HideClosedJobs = true,
-                EnablePaging = false
-            };
-            m.Jobs.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => j.UserId == id).OrderByDescending(j => j.Id)); 
+                m.Jobs = new Disco.Models.BI.Job.JobTableModel()
+                {
+                    ShowStatus = true,
+                    ShowDevice = true,
+                    ShowUser = false,
+                    IsSmallTable = false,
+                    HideClosedJobs = true,
+                    EnablePaging = false
+                };
+                m.Jobs.Fill(Database, BI.JobBI.Searching.BuildJobTableModel(Database).Where(j => j.UserId == id).OrderByDescending(j => j.Id));
+            }
 
-            m.DocumentTemplates = m.User.AvailableDocumentTemplates(dbContext, DiscoApplication.CurrentUser, DateTime.Now);
+            try
+            {
+                if (Authorization.Has(Claims.User.ShowAuthorization))
+                {
+                    var userAuth = UserService.GetAuthorization(id);
+                    var claims = userAuth.RoleTokens.Cast<RoleToken>().Select(rt => rt.Claims).ToArray();
+                    if (claims.Length > 0)
+                        m.ClaimNavigator = Claims.RoleClaimNavigator.BuildClaimTree(claims);
+                }
+            }
+            catch (ArgumentException)
+            {
+                // Ignore if User not in Active Directory anymore
+            }
+
+            if (Authorization.Has(Claims.User.Actions.GenerateDocuments))
+                m.DocumentTemplates = m.User.AvailableDocumentTemplates(Database, UserService.CurrentUser, DateTime.Now);
 
             // UI Extensions
             UIExtensions.ExecuteExtensions<UserShowModel>(this.ControllerContext, m);
diff --git a/Disco.Web/Disco.Web.csproj b/Disco.Web/Disco.Web.csproj
index 16c43528..46f1ed2e 100644
--- a/Disco.Web/Disco.Web.csproj
+++ b/Disco.Web/Disco.Web.csproj
@@ -190,7 +190,13 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>CommonHelpers.cshtml</DependentUpon>
     </Compile>
+    <Compile Include="Areas\API\Controllers\AuthorizationRoleController.cs" />
     <Compile Include="Areas\API\Controllers\PluginController.cs" />
+    <Compile Include="Areas\API\Models\AuthorizationRole\SubjectItem.cs" />
+    <Compile Include="Areas\Config\Controllers\AuthorizationRoleController.cs" />
+    <Compile Include="Areas\Config\Models\AuthorizationRole\CreateModel.cs" />
+    <Compile Include="Areas\Config\Models\AuthorizationRole\IndexModel.cs" />
+    <Compile Include="Areas\Config\Models\AuthorizationRole\ShowModel.cs" />
     <Compile Include="Areas\Config\Models\Config\IndexModel.cs" />
     <Compile Include="Areas\Config\Models\DeviceBatch\CreateModel.cs" />
     <Compile Include="Areas\Config\Models\DeviceBatch\TimelineModel.cs" />
@@ -199,6 +205,21 @@
     <Compile Include="Areas\Config\Models\DocumentTemplate\ImportStatusModel.cs" />
     <Compile Include="Areas\Config\Models\Enrolment\StatusModel.cs" />
     <Compile Include="Areas\Config\Models\Plugins\InstallModel.cs" />
+    <Compile Include="Areas\Config\Views\AuthorizationRole\Create.generated.cs">
+      <DependentUpon>Create.cshtml</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="Areas\Config\Views\AuthorizationRole\Index.generated.cs">
+      <DependentUpon>Index.cshtml</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="Areas\Config\Views\AuthorizationRole\Show.generated.cs">
+      <DependentUpon>Show.cshtml</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Include="Areas\Config\Views\Plugins\Install.generated.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -530,6 +551,7 @@
     <Compile Include="Models\Job\ShowModel.cs" />
     <Compile Include="Models\Job\WarrantyProviderJobDetailsModel.cs" />
     <Compile Include="Models\Search\QueryModel.cs" />
+    <Compile Include="Models\Shared\FancyTreeNode.cs" />
     <Compile Include="Models\Update\IndexModel.cs" />
     <Compile Include="Models\User\IndexModel.cs" />
     <Compile Include="Models\User\ShowModel.cs" />
@@ -799,6 +821,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Show.cshtml</DependentUpon>
     </Compile>
+    <Compile Include="Views\User\UserParts\_Authorization.generated.cs">
+      <DependentUpon>_Authorization.cshtml</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Include="Views\User\UserParts\_AssignmentHistory.generated.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -838,6 +865,18 @@
   <ItemGroup>
     <Content Include="ClientBin\Disco.ClientBootstrapper.exe" />
     <Content Include="ClientBin\Disco.Silverlight.AttachmentUpload.xap" />
+    <Content Include="Areas\Config\Views\AuthorizationRole\Create.cshtml">
+      <Generator>RazorGenerator</Generator>
+      <LastGenOutput>Create.generated.cs</LastGenOutput>
+    </Content>
+    <Content Include="Areas\Config\Views\AuthorizationRole\Index.cshtml">
+      <Generator>RazorGenerator</Generator>
+      <LastGenOutput>Index.generated.cs</LastGenOutput>
+    </Content>
+    <Content Include="Areas\Config\Views\AuthorizationRole\Show.cshtml">
+      <Generator>RazorGenerator</Generator>
+      <LastGenOutput>Show.generated.cs</LastGenOutput>
+    </Content>
     <None Include="Areas\Config\Views\Plugins\Install.cshtml">
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>Install.generated.cs</LastGenOutput>
@@ -863,6 +902,10 @@
     <Content Include="ClientSource\Scripts\Core.min.js">
       <DependentUpon>Core.js.bundle</DependentUpon>
     </Content>
+    <Content Include="ClientSource\Scripts\Modules\jQuery-Fancytree.js">
+      <DependentUpon>jQuery-Fancytree.js.bundle</DependentUpon>
+    </Content>
+    <Content Include="ClientSource\Scripts\Modules\jQuery-Fancytree.js.bundle" />
     <None Include="ClientSource\Scripts\Modules\Disco-AjaxHelperIcons.js">
       <DependentUpon>Disco-AjaxHelperIcons.js.bundle</DependentUpon>
     </None>
@@ -896,6 +939,9 @@
     <None Include="ClientSource\Scripts\Modules\Highcharts.min.js.map">
       <DependentUpon>Highcharts.js.bundle</DependentUpon>
     </None>
+    <Content Include="ClientSource\Scripts\Modules\jQuery-Fancytree.min.js.map">
+      <DependentUpon>jQuery-Fancytree.js.bundle</DependentUpon>
+    </Content>
     <None Include="ClientSource\Scripts\Modules\jQuery-Isotope.min.js.map">
       <DependentUpon>jQuery-Isotope.js.bundle</DependentUpon>
     </None>
@@ -939,6 +985,10 @@
     <None Include="ClientSource\Scripts\Modules\jQuery-Isotope.js">
       <DependentUpon>jQuery-Isotope.js.bundle</DependentUpon>
     </None>
+    <Content Include="ClientSource\Scripts\Modules\jQuery-Fancytree.min.js">
+      <DependentUpon>jQuery-Fancytree.js.bundle</DependentUpon>
+    </Content>
+    <Content Include="ClientSource\Scripts\Modules\jQuery-Fancytree\jquery.fancytree-all.js" />
     <Content Include="ClientSource\Scripts\Modules\jQuery-Isotope.min.js">
       <DependentUpon>jQuery-Isotope.js.bundle</DependentUpon>
     </Content>
@@ -1127,6 +1177,16 @@
     <None Include="ClientSource\Style\Images\Actions\remove.png" />
     <None Include="ClientSource\Style\Images\Actions\removeSubtle.png" />
     <None Include="ClientSource\Style\Images\Actions\unlocked.png" />
+    <None Include="ClientSource\Style\Fancytree\icons.gif" />
+    <None Include="ClientSource\Style\Fancytree\loading.gif" />
+    <None Include="ClientSource\Style\Fancytree\ui.fancytree.css" />
+    <Content Include="ClientSource\Style\Fancytree\ui.fancytree.min.css">
+      <DependentUpon>ui.fancytree.css</DependentUpon>
+    </Content>
+    <None Include="ClientSource\Style\Images\Actions\pluginDownloadIcon16.png" />
+    <None Include="ClientSource\Style\Images\Actions\pluginDownloadIconHover16.png" />
+    <None Include="ClientSource\Style\Images\Actions\user16.png" />
+    <None Include="ClientSource\Style\Images\Actions\userGroup16.png" />
     <Content Include="ClientSource\Style\Images\AttachmentTypes\document.png" />
     <Content Include="ClientSource\Style\Images\AttachmentTypes\expressionBrowserIcons.png" />
     <Content Include="ClientSource\Style\Images\AttachmentTypes\image.png" />
@@ -1810,11 +1870,14 @@
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>Index.generated.cs</LastGenOutput>
     </None>
-    <None Include="Views\User\ARCHIVE_Show.cshtml" />
     <None Include="Views\User\Show.cshtml">
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>Show.generated.cs</LastGenOutput>
     </None>
+    <Content Include="Views\User\UserParts\_Authorization.cshtml">
+      <Generator>RazorGenerator</Generator>
+      <LastGenOutput>_Authorization.generated.cs</LastGenOutput>
+    </Content>
     <None Include="Views\User\UserParts\_AssignmentHistory.cshtml">
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>_AssignmentHistory.generated.cs</LastGenOutput>
@@ -1827,7 +1890,6 @@
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>_Resources.generated.cs</LastGenOutput>
     </None>
-    <None Include="Views\User\ARCHIVE__UserDeviceAssignmentHistoryTable.cshtml" />
     <None Include="Views\User\UserParts\_Subject.cshtml">
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>_Subject.generated.cs</LastGenOutput>
@@ -1880,7 +1942,9 @@
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>_Layout.generated.cs</LastGenOutput>
     </None>
-    <None Include="Views\Web.config" />
+    <None Include="Views\Web.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
diff --git a/Disco.Web/Global.asax.cs b/Disco.Web/Global.asax.cs
index 15fad3a4..13e7ff8c 100644
--- a/Disco.Web/Global.asax.cs
+++ b/Disco.Web/Global.asax.cs
@@ -11,6 +11,7 @@ using System.Web.Mvc;
 using System.Web.Routing;
 using Disco.Data.Repository;
 using Disco.Models.Repository;
+using Disco.Services.Users;
 
 namespace Disco.Web
 {
@@ -41,24 +42,24 @@ namespace Disco.Web
                 Debug.WriteLine("Initialized Database: +{0}ms", timer.ElapsedMilliseconds - timer_last);
                 timer_last = timer.ElapsedMilliseconds;
 
-                using (DiscoDataContext dbContext = new DiscoDataContext())
+                using (DiscoDataContext database = new DiscoDataContext())
                 {
                     // Check for Post-Update
-                    var previousVersion = dbContext.DiscoConfiguration.InstalledDatabaseVersion;
+                    var previousVersion = database.DiscoConfiguration.InstalledDatabaseVersion;
                     bool isVersionUpdate = previousVersion != Disco.BI.Interop.Community.UpdateCheck.CurrentDiscoVersion();
                     bool ignoreVersionUpdate = false;
 
                     if (isVersionUpdate)
                     {
                         // Update Database with New Version
-                        dbContext.DiscoConfiguration.InstalledDatabaseVersion = Disco.BI.Interop.Community.UpdateCheck.CurrentDiscoVersion();
-                        dbContext.SaveChanges();
+                        database.DiscoConfiguration.InstalledDatabaseVersion = Disco.BI.Interop.Community.UpdateCheck.CurrentDiscoVersion();
+                        database.SaveChanges();
 
                         // Check if configured to Ignore Plugin Updates (Mainly for Dev environment)
                         bool.TryParse(ConfigurationManager.AppSettings["DiscoIgnoreVersionUpdate"], out ignoreVersionUpdate);
                         // Only Update if Plugins are installed
                         if (!ignoreVersionUpdate)
-                            ignoreVersionUpdate = (Disco.Services.Plugins.UpdatePluginTask.OfflineInstalledPlugins(dbContext).Count == 0);
+                            ignoreVersionUpdate = (Disco.Services.Plugins.UpdatePluginTask.OfflineInstalledPlugins(database).Count == 0);
                     }
 
                     if (!isVersionUpdate || ignoreVersionUpdate)
@@ -90,7 +91,7 @@ namespace Disco.Web
                         Debug.WriteLine("Registered Bundles: +{0}ms", timer.ElapsedMilliseconds - timer_last);
                         timer_last = timer.ElapsedMilliseconds;
 
-                        AppConfig.InitalizeEnvironment(dbContext);
+                        AppConfig.InitalizeNormalEnvironment(database);
 
                         Debug.WriteLine("Initialized Environment: +{0}ms", timer.ElapsedMilliseconds - timer_last);
                         timer_last = timer.ElapsedMilliseconds;
@@ -101,7 +102,7 @@ namespace Disco.Web
                         FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
                         RouteConfig.RegisterUpdateRoutes(RouteTable.Routes);
                         BundleConfig.RegisterBundles();
-                        AppConfig.InitializeUpdateEnvironment(dbContext, previousVersion);
+                        AppConfig.InitializeUpdateEnvironment(database, previousVersion);
                     }
                 }
             }
@@ -129,16 +130,6 @@ namespace Disco.Web
 
         public static bool InitialConfig { get; set; }
 
-        public static User CurrentUser
-        {
-            get
-            {
-                if (!InitialConfig)
-                    return BI.UserBI.UserCache.CurrentUser;
-                else
-                    return null;
-            }
-        }
         #endregion
         #region Cached Properties
 
diff --git a/Disco.Web/Models/Job/CreateModel.cs b/Disco.Web/Models/Job/CreateModel.cs
index 89a5554f..0333f4f0 100644
--- a/Disco.Web/Models/Job/CreateModel.cs
+++ b/Disco.Web/Models/Job/CreateModel.cs
@@ -38,16 +38,16 @@ namespace Disco.Web.Models.Job
         public Disco.Models.Repository.User User { get; set; }
         public List<Disco.Models.Repository.JobType> JobTypes { get; set; }
         public List<Disco.Models.Repository.JobSubType> JobSubTypes { get; set; }
-        public void UpdateModel(DiscoDataContext dbContext)
+        public void UpdateModel(DiscoDataContext Database)
         {
             if (this.JobTypes == null)
-                JobTypes = dbContext.JobTypes.ToList();
+                JobTypes = Database.JobTypes.ToList();
             if (this.JobSubTypes == null)
-                JobSubTypes = dbContext.JobSubTypes.ToList();
+                JobSubTypes = Database.JobSubTypes.ToList();
 
             if (!string.IsNullOrEmpty(DeviceSerialNumber))
             {
-                this.Device = dbContext.Devices.Include("DeviceModel").Where(d => d.SerialNumber == DeviceSerialNumber).FirstOrDefault();
+                this.Device = Database.Devices.Include("DeviceModel").Where(d => d.SerialNumber == DeviceSerialNumber).FirstOrDefault();
                 if (this.Device == null)
                 {
                     throw new ArgumentException("Invalid Device Serial Number Specified", "DeviceSerialNumber");
@@ -101,7 +101,7 @@ namespace Disco.Web.Models.Job
             }
             if (!string.IsNullOrEmpty(UserId))
             {
-                this.User = dbContext.Users.Find(UserId);
+                this.User = Database.Users.Find(UserId);
                 if (this.User == null)
                 {
                     throw new ArgumentException("Invalid User Id Specified", "UserId");
diff --git a/Disco.Web/Models/Job/IndexModel.cs b/Disco.Web/Models/Job/IndexModel.cs
index 8c0bd3b2..0f8d215f 100644
--- a/Disco.Web/Models/Job/IndexModel.cs
+++ b/Disco.Web/Models/Job/IndexModel.cs
@@ -10,9 +10,6 @@ namespace Disco.Web.Models.Job
     {
         public Disco.Models.BI.Job.JobTableModel OpenJobs { get; set; }
         public Disco.Models.BI.Job.JobTableModel LongRunningJobs { get; set; }
-        //public Disco.Models.BI.Job.JobTableModel WaitingForUserActionJobs { get; set; }
-        //public Disco.Models.BI.Job.JobTableModel ReadyForReturnJobs { get; set; }
-        //public Disco.Models.BI.Job.JobTableModel RecentlyClosedJobs { get; set; }
 
         public List<Disco.Models.BI.Job.Statistics.DailyOpenedClosedItem> DailyOpenedClosedStatistics { get; set; }
     }
diff --git a/Disco.Web/Models/Job/LogWarrantyModel.cs b/Disco.Web/Models/Job/LogWarrantyModel.cs
index 56bccd6d..6501bad8 100644
--- a/Disco.Web/Models/Job/LogWarrantyModel.cs
+++ b/Disco.Web/Models/Job/LogWarrantyModel.cs
@@ -9,6 +9,7 @@ using System.Web.Script.Serialization;
 using Disco.Services.Plugins;
 using Disco.Services.Plugins.Features.WarrantyProvider;
 using Newtonsoft.Json;
+using Disco.Services.Users;
 
 namespace Disco.Web.Models.Job
 {
@@ -57,23 +58,23 @@ namespace Disco.Web.Models.Job
 
         public Exception Error { get; set; }
 
-        public void UpdateModel(DiscoDataContext dbContext, bool IsPostBack)
+        public void UpdateModel(DiscoDataContext Database, bool IsPostBack)
         {
-            dbContext.Configuration.LazyLoadingEnabled = true;
+            Database.Configuration.LazyLoadingEnabled = true;
             if (Job == null)
             {
                 // Update Job User's Details [#12]
-                string jobUserId = dbContext.Jobs.Where(j => j.Id == JobId).Select(j => j.UserId).FirstOrDefault();
+                string jobUserId = Database.Jobs.Where(j => j.Id == JobId).Select(j => j.UserId).FirstOrDefault();
                 if (jobUserId != null)
                 {
                     // Ignore update errors (Most commonly when the User Id no longer exists in AD)
                     try
                     {
-                        Disco.BI.UserBI.UserCache.GetUser(jobUserId, dbContext, true);
+                        UserService.GetUser(jobUserId, Database, true);
                     } catch (Exception) {}
                 }
 
-                Job = (from j in dbContext.Jobs.Include("Device.DeviceModel").Include("JobMetaWarranty").Include("JobSubTypes")
+                Job = (from j in Database.Jobs.Include("Device.DeviceModel").Include("JobMetaWarranty").Include("JobSubTypes")
                        where (j.Id == JobId)
                        select j).FirstOrDefault();
                 if (Job == null)
@@ -83,7 +84,7 @@ namespace Disco.Web.Models.Job
             }
 
             // Update TechUser's Details [#12]
-            this.TechUser = Disco.BI.UserBI.UserCache.GetUser(DiscoApplication.CurrentUser.Id, dbContext, true);
+            this.TechUser = UserService.GetUser(UserService.CurrentUserId, Database, true);
 
             WarrantyProviders = Plugins.GetPluginFeatures(typeof(WarrantyProviderFeature));
 
@@ -95,7 +96,7 @@ namespace Disco.Web.Models.Job
             if (!string.IsNullOrEmpty(WarrantyProviderId))
                 WarrantyProvider = Plugins.GetPluginFeature(WarrantyProviderId, typeof(WarrantyProviderFeature));
 
-            this.OrganisationAddresses = dbContext.DiscoConfiguration.OrganisationAddresses.Addresses;
+            this.OrganisationAddresses = Database.DiscoConfiguration.OrganisationAddresses.Addresses;
 
             if (!IsPostBack && !this.OrganisationAddressId.HasValue)
             {
diff --git a/Disco.Web/Models/Shared/FancyTreeNode.cs b/Disco.Web/Models/Shared/FancyTreeNode.cs
new file mode 100644
index 00000000..2a244c1d
--- /dev/null
+++ b/Disco.Web/Models/Shared/FancyTreeNode.cs
@@ -0,0 +1,36 @@
+using Disco.Models.Authorization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Disco.Web.Models.Shared
+{
+    public class FancyTreeNode
+    {
+        public string title { get; set; }
+        public string key { get; set; }
+        public bool expanded { get; set; }
+        public bool folder { get; set; }
+        public bool selected { get; set; }
+        public bool unselectable { get; set; }
+        public FancyTreeNode[] children { get; set; }
+        public string tooltip { get; set; }
+
+        public static FancyTreeNode FromClaimNavigatorItem(IClaimNavigatorItem Item, bool Unselectable)
+        {
+            FancyTreeNode[] children = Item.IsGroup ? Item.Children.Where(i => !i.Hidden).Select(i => FromClaimNavigatorItem(i, Unselectable)).ToArray() : null;
+
+            return new FancyTreeNode()
+            {
+                key = Item.Key,
+                title = Item.Name,
+                folder = children != null && children.Length > 0,
+                tooltip = Item.Description,
+                children = children == null || children.Length == 0 ? null : children,
+                selected = Item.Value.HasValue && Item.Value.Value,
+                unselectable = Unselectable
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/Disco.Web/Models/User/ShowModel.cs b/Disco.Web/Models/User/ShowModel.cs
index 3a7da101..4f2b18d1 100644
--- a/Disco.Web/Models/User/ShowModel.cs
+++ b/Disco.Web/Models/User/ShowModel.cs
@@ -8,6 +8,8 @@ using Disco.BI.Extensions;
 using Disco.Models.Interop.ActiveDirectory;
 using Disco.Models.UI.User;
 using Disco.Web.Extensions;
+using Disco.Models.Authorization;
+using Disco.Web.Models.Shared;
 
 namespace Disco.Web.Models.User
 {
@@ -16,6 +18,20 @@ namespace Disco.Web.Models.User
         public Disco.Models.Repository.User User { get; set; }
         public Disco.Models.BI.Job.JobTableModel Jobs { get; set; }
         public List<Disco.Models.Repository.DocumentTemplate> DocumentTemplates { get; set; }
+        public IClaimNavigatorItem ClaimNavigator { get; set; }
+
+        public FancyTreeNode[] ClaimNavigatorFancyTreeNodes
+        {
+            get
+            {
+                var rootNode = FancyTreeNode.FromClaimNavigatorItem(this.ClaimNavigator, true);
+                rootNode.expanded = true;
+
+                return new FancyTreeNode[] {
+                    rootNode
+                };
+            }
+        }
 
         public List<SelectListItem> DocumentTemplatesSelectListItems
         {
diff --git a/Disco.Web/Properties/AssemblyInfo.cs b/Disco.Web/Properties/AssemblyInfo.cs
index 192ef242..a2a11193 100644
--- a/Disco.Web/Properties/AssemblyInfo.cs
+++ b/Disco.Web/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.2.0725.2249")]
-[assembly: AssemblyFileVersion("1.2.0725.2249")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.1001.1541")]
+[assembly: AssemblyFileVersion("1.2.1001.1541")]
\ No newline at end of file
diff --git a/Disco.Web/T4MVC.cs b/Disco.Web/T4MVC.cs
index 9854bdd5..05c66e97 100644
--- a/Disco.Web/T4MVC.cs
+++ b/Disco.Web/T4MVC.cs
@@ -48,6 +48,7 @@ namespace T4MVC
     public class APIClass
     {
         public readonly string Name = "API";
+        public Disco.Web.Areas.API.Controllers.AuthorizationRoleController AuthorizationRole = new Disco.Web.Areas.API.Controllers.T4MVC_AuthorizationRoleController();
         public Disco.Web.Areas.API.Controllers.BootstrapperController Bootstrapper = new Disco.Web.Areas.API.Controllers.T4MVC_BootstrapperController();
         public Disco.Web.Areas.API.Controllers.DeviceBatchController DeviceBatch = new Disco.Web.Areas.API.Controllers.T4MVC_DeviceBatchController();
         public Disco.Web.Areas.API.Controllers.DeviceCertificateController DeviceCertificate = new Disco.Web.Areas.API.Controllers.T4MVC_DeviceCertificateController();
@@ -66,6 +67,7 @@ namespace T4MVC
     public class ConfigClass
     {
         public readonly string Name = "Config";
+        public Disco.Web.Areas.Config.Controllers.AuthorizationRoleController AuthorizationRole = new Disco.Web.Areas.Config.Controllers.T4MVC_AuthorizationRoleController();
         public Disco.Web.Areas.Config.Controllers.ConfigController Config = new Disco.Web.Areas.Config.Controllers.T4MVC_ConfigController();
         public Disco.Web.Areas.Config.Controllers.DeviceBatchController DeviceBatch = new Disco.Web.Areas.Config.Controllers.T4MVC_DeviceBatchController();
         public Disco.Web.Areas.Config.Controllers.DeviceModelController DeviceModel = new Disco.Web.Areas.Config.Controllers.T4MVC_DeviceModelController();
@@ -272,6 +274,20 @@ namespace Links
                 public static readonly string Highcharts_min_js = Url("Highcharts.min.js");
                 public static readonly string Highcharts_min_js_map = Url("Highcharts.min.js.map");
                 [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+                public static class jQuery_Fancytree {
+                    private const string URLPATH = "~/ClientSource/Scripts/Modules/jQuery-Fancytree";
+                    public static string Url() { return T4MVCHelpers.ProcessVirtualPath(URLPATH); }
+                    public static string Url(string fileName) { return T4MVCHelpers.ProcessVirtualPath(URLPATH + "/" + fileName); }
+                    public static readonly string jquery_fancytree_all_js = T4MVCHelpers.IsProduction() && T4Extensions.FileExists(URLPATH + "/jquery.fancytree-all.min.js") ? Url("jquery.fancytree-all.min.js") : Url("jquery.fancytree-all.js");
+                                  
+                }
+            
+                public static readonly string jQuery_Fancytree_js_bundle = Url("jQuery-Fancytree.js.bundle");
+                public static readonly string jQuery_Fancytree_js = T4MVCHelpers.IsProduction() && T4Extensions.FileExists(URLPATH + "/jQuery-Fancytree.min.js") ? Url("jQuery-Fancytree.min.js") : Url("jQuery-Fancytree.js");
+                              
+                public static readonly string jQuery_Fancytree_min_js = Url("jQuery-Fancytree.min.js");
+                public static readonly string jQuery_Fancytree_min_js_map = Url("jQuery-Fancytree.min.js.map");
+                [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
                 public static class jQuery_Isotope {
                     private const string URLPATH = "~/ClientSource/Scripts/Modules/jQuery-Isotope";
                     public static string Url() { return T4MVCHelpers.ProcessVirtualPath(URLPATH); }
@@ -737,6 +753,18 @@ namespace Links
                  
             public static readonly string ExpressionEditor_min_css = Url("ExpressionEditor.min.css");
             public static readonly string ExpressionEditor_htm = Url("ExpressionEditor.htm");
+            [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+            public static class Fancytree {
+                private const string URLPATH = "~/ClientSource/Style/Fancytree";
+                public static string Url() { return T4MVCHelpers.ProcessVirtualPath(URLPATH); }
+                public static string Url(string fileName) { return T4MVCHelpers.ProcessVirtualPath(URLPATH + "/" + fileName); }
+                public static readonly string icons_gif = Url("icons.gif");
+                public static readonly string loading_gif = Url("loading.gif");
+                public static readonly string ui_fancytree_css = T4MVCHelpers.IsProduction() && T4Extensions.FileExists(URLPATH + "/ui.fancytree.min.css") ? Url("ui.fancytree.min.css") : Url("ui.fancytree.css");
+                     
+                public static readonly string ui_fancytree_min_css = Url("ui.fancytree.min.css");
+            }
+        
             [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
             public static class Images {
                 private const string URLPATH = "~/ClientSource/Style/Images";
@@ -772,10 +800,14 @@ namespace Links
                     public static readonly string pageMenuReportIcon_png = Url("pageMenuReportIcon.png");
                     public static readonly string pageMenuReportIconHover_png = Url("pageMenuReportIconHover.png");
                     public static readonly string photo_png = Url("photo.png");
+                    public static readonly string pluginDownloadIcon16_png = Url("pluginDownloadIcon16.png");
+                    public static readonly string pluginDownloadIconHover16_png = Url("pluginDownloadIconHover16.png");
                     public static readonly string post_png = Url("post.png");
                     public static readonly string remove_png = Url("remove.png");
                     public static readonly string removeSubtle_png = Url("removeSubtle.png");
                     public static readonly string unlocked_png = Url("unlocked.png");
+                    public static readonly string user16_png = Url("user16.png");
+                    public static readonly string userGroup16_png = Url("userGroup16.png");
                 }
             
                 [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
@@ -2281,15 +2313,11 @@ namespace Disco.Web.Controllers
             {
                 public readonly string _UserTable = "_UserTable";
                 public readonly string _ViewStart = "_ViewStart";
-                public readonly string ARCHIVE__UserDeviceAssignmentHistoryTable = "ARCHIVE__UserDeviceAssignmentHistoryTable";
-                public readonly string ARCHIVE_Show = "ARCHIVE_Show";
                 public readonly string Index = "Index";
                 public readonly string Show = "Show";
             }
             public readonly string _UserTable = "~/Views/User/_UserTable.cshtml";
             public readonly string _ViewStart = "~/Views/User/_ViewStart.cshtml";
-            public readonly string ARCHIVE__UserDeviceAssignmentHistoryTable = "~/Views/User/ARCHIVE__UserDeviceAssignmentHistoryTable.cshtml";
-            public readonly string ARCHIVE_Show = "~/Views/User/ARCHIVE_Show.cshtml";
             public readonly string Index = "~/Views/User/Index.cshtml";
             public readonly string Show = "~/Views/User/Show.cshtml";
             static readonly _UserPartsClass s_UserParts = new _UserPartsClass();
@@ -2302,11 +2330,13 @@ namespace Disco.Web.Controllers
                 public class _ViewNamesClass
                 {
                     public readonly string _AssignmentHistory = "_AssignmentHistory";
+                    public readonly string _Authorization = "_Authorization";
                     public readonly string _Jobs = "_Jobs";
                     public readonly string _Resources = "_Resources";
                     public readonly string _Subject = "_Subject";
                 }
                 public readonly string _AssignmentHistory = "~/Views/User/UserParts/_AssignmentHistory.cshtml";
+                public readonly string _Authorization = "~/Views/User/UserParts/_Authorization.cshtml";
                 public readonly string _Jobs = "~/Views/User/UserParts/_Jobs.cshtml";
                 public readonly string _Resources = "~/Views/User/UserParts/_Resources.cshtml";
                 public readonly string _Subject = "~/Views/User/UserParts/_Subject.cshtml";
@@ -2376,6 +2406,278 @@ namespace T4MVC
 
 }
 
+namespace Disco.Web.Areas.API.Controllers
+{
+    public partial class AuthorizationRoleController
+    {
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public AuthorizationRoleController() { }
+
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        protected AuthorizationRoleController(Dummy d) { }
+
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        protected RedirectToRouteResult RedirectToAction(ActionResult result)
+        {
+            var callInfo = result.GetT4MVCResult();
+            return RedirectToRoute(callInfo.RouteValueDictionary);
+        }
+
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        protected RedirectToRouteResult RedirectToActionPermanent(ActionResult result)
+        {
+            var callInfo = result.GetT4MVCResult();
+            return RedirectToRoutePermanent(callInfo.RouteValueDictionary);
+        }
+
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult Update()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Update);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult UpdateName()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateName);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult UpdateClaims()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateClaims);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult UpdateSubjects()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateSubjects);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult Delete()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Delete);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult SearchSubjects()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.SearchSubjects);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult Subject()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Subject);
+        }
+
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public AuthorizationRoleController Actions { get { return MVC.API.AuthorizationRole; } }
+        [GeneratedCode("T4MVC", "2.0")]
+        public readonly string Area = "API";
+        [GeneratedCode("T4MVC", "2.0")]
+        public readonly string Name = "AuthorizationRole";
+        [GeneratedCode("T4MVC", "2.0")]
+        public const string NameConst = "AuthorizationRole";
+
+        static readonly ActionNamesClass s_actions = new ActionNamesClass();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionNamesClass ActionNames { get { return s_actions; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionNamesClass
+        {
+            public readonly string Update = "Update";
+            public readonly string UpdateName = "UpdateName";
+            public readonly string UpdateClaims = "UpdateClaims";
+            public readonly string UpdateSubjects = "UpdateSubjects";
+            public readonly string Delete = "Delete";
+            public readonly string SearchSubjects = "SearchSubjects";
+            public readonly string Subject = "Subject";
+        }
+
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionNameConstants
+        {
+            public const string Update = "Update";
+            public const string UpdateName = "UpdateName";
+            public const string UpdateClaims = "UpdateClaims";
+            public const string UpdateSubjects = "UpdateSubjects";
+            public const string Delete = "Delete";
+            public const string SearchSubjects = "SearchSubjects";
+            public const string Subject = "Subject";
+        }
+
+
+        static readonly ActionParamsClass_Update s_params_Update = new ActionParamsClass_Update();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_Update UpdateParams { get { return s_params_Update; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_Update
+        {
+            public readonly string id = "id";
+            public readonly string key = "key";
+            public readonly string value = "value";
+            public readonly string redirect = "redirect";
+        }
+        static readonly ActionParamsClass_UpdateName s_params_UpdateName = new ActionParamsClass_UpdateName();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_UpdateName UpdateNameParams { get { return s_params_UpdateName; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_UpdateName
+        {
+            public readonly string id = "id";
+            public readonly string RoleName = "RoleName";
+            public readonly string redirect = "redirect";
+        }
+        static readonly ActionParamsClass_UpdateClaims s_params_UpdateClaims = new ActionParamsClass_UpdateClaims();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_UpdateClaims UpdateClaimsParams { get { return s_params_UpdateClaims; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_UpdateClaims
+        {
+            public readonly string id = "id";
+            public readonly string ClaimKeys = "ClaimKeys";
+            public readonly string redirect = "redirect";
+        }
+        static readonly ActionParamsClass_UpdateSubjects s_params_UpdateSubjects = new ActionParamsClass_UpdateSubjects();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_UpdateSubjects UpdateSubjectsParams { get { return s_params_UpdateSubjects; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_UpdateSubjects
+        {
+            public readonly string id = "id";
+            public readonly string Subjects = "Subjects";
+            public readonly string redirect = "redirect";
+        }
+        static readonly ActionParamsClass_Delete s_params_Delete = new ActionParamsClass_Delete();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_Delete DeleteParams { get { return s_params_Delete; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_Delete
+        {
+            public readonly string id = "id";
+            public readonly string redirect = "redirect";
+        }
+        static readonly ActionParamsClass_SearchSubjects s_params_SearchSubjects = new ActionParamsClass_SearchSubjects();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_SearchSubjects SearchSubjectsParams { get { return s_params_SearchSubjects; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_SearchSubjects
+        {
+            public readonly string term = "term";
+        }
+        static readonly ActionParamsClass_Subject s_params_Subject = new ActionParamsClass_Subject();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_Subject SubjectParams { get { return s_params_Subject; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_Subject
+        {
+            public readonly string Id = "Id";
+        }
+        static readonly ViewsClass s_views = new ViewsClass();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ViewsClass Views { get { return s_views; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ViewsClass
+        {
+            static readonly _ViewNamesClass s_ViewNames = new _ViewNamesClass();
+            public _ViewNamesClass ViewNames { get { return s_ViewNames; } }
+            public class _ViewNamesClass
+            {
+            }
+        }
+    }
+
+    [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+    public partial class T4MVC_AuthorizationRoleController : Disco.Web.Areas.API.Controllers.AuthorizationRoleController
+    {
+        public T4MVC_AuthorizationRoleController() : base(Dummy.Instance) { }
+
+        partial void UpdateOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id, string key, string value, bool redirect);
+
+        public override System.Web.Mvc.ActionResult Update(int id, string key, string value, bool redirect)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Update);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "key", key);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "value", value);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "redirect", redirect);
+            UpdateOverride(callInfo, id, key, value, redirect);
+            return callInfo;
+        }
+
+        partial void UpdateNameOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id, string RoleName, bool redirect);
+
+        public override System.Web.Mvc.ActionResult UpdateName(int id, string RoleName, bool redirect)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateName);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "RoleName", RoleName);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "redirect", redirect);
+            UpdateNameOverride(callInfo, id, RoleName, redirect);
+            return callInfo;
+        }
+
+        partial void UpdateClaimsOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id, string[] ClaimKeys, bool redirect);
+
+        public override System.Web.Mvc.ActionResult UpdateClaims(int id, string[] ClaimKeys, bool redirect)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateClaims);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "ClaimKeys", ClaimKeys);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "redirect", redirect);
+            UpdateClaimsOverride(callInfo, id, ClaimKeys, redirect);
+            return callInfo;
+        }
+
+        partial void UpdateSubjectsOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id, string[] Subjects, bool redirect);
+
+        public override System.Web.Mvc.ActionResult UpdateSubjects(int id, string[] Subjects, bool redirect)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateSubjects);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "Subjects", Subjects);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "redirect", redirect);
+            UpdateSubjectsOverride(callInfo, id, Subjects, redirect);
+            return callInfo;
+        }
+
+        partial void DeleteOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id, bool? redirect);
+
+        public override System.Web.Mvc.ActionResult Delete(int id, bool? redirect)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Delete);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "redirect", redirect);
+            DeleteOverride(callInfo, id, redirect);
+            return callInfo;
+        }
+
+        partial void SearchSubjectsOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string term);
+
+        public override System.Web.Mvc.ActionResult SearchSubjects(string term)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.SearchSubjects);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "term", term);
+            SearchSubjectsOverride(callInfo, term);
+            return callInfo;
+        }
+
+        partial void SubjectOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string Id);
+
+        public override System.Web.Mvc.ActionResult Subject(string Id)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Subject);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "Id", Id);
+            SubjectOverride(callInfo, Id);
+            return callInfo;
+        }
+
+    }
+}
+
 namespace Disco.Web.Areas.API.Controllers
 {
     public partial class BootstrapperController
@@ -5864,12 +6166,6 @@ namespace Disco.Web.Areas.API.Controllers
         {
             return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.GeneratePdf);
         }
-        [NonAction]
-        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
-        public virtual System.Web.Mvc.ActionResult OrganisationAddress()
-        {
-            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.OrganisationAddress);
-        }
 
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public JobController Actions { get { return MVC.API.Job; } }
@@ -5952,7 +6248,6 @@ namespace Disco.Web.Areas.API.Controllers
             public readonly string ComponentRemove = "ComponentRemove";
             public readonly string StatisticsDailyOpenedClosed = "StatisticsDailyOpenedClosed";
             public readonly string GeneratePdf = "GeneratePdf";
-            public readonly string OrganisationAddress = "OrganisationAddress";
         }
 
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
@@ -6024,7 +6319,6 @@ namespace Disco.Web.Areas.API.Controllers
             public const string ComponentRemove = "ComponentRemove";
             public const string StatisticsDailyOpenedClosed = "StatisticsDailyOpenedClosed";
             public const string GeneratePdf = "GeneratePdf";
-            public const string OrganisationAddress = "OrganisationAddress";
         }
 
 
@@ -6654,14 +6948,6 @@ namespace Disco.Web.Areas.API.Controllers
             public readonly string id = "id";
             public readonly string DocumentTemplateId = "DocumentTemplateId";
         }
-        static readonly ActionParamsClass_OrganisationAddress s_params_OrganisationAddress = new ActionParamsClass_OrganisationAddress();
-        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
-        public ActionParamsClass_OrganisationAddress OrganisationAddressParams { get { return s_params_OrganisationAddress; } }
-        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
-        public class ActionParamsClass_OrganisationAddress
-        {
-            public readonly string id = "id";
-        }
         static readonly ViewsClass s_views = new ViewsClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ViewsClass Views { get { return s_views; } }
@@ -7446,16 +7732,6 @@ namespace Disco.Web.Areas.API.Controllers
             return callInfo;
         }
 
-        partial void OrganisationAddressOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id);
-
-        public override System.Web.Mvc.ActionResult OrganisationAddress(int id)
-        {
-            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.OrganisationAddress);
-            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
-            OrganisationAddressOverride(callInfo, id);
-            return callInfo;
-        }
-
     }
 }
 
@@ -8364,6 +8640,137 @@ namespace Disco.Web.Areas.API.Controllers
     }
 }
 
+namespace Disco.Web.Areas.Config.Controllers
+{
+    public partial class AuthorizationRoleController
+    {
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public AuthorizationRoleController() { }
+
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        protected AuthorizationRoleController(Dummy d) { }
+
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        protected RedirectToRouteResult RedirectToAction(ActionResult result)
+        {
+            var callInfo = result.GetT4MVCResult();
+            return RedirectToRoute(callInfo.RouteValueDictionary);
+        }
+
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        protected RedirectToRouteResult RedirectToActionPermanent(ActionResult result)
+        {
+            var callInfo = result.GetT4MVCResult();
+            return RedirectToRoutePermanent(callInfo.RouteValueDictionary);
+        }
+
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult Index()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Index);
+        }
+
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public AuthorizationRoleController Actions { get { return MVC.Config.AuthorizationRole; } }
+        [GeneratedCode("T4MVC", "2.0")]
+        public readonly string Area = "Config";
+        [GeneratedCode("T4MVC", "2.0")]
+        public readonly string Name = "AuthorizationRole";
+        [GeneratedCode("T4MVC", "2.0")]
+        public const string NameConst = "AuthorizationRole";
+
+        static readonly ActionNamesClass s_actions = new ActionNamesClass();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionNamesClass ActionNames { get { return s_actions; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionNamesClass
+        {
+            public readonly string Index = "Index";
+            public readonly string Create = "Create";
+        }
+
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionNameConstants
+        {
+            public const string Index = "Index";
+            public const string Create = "Create";
+        }
+
+
+        static readonly ActionParamsClass_Index s_params_Index = new ActionParamsClass_Index();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_Index IndexParams { get { return s_params_Index; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_Index
+        {
+            public readonly string id = "id";
+        }
+        static readonly ActionParamsClass_Create s_params_Create = new ActionParamsClass_Create();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_Create CreateParams { get { return s_params_Create; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_Create
+        {
+            public readonly string model = "model";
+        }
+        static readonly ViewsClass s_views = new ViewsClass();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ViewsClass Views { get { return s_views; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ViewsClass
+        {
+            static readonly _ViewNamesClass s_ViewNames = new _ViewNamesClass();
+            public _ViewNamesClass ViewNames { get { return s_ViewNames; } }
+            public class _ViewNamesClass
+            {
+                public readonly string Create = "Create";
+                public readonly string Index = "Index";
+                public readonly string Show = "Show";
+            }
+            public readonly string Create = "~/Areas/Config/Views/AuthorizationRole/Create.cshtml";
+            public readonly string Index = "~/Areas/Config/Views/AuthorizationRole/Index.cshtml";
+            public readonly string Show = "~/Areas/Config/Views/AuthorizationRole/Show.cshtml";
+        }
+    }
+
+    [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+    public partial class T4MVC_AuthorizationRoleController : Disco.Web.Areas.Config.Controllers.AuthorizationRoleController
+    {
+        public T4MVC_AuthorizationRoleController() : base(Dummy.Instance) { }
+
+        partial void IndexOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int? id);
+
+        public override System.Web.Mvc.ActionResult Index(int? id)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Index);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
+            IndexOverride(callInfo, id);
+            return callInfo;
+        }
+
+        partial void CreateOverride(T4MVC_System_Web_Mvc_ActionResult callInfo);
+
+        public override System.Web.Mvc.ActionResult Create()
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Create);
+            CreateOverride(callInfo);
+            return callInfo;
+        }
+
+        partial void CreateOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, Disco.Web.Areas.Config.Models.AuthorizationRole.CreateModel model);
+
+        public override System.Web.Mvc.ActionResult Create(Disco.Web.Areas.Config.Models.AuthorizationRole.CreateModel model)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Create);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "model", model);
+            CreateOverride(callInfo, model);
+            return callInfo;
+        }
+
+    }
+}
+
 namespace Disco.Web.Areas.Config.Controllers
 {
     public partial class ConfigController
diff --git a/Disco.Web/Views/Device/AddOffline.cshtml b/Disco.Web/Views/Device/AddOffline.cshtml
index f20aecb5..c5b35819 100644
--- a/Disco.Web/Views/Device/AddOffline.cshtml
+++ b/Disco.Web/Views/Device/AddOffline.cshtml
@@ -1,6 +1,15 @@
 @model Disco.Web.Models.Device.AddOfflineModel
 @{
+    Authorization.Require(Claims.Device.Actions.EnrolDevices);
+
     ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Add Offline");
+
+    var hasAssetNumber = Authorization.Has(Claims.Device.Properties.AssetNumber);
+    var hasLocation = Authorization.Has(Claims.Device.Properties.Location);
+    var hasDeviceBatch = Authorization.Has(Claims.Device.Properties.DeviceBatch);
+    var hasDeviceProfile = Authorization.Has(Claims.Device.Properties.DeviceProfile);
+    var hasAssignUser = Authorization.Has(Claims.Device.Actions.AssignUser);
+    
 }
 @using (Html.BeginForm())
 {
@@ -8,86 +17,111 @@
     <div class="form" style="width: 450px">
         <table>
             <tr>
-                <th>
-                    Serial Number:
+                <th>Serial Number:
                 </th>
                 <td>
                     @Html.TextBoxFor(model => model.Device.SerialNumber)<br />
                     @Html.ValidationMessageFor(model => model.Device.SerialNumber)
                 </td>
             </tr>
-            <tr>
-                <th>
-                    Asset Number:
-                </th>
-                <td>@Html.TextBoxFor(model => model.Device.AssetNumber)<br />
-                @Html.ValidationMessageFor(model => model.Device.AssetNumber)
-                </td>
-            </tr>
-            <tr>
-                <th>
-                    Location:
-                </th>
-                <td>@Html.TextBoxFor(model => model.Device.Location)<br />
-                @Html.ValidationMessageFor(model => model.Device.Location)
-                </td>
-            </tr>
-            <tr>
-                <th>
-                    Device Batch:
-                </th>
-                <td>
-                    @Html.DropDownListFor(model => model.Device.DeviceBatchId, Model.DeviceBatches.ToSelectListItems()) <br />
-                    @Html.ValidationMessageFor(model => model.Device.DeviceBatchId)
-                </td>
-            </tr>
-            <tr>
-                <th>
-                    Device Profile:
-                </th>
-                <td>
-                    @Html.DropDownListFor(model => model.Device.DeviceProfileId, Model.DeviceProfiles.ToSelectListItems(Model.DefaultDeviceProfileId))<br />
-                    @Html.ValidationMessageFor(model => model.Device.DeviceProfileId)
-                </td>
-            </tr>
-            <tr>
-                <th>
-                    Assigned User:
-                </th>
-                <td>
-                    @Html.TextBoxFor(model => model.Device.AssignedUserId)<br />
-                    @Html.ValidationMessageFor(model => model.Device.AssignedUserId)
-                </td>
-            </tr>
+            @if (hasAssetNumber)
+            {
+                <tr>
+                    <th>Asset Number:
+                    </th>
+                    <td>@Html.TextBoxFor(model => model.Device.AssetNumber)<br />
+                        @Html.ValidationMessageFor(model => model.Device.AssetNumber)
+                    </td>
+                </tr>
+            }
+            @if (hasLocation)
+            {
+                <tr>
+                    <th>Location:
+                    </th>
+                    <td>@Html.TextBoxFor(model => model.Device.Location)<br />
+                        @Html.ValidationMessageFor(model => model.Device.Location)
+                    </td>
+                </tr>
+            }
+            @if (hasDeviceBatch)
+            {
+                <tr>
+                    <th>Device Batch:
+                    </th>
+                    <td>
+                        @Html.DropDownListFor(model => model.Device.DeviceBatchId, Model.DeviceBatches.ToSelectListItems())
+                        <br />
+                        @Html.ValidationMessageFor(model => model.Device.DeviceBatchId)
+                    </td>
+                </tr>
+            }
+            @if (hasDeviceProfile)
+            {
+                <tr>
+                    <th>Device Profile:
+                    </th>
+                    <td>
+                        @Html.DropDownListFor(model => model.Device.DeviceProfileId, Model.DeviceProfiles.ToSelectListItems(Model.DefaultDeviceProfileId))<br />
+                        @Html.ValidationMessageFor(model => model.Device.DeviceProfileId)
+                    </td>
+                </tr>
+            }
+            @if (hasAssignUser)
+            {
+                <tr>
+                    <th>Assigned User:
+                    </th>
+                    <td>
+                        @Html.TextBoxFor(model => model.Device.AssignedUserId)<br />
+                        @Html.ValidationMessageFor(model => model.Device.AssignedUserId)
+                    </td>
+                </tr>
+            }
         </table>
         <p class="actions">
+            @if (!hasDeviceProfile)
+            {
+                @Html.Hidden("Device.DeviceProfileId", Model.DefaultDeviceProfileId)
+            }
+
             <input type="submit" class="button" value="Add" />
         </p>
-        <script type="text/javascript">
-            $(function () {
-                $SerialNumber = $('#Device_SerialNumber');
-                $AssetNumber = $('#Device_AssetNumber');
-                $Location = $('#Device_Location');
-                $AssignedUserId = $('#Device_AssignedUserId');
+            <script type="text/javascript">
+                $(function () {
+                    var $SerialNumber = $('#Device_SerialNumber').focus();
 
-                $SerialNumber.focus().keydown(function (e) {
+                @if (hasAssignUser)
+                {<text>
+                $SerialNumber.keydown(function (e) {
                     if (e.which == 13) {
-                        $AssignedUserId.focus();
-                        return false;
-                    }
-                });
-                $AssetNumber.keydown(function (e) {
-                    if (e.which == 13) {
-                        $Location.focus();
-                        return false;
-                    }
-                });
-                $Location.keydown(function (e) {
-                    if (e.which == 13) {
-                        $AssignedUserId.focus();
+                        $('#Device_AssignedUserId').focus();
+                        return false;
+                    }
+                });</text>}
+@if (hasAssetNumber)
+{<text>
+                    $('#Device_AssetNumber').keydown(function (e) {
+                    if (e.which == 13) {
+                        @if (hasLocation)
+                        {<text>$('#Device_Location').focus(); return false;</text>}
+                        else if (hasAssignUser)
+                        {<text>$('#Device_AssignedUserId').focus(); return false;</text>}
+                    }
+                });
+                </text>}
+@if (hasLocation && hasAssignUser)
+{<text>
+                    $('#Device_Location').keydown(function (e) {
+                    if (e.which == 13) {
+                        $('#Device_AssignedUserId').focus();
                         return false;
                     }
                 });
+                </text>}
+                    @if (hasAssignUser)
+{<text>
+                    var $AssignedUserId = $('#Device_AssignedUserId');
                 $AssignedUserId
                     .watermark('Search Users')
                     .focus(function () { $AssignedUserId.select() })
@@ -108,7 +142,8 @@
                         .append("<a><strong>" + item.DisplayName + "</strong><br>" + item.Id + " (" + item.Type + ")</a>")
                         .appendTo(ul);
                     };
+                </text>}
             });
-        </script>
+            </script>
     </div>
 }
diff --git a/Disco.Web/Views/Device/AddOffline.generated.cs b/Disco.Web/Views/Device/AddOffline.generated.cs
index 434ef843..98b69e54 100644
--- a/Disco.Web/Views/Device/AddOffline.generated.cs
+++ b/Disco.Web/Views/Device/AddOffline.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Device
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Device/AddOffline.cshtml")]
-    public partial class AddOffline : System.Web.Mvc.WebViewPage<Disco.Web.Models.Device.AddOfflineModel>
+    public partial class AddOffline : Disco.Services.Web.WebViewPage<Disco.Web.Models.Device.AddOfflineModel>
     {
         public AddOffline()
         {
@@ -43,15 +45,24 @@ namespace Disco.Web.Views.Device
             
             #line 2 "..\..\Views\Device\AddOffline.cshtml"
   
+    Authorization.Require(Claims.Device.Actions.EnrolDevices);
+
     ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Add Offline");
 
+    var hasAssetNumber = Authorization.Has(Claims.Device.Properties.AssetNumber);
+    var hasLocation = Authorization.Has(Claims.Device.Properties.Location);
+    var hasDeviceBatch = Authorization.Has(Claims.Device.Properties.DeviceBatch);
+    var hasDeviceProfile = Authorization.Has(Claims.Device.Properties.DeviceProfile);
+    var hasAssignUser = Authorization.Has(Claims.Device.Actions.AssignUser);
+    
+
             
             #line default
             #line hidden
 WriteLiteral("\r\n");
 
             
-            #line 5 "..\..\Views\Device\AddOffline.cshtml"
+            #line 14 "..\..\Views\Device\AddOffline.cshtml"
  using (Html.BeginForm())
 {
     
@@ -59,14 +70,14 @@ WriteLiteral("\r\n");
             #line default
             #line hidden
             
-            #line 7 "..\..\Views\Device\AddOffline.cshtml"
+            #line 16 "..\..\Views\Device\AddOffline.cshtml"
 Write(Html.ValidationSummary(true));
 
             
             #line default
             #line hidden
             
-            #line 7 "..\..\Views\Device\AddOffline.cshtml"
+            #line 16 "..\..\Views\Device\AddOffline.cshtml"
                                  
 
             
@@ -78,13 +89,13 @@ WriteLiteral(" class=\"form\"");
 
 WriteLiteral(" style=\"width: 450px\"");
 
-WriteLiteral(">\r\n        <table>\r\n            <tr>\r\n                <th>\r\n                    S" +
-"erial Number:\r\n                </th>\r\n                <td>\r\n");
+WriteLiteral(">\r\n        <table>\r\n            <tr>\r\n                <th>Serial Number:\r\n       " +
+"         </th>\r\n                <td>\r\n");
 
 WriteLiteral("                    ");
 
             
-            #line 15 "..\..\Views\Device\AddOffline.cshtml"
+            #line 23 "..\..\Views\Device\AddOffline.cshtml"
                Write(Html.TextBoxFor(model => model.Device.SerialNumber));
 
             
@@ -95,132 +106,260 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 16 "..\..\Views\Device\AddOffline.cshtml"
+            #line 24 "..\..\Views\Device\AddOffline.cshtml"
                Write(Html.ValidationMessageFor(model => model.Device.SerialNumber));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                <th" +
-">\r\n                    Asset Number:\r\n                </th>\r\n                <td" +
-">");
+WriteLiteral("\r\n                </td>\r\n            </tr>\r\n");
 
             
-            #line 23 "..\..\Views\Device\AddOffline.cshtml"
-               Write(Html.TextBoxFor(model => model.Device.AssetNumber));
+            #line 27 "..\..\Views\Device\AddOffline.cshtml"
+            
+            
+            #line default
+            #line hidden
+            
+            #line 27 "..\..\Views\Device\AddOffline.cshtml"
+             if (hasAssetNumber)
+            {
 
             
             #line default
             #line hidden
-WriteLiteral("<br />\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 24 "..\..\Views\Device\AddOffline.cshtml"
-           Write(Html.ValidationMessageFor(model => model.Device.AssetNumber));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                <th" +
-">\r\n                    Location:\r\n                </th>\r\n                <td>");
-
-            
-            #line 31 "..\..\Views\Device\AddOffline.cshtml"
-               Write(Html.TextBoxFor(model => model.Device.Location));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("<br />\r\n");
-
-WriteLiteral("                ");
+WriteLiteral("                <tr>\r\n                    <th>Asset Number:\r\n                    " +
+"</th>\r\n                    <td>");
 
             
             #line 32 "..\..\Views\Device\AddOffline.cshtml"
-           Write(Html.ValidationMessageFor(model => model.Device.Location));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                <th" +
-">\r\n                    Device Batch:\r\n                </th>\r\n                <td" +
-">\r\n");
-
-WriteLiteral("                    ");
-
-            
-            #line 40 "..\..\Views\Device\AddOffline.cshtml"
-               Write(Html.DropDownListFor(model => model.Device.DeviceBatchId, Model.DeviceBatches.ToSelectListItems()));
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" <br />\r\n");
-
-WriteLiteral("                    ");
-
-            
-            #line 41 "..\..\Views\Device\AddOffline.cshtml"
-               Write(Html.ValidationMessageFor(model => model.Device.DeviceBatchId));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                <th" +
-">\r\n                    Device Profile:\r\n                </th>\r\n                <" +
-"td>\r\n");
-
-WriteLiteral("                    ");
-
-            
-            #line 49 "..\..\Views\Device\AddOffline.cshtml"
-               Write(Html.DropDownListFor(model => model.Device.DeviceProfileId, Model.DeviceProfiles.ToSelectListItems(Model.DefaultDeviceProfileId)));
+                   Write(Html.TextBoxFor(model => model.Device.AssetNumber));
 
             
             #line default
             #line hidden
 WriteLiteral("<br />\r\n");
 
-WriteLiteral("                    ");
+WriteLiteral("                        ");
 
             
-            #line 50 "..\..\Views\Device\AddOffline.cshtml"
-               Write(Html.ValidationMessageFor(model => model.Device.DeviceProfileId));
+            #line 33 "..\..\Views\Device\AddOffline.cshtml"
+                   Write(Html.ValidationMessageFor(model => model.Device.AssetNumber));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                <th" +
-">\r\n                    Assigned User:\r\n                </th>\r\n                <t" +
-"d>\r\n");
+WriteLiteral("\r\n                    </td>\r\n                </tr>\r\n");
 
-WriteLiteral("                    ");
+            
+            #line 36 "..\..\Views\Device\AddOffline.cshtml"
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            ");
+
+            
+            #line 37 "..\..\Views\Device\AddOffline.cshtml"
+             if (hasLocation)
+            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <tr>\r\n                    <th>Location:\r\n                    </th" +
+">\r\n                    <td>");
+
+            
+            #line 42 "..\..\Views\Device\AddOffline.cshtml"
+                   Write(Html.TextBoxFor(model => model.Device.Location));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("<br />\r\n");
+
+WriteLiteral("                        ");
+
+            
+            #line 43 "..\..\Views\Device\AddOffline.cshtml"
+                   Write(Html.ValidationMessageFor(model => model.Device.Location));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                    </td>\r\n                </tr>\r\n");
+
+            
+            #line 46 "..\..\Views\Device\AddOffline.cshtml"
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            ");
+
+            
+            #line 47 "..\..\Views\Device\AddOffline.cshtml"
+             if (hasDeviceBatch)
+            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <tr>\r\n                    <th>Device Batch:\r\n                    " +
+"</th>\r\n                    <td>\r\n");
+
+WriteLiteral("                        ");
+
+            
+            #line 53 "..\..\Views\Device\AddOffline.cshtml"
+                   Write(Html.DropDownListFor(model => model.Device.DeviceBatchId, Model.DeviceBatches.ToSelectListItems()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                        <br />\r\n");
+
+WriteLiteral("                        ");
+
+            
+            #line 55 "..\..\Views\Device\AddOffline.cshtml"
+                   Write(Html.ValidationMessageFor(model => model.Device.DeviceBatchId));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                    </td>\r\n                </tr>\r\n");
 
             
             #line 58 "..\..\Views\Device\AddOffline.cshtml"
-               Write(Html.TextBoxFor(model => model.Device.AssignedUserId));
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            ");
+
+            
+            #line 59 "..\..\Views\Device\AddOffline.cshtml"
+             if (hasDeviceProfile)
+            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <tr>\r\n                    <th>Device Profile:\r\n                  " +
+"  </th>\r\n                    <td>\r\n");
+
+WriteLiteral("                        ");
+
+            
+            #line 65 "..\..\Views\Device\AddOffline.cshtml"
+                   Write(Html.DropDownListFor(model => model.Device.DeviceProfileId, Model.DeviceProfiles.ToSelectListItems(Model.DefaultDeviceProfileId)));
 
             
             #line default
             #line hidden
 WriteLiteral("<br />\r\n");
 
-WriteLiteral("                    ");
+WriteLiteral("                        ");
 
             
-            #line 59 "..\..\Views\Device\AddOffline.cshtml"
-               Write(Html.ValidationMessageFor(model => model.Device.AssignedUserId));
+            #line 66 "..\..\Views\Device\AddOffline.cshtml"
+                   Write(Html.ValidationMessageFor(model => model.Device.DeviceProfileId));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                </td>\r\n            </tr>\r\n        </table>\r\n        <p");
+WriteLiteral("\r\n                    </td>\r\n                </tr>\r\n");
+
+            
+            #line 69 "..\..\Views\Device\AddOffline.cshtml"
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            ");
+
+            
+            #line 70 "..\..\Views\Device\AddOffline.cshtml"
+             if (hasAssignUser)
+            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <tr>\r\n                    <th>Assigned User:\r\n                   " +
+" </th>\r\n                    <td>\r\n");
+
+WriteLiteral("                        ");
+
+            
+            #line 76 "..\..\Views\Device\AddOffline.cshtml"
+                   Write(Html.TextBoxFor(model => model.Device.AssignedUserId));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("<br />\r\n");
+
+WriteLiteral("                        ");
+
+            
+            #line 77 "..\..\Views\Device\AddOffline.cshtml"
+                   Write(Html.ValidationMessageFor(model => model.Device.AssignedUserId));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                    </td>\r\n                </tr>\r\n");
+
+            
+            #line 80 "..\..\Views\Device\AddOffline.cshtml"
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        </table>\r\n        <p");
 
 WriteLiteral(" class=\"actions\"");
 
-WriteLiteral(">\r\n            <input");
+WriteLiteral(">\r\n");
+
+            
+            #line 83 "..\..\Views\Device\AddOffline.cshtml"
+            
+            
+            #line default
+            #line hidden
+            
+            #line 83 "..\..\Views\Device\AddOffline.cshtml"
+             if (!hasDeviceProfile)
+            {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 85 "..\..\Views\Device\AddOffline.cshtml"
+           Write(Html.Hidden("Device.DeviceProfileId", Model.DefaultDeviceProfileId));
+
+            
+            #line default
+            #line hidden
+            
+            #line 85 "..\..\Views\Device\AddOffline.cshtml"
+                                                                                    
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n            <input");
 
 WriteLiteral(" type=\"submit\"");
 
@@ -228,35 +367,123 @@ WriteLiteral(" class=\"button\"");
 
 WriteLiteral(" value=\"Add\"");
 
-WriteLiteral(" />\r\n        </p>\r\n        <script");
+WriteLiteral(" />\r\n        </p>\r\n            <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(@">
-            $(function () {
-                $SerialNumber = $('#Device_SerialNumber');
-                $AssetNumber = $('#Device_AssetNumber');
-                $Location = $('#Device_Location');
-                $AssignedUserId = $('#Device_AssignedUserId');
+WriteLiteral(">\r\n                $(function () {\r\n                    var $SerialNumber = $(\'#D" +
+"evice_SerialNumber\').focus();\r\n\r\n");
 
-                $SerialNumber.focus().keydown(function (e) {
+            
+            #line 94 "..\..\Views\Device\AddOffline.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 94 "..\..\Views\Device\AddOffline.cshtml"
+                 if (hasAssignUser)
+                {
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                $SerialNumber.keydown(function (e) {\r\n                    if (e" +
+".which == 13) {\r\n                        $(\'#Device_AssignedUserId\').focus();\r\n " +
+"                       return false;\r\n                    }\r\n                });" +
+"");
+
+            
+            #line 101 "..\..\Views\Device\AddOffline.cshtml"
+                          }
+
+            
+            #line default
+            #line hidden
+            
+            #line 102 "..\..\Views\Device\AddOffline.cshtml"
+ if (hasAssetNumber)
+{
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                    $(\'#Device_AssetNumber\').keydown(function (e) {\r\n          " +
+"          if (e.which == 13) {\r\n");
+
+            
+            #line 106 "..\..\Views\Device\AddOffline.cshtml"
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 106 "..\..\Views\Device\AddOffline.cshtml"
+                         if (hasLocation)
+                        {
+            
+            #line default
+            #line hidden
+WriteLiteral("$(\'#Device_Location\').focus(); return false;");
+
+            
+            #line 107 "..\..\Views\Device\AddOffline.cshtml"
+                                                                                  }
+                        else if (hasAssignUser)
+                        {
+            
+            #line default
+            #line hidden
+WriteLiteral("$(\'#Device_AssignedUserId\').focus(); return false;");
+
+            
+            #line 109 "..\..\Views\Device\AddOffline.cshtml"
+                                                                                        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    }\r\n                });\r\n                ");
+
+            
+            #line 112 "..\..\Views\Device\AddOffline.cshtml"
+                       }
+
+            
+            #line default
+            #line hidden
+            
+            #line 113 "..\..\Views\Device\AddOffline.cshtml"
+ if (hasLocation && hasAssignUser)
+{
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+                    $('#Device_Location').keydown(function (e) {
                     if (e.which == 13) {
-                        $AssignedUserId.focus();
-                        return false;
-                    }
-                });
-                $AssetNumber.keydown(function (e) {
-                    if (e.which == 13) {
-                        $Location.focus();
-                        return false;
-                    }
-                });
-                $Location.keydown(function (e) {
-                    if (e.which == 13) {
-                        $AssignedUserId.focus();
+                        $('#Device_AssignedUserId').focus();
                         return false;
                     }
                 });
+                ");
+
+            
+            #line 121 "..\..\Views\Device\AddOffline.cshtml"
+                       }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    ");
+
+            
+            #line 122 "..\..\Views\Device\AddOffline.cshtml"
+                     if (hasAssignUser)
+{
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+                    var $AssignedUserId = $('#Device_AssignedUserId');
                 $AssignedUserId
                     .watermark('Search Users')
                     .focus(function () { $AssignedUserId.select() })
@@ -264,7 +491,7 @@ WriteLiteral(@">
                         source: '");
 
             
-            #line 95 "..\..\Views\Device\AddOffline.cshtml"
+            #line 129 "..\..\Views\Device\AddOffline.cshtml"
                              Write(Url.Action(MVC.API.User.UpstreamUsers()));
 
             
@@ -286,13 +513,19 @@ WriteLiteral(@"',
                         .append(""<a><strong>"" + item.DisplayName + ""</strong><br>"" + item.Id + "" ("" + item.Type + "")</a>"")
                         .appendTo(ul);
                     };
-            });
-        </script>
-    </div>
-");
+                ");
 
             
-            #line 114 "..\..\Views\Device\AddOffline.cshtml"
+            #line 145 "..\..\Views\Device\AddOffline.cshtml"
+                       }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            });\r\n            </script>\r\n    </div>\r\n");
+
+            
+            #line 149 "..\..\Views\Device\AddOffline.cshtml"
 }
 
             
diff --git a/Disco.Web/Views/Device/DeviceParts/_AssignmentHistory.cshtml b/Disco.Web/Views/Device/DeviceParts/_AssignmentHistory.cshtml
index cde33d30..7a090df3 100644
--- a/Disco.Web/Views/Device/DeviceParts/_AssignmentHistory.cshtml
+++ b/Disco.Web/Views/Device/DeviceParts/_AssignmentHistory.cshtml
@@ -1,4 +1,7 @@
 @model Disco.Web.Models.Device.ShowModel
+@{
+    Authorization.Require(Claims.Device.ShowAssignmentHistory);
+}
 <div id="DeviceDetailTab-AssignmentHistory" class="DevicePart">
     @if (Model.Device.DeviceUserAssignments.Count > 0)
     { 
@@ -15,7 +18,14 @@
             {
                 <tr>
                     <td>
-                        @Html.ActionLink(dua.AssignedUser.ToString(), MVC.User.Show(dua.AssignedUserId))
+                        @if (Authorization.Has(Claims.User.Show))
+                        {
+                            @Html.ActionLink(dua.AssignedUser.ToString(), MVC.User.Show(dua.AssignedUserId))
+                        }
+                        else
+                        {
+                            @dua.AssignedUser.ToString()
+                        }
                     </td>
                     <td>
                         @CommonHelpers.FriendlyDate(dua.AssignedDate)
diff --git a/Disco.Web/Views/Device/DeviceParts/_AssignmentHistory.generated.cs b/Disco.Web/Views/Device/DeviceParts/_AssignmentHistory.generated.cs
index 06ca4b6a..76f3d820 100644
--- a/Disco.Web/Views/Device/DeviceParts/_AssignmentHistory.generated.cs
+++ b/Disco.Web/Views/Device/DeviceParts/_AssignmentHistory.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,19 +28,29 @@ namespace Disco.Web.Views.Device.DeviceParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Device/DeviceParts/_AssignmentHistory.cshtml")]
-    public partial class AssignmentHistory : System.Web.Mvc.WebViewPage<Disco.Web.Models.Device.ShowModel>
+    public partial class AssignmentHistory : Disco.Services.Web.WebViewPage<Disco.Web.Models.Device.ShowModel>
     {
         public AssignmentHistory()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<div");
+            
+            #line 2 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+  
+    Authorization.Require(Claims.Device.ShowAssignmentHistory);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<div");
 
 WriteLiteral(" id=\"DeviceDetailTab-AssignmentHistory\"");
 
@@ -49,13 +59,13 @@ WriteLiteral(" class=\"DevicePart\"");
 WriteLiteral(">\r\n");
 
             
-            #line 3 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+            #line 6 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 3 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+            #line 6 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
      if (Model.Device.DeviceUserAssignments.Count > 0)
     { 
 
@@ -71,13 +81,13 @@ WriteLiteral(">\r\n            <tr>\r\n                <th>User\r\n
 "          </th>\r\n            </tr>\r\n");
 
             
-            #line 14 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+            #line 17 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
             
             
             #line default
             #line hidden
             
-            #line 14 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+            #line 17 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
              foreach (var dua in Model.Device.DeviceUserAssignments.OrderByDescending(m => m.AssignedDate))
             {
 
@@ -86,21 +96,58 @@ WriteLiteral(">\r\n            <tr>\r\n                <th>User\r\n
             #line hidden
 WriteLiteral("                <tr>\r\n                    <td>\r\n");
 
-WriteLiteral("                        ");
-
             
-            #line 18 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
-                   Write(Html.ActionLink(dua.AssignedUser.ToString(), MVC.User.Show(dua.AssignedUserId)));
+            #line 21 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 21 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+                         if (Authorization.Has(Claims.User.Show))
+                        {
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 23 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+                       Write(Html.ActionLink(dua.AssignedUser.ToString(), MVC.User.Show(dua.AssignedUserId)));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    </td>\r\n                    <td>\r\n");
+            
+            #line 23 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+                                                                                                            
+                        }
+                        else
+                        {
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 27 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+                       Write(dua.AssignedUser.ToString());
+
+            
+            #line default
+            #line hidden
+            
+            #line 27 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+                                                        
+                        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    </td>\r\n                    <td>\r\n");
 
 WriteLiteral("                        ");
 
             
-            #line 21 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+            #line 31 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
                    Write(CommonHelpers.FriendlyDate(dua.AssignedDate));
 
             
@@ -111,7 +158,7 @@ WriteLiteral("\r\n                    </td>\r\n                    <td>\r\n");
 WriteLiteral("                        ");
 
             
-            #line 24 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+            #line 34 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
                    Write(CommonHelpers.FriendlyDate(dua.UnassignedDate, "Current"));
 
             
@@ -120,7 +167,7 @@ WriteLiteral("                        ");
 WriteLiteral("\r\n                    </td>\r\n                </tr>\r\n");
 
             
-            #line 27 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+            #line 37 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
             }
 
             
@@ -129,7 +176,7 @@ WriteLiteral("\r\n                    </td>\r\n                </tr>\r\n");
 WriteLiteral("        </table>\r\n");
 
             
-            #line 29 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+            #line 39 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
     }
     else
     { 
@@ -144,7 +191,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Assignment History Available</span>\r\n");
 
             
-            #line 33 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+            #line 43 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
     }
 
             
@@ -154,7 +201,7 @@ WriteLiteral("    <script>\r\n        $(\'#DeviceDetailTabItems\').append(\'<li>
 "ilTab-AssignmentHistory\">Assignment History [");
 
             
-            #line 35 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
+            #line 45 "..\..\Views\Device\DeviceParts\_AssignmentHistory.cshtml"
                                                                                                             Write(Model.Device.DeviceUserAssignments.Count);
 
             
diff --git a/Disco.Web/Views/Device/DeviceParts/_Certificates.cshtml b/Disco.Web/Views/Device/DeviceParts/_Certificates.cshtml
index 1dc5319b..b5deecf9 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Certificates.cshtml
+++ b/Disco.Web/Views/Device/DeviceParts/_Certificates.cshtml
@@ -1,4 +1,8 @@
 @model Disco.Web.Models.Device.ShowModel
+@{
+    Authorization.Require(Claims.Device.ShowCertificates);
+    var hasDownloadCert = Authorization.Has(Claims.Config.DeviceCertificate.DownloadCertificates);
+}
 <div id="DeviceDetailTab-Certificates" class="DevicePart">
     <div class="genericData certificateTable">
         @if (Model.Certificates.Count() > 0)
@@ -18,7 +22,14 @@
                 {
                     <tr>
                         <td>
-                            @Html.ActionLink(item.Name, MVC.API.DeviceCertificate.Download(item.Id))
+                            @if (hasDownloadCert)
+                            {
+                                @Html.ActionLink(item.Name, MVC.API.DeviceCertificate.Download(item.Id))
+                            }
+                            else
+                            {
+                                @item.Name
+                            }
                         </td>
                         <td>
                             @item.Enabled
@@ -41,4 +52,4 @@
     <script>
         $('#DeviceDetailTabItems').append('<li><a href="#DeviceDetailTab-Certificates">Certificates [@(Model.Certificates.Count)]</a></li>');
     </script>
-</div>
\ No newline at end of file
+</div>
diff --git a/Disco.Web/Views/Device/DeviceParts/_Certificates.generated.cs b/Disco.Web/Views/Device/DeviceParts/_Certificates.generated.cs
index b74eb25c..150e9277 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Certificates.generated.cs
+++ b/Disco.Web/Views/Device/DeviceParts/_Certificates.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,19 +28,30 @@ namespace Disco.Web.Views.Device.DeviceParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Device/DeviceParts/_Certificates.cshtml")]
-    public partial class Certificates : System.Web.Mvc.WebViewPage<Disco.Web.Models.Device.ShowModel>
+    public partial class Certificates : Disco.Services.Web.WebViewPage<Disco.Web.Models.Device.ShowModel>
     {
         public Certificates()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<div");
+            
+            #line 2 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+  
+    Authorization.Require(Claims.Device.ShowCertificates);
+    var hasDownloadCert = Authorization.Has(Claims.Config.DeviceCertificate.DownloadCertificates);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<div");
 
 WriteLiteral(" id=\"DeviceDetailTab-Certificates\"");
 
@@ -53,13 +64,13 @@ WriteLiteral(" class=\"genericData certificateTable\"");
 WriteLiteral(">\r\n");
 
             
-            #line 4 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+            #line 8 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
         
             
             #line default
             #line hidden
             
-            #line 4 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+            #line 8 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
          if (Model.Certificates.Count() > 0)
         { 
 
@@ -84,13 +95,13 @@ WriteLiteral(@">
 ");
 
             
-            #line 17 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+            #line 21 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 17 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+            #line 21 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
                  foreach (var item in Model.Certificates)
                 {
 
@@ -99,21 +110,58 @@ WriteLiteral(@">
             #line hidden
 WriteLiteral("                    <tr>\r\n                        <td>\r\n");
 
-WriteLiteral("                            ");
-
             
-            #line 21 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
-                       Write(Html.ActionLink(item.Name, MVC.API.DeviceCertificate.Download(item.Id)));
+            #line 25 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 25 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+                             if (hasDownloadCert)
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 27 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+                           Write(Html.ActionLink(item.Name, MVC.API.DeviceCertificate.Download(item.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                        </td>\r\n                        <td>\r\n");
+            
+            #line 27 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+                                                                                                        
+                            }
+                            else
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 31 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+                           Write(item.Name);
+
+            
+            #line default
+            #line hidden
+            
+            #line 31 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+                                          
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </td>\r\n                        <td>\r\n");
 
 WriteLiteral("                            ");
 
             
-            #line 24 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+            #line 35 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
                        Write(item.Enabled);
 
             
@@ -124,7 +172,7 @@ WriteLiteral("\r\n                        </td>\r\n                        <td>\
 WriteLiteral("                            ");
 
             
-            #line 27 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+            #line 38 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
                        Write(CommonHelpers.FriendlyDate(item.AllocatedDate));
 
             
@@ -135,7 +183,7 @@ WriteLiteral("\r\n                        </td>\r\n                        <td>\
 WriteLiteral("                            ");
 
             
-            #line 30 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+            #line 41 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
                        Write(CommonHelpers.FriendlyDate(item.ExpirationDate));
 
             
@@ -144,7 +192,7 @@ WriteLiteral("                            ");
 WriteLiteral("\r\n                        </td>\r\n                    </tr>\r\n");
 
             
-            #line 33 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+            #line 44 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
                 }
 
             
@@ -153,7 +201,7 @@ WriteLiteral("\r\n                        </td>\r\n                    </tr>\r\n
 WriteLiteral("            </table>\r\n");
 
             
-            #line 35 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+            #line 46 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
         }
         else
         { 
@@ -168,7 +216,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Certificates Allocated</span>\r\n");
 
             
-            #line 39 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+            #line 50 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
         }
 
             
@@ -178,13 +226,13 @@ WriteLiteral("    </div>\r\n    <script>\r\n        $(\'#DeviceDetailTabItems\')
 "\"#DeviceDetailTab-Certificates\">Certificates [");
 
             
-            #line 42 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
+            #line 53 "..\..\Views\Device\DeviceParts\_Certificates.cshtml"
                                                                                                  Write(Model.Certificates.Count);
 
             
             #line default
             #line hidden
-WriteLiteral("]</a></li>\');\r\n    </script>\r\n</div>");
+WriteLiteral("]</a></li>\');\r\n    </script>\r\n</div>\r\n");
 
         }
     }
diff --git a/Disco.Web/Views/Device/DeviceParts/_Details.cshtml b/Disco.Web/Views/Device/DeviceParts/_Details.cshtml
index a46c150f..14e979ef 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Details.cshtml
+++ b/Disco.Web/Views/Device/DeviceParts/_Details.cshtml
@@ -1,4 +1,7 @@
 @model Disco.Web.Models.Device.ShowModel
+@{
+    Authorization.Require(Claims.Device.ShowDetails);
+}
 <div id="DeviceDetailTab-Details" class="DevicePart">
     <div id="DeviceDetailTab-DetailsContainer">
         <table class="tableData">
diff --git a/Disco.Web/Views/Device/DeviceParts/_Details.generated.cs b/Disco.Web/Views/Device/DeviceParts/_Details.generated.cs
index ae603919..37017834 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Details.generated.cs
+++ b/Disco.Web/Views/Device/DeviceParts/_Details.generated.cs
@@ -28,19 +28,29 @@ namespace Disco.Web.Views.Device.DeviceParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Device/DeviceParts/_Details.cshtml")]
-    public partial class Details : System.Web.Mvc.WebViewPage<Disco.Web.Models.Device.ShowModel>
+    public partial class Details : Disco.Services.Web.WebViewPage<Disco.Web.Models.Device.ShowModel>
     {
         public Details()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<div");
+            
+            #line 2 "..\..\Views\Device\DeviceParts\_Details.cshtml"
+  
+    Authorization.Require(Claims.Device.ShowDetails);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<div");
 
 WriteLiteral(" id=\"DeviceDetailTab-Details\"");
 
@@ -58,7 +68,7 @@ WriteLiteral(">\r\n            <tbody>\r\n                <tr>\r\n
 "ress</th>\r\n                    <td>");
 
             
-            #line 8 "..\..\Views\Device\DeviceParts\_Details.cshtml"
+            #line 11 "..\..\Views\Device\DeviceParts\_Details.cshtml"
                     Write(Model.Device.DeviceDetails.LanMacAddress() ?? "Unknown");
 
             
@@ -68,7 +78,7 @@ WriteLiteral("</td>\r\n                </tr>\r\n                <tr>\r\n
 "MAC Address</th>\r\n                    <td>");
 
             
-            #line 12 "..\..\Views\Device\DeviceParts\_Details.cshtml"
+            #line 15 "..\..\Views\Device\DeviceParts\_Details.cshtml"
                     Write(Model.Device.DeviceDetails.WLanMacAddress() ?? "Unknown");
 
             
diff --git a/Disco.Web/Views/Device/DeviceParts/_Jobs.cshtml b/Disco.Web/Views/Device/DeviceParts/_Jobs.cshtml
index aedc2d7d..03ecf466 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Jobs.cshtml
+++ b/Disco.Web/Views/Device/DeviceParts/_Jobs.cshtml
@@ -1,9 +1,12 @@
 @model Disco.Web.Models.Device.ShowModel
+@{
+    Authorization.Require(Claims.Device.ShowJobs);
+}
 <div id="DeviceDetailTab-Jobs" class="DevicePart">
     <div id="DeviceDetailTab-JobsContainer">
         @Html.Partial(MVC.Shared.Views._JobTable, Model.Jobs)
     </div>
     <script>
-        $('#DeviceDetailTabItems').append('<li><a href="#DeviceDetailTab-Jobs">Jobs [@(Model.Device.Jobs == null ? 0 : Model.Device.Jobs.Count)]</a></li>');
+        $('#DeviceDetailTabItems').append('<li><a href="#DeviceDetailTab-Jobs">Jobs [@(Model.Jobs.Items.Count)]</a></li>');
     </script>
 </div>
diff --git a/Disco.Web/Views/Device/DeviceParts/_Jobs.generated.cs b/Disco.Web/Views/Device/DeviceParts/_Jobs.generated.cs
index 23113b0b..63b3d86a 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Jobs.generated.cs
+++ b/Disco.Web/Views/Device/DeviceParts/_Jobs.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,19 +28,29 @@ namespace Disco.Web.Views.Device.DeviceParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Device/DeviceParts/_Jobs.cshtml")]
-    public partial class Jobs : System.Web.Mvc.WebViewPage<Disco.Web.Models.Device.ShowModel>
+    public partial class Jobs : Disco.Services.Web.WebViewPage<Disco.Web.Models.Device.ShowModel>
     {
         public Jobs()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<div");
+            
+            #line 2 "..\..\Views\Device\DeviceParts\_Jobs.cshtml"
+  
+    Authorization.Require(Claims.Device.ShowJobs);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<div");
 
 WriteLiteral(" id=\"DeviceDetailTab-Jobs\"");
 
@@ -55,7 +65,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("        ");
 
             
-            #line 4 "..\..\Views\Device\DeviceParts\_Jobs.cshtml"
+            #line 7 "..\..\Views\Device\DeviceParts\_Jobs.cshtml"
    Write(Html.Partial(MVC.Shared.Views._JobTable, Model.Jobs));
 
             
@@ -65,8 +75,8 @@ WriteLiteral("\r\n    </div>\r\n    <script>\r\n        $(\'#DeviceDetailTabItem
 "f=\"#DeviceDetailTab-Jobs\">Jobs [");
 
             
-            #line 7 "..\..\Views\Device\DeviceParts\_Jobs.cshtml"
-                                                                                 Write(Model.Device.Jobs == null ? 0 : Model.Device.Jobs.Count);
+            #line 10 "..\..\Views\Device\DeviceParts\_Jobs.cshtml"
+                                                                                 Write(Model.Jobs.Items.Count);
 
             
             #line default
diff --git a/Disco.Web/Views/Device/DeviceParts/_Resources.cshtml b/Disco.Web/Views/Device/DeviceParts/_Resources.cshtml
index 793c0191..c7378e75 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Resources.cshtml
+++ b/Disco.Web/Views/Device/DeviceParts/_Resources.cshtml
@@ -1,13 +1,23 @@
 @model Disco.Web.Models.Device.ShowModel
 @{
+    Authorization.Require(Claims.Device.ShowAttachments);
+
+    var canAddAttachments = Authorization.Has(Claims.Device.Actions.AddAttachments);
+    var canRemoveAnyAttachments = Authorization.Has(Claims.Device.Actions.RemoveAnyAttachments);
+    var canRemoveOwnAttachments = Authorization.Has(Claims.Device.Actions.RemoveOwnAttachments);
+
     Html.BundleDeferred("~/Style/Shadowbox");
     Html.BundleDeferred("~/ClientScripts/Modules/Shadowbox");
-    Html.BundleDeferred("~/ClientScripts/Modules/Silverlight");
+
+    if (Authorization.Has(Claims.Device.Actions.AddAttachments))
+    {
+        Html.BundleDeferred("~/ClientScripts/Modules/Silverlight");
+    }
 }
 <div id="DeviceDetailTab-Resources" class="DevicePart">
     <table id="deviceShowResources">
         <tr>
-            <td id="Attachments">
+            <td id="Attachments" class="@(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments")">
                 <div class="attachmentOutput">
                     @if (Model.Device.DeviceAttachments != null)
                     {
@@ -21,30 +31,35 @@
                                   { @da.DocumentTemplate.Description}
                                   else
                                   { @da.Comments }}
-                            </span><span class="author">@da.TechUser.ToString()</span><span class="remove"></span><span class="timestamp" title="@da.Timestamp.ToFullDateTime()">@da.Timestamp.ToFuzzy()</span>
+                            </span><span class="author">@da.TechUser.ToString()</span>@if (canRemoveAnyAttachments || (canRemoveOwnAttachments && da.TechUserId == CurrentUser.Id))
+                                                                                      {<text><span class="remove"></span></text>}<span class="timestamp" title="@da.Timestamp.ToFullDateTime()">@da.Timestamp.ToFuzzy()</span>
                         </a>   
                         }
                     }
                 </div>
-                <div class="attachmentInput clearfix">
-                    <span class="action upload"></span><span class="action photo"></span>
-                </div>
+                @if (canAddAttachments)
+                {
+                    <div class="attachmentInput clearfix">
+                        <span class="action upload"></span><span class="action photo"></span>
+                    </div>
+                }
                 <script type="text/javascript">
                     Shadowbox.init({
                         skipSetup: true,
                         modal: true
                     });
                     $(function () {
+                        $Attachments = $('#Attachments');
+                        $attachmentOutput = $Attachments.find('.attachmentOutput');
+
+                        @if (canAddAttachments)
+                        {<text>
+                        //#region Add Attachments
                         if (!document.DiscoFunctions) {
                             document.DiscoFunctions = {};
                         }
                         document.DiscoFunctions.addAttachment = addAttachment;
 
-                        $Attachments = $('#Attachments');
-                        $attachmentOutput = $Attachments.find('.attachmentOutput');
-
-                        $attachmentOutput.find('span.remove').click(removeAttachment);
-
                         $('#dialogUpload').dialog({
                             autoOpen: false,
                             draggable: false,
@@ -57,6 +72,101 @@
                             }
                         });
 
+
+
+                        var onLoadNavigation = null;
+                        var isLoaded = null;
+                        Silverlight.createObject(
+                                '@(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap)',
+                                $('#silverlightHostUploadAttachment').get(0),
+                                'silverlightUploadAttachment',
+                                { width: '840px', height: '500px', background: 'white', version: '4.0.60310.0' },
+                                {
+                                    onLoad: function () {
+                                        if (onLoadNavigation) {
+                                            silverlightUploadAttachment.content.Navigator.Navigate(onLoadNavigation);
+                                            isLoaded = true;
+                                        }
+                                    }
+                                },
+                                'UploadUrl=@(Url.Action(MVC.API.Device.AttachmentUpload(Model.Device.SerialNumber, null)))'
+                        );
+
+                        $attachmentInput = $Attachments.find('.attachmentInput');
+                        $attachmentInput.find('.photo').click(function () {
+                            showDialog('/WebCam');
+                        });
+                        $attachmentInput.find('.upload').click(function () {
+                            showDialog('/File');
+                        });
+
+                        silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
+                        function showDialog(navigationPath) {
+                            $('#dialogUpload').dialog('open');
+                            if (isLoaded) {
+                                silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
+                            } else {
+                                onLoadNavigation = navigationPath;
+                            }
+                        };
+
+                        function addAttachment(id, quick) {
+                            var data = { id: id };
+                            $.ajax({
+                                url: '@Url.Action(MVC.API.Device.Attachment())',
+                                dataType: 'json',
+                                data: data,
+                                success: function (d) {
+                                    if (d.Result == 'OK') {
+                                        var a = d.Attachment;
+                                        @if (canRemoveAnyAttachments)
+                                        {<text>buildAttachment(a, true);</text>}
+                                        else if (canRemoveOwnAttachments)
+                                        {<text>buildAttachment(a, (a.AuthorId === '@(CurrentUser.Id)'));</text>}
+                                        else
+                                        {<text>buildAttachment(a, false);</text>}
+                                        
+                                    } else {
+                                        alert('Unable to add attachment: ' + d.Result);
+                                    }
+                                },
+                                    error: function (jqXHR, textStatus, errorThrown) {
+                                        alert('Unable to add attachment: ' + textStatus);
+                                    }
+                                });
+                        }
+
+                        function buildAttachment(a, canRemove) {
+                            var t = '<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span>';
+                            if (canRemove)
+                                t += '<span class="remove"></span>';
+                            t += '<span class="timestamp"></span></a>';
+
+                            var e = $(t);
+
+                            e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '@(Url.Action(MVC.API.Device.AttachmentDownload()))/' + a.Id);
+                            e.find('.icon img').attr('src', '@(Url.Action(MVC.API.Device.AttachmentThumbnail()))/' + a.Id);
+                            e.find('.comments').text(a.Comments);
+                            e.find('.author').text(a.Author);
+                            e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
+                            if (canRemove)
+                                e.find('.remove').click(removeAttachment);
+                            if (!quick)
+                                e.hide();
+                            $attachmentOutput.append(e);
+                            if (!quick)
+                                e.show('slow');
+                            if (a.MimeType.toLowerCase().indexOf('image/') == 0)
+                                e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments });
+                        }
+
+                        //#endregion
+                        </text>}
+                        @if (canRemoveAnyAttachments || canRemoveOwnAttachments)
+                        {<text>
+                        //#region Remove Attachments
+                        $attachmentOutput.find('span.remove').click(removeAttachment);
+
                         $('#dialogRemoveAttachment').dialog({
                             resizable: false,
                             height: 140,
@@ -64,117 +174,50 @@
                             autoOpen: false
                         });
 
-                        var onLoadNavigation = null;
-                        var isLoaded = null;
-                        Silverlight.createObject(
-                                '@(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap)',
-                            $('#silverlightHostUploadAttachment').get(0),
-                            'silverlightUploadAttachment',
-                            { width: '840px', height: '500px', background: 'white', version: '4.0.60310.0' },
-                            {
-                                onLoad: function () {
-                                    if (onLoadNavigation) {
-                                        silverlightUploadAttachment.content.Navigator.Navigate(onLoadNavigation);
-                                        isLoaded = true;
-                                    }
-                                }
-                            },
-                            'UploadUrl=@(Url.Action(MVC.API.Device.AttachmentUpload(Model.Device.SerialNumber, null)))'
-                        );
+                        function removeAttachment() {
+                            $this = $(this).closest('a');
 
-                    $attachmentInput = $Attachments.find('.attachmentInput');
-                    $attachmentInput.find('.photo').click(function () {
-                        showDialog('/WebCam');
-                    });
-                    $attachmentInput.find('.upload').click(function () {
-                        showDialog('/File');
-                    });
-
-                    silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
-                    function showDialog(navigationPath) {
-                        $('#dialogUpload').dialog('open');
-                        if (isLoaded) {
-                            silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
-                        } else {
-                            onLoadNavigation = navigationPath;
-                        }
-                    };
-                    function addAttachment(id, quick) {
-                        var data = { id: id };
-                        $.ajax({
-                            url: '@Url.Action(MVC.API.Device.Attachment())',
-                            dataType: 'json',
-                            data: data,
-                            success: function (d) {
-                                if (d.Result == 'OK') {
-                                    var a = d.Attachment;
-
-                                    var e = $('<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span><span class="remove"></span><span class="timestamp"></span></a>');
-
-                                    e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '@(Url.Action(MVC.API.Device.AttachmentDownload()))/' + a.Id);
-                                    e.find('.icon img').attr('src', '@(Url.Action(MVC.API.Device.AttachmentThumbnail()))/' + a.Id);
-                                    e.find('.comments').text(a.Comments);
-                                    e.find('.author').text(a.Author);
-                                    e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
-                                    e.find('.remove').click(removeAttachment);
-                                    if (!quick)
-                                        e.hide();
-                                    $attachmentOutput.append(e);
-                                    if (!quick)
-                                        e.show('slow');
-                                    if (a.MimeType.toLowerCase().indexOf('image/') == 0)
-                                        e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments });
-                                } else {
-                                    alert('Unable to add attachment: ' + d.Result);
-                                }
-                            },
-                            error: function (jqXHR, textStatus, errorThrown) {
-                                alert('Unable to add attachment: ' + textStatus);
-                            }
-                        });
-                    }
-                    function removeAttachment() {
-                        $this = $(this).closest('a');
-
-                        var data = { id: $this.attr('data-attachmentid') };
-                        var $dialogRemoveAttachment = $('#dialogRemoveAttachment');
-                        $dialogRemoveAttachment.dialog("enable");
-                        $dialogRemoveAttachment.dialog('option', 'buttons', {
-                            "Remove": function () {
-                                $dialogRemoveAttachment.dialog("disable");
-                                $dialogRemoveAttachment.dialog("option", "buttons", null);
-                                $.ajax({
-                                    url: '@Url.Action(MVC.API.Device.AttachmentRemove())',
-                                    dataType: 'json',
-                                    data: data,
-                                    success: function (d) {
-                                        if (d == 'OK') {
-                                            $this.hide(300).delay(300).queue(function () {
-                                                var $this = $(this);
-                                                if ($this.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
-                                                    Shadowbox.removeCache(this);
-                                                $this.remove();
-                                            });
-                                        } else {
-                                            alert('Unable to remove attachment: ' + d);
+                            var data = { id: $this.attr('data-attachmentid') };
+                            var $dialogRemoveAttachment = $('#dialogRemoveAttachment');
+                            $dialogRemoveAttachment.dialog("enable");
+                            $dialogRemoveAttachment.dialog('option', 'buttons', {
+                                "Remove": function () {
+                                    $dialogRemoveAttachment.dialog("disable");
+                                    $dialogRemoveAttachment.dialog("option", "buttons", null);
+                                    $.ajax({
+                                        url: '@Url.Action(MVC.API.Device.AttachmentRemove())',
+                                        dataType: 'json',
+                                        data: data,
+                                        success: function (d) {
+                                            if (d == 'OK') {
+                                                $this.hide(300).delay(300).queue(function () {
+                                                    var $this = $(this);
+                                                    if ($this.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
+                                                        Shadowbox.removeCache(this);
+                                                    $this.remove();
+                                                });
+                                            } else {
+                                                alert('Unable to remove attachment: ' + d);
+                                            }
+                                            $dialogRemoveAttachment.dialog("close");
+                                        },
+                                        error: function (jqXHR, textStatus, errorThrown) {
+                                            alert('Unable to remove attachment: ' + textStatus);
+                                            $dialogRemoveAttachment.dialog("close");
                                         }
-                                        $dialogRemoveAttachment.dialog("close");
-                                    },
-                                    error: function (jqXHR, textStatus, errorThrown) {
-                                        alert('Unable to remove attachment: ' + textStatus);
-                                        $dialogRemoveAttachment.dialog("close");
-                                    }
-                                });
-                            },
-                            "Cancel": function () {
-                                $dialogRemoveAttachment.dialog("close");
-                            }
-                        });
+                                    });
+                                },
+                                "Cancel": function () {
+                                    $dialogRemoveAttachment.dialog("close");
+                                }
+                            });
 
-                        $dialogRemoveAttachment.dialog('open');
+                            $dialogRemoveAttachment.dialog('open');
 
-                        return false;
-                    }
+                            return false;
+                        }
+                        //#endregion
+                        </text>}
 
                     $attachmentOutput.children('a').each(function () {
                         $this = $(this);
diff --git a/Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs b/Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs
index 4cafd8c5..a5df6296 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs
+++ b/Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Device.DeviceParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Device/DeviceParts/_Resources.cshtml")]
-    public partial class Resources : System.Web.Mvc.WebViewPage<Disco.Web.Models.Device.ShowModel>
+    public partial class Resources : Disco.Services.Web.WebViewPage<Disco.Web.Models.Device.ShowModel>
     {
         public Resources()
         {
@@ -43,9 +45,19 @@ namespace Disco.Web.Views.Device.DeviceParts
             
             #line 2 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
   
+    Authorization.Require(Claims.Device.ShowAttachments);
+
+    var canAddAttachments = Authorization.Has(Claims.Device.Actions.AddAttachments);
+    var canRemoveAnyAttachments = Authorization.Has(Claims.Device.Actions.RemoveAnyAttachments);
+    var canRemoveOwnAttachments = Authorization.Has(Claims.Device.Actions.RemoveOwnAttachments);
+
     Html.BundleDeferred("~/Style/Shadowbox");
     Html.BundleDeferred("~/ClientScripts/Modules/Shadowbox");
-    Html.BundleDeferred("~/ClientScripts/Modules/Silverlight");
+
+    if (Authorization.Has(Claims.Device.Actions.AddAttachments))
+    {
+        Html.BundleDeferred("~/ClientScripts/Modules/Silverlight");
+    }
 
             
             #line default
@@ -64,6 +76,16 @@ WriteLiteral(">\r\n        <tr>\r\n            <td");
 
 WriteLiteral(" id=\"Attachments\"");
 
+WriteAttribute("class", Tuple.Create(" class=\"", 796), Tuple.Create("\"", 871)
+            
+            #line 20 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 804), Tuple.Create<System.Object, System.Int32>(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments"
+            
+            #line default
+            #line hidden
+, 804), false)
+);
+
 WriteLiteral(">\r\n                <div");
 
 WriteLiteral(" class=\"attachmentOutput\"");
@@ -71,13 +93,13 @@ WriteLiteral(" class=\"attachmentOutput\"");
 WriteLiteral(">\r\n");
 
             
-            #line 12 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 22 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 12 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 22 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                      if (Model.Device.DeviceAttachments != null)
                     {
                         foreach (var da in Model.Device.DeviceAttachments)
@@ -88,20 +110,20 @@ WriteLiteral(">\r\n");
             #line hidden
 WriteLiteral("                        <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 634), Tuple.Create("\"", 694)
+WriteAttribute("href", Tuple.Create(" href=\"", 1141), Tuple.Create("\"", 1201)
             
-            #line 16 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 641), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.AttachmentDownload(da.Id))
+            #line 26 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 1148), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.AttachmentDownload(da.Id))
             
             #line default
             #line hidden
-, 641), false)
+, 1148), false)
 );
 
 WriteLiteral(" data-attachmentid=\"");
 
             
-            #line 16 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 26 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                                                                                       Write(da.Id);
 
             
@@ -112,7 +134,7 @@ WriteLiteral("\"");
 WriteLiteral(" data-mimetype=\"");
 
             
-            #line 16 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 26 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                                                                                                              Write(da.MimeType);
 
             
@@ -124,68 +146,68 @@ WriteLiteral(">\r\n                            <span");
 
 WriteLiteral(" class=\"icon\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 800), Tuple.Create("\"", 820)
+WriteAttribute("title", Tuple.Create(" title=\"", 1307), Tuple.Create("\"", 1327)
             
-            #line 17 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 808), Tuple.Create<System.Object, System.Int32>(da.Filename
+            #line 27 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 1315), Tuple.Create<System.Object, System.Int32>(da.Filename
             
             #line default
             #line hidden
-, 808), false)
+, 1315), false)
 );
 
 WriteLiteral(">\r\n                                <img");
 
 WriteLiteral(" alt=\"Attachment Thumbnail\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 887), Tuple.Create("\"", 949)
+WriteAttribute("src", Tuple.Create(" src=\"", 1394), Tuple.Create("\"", 1456)
             
-            #line 18 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 893), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.AttachmentThumbnail(da.Id))
+            #line 28 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 1400), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.AttachmentThumbnail(da.Id))
             
             #line default
             #line hidden
-, 893), false)
+, 1400), false)
 );
 
 WriteLiteral(" /></span>\r\n                            <span");
 
 WriteLiteral(" class=\"comments\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 1012), Tuple.Create("\"", 1032)
+WriteAttribute("title", Tuple.Create(" title=\"", 1519), Tuple.Create("\"", 1539)
             
-            #line 19 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 1020), Tuple.Create<System.Object, System.Int32>(da.Comments
+            #line 29 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 1527), Tuple.Create<System.Object, System.Int32>(da.Comments
             
             #line default
             #line hidden
-, 1020), false)
+, 1527), false)
 );
 
 WriteLiteral(">\r\n");
 
             
-            #line 20 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 30 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                 
             
             #line default
             #line hidden
             
-            #line 20 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 30 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                   if (!string.IsNullOrEmpty(da.DocumentTemplateId))
                                   { 
             
             #line default
             #line hidden
             
-            #line 21 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 31 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                Write(da.DocumentTemplate.Description);
 
             
             #line default
             #line hidden
             
-            #line 21 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 31 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                                                     }
                                   else
                                   { 
@@ -193,14 +215,14 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 23 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 33 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                Write(da.Comments);
 
             
             #line default
             #line hidden
             
-            #line 23 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 33 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                                  }
             
             #line default
@@ -212,35 +234,52 @@ WriteLiteral(" class=\"author\"");
 WriteLiteral(">");
 
             
-            #line 24 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 34 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                                    Write(da.TechUser.ToString());
 
             
             #line default
             #line hidden
-WriteLiteral("</span><span");
+WriteLiteral("</span>");
 
-WriteLiteral(" class=\"remove\"");
-
-WriteLiteral("></span><span");
-
-WriteLiteral(" class=\"timestamp\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 1422), Tuple.Create("\"", 1460)
             
-            #line 24 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
-                                                                 , Tuple.Create(Tuple.Create("", 1430), Tuple.Create<System.Object, System.Int32>(da.Timestamp.ToFullDateTime()
+            #line 34 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                                                                       if (canRemoveAnyAttachments || (canRemoveOwnAttachments && da.TechUserId == CurrentUser.Id))
+                                                                                      {
             
             #line default
             #line hidden
-, 1430), false)
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"remove\"");
+
+WriteLiteral("></span>");
+
+            
+            #line 35 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                                                                                                                }
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"timestamp\"");
+
+WriteAttribute("title", Tuple.Create(" title=\"", 2125), Tuple.Create("\"", 2163)
+            
+            #line 35 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                                                                , Tuple.Create(Tuple.Create("", 2133), Tuple.Create<System.Object, System.Int32>(da.Timestamp.ToFullDateTime()
+            
+            #line default
+            #line hidden
+, 2133), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 24 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
-                                                                                                                                                                            Write(da.Timestamp.ToFuzzy());
+            #line 35 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                                                                                                                                                                           Write(da.Timestamp.ToFuzzy());
 
             
             #line default
@@ -248,18 +287,34 @@ WriteLiteral(">");
 WriteLiteral("</span>\r\n                        </a>   \r\n");
 
             
-            #line 26 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 37 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                         }
                     }
 
             
             #line default
             #line hidden
-WriteLiteral("                </div>\r\n                <div");
+WriteLiteral("                </div>\r\n");
+
+            
+            #line 40 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 40 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                 if (canAddAttachments)
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <div");
 
 WriteLiteral(" class=\"attachmentInput clearfix\"");
 
-WriteLiteral(">\r\n                    <span");
+WriteLiteral(">\r\n                        <span");
 
 WriteLiteral(" class=\"action upload\"");
 
@@ -267,56 +322,93 @@ WriteLiteral("></span><span");
 
 WriteLiteral(" class=\"action photo\"");
 
-WriteLiteral("></span>\r\n                </div>\r\n                <script");
+WriteLiteral("></span>\r\n                    </div>\r\n");
+
+            
+            #line 45 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n                    Shadowbox.init({\r\n                        skipSetup: true," +
-"\r\n                        modal: true\r\n                    });\r\n                " +
-"    $(function () {\r\n                        if (!document.DiscoFunctions) {\r\n  " +
-"                          document.DiscoFunctions = {};\r\n                       " +
-" }\r\n                        document.DiscoFunctions.addAttachment = addAttachmen" +
-"t;\r\n\r\n                        $Attachments = $(\'#Attachments\');\r\n               " +
-"         $attachmentOutput = $Attachments.find(\'.attachmentOutput\');\r\n\r\n        " +
-"                $attachmentOutput.find(\'span.remove\').click(removeAttachment);\r\n" +
-"\r\n                        $(\'#dialogUpload\').dialog({\r\n                         " +
-"   autoOpen: false,\r\n                            draggable: false,\r\n            " +
-"                modal: true,\r\n                            resizable: false,\r\n   " +
-"                         width: 860,\r\n                            height: 550,\r\n" +
-"                            close: function () {\r\n                              " +
-"  silverlightUploadAttachment.content.Navigator.Navigate(\'/Hidden\');\r\n          " +
-"                  }\r\n                        });\r\n\r\n                        $(\'#" +
-"dialogRemoveAttachment\').dialog({\r\n                            resizable: false," +
-"\r\n                            height: 140,\r\n                            modal: t" +
-"rue,\r\n                            autoOpen: false\r\n                        });\r\n" +
-"\r\n                        var onLoadNavigation = null;\r\n                        " +
-"var isLoaded = null;\r\n                        Silverlight.createObject(\r\n       " +
-"                         \'");
+WriteLiteral(@">
+                    Shadowbox.init({
+                        skipSetup: true,
+                        modal: true
+                    });
+                    $(function () {
+                        $Attachments = $('#Attachments');
+                        $attachmentOutput = $Attachments.find('.attachmentOutput');
+
+");
 
             
-            #line 70 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 55 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 55 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                         if (canAddAttachments)
+                        {
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+                        //#region Add Attachments
+                        if (!document.DiscoFunctions) {
+                            document.DiscoFunctions = {};
+                        }
+                        document.DiscoFunctions.addAttachment = addAttachment;
+
+                        $('#dialogUpload').dialog({
+                            autoOpen: false,
+                            draggable: false,
+                            modal: true,
+                            resizable: false,
+                            width: 860,
+                            height: 550,
+                            close: function () {
+                                silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
+                            }
+                        });
+
+
+
+                        var onLoadNavigation = null;
+                        var isLoaded = null;
+                        Silverlight.createObject(
+                                '");
+
+            
+            #line 80 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                              Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap);
 
             
             #line default
             #line hidden
 WriteLiteral(@"',
-                            $('#silverlightHostUploadAttachment').get(0),
-                            'silverlightUploadAttachment',
-                            { width: '840px', height: '500px', background: 'white', version: '4.0.60310.0' },
-                            {
-                                onLoad: function () {
-                                    if (onLoadNavigation) {
-                                        silverlightUploadAttachment.content.Navigator.Navigate(onLoadNavigation);
-                                        isLoaded = true;
+                                $('#silverlightHostUploadAttachment').get(0),
+                                'silverlightUploadAttachment',
+                                { width: '840px', height: '500px', background: 'white', version: '4.0.60310.0' },
+                                {
+                                    onLoad: function () {
+                                        if (onLoadNavigation) {
+                                            silverlightUploadAttachment.content.Navigator.Navigate(onLoadNavigation);
+                                            isLoaded = true;
+                                        }
                                     }
-                                }
-                            },
-                            'UploadUrl=");
+                                },
+                                'UploadUrl=");
 
             
-            #line 82 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
-                                   Write(Url.Action(MVC.API.Device.AttachmentUpload(Model.Device.SerialNumber, null)));
+            #line 92 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                       Write(Url.Action(MVC.API.Device.AttachmentUpload(Model.Device.SerialNumber, null)));
 
             
             #line default
@@ -324,124 +416,261 @@ WriteLiteral(@"',
 WriteLiteral(@"'
                         );
 
-                    $attachmentInput = $Attachments.find('.attachmentInput');
-                    $attachmentInput.find('.photo').click(function () {
-                        showDialog('/WebCam');
-                    });
-                    $attachmentInput.find('.upload').click(function () {
-                        showDialog('/File');
-                    });
+                        $attachmentInput = $Attachments.find('.attachmentInput');
+                        $attachmentInput.find('.photo').click(function () {
+                            showDialog('/WebCam');
+                        });
+                        $attachmentInput.find('.upload').click(function () {
+                            showDialog('/File');
+                        });
 
-                    silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
-                    function showDialog(navigationPath) {
-                        $('#dialogUpload').dialog('open');
-                        if (isLoaded) {
-                            silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
-                        } else {
-                            onLoadNavigation = navigationPath;
-                        }
-                    };
-                    function addAttachment(id, quick) {
-                        var data = { id: id };
-                        $.ajax({
-                            url: '");
+                        silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
+                        function showDialog(navigationPath) {
+                            $('#dialogUpload').dialog('open');
+                            if (isLoaded) {
+                                silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
+                            } else {
+                                onLoadNavigation = navigationPath;
+                            }
+                        };
+
+                        function addAttachment(id, quick) {
+                            var data = { id: id };
+                            $.ajax({
+                                url: '");
 
             
-            #line 105 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
-                             Write(Url.Action(MVC.API.Device.Attachment()));
+            #line 116 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                 Write(Url.Action(MVC.API.Device.Attachment()));
 
             
             #line default
             #line hidden
 WriteLiteral(@"',
-                            dataType: 'json',
-                            data: data,
-                            success: function (d) {
-                                if (d.Result == 'OK') {
-                                    var a = d.Attachment;
-
-                                    var e = $('<a><span class=""icon""><img alt=""Attachment Thumbnail"" /></span><span class=""comments""></span><span class=""author""></span><span class=""remove""></span><span class=""timestamp""></span></a>');
-
-                                    e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '");
+                                dataType: 'json',
+                                data: data,
+                                success: function (d) {
+                                    if (d.Result == 'OK') {
+                                        var a = d.Attachment;
+");
 
             
-            #line 114 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
-                                                                                                                  Write(Url.Action(MVC.API.Device.AttachmentDownload()));
+            #line 122 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                        
+            
+            #line default
+            #line hidden
+            
+            #line 122 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                         if (canRemoveAnyAttachments)
+                                        {
+            
+            #line default
+            #line hidden
+WriteLiteral("buildAttachment(a, true);");
+
+            
+            #line 123 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                                                               }
+                                        else if (canRemoveOwnAttachments)
+                                        {
+            
+            #line default
+            #line hidden
+WriteLiteral("buildAttachment(a, (a.AuthorId === \'");
+
+            
+            #line 125 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                                                               Write(CurrentUser.Id);
 
             
             #line default
             #line hidden
-WriteLiteral("/\' + a.Id);\r\n                                    e.find(\'.icon img\').attr(\'src\', " +
-"\'");
+WriteLiteral("\'));");
 
             
-            #line 115 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
-                                                                 Write(Url.Action(MVC.API.Device.AttachmentThumbnail()));
+            #line 125 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                                                                                               }
+                                        else
+                                        {
+            
+            #line default
+            #line hidden
+WriteLiteral("buildAttachment(a, false);");
+
+            
+            #line 127 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                                                                }
 
             
             #line default
             #line hidden
-WriteLiteral("/\' + a.Id);\r\n                                    e.find(\'.comments\').text(a.Comme" +
-"nts);\r\n                                    e.find(\'.author\').text(a.Author);\r\n  " +
-"                                  e.find(\'.timestamp\').text(a.TimestampFuzzy).at" +
-"tr(\'title\', a.TimestampFull);\r\n                                    e.find(\'.remo" +
-"ve\').click(removeAttachment);\r\n                                    if (!quick)\r\n" +
-"                                        e.hide();\r\n                             " +
-"       $attachmentOutput.append(e);\r\n                                    if (!qu" +
-"ick)\r\n                                        e.show(\'slow\');\r\n                 " +
-"                   if (a.MimeType.toLowerCase().indexOf(\'image/\') == 0)\r\n       " +
-"                                 e.shadowbox({ gallery: \'attachments\', player: \'" +
-"img\', title: a.Comments });\r\n                                } else {\r\n         " +
-"                           alert(\'Unable to add attachment: \' + d.Result);\r\n    " +
-"                            }\r\n                            },\r\n                 " +
-"           error: function (jqXHR, textStatus, errorThrown) {\r\n                 " +
-"               alert(\'Unable to add attachment: \' + textStatus);\r\n              " +
-"              }\r\n                        });\r\n                    }\r\n           " +
-"         function removeAttachment() {\r\n                        $this = $(this)." +
-"closest(\'a\');\r\n\r\n                        var data = { id: $this.attr(\'data-attac" +
-"hmentid\') };\r\n                        var $dialogRemoveAttachment = $(\'#dialogRe" +
-"moveAttachment\');\r\n                        $dialogRemoveAttachment.dialog(\"enabl" +
-"e\");\r\n                        $dialogRemoveAttachment.dialog(\'option\', \'buttons\'" +
-", {\r\n                            \"Remove\": function () {\r\n                      " +
-"          $dialogRemoveAttachment.dialog(\"disable\");\r\n                          " +
-"      $dialogRemoveAttachment.dialog(\"option\", \"buttons\", null);\r\n              " +
-"                  $.ajax({\r\n                                    url: \'");
+WriteLiteral(@"                                        
+                                    } else {
+                                        alert('Unable to add attachment: ' + d.Result);
+                                    }
+                                },
+                                    error: function (jqXHR, textStatus, errorThrown) {
+                                        alert('Unable to add attachment: ' + textStatus);
+                                    }
+                                });
+                        }
+
+                        function buildAttachment(a, canRemove) {
+                            var t = '<a><span");
+
+WriteLiteral(" class=\"icon\"");
+
+WriteLiteral("><img");
+
+WriteLiteral(" alt=\"Attachment Thumbnail\"");
+
+WriteLiteral(" /></span><span");
+
+WriteLiteral(" class=\"comments\"");
+
+WriteLiteral("></span><span");
+
+WriteLiteral(" class=\"author\"");
+
+WriteLiteral("></span>\';\r\n                            if (canRemove)\r\n                         " +
+"       t += \'<span");
+
+WriteLiteral(" class=\"remove\"");
+
+WriteLiteral("></span>\';\r\n                            t += \'<span");
+
+WriteLiteral(" class=\"timestamp\"");
+
+WriteLiteral("></span></a>\';\r\n\r\n                            var e = $(t);\r\n\r\n                  " +
+"          e.attr(\'data-attachmentid\', a.Id).attr(\'data-mimetype\', a.MimeType).at" +
+"tr(\'href\', \'");
 
             
             #line 147 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
-                                     Write(Url.Action(MVC.API.Device.AttachmentRemove()));
+                                                                                                          Write(Url.Action(MVC.API.Device.AttachmentDownload()));
 
             
             #line default
             #line hidden
-WriteLiteral("\',\r\n                                    dataType: \'json\',\r\n                      " +
-"              data: data,\r\n                                    success: function" +
-" (d) {\r\n                                        if (d == \'OK\') {\r\n              " +
-"                              $this.hide(300).delay(300).queue(function () {\r\n  " +
-"                                              var $this = $(this);\r\n            " +
-"                                    if ($this.attr(\'data-mimetype\').toLowerCase(" +
-").indexOf(\'image/\') == 0)\r\n                                                    S" +
-"hadowbox.removeCache(this);\r\n                                                $th" +
-"is.remove();\r\n                                            });\r\n                 " +
-"                       } else {\r\n                                            ale" +
-"rt(\'Unable to remove attachment: \' + d);\r\n                                      " +
-"  }\r\n                                        $dialogRemoveAttachment.dialog(\"clo" +
-"se\");\r\n                                    },\r\n                                 " +
-"   error: function (jqXHR, textStatus, errorThrown) {\r\n                         " +
-"               alert(\'Unable to remove attachment: \' + textStatus);\r\n           " +
-"                             $dialogRemoveAttachment.dialog(\"close\");\r\n         " +
-"                           }\r\n                                });\r\n             " +
-"               },\r\n                            \"Cancel\": function () {\r\n        " +
-"                        $dialogRemoveAttachment.dialog(\"close\");\r\n              " +
-"              }\r\n                        });\r\n\r\n                        $dialogR" +
-"emoveAttachment.dialog(\'open\');\r\n\r\n                        return false;\r\n      " +
-"              }\r\n\r\n                    $attachmentOutput.children(\'a\').each(func" +
-"tion () {\r\n                        $this = $(this);\r\n                        if " +
-"($this.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n            " +
-"                $this.shadowbox({ gallery: \'attachments\', player: \'img\', title: " +
-"$this.find(\'.comments\').text() });\r\n                    });\r\n                });" +
-"\r\n                </script>\r\n            </td>\r\n        </tr>\r\n    </table>\r\n   " +
-" <div");
+WriteLiteral("/\' + a.Id);\r\n                            e.find(\'.icon img\').attr(\'src\', \'");
+
+            
+            #line 148 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                                         Write(Url.Action(MVC.API.Device.AttachmentThumbnail()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"/' + a.Id);
+                            e.find('.comments').text(a.Comments);
+                            e.find('.author').text(a.Author);
+                            e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
+                            if (canRemove)
+                                e.find('.remove').click(removeAttachment);
+                            if (!quick)
+                                e.hide();
+                            $attachmentOutput.append(e);
+                            if (!quick)
+                                e.show('slow');
+                            if (a.MimeType.toLowerCase().indexOf('image/') == 0)
+                                e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments });
+                        }
+
+                        //#endregion
+                        ");
+
+            
+            #line 164 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                               }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        ");
+
+            
+            #line 165 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                         if (canRemoveAnyAttachments || canRemoveOwnAttachments)
+                        {
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+                        //#region Remove Attachments
+                        $attachmentOutput.find('span.remove').click(removeAttachment);
+
+                        $('#dialogRemoveAttachment').dialog({
+                            resizable: false,
+                            height: 140,
+                            modal: true,
+                            autoOpen: false
+                        });
+
+                        function removeAttachment() {
+                            $this = $(this).closest('a');
+
+                            var data = { id: $this.attr('data-attachmentid') };
+                            var $dialogRemoveAttachment = $('#dialogRemoveAttachment');
+                            $dialogRemoveAttachment.dialog(""enable"");
+                            $dialogRemoveAttachment.dialog('option', 'buttons', {
+                                ""Remove"": function () {
+                                    $dialogRemoveAttachment.dialog(""disable"");
+                                    $dialogRemoveAttachment.dialog(""option"", ""buttons"", null);
+                                    $.ajax({
+                                        url: '");
+
+            
+            #line 188 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                                         Write(Url.Action(MVC.API.Device.AttachmentRemove()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\',\r\n                                        dataType: \'json\',\r\n                  " +
+"                      data: data,\r\n                                        succe" +
+"ss: function (d) {\r\n                                            if (d == \'OK\') {" +
+"\r\n                                                $this.hide(300).delay(300).que" +
+"ue(function () {\r\n                                                    var $this " +
+"= $(this);\r\n                                                    if ($this.attr(\'" +
+"data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n                         " +
+"                               Shadowbox.removeCache(this);\r\n                   " +
+"                                 $this.remove();\r\n                              " +
+"                  });\r\n                                            } else {\r\n   " +
+"                                             alert(\'Unable to remove attachment:" +
+" \' + d);\r\n                                            }\r\n                       " +
+"                     $dialogRemoveAttachment.dialog(\"close\");\r\n                 " +
+"                       },\r\n                                        error: functi" +
+"on (jqXHR, textStatus, errorThrown) {\r\n                                         " +
+"   alert(\'Unable to remove attachment: \' + textStatus);\r\n                       " +
+"                     $dialogRemoveAttachment.dialog(\"close\");\r\n                 " +
+"                       }\r\n                                    });\r\n             " +
+"                   },\r\n                                \"Cancel\": function () {\r\n" +
+"                                    $dialogRemoveAttachment.dialog(\"close\");\r\n  " +
+"                              }\r\n                            });\r\n\r\n            " +
+"                $dialogRemoveAttachment.dialog(\'open\');\r\n\r\n                     " +
+"       return false;\r\n                        }\r\n                        //#endr" +
+"egion\r\n                        ");
+
+            
+            #line 220 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+                               }
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+                    $attachmentOutput.children('a').each(function () {
+                        $this = $(this);
+                        if ($this.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
+                            $this.shadowbox({ gallery: 'attachments', player: 'img', title: $this.find('.comments').text() });
+                    });
+                });
+                </script>
+            </td>
+        </tr>
+    </table>
+    <div");
 
 WriteLiteral(" id=\"dialogUpload\"");
 
@@ -468,7 +697,7 @@ WriteLiteral("></span>\r\n            Are you sure?\r\n        </p>\r\n    </div
 "id=\"DeviceDetailTab-ResourcesLink\">Attachments [");
 
             
-            #line 200 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 243 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                                                                                                                 Write(Model.Device.DeviceAttachments == null ? 0 : Model.Device.DeviceAttachments.Count);
 
             
diff --git a/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml b/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
index 05502210..18d007a9 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
+++ b/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Models.Device.ShowModel
 @{
+    Authorization.Require(Claims.Device.Show);
+
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
 }
 <table id="Device_Show_Subjects">
@@ -23,19 +25,42 @@
                         </tr>
                         <tr>
                             <td>Asset:</td>
-                            <td>@Html.TextBoxFor(m => m.Device.AssetNumber, new { @class = "small discreet" }) @AjaxHelpers.AjaxSave() @AjaxHelpers.AjaxLoader()</td>
+                            <td>
+                                @if (Authorization.Has(Claims.Device.Properties.AssetNumber))
+                                {
+                                    @Html.TextBoxFor(m => m.Device.AssetNumber, new { @class = "small discreet" }) @AjaxHelpers.AjaxSave() @AjaxHelpers.AjaxLoader()
+                                }
+                                else
+                                {
+                                    <span class="small discreet">@Model.Device.AssetNumber</span>
+                                }
+                            </td>
                         </tr>
                         <tr>
                             <td>Location:</td>
-                            <td>@Html.TextBoxFor(m => m.Device.Location, new { @class = "small discreet" }) @AjaxHelpers.AjaxSave() @AjaxHelpers.AjaxLoader()</td>
+                            <td>
+                                @if (Authorization.Has(Claims.Device.Properties.Location))
+                                {
+                                    @Html.TextBoxFor(m => m.Device.Location, new { @class = "small discreet" }) @AjaxHelpers.AjaxSave() @AjaxHelpers.AjaxLoader()
+                                }
+                                else
+                                {
+                                    <span class="small discreet">@Model.Device.Location</span>
+                                }
+                            </td>
                         </tr>
                     </table>
-                    <script>
-                        $(function () {
-                            document.DiscoFunctions.PropertyChangeHelper($('#Device_AssetNumber'), 'Unknown', '@Url.Action(MVC.API.Device.UpdateAssetNumber(Model.Device.SerialNumber, null))', 'AssetNumber');
-                            document.DiscoFunctions.PropertyChangeHelper($('#Device_Location'), 'Unknown', '@Url.Action(MVC.API.Device.UpdateLocation(Model.Device.SerialNumber, null))', 'Location');
-                        });
-                    </script>
+                    @if (Authorization.HasAny(Claims.Device.Properties.AssetNumber, Claims.Device.Properties.Location))
+                    {
+                        <script>
+                            $(function () {
+                                @if (Authorization.Has(Claims.Device.Properties.AssetNumber))
+                                {<text>document.DiscoFunctions.PropertyChangeHelper($('#Device_AssetNumber'), 'Unknown', '@Url.Action(MVC.API.Device.UpdateAssetNumber(Model.Device.SerialNumber, null))', 'AssetNumber');</text>}
+                                @if (Authorization.Has(Claims.Device.Properties.Location))
+                                {<text>document.DiscoFunctions.PropertyChangeHelper($('#Device_Location'), 'Unknown', '@Url.Action(MVC.API.Device.UpdateLocation(Model.Device.SerialNumber, null))', 'Location');</text>}
+                            });
+                        </script>
+                    }
                 </div>
                 <div id="Device_Show_Details_Dates" class="status">
                     <table class="none verticalHeadings">
@@ -146,7 +171,7 @@
                                 {
                                     <div id="Device_Show_User">
                                         <div id="Device_Show_User_DisplayName" title="Display Name">@Html.ActionLink(assignedUser.DisplayName, MVC.User.Show(assignedUser.Id))</div>
-                                        <div id="Device_Show_User_Id" title="Id">@assignedUser.Id <span id="Device_Show_User_Type" title="Type">[@(assignedUser.Type)]</span></div>
+                                        <div id="Device_Show_User_Id" title="Id">@assignedUser.Id</div>
                                         @if (!string.IsNullOrWhiteSpace(assignedUser.PhoneNumber))
                                         {
                                             <div id="Device_Show_User_PhoneNumber" title="Phone Number">@assignedUser.PhoneNumber</div>
@@ -165,11 +190,13 @@
                         </tr>
                     </table>
                 </div>
-                <div id="Device_Show_GenerateDocument_Container" class="status">
-                    @Html.DropDownList("Device_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems)
-                    <script type="text/javascript">
-                        $(function () {
-                            var generatePdfUrl = '@Url.Action(MVC.API.Device.GeneratePdf(Model.Device.SerialNumber.ToString(), null))?DocumentTemplateId=';
+                @if (Authorization.Has(Claims.Device.Actions.GenerateDocuments))
+                {
+                    <div id="Device_Show_GenerateDocument_Container" class="status">
+                        @Html.DropDownList("Device_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems)
+                        <script type="text/javascript">
+                            $(function () {
+                                var generatePdfUrl = '@Url.Action(MVC.API.Device.GeneratePdf(Model.Device.SerialNumber.ToString(), null))?DocumentTemplateId=';
                             var $documentTemplates = $('#Device_Show_GenerateDocument');
                             $documentTemplates.change(function () {
                                 var v = $documentTemplates.val();
@@ -179,8 +206,9 @@
                                 }
                             });
                         });
-                    </script>
-                </div>
+                        </script>
+                    </div>
+                }
             </div>
         </td>
         <td id="Device_Show_Policies" rowspan="2">
@@ -602,7 +630,7 @@
                             {
                                 <li>
                                     <input type="radio" id="Device_Show_Device_Actions_Decommission_Reason_@((int)decommissionReason)"
-                                        name="Device_Show_Device_Actions_Decommission_Reason" value="@((int)decommissionReason)" @((decommissionReason== Device.DecommissionReasons.EndOfLife) ? "checked=\"checked\"" : string.Empty)/>
+                                        name="Device_Show_Device_Actions_Decommission_Reason" value="@((int)decommissionReason)" @((decommissionReason == Device.DecommissionReasons.EndOfLife) ? "checked=\"checked\"" : string.Empty)/>
                                     <label for="Device_Show_Device_Actions_Decommission_Reason_@((int)decommissionReason)">@(decommissionReason.ReasonMessage())</label>
                                 </li>
                             }
@@ -627,7 +655,7 @@
                                                             "Decommission": function () {
 
                                                                 var reasonId = buttonDialog.find('input:checked').val();
-                                                                
+
                                                                 var $this = $(this);
                                                                 $this.dialog("disable");
                                                                 $this.dialog("option", "buttons", null);
diff --git a/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs b/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs
index fb692ef4..0c176525 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs
+++ b/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Device.DeviceParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Device/DeviceParts/_Subject.cshtml")]
-    public partial class Subject : System.Web.Mvc.WebViewPage<Disco.Web.Models.Device.ShowModel>
+    public partial class Subject : Disco.Services.Web.WebViewPage<Disco.Web.Models.Device.ShowModel>
     {
         public Subject()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Views.Device.DeviceParts
             
             #line 2 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
   
+    Authorization.Require(Claims.Device.Show);
+
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
 
             
@@ -72,7 +76,7 @@ WriteLiteral(">Name:</span>\r\n                            </td>\r\n
 ">");
 
             
-            #line 14 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 16 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                  if (string.IsNullOrWhiteSpace(Model.Device.ComputerName))
                                 {
 
@@ -90,7 +94,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">&lt;Unknown/Not Allocated&gt;</span>\r\n");
 
             
-            #line 17 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 19 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                 }
                                 else
                                 {
@@ -107,7 +111,7 @@ WriteLiteral(" title=\"Computer Name\"");
 WriteLiteral(">");
 
             
-            #line 20 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 22 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                          Write(Model.Device.ComputerName);
 
             
@@ -116,7 +120,7 @@ WriteLiteral(">");
 WriteLiteral("</h4>\r\n");
 
             
-            #line 21 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 23 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                 }
 
             
@@ -124,85 +128,258 @@ WriteLiteral("</h4>\r\n");
             #line hidden
 WriteLiteral("                            </td>\r\n                        </tr>\r\n               " +
 "         <tr>\r\n                            <td>Asset:</td>\r\n                    " +
-"        <td>");
+"        <td>\r\n");
 
             
-            #line 26 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                           Write(Html.TextBoxFor(m => m.Device.AssetNumber, new { @class = "small discreet" }));
+            #line 29 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 29 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                 if (Authorization.Has(Claims.Device.Properties.AssetNumber))
+                                {
+                                    
+            
+            #line default
+            #line hidden
+            
+            #line 31 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                               Write(Html.TextBoxFor(m => m.Device.AssetNumber, new { @class = "small discreet" }));
 
             
             #line default
             #line hidden
-WriteLiteral(" ");
-
             
-            #line 26 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                          Write(AjaxHelpers.AjaxSave());
+            #line 31 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                   
+            
+            #line default
+            #line hidden
+            
+            #line 31 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                              Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral(" ");
-
             
-            #line 26 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                                                  Write(AjaxHelpers.AjaxLoader());
+            #line 31 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                                           
+            
+            #line default
+            #line hidden
+            
+            #line 31 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                                      Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("</td>\r\n                        </tr>\r\n                        <tr>\r\n             " +
-"               <td>Location:</td>\r\n                            <td>");
-
             
-            #line 30 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                           Write(Html.TextBoxFor(m => m.Device.Location, new { @class = "small discreet" }));
+            #line 31 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                                                                    
+                                }
+                                else
+                                {
 
             
             #line default
             #line hidden
-WriteLiteral(" ");
+WriteLiteral("                                    <span");
 
-            
-            #line 30 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                       Write(AjaxHelpers.AjaxSave());
+WriteLiteral(" class=\"small discreet\"");
 
-            
-            #line default
-            #line hidden
-WriteLiteral(" ");
-
-            
-            #line 30 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                                               Write(AjaxHelpers.AjaxLoader());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                        </tr>\r\n                    </table>\r\n             " +
-"       <script>\r\n                        $(function () {\r\n                      " +
-"      document.DiscoFunctions.PropertyChangeHelper($(\'#Device_AssetNumber\'), \'Un" +
-"known\', \'");
+WriteLiteral(">");
 
             
             #line 35 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                          Write(Url.Action(MVC.API.Device.UpdateAssetNumber(Model.Device.SerialNumber, null)));
+                                                            Write(Model.Device.AssetNumber);
 
             
             #line default
             #line hidden
-WriteLiteral("\', \'AssetNumber\');\r\n                            document.DiscoFunctions.PropertyC" +
-"hangeHelper($(\'#Device_Location\'), \'Unknown\', \'");
+WriteLiteral("</span>\r\n");
 
             
             #line 36 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                       Write(Url.Action(MVC.API.Device.UpdateLocation(Model.Device.SerialNumber, null)));
+                                }
 
             
             #line default
             #line hidden
-WriteLiteral("\', \'Location\');\r\n                        });\r\n                    </script>\r\n    " +
-"            </div>\r\n                <div");
+WriteLiteral("                            </td>\r\n                        </tr>\r\n               " +
+"         <tr>\r\n                            <td>Location:</td>\r\n                 " +
+"           <td>\r\n");
+
+            
+            #line 42 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 42 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                 if (Authorization.Has(Claims.Device.Properties.Location))
+                                {
+                                    
+            
+            #line default
+            #line hidden
+            
+            #line 44 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                               Write(Html.TextBoxFor(m => m.Device.Location, new { @class = "small discreet" }));
+
+            
+            #line default
+            #line hidden
+            
+            #line 44 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                
+            
+            #line default
+            #line hidden
+            
+            #line 44 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                           Write(AjaxHelpers.AjaxSave());
+
+            
+            #line default
+            #line hidden
+            
+            #line 44 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                                        
+            
+            #line default
+            #line hidden
+            
+            #line 44 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                                   Write(AjaxHelpers.AjaxLoader());
+
+            
+            #line default
+            #line hidden
+            
+            #line 44 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                                                                 
+                                }
+                                else
+                                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                    <span");
+
+WriteLiteral(" class=\"small discreet\"");
+
+WriteLiteral(">");
+
+            
+            #line 48 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                            Write(Model.Device.Location);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</span>\r\n");
+
+            
+            #line 49 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            </td>\r\n                        </tr>\r\n               " +
+"     </table>\r\n");
+
+            
+            #line 53 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 53 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                     if (Authorization.HasAny(Claims.Device.Properties.AssetNumber, Claims.Device.Properties.Location))
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <script>\r\n                            $(function () {\r\n");
+
+            
+            #line 57 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 57 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                 if (Authorization.Has(Claims.Device.Properties.AssetNumber))
+                                {
+            
+            #line default
+            #line hidden
+WriteLiteral("document.DiscoFunctions.PropertyChangeHelper($(\'#Device_AssetNumber\'), \'Unknown\'," +
+" \'");
+
+            
+            #line 58 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                     Write(Url.Action(MVC.API.Device.UpdateAssetNumber(Model.Device.SerialNumber, null)));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\', \'AssetNumber\');");
+
+            
+            #line 58 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                                                                                                                                 }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                ");
+
+            
+            #line 59 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                 if (Authorization.Has(Claims.Device.Properties.Location))
+                                {
+            
+            #line default
+            #line hidden
+WriteLiteral("document.DiscoFunctions.PropertyChangeHelper($(\'#Device_Location\'), \'Unknown\', \'");
+
+            
+            #line 60 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                  Write(Url.Action(MVC.API.Device.UpdateLocation(Model.Device.SerialNumber, null)));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\', \'Location\');");
+
+            
+            #line 60 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                                                                                                                        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            });\r\n                        </script>\r\n");
+
+            
+            #line 63 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n                <div");
 
 WriteLiteral(" id=\"Device_Show_Details_Dates\"");
 
@@ -220,7 +397,7 @@ WriteLiteral(" id=\"Device_Show_Details_Dates_Created\"");
 WriteLiteral(">");
 
             
-            #line 45 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 70 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                         Write(CommonHelpers.FriendlyDate(Model.Device.CreatedDate));
 
             
@@ -229,13 +406,13 @@ WriteLiteral(">");
 WriteLiteral("</span></td>\r\n                        </tr>\r\n");
 
             
-            #line 47 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 72 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 47 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 72 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                          if (Model.Device.DecommissionedDate.HasValue)
                         {
 
@@ -251,7 +428,7 @@ WriteLiteral(" id=\"Device_Show_Details_Dates_Decommissioned\"");
 WriteLiteral(">");
 
             
-            #line 52 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 77 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                    Write(CommonHelpers.FriendlyDate(Model.Device.DecommissionedDate));
 
             
@@ -260,7 +437,7 @@ WriteLiteral(">");
 WriteLiteral("</span></td>\r\n                            </tr>\r\n");
 
             
-            #line 54 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 79 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                         }
 
             
@@ -270,13 +447,13 @@ WriteLiteral("\r\n                        <tr>\r\n                            <t
 "                      </td>\r\n                            <td>\r\n");
 
             
-            #line 60 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 85 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                 
             
             #line default
             #line hidden
             
-            #line 60 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 85 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                  if (Model.Device.EnrolledDate.HasValue)
                                 {
 
@@ -294,7 +471,7 @@ WriteLiteral(" id=\"Device_Show_Details_Asset_Enrolled_First\"");
 WriteLiteral(">");
 
             
-            #line 62 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 87 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                        Write(CommonHelpers.FriendlyDate(Model.Device.EnrolledDate));
 
             
@@ -303,7 +480,7 @@ WriteLiteral(">");
 WriteLiteral("</span>\r\n");
 
             
-            #line 63 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 88 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                     if (Model.Device.LastEnrolDate.HasValue && Model.Device.EnrolledDate.Value != Model.Device.LastEnrolDate.Value)
                                     {
 
@@ -321,7 +498,7 @@ WriteLiteral(" id=\"Device_Show_Details_Asset_Enrolled_Last\"");
 WriteLiteral(">");
 
             
-            #line 65 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 90 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                            Write(CommonHelpers.FriendlyDate(Model.Device.LastEnrolDate));
 
             
@@ -330,7 +507,7 @@ WriteLiteral(">");
 WriteLiteral("</span>\r\n");
 
             
-            #line 66 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 91 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                     }
                                 }
                                 else
@@ -348,7 +525,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">Never</span>\r\n");
 
             
-            #line 71 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 96 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                 }
 
             
@@ -357,7 +534,7 @@ WriteLiteral(">Never</span>\r\n");
 WriteLiteral("                                ");
 
             
-            #line 72 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 97 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                  if (Model.Device.AllowUnauthenticatedEnrol)
                                 {
 
@@ -373,7 +550,7 @@ WriteLiteral(" title=\"Trusted Unauthenticated Enrolment is Allowed\"");
 WriteLiteral("></span>\r\n");
 
             
-            #line 75 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 100 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                 }
 
             
@@ -398,7 +575,7 @@ WriteLiteral(">Last Seen:</span>\r\n                            </td>\r\n
 "  <td>");
 
             
-            #line 86 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 111 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                   
                                 string lastSeenClass = null;
                                 if (Model.Device.LastNetworkLogonDate.HasValue)
@@ -423,20 +600,20 @@ WriteLiteral("\r\n                                <span");
 
 WriteLiteral(" id=\"Device_Show_Details_Status_LastSeen\"");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 5908), Tuple.Create("\"", 5930)
+WriteAttribute("class", Tuple.Create(" class=\"", 7240), Tuple.Create("\"", 7262)
             
-            #line 103 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-      , Tuple.Create(Tuple.Create("", 5916), Tuple.Create<System.Object, System.Int32>(lastSeenClass
+            #line 128 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+      , Tuple.Create(Tuple.Create("", 7248), Tuple.Create<System.Object, System.Int32>(lastSeenClass
             
             #line default
             #line hidden
-, 5916), false)
+, 7248), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 103 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 128 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                  Write(CommonHelpers.FriendlyDate(Model.Device.LastNetworkLogonDate));
 
             
@@ -445,13 +622,13 @@ WriteLiteral(">");
 WriteLiteral("</span></td>\r\n");
 
             
-            #line 104 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 129 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 104 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 129 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                              if (!string.IsNullOrEmpty(Model.Device.ComputerName))
                             {
 
@@ -471,7 +648,7 @@ WriteLiteral(@">
                                         $.getJSON('");
 
             
-            #line 112 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 137 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                Write(Url.Action(MVC.API.Device.LastNetworkLogonDate(Model.Device.SerialNumber)));
 
             
@@ -500,7 +677,7 @@ WriteLiteral(@"', function (response, result) {
 ");
 
             
-            #line 132 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 157 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                             }
 
             
@@ -514,13 +691,13 @@ WriteLiteral(" class=\"status\"");
 WriteLiteral(">\r\n");
 
             
-            #line 137 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 162 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 137 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 162 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                       
                         var assignedUser = Model.Device.AssignedUser;
                     
@@ -535,13 +712,13 @@ WriteLiteral(">\r\n                        <tr>\r\n                            <
 "                         </td>\r\n                            <td>\r\n");
 
             
-            #line 145 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 170 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                 
             
             #line default
             #line hidden
             
-            #line 145 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 170 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                  if (assignedUser != null)
                                 {
 
@@ -561,7 +738,7 @@ WriteLiteral(" title=\"Display Name\"");
 WriteLiteral(">");
 
             
-            #line 148 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 173 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                Write(Html.ActionLink(assignedUser.DisplayName, MVC.User.Show(assignedUser.Id)));
 
             
@@ -576,37 +753,22 @@ WriteLiteral(" title=\"Id\"");
 WriteLiteral(">");
 
             
-            #line 149 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 174 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                             Write(assignedUser.Id);
 
             
             #line default
             #line hidden
-WriteLiteral(" <span");
-
-WriteLiteral(" id=\"Device_Show_User_Type\"");
-
-WriteLiteral(" title=\"Type\"");
-
-WriteLiteral(">[");
+WriteLiteral("</div>\r\n");
 
             
-            #line 149 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                                                             Write(assignedUser.Type);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("]</span></div>\r\n");
-
-            
-            #line 150 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 175 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                         
             
             #line default
             #line hidden
             
-            #line 150 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 175 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                          if (!string.IsNullOrWhiteSpace(assignedUser.PhoneNumber))
                                         {
 
@@ -622,7 +784,7 @@ WriteLiteral(" title=\"Phone Number\"");
 WriteLiteral(">");
 
             
-            #line 152 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 177 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                    Write(assignedUser.PhoneNumber);
 
             
@@ -631,7 +793,7 @@ WriteLiteral(">");
 WriteLiteral("</div>\r\n");
 
             
-            #line 153 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 178 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                         }
 
             
@@ -640,7 +802,7 @@ WriteLiteral("</div>\r\n");
 WriteLiteral("                                        ");
 
             
-            #line 154 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 179 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                          if (!string.IsNullOrWhiteSpace(assignedUser.EmailAddress))
                                         {
 
@@ -655,21 +817,21 @@ WriteLiteral(" title=\"Email Address\"");
 
 WriteLiteral("><a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 9471), Tuple.Create("\"", 9526)
-, Tuple.Create(Tuple.Create("", 9478), Tuple.Create("mailto:", 9478), true)
+WriteAttribute("href", Tuple.Create(" href=\"", 10727), Tuple.Create("\"", 10782)
+, Tuple.Create(Tuple.Create("", 10734), Tuple.Create("mailto:", 10734), true)
             
-            #line 156 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                           , Tuple.Create(Tuple.Create("", 9485), Tuple.Create<System.Object, System.Int32>(Model.Device.AssignedUser.EmailAddress
+            #line 181 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                          , Tuple.Create(Tuple.Create("", 10741), Tuple.Create<System.Object, System.Int32>(Model.Device.AssignedUser.EmailAddress
             
             #line default
             #line hidden
-, 9485), false)
+, 10741), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 156 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 181 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                                                 Write(assignedUser.EmailAddress);
 
             
@@ -678,7 +840,7 @@ WriteLiteral(">");
 WriteLiteral("</a></div>\r\n");
 
             
-            #line 157 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 182 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                         }
 
             
@@ -687,7 +849,7 @@ WriteLiteral("</a></div>\r\n");
 WriteLiteral("                                    </div>\r\n");
 
             
-            #line 159 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 184 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                 }
                                 else
                                 {
@@ -702,14 +864,30 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">Not Assigned</span>\r\n");
 
             
-            #line 163 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 188 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                 }
 
             
             #line default
             #line hidden
 WriteLiteral("                            </td>\r\n                        </tr>\r\n               " +
-"     </table>\r\n                </div>\r\n                <div");
+"     </table>\r\n                </div>\r\n");
+
+            
+            #line 193 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 193 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                 if (Authorization.Has(Claims.Device.Actions.GenerateDocuments))
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <div");
 
 WriteLiteral(" id=\"Device_Show_GenerateDocument_Container\"");
 
@@ -717,25 +895,25 @@ WriteLiteral(" class=\"status\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("                    ");
+WriteLiteral("                        ");
 
             
-            #line 169 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-               Write(Html.DropDownList("Device_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems));
+            #line 196 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                   Write(Html.DropDownList("Device_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    <script");
+WriteLiteral("\r\n                        <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n                        $(function () {\r\n                            var gener" +
-"atePdfUrl = \'");
+WriteLiteral(">\r\n                            $(function () {\r\n                                v" +
+"ar generatePdfUrl = \'");
 
             
-            #line 172 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                             Write(Url.Action(MVC.API.Device.GeneratePdf(Model.Device.SerialNumber.ToString(), null)));
+            #line 199 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                 Write(Url.Action(MVC.API.Device.GeneratePdf(Model.Device.SerialNumber.ToString(), null)));
 
             
             #line default
@@ -750,11 +928,18 @@ WriteLiteral(@"?DocumentTemplateId=';
                                 }
                             });
                         });
-                    </script>
-                </div>
-            </div>
-        </td>
-        <td");
+                        </script>
+                    </div>
+");
+
+            
+            #line 211 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </div>\r\n        </td>\r\n        <td");
 
 WriteLiteral(" id=\"Device_Show_Policies\"");
 
@@ -771,7 +956,7 @@ WriteLiteral(" title=\"Device Profile\"");
 WriteLiteral(">");
 
             
-            #line 189 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 217 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                           Write(Html.ActionLink(Model.Device.DeviceProfile.Name, MVC.Config.DeviceProfile.Index(Model.Device.DeviceProfileId)));
 
             
@@ -789,7 +974,7 @@ WriteLiteral(">Distribution:</span>\r\n                            </td>\r\n
 "     <td>");
 
             
-            #line 194 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 222 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                            Write(Model.Device.DeviceProfile.DistributionType.ToString());
 
             
@@ -804,7 +989,7 @@ WriteLiteral(">Address:</span>\r\n                            </td>\r\n
 "<td>");
 
             
-            #line 200 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 228 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                   
                                 if (Model.DeviceProfileDefaultOrganisationAddress != null)
                                 {
@@ -819,7 +1004,7 @@ WriteLiteral(" id=\"Device_Show_Policies_Profile_Address\"");
 WriteLiteral(">");
 
             
-            #line 203 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 231 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                            Write(Model.DeviceProfileDefaultOrganisationAddress.Name);
 
             
@@ -828,7 +1013,7 @@ WriteLiteral(">");
 WriteLiteral("</span>\r\n");
 
             
-            #line 204 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 232 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                 }
                                 else
                                 {
@@ -845,7 +1030,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">None</span>\r\n");
 
             
-            #line 208 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 236 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                 }
                             
             
@@ -860,7 +1045,7 @@ WriteLiteral(">Provision Account:</span>\r\n                            </td>\r\
 "          <td>");
 
             
-            #line 215 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 243 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                             Write(Model.Device.DeviceProfile.ProvisionADAccount ? "Active Directory" : "No");
 
             
@@ -875,7 +1060,7 @@ WriteLiteral(">Allocate Certificate:</span>\r\n                            </td>
 "             <td>");
 
             
-            #line 221 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 249 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                             Write(Model.DeviceProfileCertificateProvider != null ? Model.DeviceProfileCertificateProvider.Name : "No");
 
             
@@ -885,13 +1070,13 @@ WriteLiteral("\r\n                            </td>\r\n                        <
 "       </table>\r\n");
 
             
-            #line 225 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 253 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 225 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 253 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                      if (Model.Device.CanUpdateDeviceProfile())
                     {
                         
@@ -899,14 +1084,14 @@ WriteLiteral("\r\n                            </td>\r\n                        <
             #line default
             #line hidden
             
-            #line 227 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 255 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                    Write(Html.ActionLinkSmallButton("Update Profile", MVC.API.Device.UpdateDeviceProfileId(Model.Device.SerialNumber, null, true), "Device_Show_Policies_Profile_Actions_Update_Button"));
 
             
             #line default
             #line hidden
             
-            #line 227 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 255 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                                                                                         
 
 
@@ -928,13 +1113,13 @@ WriteLiteral(" class=\"none\"");
 WriteLiteral(">\r\n");
 
             
-            #line 232 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 260 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                     
             
             #line default
             #line hidden
             
-            #line 232 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 260 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                      foreach (var dp in Model.DeviceProfiles.OrderBy(i => i.Name))
                                     {
 
@@ -949,7 +1134,7 @@ WriteLiteral(" type=\"radio\"");
 WriteLiteral(" data-deviceprofileid=\"");
 
             
-            #line 235 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 263 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                  Write(dp.Id);
 
             
@@ -959,45 +1144,45 @@ WriteLiteral("\"");
 
 WriteLiteral(" name=\"DeviceProfile\"");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 14064), Tuple.Create("\"", 14091)
-, Tuple.Create(Tuple.Create("", 14069), Tuple.Create("DeviceProfile_", 14069), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 15468), Tuple.Create("\"", 15495)
+, Tuple.Create(Tuple.Create("", 15473), Tuple.Create("DeviceProfile_", 15473), true)
             
-            #line 235 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                     , Tuple.Create(Tuple.Create("", 14083), Tuple.Create<System.Object, System.Int32>(dp.Id
+            #line 263 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                     , Tuple.Create(Tuple.Create("", 15487), Tuple.Create<System.Object, System.Int32>(dp.Id
             
             #line default
             #line hidden
-, 14083), false)
+, 15487), false)
 );
 
 WriteLiteral(" /><label");
 
-WriteAttribute("for", Tuple.Create(" for=\"", 14101), Tuple.Create("\"", 14129)
-, Tuple.Create(Tuple.Create("", 14107), Tuple.Create("DeviceProfile_", 14107), true)
+WriteAttribute("for", Tuple.Create(" for=\"", 15505), Tuple.Create("\"", 15533)
+, Tuple.Create(Tuple.Create("", 15511), Tuple.Create("DeviceProfile_", 15511), true)
             
-            #line 235 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                           , Tuple.Create(Tuple.Create("", 14121), Tuple.Create<System.Object, System.Int32>(dp.Id
+            #line 263 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                           , Tuple.Create(Tuple.Create("", 15525), Tuple.Create<System.Object, System.Int32>(dp.Id
             
             #line default
             #line hidden
-, 14121), false)
+, 15525), false)
 );
 
-WriteAttribute("title", Tuple.Create(" title=\"", 14130), Tuple.Create("\"", 14174)
-, Tuple.Create(Tuple.Create("", 14138), Tuple.Create("Distribution:", 14138), true)
+WriteAttribute("title", Tuple.Create(" title=\"", 15534), Tuple.Create("\"", 15578)
+, Tuple.Create(Tuple.Create("", 15542), Tuple.Create("Distribution:", 15542), true)
             
-            #line 235 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                                         , Tuple.Create(Tuple.Create(" ", 14151), Tuple.Create<System.Object, System.Int32>(dp.DistributionType
+            #line 263 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                         , Tuple.Create(Tuple.Create(" ", 15555), Tuple.Create<System.Object, System.Int32>(dp.DistributionType
             
             #line default
             #line hidden
-, 14152), false)
+, 15556), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 235 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 263 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                                                                                                              Write(dp.Name);
 
             
@@ -1006,7 +1191,7 @@ WriteLiteral(">");
 WriteLiteral("</label></li>   \r\n");
 
             
-            #line 236 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 264 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                     }
 
             
@@ -1019,7 +1204,7 @@ WriteLiteral("                        <script>\r\n                            $(
 "                              var currentProfile = \'");
 
             
-            #line 242 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 270 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                   Write(Model.Device.DeviceProfileId);
 
             
@@ -1071,7 +1256,7 @@ WriteLiteral("\';\r\n                                var button = $(\'#Device_Sh
 ">\r\n");
 
             
-            #line 292 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 320 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                     }
 
             
@@ -1086,13 +1271,13 @@ WriteLiteral(" class=\"status\"");
 WriteLiteral(">\r\n");
 
             
-            #line 295 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 323 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 295 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 323 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                      if (Model.Device.DeviceBatchId.HasValue)
                     {
 
@@ -1106,7 +1291,7 @@ WriteLiteral(" title=\"Device Batch\"");
 WriteLiteral(">");
 
             
-            #line 297 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 325 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                             Write(Html.ActionLink(Model.Device.DeviceBatch.Name, MVC.Config.DeviceBatch.Index(Model.Device.DeviceBatchId.Value)));
 
             
@@ -1126,7 +1311,7 @@ WriteLiteral(">Purchased:</span>\r\n                                </td>\r\n
 "          <td>");
 
             
-            #line 302 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 330 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                Write(CommonHelpers.FriendlyDate(Model.Device.DeviceBatch.PurchaseDate));
 
             
@@ -1141,7 +1326,7 @@ WriteLiteral(">Supplier:</span>\r\n                                </td>\r\n
 "         <td>");
 
             
-            #line 308 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 336 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                 Write(Model.Device.DeviceBatch.Supplier ?? "Unknown");
 
             
@@ -1155,20 +1340,20 @@ WriteLiteral(" title=\"Warranty Valid Until\"");
 WriteLiteral(">Warranty Until:</span>\r\n                                </td>\r\n                 " +
 "               <td");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 19238), Tuple.Create("\"", 19386)
+WriteAttribute("class", Tuple.Create(" class=\"", 20642), Tuple.Create("\"", 20790)
             
-            #line 314 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 19246), Tuple.Create<System.Object, System.Int32>(Model.Device.DeviceBatch.WarrantyValidUntil.HasValue && Model.Device.DeviceBatch.WarrantyValidUntil.Value < DateTime.Now ? "alert" : null
+            #line 342 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+, Tuple.Create(Tuple.Create("", 20650), Tuple.Create<System.Object, System.Int32>(Model.Device.DeviceBatch.WarrantyValidUntil.HasValue && Model.Device.DeviceBatch.WarrantyValidUntil.Value < DateTime.Now ? "alert" : null
             
             #line default
             #line hidden
-, 19246), false)
+, 20650), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 314 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 342 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                                                                     Write(CommonHelpers.FriendlyDate(Model.Device.DeviceBatch.WarrantyValidUntil, "Unknown", null));
 
             
@@ -1183,7 +1368,7 @@ WriteLiteral(">Insurance Supplier:</span>\r\n                                </t
 "                   <td>");
 
             
-            #line 320 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 348 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                 Write(Model.Device.DeviceBatch.InsuranceSupplier ?? "Unknown");
 
             
@@ -1197,20 +1382,20 @@ WriteLiteral(" title=\"Insured Until\"");
 WriteLiteral(">Insured Until:</span>\r\n                                </td>\r\n                  " +
 "              <td");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 20088), Tuple.Create("\"", 20224)
+WriteAttribute("class", Tuple.Create(" class=\"", 21492), Tuple.Create("\"", 21628)
             
-            #line 326 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 20096), Tuple.Create<System.Object, System.Int32>(Model.Device.DeviceBatch.InsuredUntil.HasValue && Model.Device.DeviceBatch.InsuredUntil.Value < DateTime.Now ? "alert" : null
+            #line 354 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+, Tuple.Create(Tuple.Create("", 21500), Tuple.Create<System.Object, System.Int32>(Model.Device.DeviceBatch.InsuredUntil.HasValue && Model.Device.DeviceBatch.InsuredUntil.Value < DateTime.Now ? "alert" : null
             
             #line default
             #line hidden
-, 20096), false)
+, 21500), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 326 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 354 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                                                         Write(CommonHelpers.FriendlyDate(Model.Device.DeviceBatch.InsuredUntil, "Unknown", null));
 
             
@@ -1220,7 +1405,7 @@ WriteLiteral("\r\n                                </td>\r\n
 "                   </table>\r\n");
 
             
-            #line 330 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 358 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                     }
                     else
                     {
@@ -1231,7 +1416,7 @@ WriteLiteral("\r\n                                </td>\r\n
 WriteLiteral("                        <h2>Batch: <em>Not Associated</em></h2>\r\n");
 
             
-            #line 334 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 362 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                     }
 
             
@@ -1240,7 +1425,7 @@ WriteLiteral("                        <h2>Batch: <em>Not Associated</em></h2>\r\
 WriteLiteral("                    ");
 
             
-            #line 335 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 363 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                      if (Model.Device.CanUpdateDeviceBatch())
                     {
                         
@@ -1248,14 +1433,14 @@ WriteLiteral("                    ");
             #line default
             #line hidden
             
-            #line 337 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 365 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                    Write(Html.ActionLinkSmallButton("Update Batch", MVC.API.Device.UpdateDeviceBatchId(Model.Device.SerialNumber, null, true), "Device_Show_Policies_Batch_Actions_Update_Button"));
 
             
             #line default
             #line hidden
             
-            #line 337 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 365 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                                                                                   
 
 
@@ -1277,13 +1462,13 @@ WriteLiteral(" class=\"none\"");
 WriteLiteral(">\r\n");
 
             
-            #line 342 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 370 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                     
             
             #line default
             #line hidden
             
-            #line 342 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 370 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                      foreach (var db in Model.DeviceBatches.OrderBy(i => i.Name))
                                     {
 
@@ -1298,7 +1483,7 @@ WriteLiteral(" type=\"radio\"");
 WriteLiteral(" data-devicebatchid=\"");
 
             
-            #line 345 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 373 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                Write(db.Id);
 
             
@@ -1308,45 +1493,45 @@ WriteLiteral("\"");
 
 WriteLiteral(" name=\"DeviceBatch\"");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 21374), Tuple.Create("\"", 21399)
-, Tuple.Create(Tuple.Create("", 21379), Tuple.Create("DeviceBatch_", 21379), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 22778), Tuple.Create("\"", 22803)
+, Tuple.Create(Tuple.Create("", 22783), Tuple.Create("DeviceBatch_", 22783), true)
             
-            #line 345 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                               , Tuple.Create(Tuple.Create("", 21391), Tuple.Create<System.Object, System.Int32>(db.Id
+            #line 373 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                               , Tuple.Create(Tuple.Create("", 22795), Tuple.Create<System.Object, System.Int32>(db.Id
             
             #line default
             #line hidden
-, 21391), false)
+, 22795), false)
 );
 
 WriteLiteral(" /><label");
 
-WriteAttribute("for", Tuple.Create(" for=\"", 21409), Tuple.Create("\"", 21435)
-, Tuple.Create(Tuple.Create("", 21415), Tuple.Create("DeviceBatch_", 21415), true)
+WriteAttribute("for", Tuple.Create(" for=\"", 22813), Tuple.Create("\"", 22839)
+, Tuple.Create(Tuple.Create("", 22819), Tuple.Create("DeviceBatch_", 22819), true)
             
-            #line 345 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                   , Tuple.Create(Tuple.Create("", 21427), Tuple.Create<System.Object, System.Int32>(db.Id
+            #line 373 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                   , Tuple.Create(Tuple.Create("", 22831), Tuple.Create<System.Object, System.Int32>(db.Id
             
             #line default
             #line hidden
-, 21427), false)
+, 22831), false)
 );
 
-WriteAttribute("title", Tuple.Create(" title=\"", 21436), Tuple.Create("\"", 21483)
-, Tuple.Create(Tuple.Create("", 21444), Tuple.Create("Purchased:", 21444), true)
+WriteAttribute("title", Tuple.Create(" title=\"", 22840), Tuple.Create("\"", 22887)
+, Tuple.Create(Tuple.Create("", 22848), Tuple.Create("Purchased:", 22848), true)
             
-            #line 345 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                              , Tuple.Create(Tuple.Create(" ", 21454), Tuple.Create<System.Object, System.Int32>(db.PurchaseDate.ToFuzzy()
+            #line 373 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                              , Tuple.Create(Tuple.Create(" ", 22858), Tuple.Create<System.Object, System.Int32>(db.PurchaseDate.ToFuzzy()
             
             #line default
             #line hidden
-, 21455), false)
+, 22859), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 345 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 373 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                                                                                                         Write(db.Name);
 
             
@@ -1355,7 +1540,7 @@ WriteLiteral(">");
 WriteLiteral("</label></li>   \r\n");
 
             
-            #line 346 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 374 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                     }
 
             
@@ -1368,7 +1553,7 @@ WriteLiteral("                        <script>\r\n                            $(
 "                              var currentBatch = \'");
 
             
-            #line 352 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 380 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                 Write(Model.Device.DeviceBatchId);
 
             
@@ -1419,7 +1604,7 @@ WriteLiteral("\';\r\n                                var button = $(\'#Device_Sh
 "                     });\r\n                        </script>\r\n");
 
             
-            #line 402 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 430 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                     }
 
             
@@ -1446,7 +1631,7 @@ WriteLiteral(" title=\"Model Description\"");
 WriteLiteral(">");
 
             
-            #line 409 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 437 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                         Write(Html.ActionLink(Model.Device.DeviceModel.ToString(), MVC.Config.DeviceModel.Index(Model.Device.DeviceModelId)));
 
             
@@ -1458,14 +1643,14 @@ WriteLiteral(" id=\"Device_Show_Aspects_Model_Image\"");
 
 WriteLiteral(" alt=\"Model Image\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 25752), Tuple.Create("\"", 25862)
+WriteAttribute("src", Tuple.Create(" src=\"", 27156), Tuple.Create("\"", 27266)
             
-            #line 410 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-    , Tuple.Create(Tuple.Create("", 25758), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash()))
+            #line 438 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+    , Tuple.Create(Tuple.Create("", 27162), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash()))
             
             #line default
             #line hidden
-, 25758), false)
+, 27162), false)
 );
 
 WriteLiteral(" />\r\n                </div>\r\n            </div>\r\n        </td>\r\n    </tr>\r\n    <t" +
@@ -1480,13 +1665,13 @@ WriteLiteral(" id=\"Device_Show_Device_Actions\"");
 WriteLiteral(">\r\n");
 
             
-            #line 417 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 445 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
             
             
             #line default
             #line hidden
             
-            #line 417 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 445 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
              if (Model.Device.CanCreateJob())
             {
                 Html.BundleDeferred("~/ClientScripts/Modules/Disco-CreateJob");
@@ -1495,14 +1680,14 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 420 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 448 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Create Job", MVC.Job.Create(Model.Device.SerialNumber, Model.Device.AssignedUserId), "buttonCreateJob"));
 
             
             #line default
             #line hidden
             
-            #line 420 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 448 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                                     
             }
 
@@ -1512,7 +1697,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("            ");
 
             
-            #line 422 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 450 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
              if (Model.Device.CanUpdateAssignment())
             {
                 
@@ -1520,14 +1705,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 424 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 452 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Update Assignment", MVC.API.Device.UpdateAssignedUserId(Model.Device.SerialNumber, null, true), "Device_Show_User_Actions_Assign_Button"));
 
             
             #line default
             #line hidden
             
-            #line 424 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 452 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                                                                       
 
             
@@ -1570,13 +1755,13 @@ WriteLiteral(@">
 ");
 
             
-            #line 439 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 467 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                 
             
             #line default
             #line hidden
             
-            #line 439 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 467 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                   
                 if (assignedUser != null)
                 {
@@ -1598,7 +1783,7 @@ WriteLiteral(@"
 WriteLiteral("\r\n");
 
             
-            #line 450 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 478 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                 }
                                                 
             
@@ -1629,7 +1814,7 @@ WriteLiteral("\r\n                            \"Assign\": function () {\r\n
 "                              source: \'");
 
             
-            #line 481 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 509 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                              Write(Url.Action(MVC.API.User.UpstreamUsers()));
 
             
@@ -1659,7 +1844,7 @@ WriteLiteral(@"',
 ");
 
             
-            #line 502 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 530 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
             }
 
             
@@ -1668,7 +1853,7 @@ WriteLiteral(@"',
 WriteLiteral("            ");
 
             
-            #line 503 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 531 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
              if (Model.Device.CanUpdateTrustEnrol())
             {
                 
@@ -1676,14 +1861,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 505 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 533 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Trust Enrol", MVC.API.Device.UpdateAllowUnauthenticatedEnrol(Model.Device.SerialNumber, true.ToString(), true), "Device_Show_Device_Actions_TrustEnrol_Button"));
 
             
             #line default
             #line hidden
             
-            #line 505 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 533 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                                                                                             
 
             
@@ -1719,7 +1904,7 @@ WriteLiteral("></span>\r\n                                This action will allow
 "iming</em> to have the Serial Number \'");
 
             
-            #line 511 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 539 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                          Write(Model.Device.SerialNumber);
 
             
@@ -1779,7 +1964,7 @@ WriteLiteral(@">
 ");
 
             
-            #line 550 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 578 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
             }
 
             
@@ -1788,7 +1973,7 @@ WriteLiteral(@">
 WriteLiteral("            ");
 
             
-            #line 551 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 579 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
              if (Model.Device.CanUpdateUntrustEnrol())
             {
                 
@@ -1796,14 +1981,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 553 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 581 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Untrust Enrol", MVC.API.Device.UpdateAllowUnauthenticatedEnrol(Model.Device.SerialNumber, false.ToString(), true), "Device_Show_Device_Actions_UntrustEnrol_Button"));
 
             
             #line default
             #line hidden
             
-            #line 553 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 581 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                                                                                                  
 
             
@@ -1868,7 +2053,7 @@ WriteLiteral(@">
 ");
 
             
-            #line 590 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 618 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
             }
 
             
@@ -1877,7 +2062,7 @@ WriteLiteral(@">
 WriteLiteral("            ");
 
             
-            #line 591 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 619 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
              if (Model.Device.CanDecommission())
             { 
                 
@@ -1885,14 +2070,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 593 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 621 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Decommission", MVC.API.Device.Decommission(), "Device_Show_Device_Actions_Decommission_Button"));
 
             
             #line default
             #line hidden
             
-            #line 593 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 621 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                             
 
             
@@ -1926,13 +2111,13 @@ WriteLiteral(" class=\"none\"");
 WriteLiteral(">\r\n");
 
             
-            #line 601 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 629 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 601 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 629 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                              foreach (Device.DecommissionReasons decommissionReason in Enum.GetValues(typeof(Device.DecommissionReasons)))
                             {
 
@@ -1943,56 +2128,56 @@ WriteLiteral("                                <li>\r\n
 
 WriteLiteral(" type=\"radio\"");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 37225), Tuple.Create("\"", 37303)
-, Tuple.Create(Tuple.Create("", 37230), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 37230), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 38629), Tuple.Create("\"", 38707)
+, Tuple.Create(Tuple.Create("", 38634), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 38634), true)
             
-            #line 604 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                           , Tuple.Create(Tuple.Create("", 37277), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
+            #line 632 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                           , Tuple.Create(Tuple.Create("", 38681), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
             
             #line default
             #line hidden
-, 37277), false)
+, 38681), false)
 );
 
 WriteLiteral("\r\n                                        name=\"Device_Show_Device_Actions_Decomm" +
 "ission_Reason\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 37399), Tuple.Create("\"", 37433)
+WriteAttribute("value", Tuple.Create(" value=\"", 38803), Tuple.Create("\"", 38837)
             
-            #line 605 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                     , Tuple.Create(Tuple.Create("", 37407), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
+            #line 633 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                     , Tuple.Create(Tuple.Create("", 38811), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
             
             #line default
             #line hidden
-, 37407), false)
+, 38811), false)
 );
 
 WriteLiteral(" ");
 
             
-            #line 605 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                                             Write((decommissionReason== Device.DecommissionReasons.EndOfLife) ? "checked=\"checked\"" : string.Empty);
+            #line 633 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                                                                                                             Write((decommissionReason == Device.DecommissionReasons.EndOfLife) ? "checked=\"checked\"" : string.Empty);
 
             
             #line default
             #line hidden
 WriteLiteral("/>\r\n                                    <label");
 
-WriteAttribute("for", Tuple.Create(" for=\"", 37582), Tuple.Create("\"", 37661)
-, Tuple.Create(Tuple.Create("", 37588), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 37588), true)
+WriteAttribute("for", Tuple.Create(" for=\"", 38987), Tuple.Create("\"", 39066)
+, Tuple.Create(Tuple.Create("", 38993), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 38993), true)
             
-            #line 606 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-               , Tuple.Create(Tuple.Create("", 37635), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
+            #line 634 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+               , Tuple.Create(Tuple.Create("", 39040), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
             
             #line default
             #line hidden
-, 37635), false)
+, 39040), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 606 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 634 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                        Write(decommissionReason.ReasonMessage());
 
             
@@ -2001,7 +2186,7 @@ WriteLiteral(">");
 WriteLiteral("</label>\r\n                                </li>\r\n");
 
             
-            #line 608 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 636 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                             }
 
             
@@ -2019,7 +2204,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 "uttonDialog = null;\r\n                        var deviceSerialNumber = \'");
 
             
-            #line 616 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 644 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                               Write(Model.Device.SerialNumber);
 
             
@@ -2034,26 +2219,25 @@ WriteLiteral("\';\r\n\r\n                        button.click(function () {\r\n\
 "en: false,\r\n                                                        buttons: {\r\n" +
 "                                                            \"Decommission\": func" +
 "tion () {\r\n\r\n                                                                var" +
-" reasonId = buttonDialog.find(\'input:checked\').val();\r\n                         " +
-"                                       \r\n                                       " +
-"                         var $this = $(this);\r\n                                 " +
-"                               $this.dialog(\"disable\");\r\n                       " +
-"                                         $this.dialog(\"option\", \"buttons\", null)" +
-";\r\n\r\n                                                                var url = b" +
-"utton.attr(\'href\') + \'/\' + deviceSerialNumber + \'?Reason=\' + reasonId + \'&redire" +
-"ct=True\';\r\n\r\n                                                                win" +
-"dow.location.href = url;\r\n                                                      " +
-"      },\r\n                                                            Cancel: fu" +
-"nction () {\r\n                                                                $(t" +
-"his).dialog(\"close\");\r\n                                                         " +
-"   }\r\n                                                        }\r\n               " +
-"                                     });\r\n                            }\r\n\r\n     " +
-"                       buttonDialog.dialog(\'open\');\r\n                           " +
-" return false;\r\n                        });\r\n\r\n                    });\r\n        " +
-"        </script>\r\n");
+" reasonId = buttonDialog.find(\'input:checked\').val();\r\n\r\n                       " +
+"                                         var $this = $(this);\r\n                 " +
+"                                               $this.dialog(\"disable\");\r\n       " +
+"                                                         $this.dialog(\"option\", " +
+"\"buttons\", null);\r\n\r\n                                                           " +
+"     var url = button.attr(\'href\') + \'/\' + deviceSerialNumber + \'?Reason=\' + rea" +
+"sonId + \'&redirect=True\';\r\n\r\n                                                   " +
+"             window.location.href = url;\r\n                                      " +
+"                      },\r\n                                                      " +
+"      Cancel: function () {\r\n                                                   " +
+"             $(this).dialog(\"close\");\r\n                                         " +
+"                   }\r\n                                                        }\r" +
+"\n                                                    });\r\n                      " +
+"      }\r\n\r\n                            buttonDialog.dialog(\'open\');\r\n           " +
+"                 return false;\r\n                        });\r\n\r\n                 " +
+"   });\r\n                </script>\r\n");
 
             
-            #line 652 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 680 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
             }
 
             
@@ -2062,7 +2246,7 @@ WriteLiteral("\';\r\n\r\n                        button.click(function () {\r\n\
 WriteLiteral("            ");
 
             
-            #line 653 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 681 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
              if (Model.Device.CanRecommission())
             { 
                 
@@ -2070,14 +2254,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 655 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 683 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Recommission", MVC.API.Device.Recommission(Model.Device.SerialNumber, true), "Device_Show_Device_Actions_Recommission_Button"));
 
             
             #line default
             #line hidden
             
-            #line 655 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 683 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                                                            
 
             
@@ -2134,7 +2318,7 @@ WriteLiteral(@">
 ");
 
             
-            #line 691 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 719 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
             }
 
             
@@ -2143,7 +2327,7 @@ WriteLiteral(@">
 WriteLiteral("            ");
 
             
-            #line 692 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 720 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
              if (Model.Device.CanDelete())
             { 
                 
@@ -2151,14 +2335,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 694 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 722 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Delete Device", MVC.API.Device.Delete(Model.Device.SerialNumber, true), "Device_Show_Device_Actions_Delete_Button"));
 
             
             #line default
             #line hidden
             
-            #line 694 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 722 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
                                                                                                                                                                 
 
             
@@ -2220,7 +2404,7 @@ WriteLiteral(@">
 ");
 
             
-            #line 732 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+            #line 760 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
             }
 
             
diff --git a/Disco.Web/Views/Device/ImportExport.cshtml b/Disco.Web/Views/Device/ImportExport.cshtml
index 7e7548ec..55825af4 100644
--- a/Disco.Web/Views/Device/ImportExport.cshtml
+++ b/Disco.Web/Views/Device/ImportExport.cshtml
@@ -1,7 +1,10 @@
 @model Disco.Web.Models.Device.ImportModel
 @{
+    Authorization.RequireAny(Claims.Device.Actions.Import, Claims.Device.Actions.Export);
+
     ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Import/Export Devices");
 }
+@if (Authorization.Has(Claims.Device.Actions.Import)){
 <div id="deviceImport">
     @using (Html.BeginForm(MVC.API.Device.ImportParse(), FormMethod.Post, new { enctype = "multipart/form-data" }))
     {
@@ -185,8 +188,10 @@
             });
         </script>
     </div>
-
-    <div class="actionBar">
-        @Html.ActionLinkButton("Export All Devices", MVC.API.Device.ExportAllDevices())
-    </div>
 </div>
+}
+@if (Authorization.Has(Claims.Device.Actions.Export)){
+<div class="actionBar">
+    @Html.ActionLinkButton("Export All Devices", MVC.API.Device.ExportAllDevices())
+</div>
+}
\ No newline at end of file
diff --git a/Disco.Web/Views/Device/ImportExport.generated.cs b/Disco.Web/Views/Device/ImportExport.generated.cs
index f207d673..af620337 100644
--- a/Disco.Web/Views/Device/ImportExport.generated.cs
+++ b/Disco.Web/Views/Device/ImportExport.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Device
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Device/ImportExport.cshtml")]
-    public partial class ImportExport : System.Web.Mvc.WebViewPage<Disco.Web.Models.Device.ImportModel>
+    public partial class ImportExport : Disco.Services.Web.WebViewPage<Disco.Web.Models.Device.ImportModel>
     {
         public ImportExport()
         {
@@ -43,25 +45,36 @@ namespace Disco.Web.Views.Device
             
             #line 2 "..\..\Views\Device\ImportExport.cshtml"
   
+    Authorization.RequireAny(Claims.Device.Actions.Import, Claims.Device.Actions.Export);
+
     ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Import/Export Devices");
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n<div");
+WriteLiteral("\r\n");
+
+            
+            #line 7 "..\..\Views\Device\ImportExport.cshtml"
+ if (Authorization.Has(Claims.Device.Actions.Import)){
+
+            
+            #line default
+            #line hidden
+WriteLiteral("<div");
 
 WriteLiteral(" id=\"deviceImport\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 6 "..\..\Views\Device\ImportExport.cshtml"
+            #line 9 "..\..\Views\Device\ImportExport.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 6 "..\..\Views\Device\ImportExport.cshtml"
+            #line 9 "..\..\Views\Device\ImportExport.cshtml"
      using (Html.BeginForm(MVC.API.Device.ImportParse(), FormMethod.Post, new { enctype = "multipart/form-data" }))
     {
         
@@ -69,14 +82,14 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 8 "..\..\Views\Device\ImportExport.cshtml"
+            #line 11 "..\..\Views\Device\ImportExport.cshtml"
    Write(Html.ValidationSummary());
 
             
             #line default
             #line hidden
             
-            #line 8 "..\..\Views\Device\ImportExport.cshtml"
+            #line 11 "..\..\Views\Device\ImportExport.cshtml"
                                  
 
             
@@ -96,7 +109,7 @@ WriteLiteral(">\r\n            <h2>Import Devices</h2>\r\n            <table>\r\
 WriteLiteral("                        ");
 
             
-            #line 14 "..\..\Views\Device\ImportExport.cshtml"
+            #line 17 "..\..\Views\Device\ImportExport.cshtml"
                    Write(Html.LabelFor(m => m.ImportFile));
 
             
@@ -131,7 +144,7 @@ WriteLiteral(" value=\"Import\"");
 WriteLiteral(" />\r\n            </p>\r\n        </div>\r\n");
 
             
-            #line 25 "..\..\Views\Device\ImportExport.cshtml"
+            #line 28 "..\..\Views\Device\ImportExport.cshtml"
     }
 
             
@@ -196,7 +209,7 @@ WriteLiteral(" class=\"code\"");
 WriteLiteral(">1</span> [");
 
             
-            #line 51 "..\..\Views\Device\ImportExport.cshtml"
+            #line 54 "..\..\Views\Device\ImportExport.cshtml"
                                                                                                                                                                      Write(Html.ActionLink(Model.DeviceModels[0].ToString(), MVC.Config.DeviceModel.Index(Model.DeviceModels[0].Id)));
 
             
@@ -220,7 +233,7 @@ WriteLiteral(" class=\"code\"");
 WriteLiteral(">1</span> [");
 
             
-            #line 56 "..\..\Views\Device\ImportExport.cshtml"
+            #line 59 "..\..\Views\Device\ImportExport.cshtml"
                                                                                                                                                                          Write(Html.ActionLink(Model.DeviceProfiles[0].ToString(), MVC.Config.DeviceProfile.Index(Model.DeviceProfiles[0].Id)));
 
             
@@ -291,13 +304,13 @@ WriteLiteral(@">
 ");
 
             
-            #line 94 "..\..\Views\Device\ImportExport.cshtml"
+            #line 97 "..\..\Views\Device\ImportExport.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 94 "..\..\Views\Device\ImportExport.cshtml"
+            #line 97 "..\..\Views\Device\ImportExport.cshtml"
                      foreach (var dm in Model.DeviceModels)
                     {
 
@@ -307,7 +320,7 @@ WriteLiteral(@">
 WriteLiteral("                        <tr>\r\n                            <td>");
 
             
-            #line 97 "..\..\Views\Device\ImportExport.cshtml"
+            #line 100 "..\..\Views\Device\ImportExport.cshtml"
                            Write(Html.ActionLink(dm.Id.ToString(), MVC.Config.DeviceModel.Index(dm.Id)));
 
             
@@ -316,7 +329,7 @@ WriteLiteral("                        <tr>\r\n                            <td>")
 WriteLiteral("</td>\r\n                            <td>");
 
             
-            #line 98 "..\..\Views\Device\ImportExport.cshtml"
+            #line 101 "..\..\Views\Device\ImportExport.cshtml"
                            Write(dm.ToString());
 
             
@@ -325,7 +338,7 @@ WriteLiteral("</td>\r\n                            <td>");
 WriteLiteral("</td>\r\n                            <td>");
 
             
-            #line 99 "..\..\Views\Device\ImportExport.cshtml"
+            #line 102 "..\..\Views\Device\ImportExport.cshtml"
                            Write(dm.Manufacturer);
 
             
@@ -334,7 +347,7 @@ WriteLiteral("</td>\r\n                            <td>");
 WriteLiteral("</td>\r\n                            <td>");
 
             
-            #line 100 "..\..\Views\Device\ImportExport.cshtml"
+            #line 103 "..\..\Views\Device\ImportExport.cshtml"
                            Write(dm.Model);
 
             
@@ -343,7 +356,7 @@ WriteLiteral("</td>\r\n                            <td>");
 WriteLiteral("</td>\r\n                        </tr>\r\n");
 
             
-            #line 102 "..\..\Views\Device\ImportExport.cshtml"
+            #line 105 "..\..\Views\Device\ImportExport.cshtml"
                     }
 
             
@@ -374,13 +387,13 @@ WriteLiteral(@">
 ");
 
             
-            #line 118 "..\..\Views\Device\ImportExport.cshtml"
+            #line 121 "..\..\Views\Device\ImportExport.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 118 "..\..\Views\Device\ImportExport.cshtml"
+            #line 121 "..\..\Views\Device\ImportExport.cshtml"
                      foreach (var dp in Model.DeviceProfiles)
                     {
 
@@ -390,7 +403,7 @@ WriteLiteral(@">
 WriteLiteral("                        <tr>\r\n                            <td>");
 
             
-            #line 121 "..\..\Views\Device\ImportExport.cshtml"
+            #line 124 "..\..\Views\Device\ImportExport.cshtml"
                            Write(Html.ActionLink(dp.Id.ToString(), MVC.Config.DeviceProfile.Index(dp.Id)));
 
             
@@ -399,7 +412,7 @@ WriteLiteral("                        <tr>\r\n                            <td>")
 WriteLiteral("</td>\r\n                            <td>");
 
             
-            #line 122 "..\..\Views\Device\ImportExport.cshtml"
+            #line 125 "..\..\Views\Device\ImportExport.cshtml"
                            Write(dp.Name);
 
             
@@ -408,7 +421,7 @@ WriteLiteral("</td>\r\n                            <td>");
 WriteLiteral("</td>\r\n                            <td>");
 
             
-            #line 123 "..\..\Views\Device\ImportExport.cshtml"
+            #line 126 "..\..\Views\Device\ImportExport.cshtml"
                            Write(dp.ShortName);
 
             
@@ -417,7 +430,7 @@ WriteLiteral("</td>\r\n                            <td>");
 WriteLiteral("</td>\r\n                            <td>");
 
             
-            #line 124 "..\..\Views\Device\ImportExport.cshtml"
+            #line 127 "..\..\Views\Device\ImportExport.cshtml"
                            Write(dp.Description);
 
             
@@ -426,7 +439,7 @@ WriteLiteral("</td>\r\n                            <td>");
 WriteLiteral("</td>\r\n                        </tr>\r\n");
 
             
-            #line 126 "..\..\Views\Device\ImportExport.cshtml"
+            #line 129 "..\..\Views\Device\ImportExport.cshtml"
                     }
 
             
@@ -456,13 +469,13 @@ WriteLiteral(@">
 ");
 
             
-            #line 141 "..\..\Views\Device\ImportExport.cshtml"
+            #line 144 "..\..\Views\Device\ImportExport.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 141 "..\..\Views\Device\ImportExport.cshtml"
+            #line 144 "..\..\Views\Device\ImportExport.cshtml"
                      foreach (var db in Model.DeviceBatches)
                     {
 
@@ -472,7 +485,7 @@ WriteLiteral(@">
 WriteLiteral("                        <tr>\r\n                            <td>");
 
             
-            #line 144 "..\..\Views\Device\ImportExport.cshtml"
+            #line 147 "..\..\Views\Device\ImportExport.cshtml"
                            Write(Html.ActionLink(db.Id.ToString(), MVC.Config.DeviceBatch.Index(db.Id)));
 
             
@@ -481,7 +494,7 @@ WriteLiteral("                        <tr>\r\n                            <td>")
 WriteLiteral("</td>\r\n                            <td>");
 
             
-            #line 145 "..\..\Views\Device\ImportExport.cshtml"
+            #line 148 "..\..\Views\Device\ImportExport.cshtml"
                            Write(db.Name);
 
             
@@ -490,7 +503,7 @@ WriteLiteral("</td>\r\n                            <td>");
 WriteLiteral("</td>\r\n                            <td>");
 
             
-            #line 146 "..\..\Views\Device\ImportExport.cshtml"
+            #line 149 "..\..\Views\Device\ImportExport.cshtml"
                            Write(CommonHelpers.FriendlyDate(db.PurchaseDate));
 
             
@@ -499,7 +512,7 @@ WriteLiteral("</td>\r\n                            <td>");
 WriteLiteral("</td>\r\n                        </tr>\r\n");
 
             
-            #line 148 "..\..\Views\Device\ImportExport.cshtml"
+            #line 151 "..\..\Views\Device\ImportExport.cshtml"
                     }
 
             
@@ -524,23 +537,45 @@ WriteLiteral("                </tbody>\r\n            </table>\r\n        </div>
 "efault();\r\n                    if (!$showDeviceBatchesDialog)\r\n                 " +
 "       $showDeviceBatchesDialog = $(\'#showDeviceBatchesDialog\').dialog(dialogOpt" +
 "ions);\r\n                    $showDeviceBatchesDialog.dialog(\'open\');\r\n          " +
-"      });\r\n            });\r\n        </script>\r\n    </div>\r\n\r\n    <div");
+"      });\r\n            });\r\n        </script>\r\n    </div>\r\n</div>\r\n");
+
+            
+            #line 192 "..\..\Views\Device\ImportExport.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+            
+            #line 193 "..\..\Views\Device\ImportExport.cshtml"
+ if (Authorization.Has(Claims.Device.Actions.Export)){
+
+            
+            #line default
+            #line hidden
+WriteLiteral("<div");
 
 WriteLiteral(" class=\"actionBar\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("        ");
+WriteLiteral("    ");
 
             
-            #line 190 "..\..\Views\Device\ImportExport.cshtml"
-   Write(Html.ActionLinkButton("Export All Devices", MVC.API.Device.ExportAllDevices()));
+            #line 195 "..\..\Views\Device\ImportExport.cshtml"
+Write(Html.ActionLinkButton("Export All Devices", MVC.API.Device.ExportAllDevices()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n    </div>\r\n</div>\r\n");
+WriteLiteral("\r\n</div>\r\n");
 
+            
+            #line 197 "..\..\Views\Device\ImportExport.cshtml"
+}
+            
+            #line default
+            #line hidden
         }
     }
 }
diff --git a/Disco.Web/Views/Device/ImportReview.cshtml b/Disco.Web/Views/Device/ImportReview.cshtml
index 21423a43..e2a43cf0 100644
--- a/Disco.Web/Views/Device/ImportReview.cshtml
+++ b/Disco.Web/Views/Device/ImportReview.cshtml
@@ -1,6 +1,8 @@
 @model Disco.Web.Models.Device.ImportReviewModel
 @using Disco.BI.DeviceBI.Importing
 @{
+    Authorization.Require(Claims.Device.Actions.Import);
+    
     ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Import Devices", MVC.Device.ImportExport(), string.Format("File: {0}", Model.ImportFilename));
 
     int importDeviceOkCount = Model.ImportDevices.Count(id => id.Errors.Count == 0);
diff --git a/Disco.Web/Views/Device/ImportReview.generated.cs b/Disco.Web/Views/Device/ImportReview.generated.cs
index 0555b4c0..a29b1db0 100644
--- a/Disco.Web/Views/Device/ImportReview.generated.cs
+++ b/Disco.Web/Views/Device/ImportReview.generated.cs
@@ -34,12 +34,14 @@ namespace Disco.Web.Views.Device
     #line hidden
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Device/ImportReview.cshtml")]
-    public partial class ImportReview : System.Web.Mvc.WebViewPage<Disco.Web.Models.Device.ImportReviewModel>
+    public partial class ImportReview : Disco.Services.Web.WebViewPage<Disco.Web.Models.Device.ImportReviewModel>
     {
         public ImportReview()
         {
@@ -49,6 +51,8 @@ namespace Disco.Web.Views.Device
             
             #line 3 "..\..\Views\Device\ImportReview.cshtml"
   
+    Authorization.Require(Claims.Device.Actions.Import);
+    
     ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Import Devices", MVC.Device.ImportExport(), string.Format("File: {0}", Model.ImportFilename));
 
     int importDeviceOkCount = Model.ImportDevices.Count(id => id.Errors.Count == 0);
@@ -66,13 +70,13 @@ WriteLiteral(" id=\"deviceImportReview\"");
 WriteLiteral(">\r\n");
 
             
-            #line 12 "..\..\Views\Device\ImportReview.cshtml"
+            #line 14 "..\..\Views\Device\ImportReview.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 12 "..\..\Views\Device\ImportReview.cshtml"
+            #line 14 "..\..\Views\Device\ImportReview.cshtml"
      if (Model.ImportDevices.Count > 0)
     {
 
@@ -82,7 +86,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("        <h2>Parsed ");
 
             
-            #line 14 "..\..\Views\Device\ImportReview.cshtml"
+            #line 16 "..\..\Views\Device\ImportReview.cshtml"
               Write(Model.ImportDevices.Count);
 
             
@@ -91,7 +95,7 @@ WriteLiteral("        <h2>Parsed ");
 WriteLiteral(" Device Record");
 
             
-            #line 14 "..\..\Views\Device\ImportReview.cshtml"
+            #line 16 "..\..\Views\Device\ImportReview.cshtml"
                                                        Write(Model.ImportDevices.Count != 1 ? "s" : null);
 
             
@@ -104,7 +108,7 @@ WriteLiteral("        <h4>\r\n");
 WriteLiteral("            ");
 
             
-            #line 16 "..\..\Views\Device\ImportReview.cshtml"
+            #line 18 "..\..\Views\Device\ImportReview.cshtml"
        Write(importDeviceOkCount);
 
             
@@ -113,7 +117,7 @@ WriteLiteral("            ");
 WriteLiteral(" of ");
 
             
-            #line 16 "..\..\Views\Device\ImportReview.cshtml"
+            #line 18 "..\..\Views\Device\ImportReview.cshtml"
                                Write(Model.ImportDevices.Count);
 
             
@@ -122,7 +126,7 @@ WriteLiteral(" of ");
 WriteLiteral(" Device");
 
             
-            #line 16 "..\..\Views\Device\ImportReview.cshtml"
+            #line 18 "..\..\Views\Device\ImportReview.cshtml"
                                                                  Write(Model.ImportDevices.Count != 1 ? "s" : null);
 
             
@@ -131,7 +135,7 @@ WriteLiteral(" Device");
 WriteLiteral(" are ready for import.\r\n        </h4>\r\n");
 
             
-            #line 18 "..\..\Views\Device\ImportReview.cshtml"
+            #line 20 "..\..\Views\Device\ImportReview.cshtml"
         if (importDeviceErrorCount > 0)
         {
 
@@ -147,7 +151,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("            ");
 
             
-            #line 21 "..\..\Views\Device\ImportReview.cshtml"
+            #line 23 "..\..\Views\Device\ImportReview.cshtml"
         Write(importDeviceErrorCount);
 
             
@@ -156,7 +160,7 @@ WriteLiteral("            ");
 WriteLiteral(" Record");
 
             
-            #line 21 "..\..\Views\Device\ImportReview.cshtml"
+            #line 23 "..\..\Views\Device\ImportReview.cshtml"
                                         Write(importDeviceErrorCount != 1 ? "s" : null);
 
             
@@ -165,7 +169,7 @@ WriteLiteral(" Record");
 WriteLiteral(" will be skipped if the import continues\r\n        </h4>\r\n");
 
             
-            #line 23 "..\..\Views\Device\ImportReview.cshtml"
+            #line 25 "..\..\Views\Device\ImportReview.cshtml"
         }
 
 
@@ -183,13 +187,13 @@ WriteLiteral(" class=\"none\"");
 WriteLiteral(">\r\n");
 
             
-            #line 27 "..\..\Views\Device\ImportReview.cshtml"
+            #line 29 "..\..\Views\Device\ImportReview.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 27 "..\..\Views\Device\ImportReview.cshtml"
+            #line 29 "..\..\Views\Device\ImportReview.cshtml"
                  if (importDeviceNewCount > 0)
                 {
             
@@ -214,7 +218,7 @@ WriteLiteral(" for=\"devicesNavigationNew\"");
 WriteLiteral(">Show New Devices (");
 
             
-            #line 29 "..\..\Views\Device\ImportReview.cshtml"
+            #line 31 "..\..\Views\Device\ImportReview.cshtml"
                                                                                                                                          Write(Model.ImportDevices.Count(id => id.Errors.Count == 0 && id.Device == null));
 
             
@@ -223,13 +227,13 @@ WriteLiteral(">Show New Devices (");
 WriteLiteral(")</label>\r\n                </li>");
 
             
-            #line 30 "..\..\Views\Device\ImportReview.cshtml"
+            #line 32 "..\..\Views\Device\ImportReview.cshtml"
                      }
             
             #line default
             #line hidden
             
-            #line 30 "..\..\Views\Device\ImportReview.cshtml"
+            #line 32 "..\..\Views\Device\ImportReview.cshtml"
                        if (importDeviceUpdateCount > 0)
                       {
             
@@ -254,7 +258,7 @@ WriteLiteral(" for=\"devicesNavigationUpdate\"");
 WriteLiteral(">Show Updates (");
 
             
-            #line 32 "..\..\Views\Device\ImportReview.cshtml"
+            #line 34 "..\..\Views\Device\ImportReview.cshtml"
                                                                                                                                                  Write(Model.ImportDevices.Count(id => id.Errors.Count == 0 && id.Device != null));
 
             
@@ -263,13 +267,13 @@ WriteLiteral(">Show Updates (");
 WriteLiteral(")</label>\r\n                      </li>");
 
             
-            #line 33 "..\..\Views\Device\ImportReview.cshtml"
+            #line 35 "..\..\Views\Device\ImportReview.cshtml"
                            }
             
             #line default
             #line hidden
             
-            #line 33 "..\..\Views\Device\ImportReview.cshtml"
+            #line 35 "..\..\Views\Device\ImportReview.cshtml"
                              if (importDeviceErrorCount > 0)
                             {
             
@@ -294,7 +298,7 @@ WriteLiteral(" for=\"devicesNavigationError\"");
 WriteLiteral(">Show Errors (");
 
             
-            #line 35 "..\..\Views\Device\ImportReview.cshtml"
+            #line 37 "..\..\Views\Device\ImportReview.cshtml"
                                                                                                                                                     Write(Model.ImportDevices.Count(id => id.Errors.Count != 0));
 
             
@@ -303,7 +307,7 @@ WriteLiteral(">Show Errors (");
 WriteLiteral(")</label>\r\n                            </li>");
 
             
-            #line 36 "..\..\Views\Device\ImportReview.cshtml"
+            #line 38 "..\..\Views\Device\ImportReview.cshtml"
                                  }
 
             
@@ -341,7 +345,7 @@ WriteLiteral(@"            </ul>
 ");
 
             
-            #line 66 "..\..\Views\Device\ImportReview.cshtml"
+            #line 68 "..\..\Views\Device\ImportReview.cshtml"
         
 
             
@@ -391,13 +395,13 @@ WriteLiteral(">Asset Number</th>\r\n                </tr>\r\n            </thead
 "dy>\r\n");
 
             
-            #line 82 "..\..\Views\Device\ImportReview.cshtml"
+            #line 84 "..\..\Views\Device\ImportReview.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 82 "..\..\Views\Device\ImportReview.cshtml"
+            #line 84 "..\..\Views\Device\ImportReview.cshtml"
                  foreach (var device in Model.ImportDevices)
                 {
                     bool isUpdate = device.Device != null;
@@ -408,15 +412,15 @@ WriteLiteral(">Asset Number</th>\r\n                </tr>\r\n            </thead
             #line hidden
 WriteLiteral("                    <tr");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 4390), Tuple.Create("\"", 4428)
-, Tuple.Create(Tuple.Create("", 4398), Tuple.Create("status", 4398), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 4454), Tuple.Create("\"", 4492)
+, Tuple.Create(Tuple.Create("", 4462), Tuple.Create("status", 4462), true)
             
-            #line 86 "..\..\Views\Device\ImportReview.cshtml"
-, Tuple.Create(Tuple.Create("", 4404), Tuple.Create<System.Object, System.Int32>(device.ImportStatus()
+            #line 88 "..\..\Views\Device\ImportReview.cshtml"
+, Tuple.Create(Tuple.Create("", 4468), Tuple.Create<System.Object, System.Int32>(device.ImportStatus()
             
             #line default
             #line hidden
-, 4404), false)
+, 4468), false)
 );
 
 WriteLiteral(">\r\n                        <td");
@@ -428,7 +432,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                            ");
 
             
-            #line 88 "..\..\Views\Device\ImportReview.cshtml"
+            #line 90 "..\..\Views\Device\ImportReview.cshtml"
                         Write((Model.ImportDevices.IndexOf(device) + 1));
 
             
@@ -443,7 +447,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                            ");
 
             
-            #line 91 "..\..\Views\Device\ImportReview.cshtml"
+            #line 93 "..\..\Views\Device\ImportReview.cshtml"
                         Write(device.ImportStatus());
 
             
@@ -456,13 +460,13 @@ WriteLiteral(" class=\"serialNumber\"");
 WriteLiteral(">\r\n");
 
             
-            #line 94 "..\..\Views\Device\ImportReview.cshtml"
+            #line 96 "..\..\Views\Device\ImportReview.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 94 "..\..\Views\Device\ImportReview.cshtml"
+            #line 96 "..\..\Views\Device\ImportReview.cshtml"
                              if (device.Device == null)
                             {
                                 
@@ -470,14 +474,14 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 96 "..\..\Views\Device\ImportReview.cshtml"
+            #line 98 "..\..\Views\Device\ImportReview.cshtml"
                            Write(device.SerialNumber);
 
             
             #line default
             #line hidden
             
-            #line 96 "..\..\Views\Device\ImportReview.cshtml"
+            #line 98 "..\..\Views\Device\ImportReview.cshtml"
                                                     
                             }
                             else
@@ -487,14 +491,14 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 100 "..\..\Views\Device\ImportReview.cshtml"
+            #line 102 "..\..\Views\Device\ImportReview.cshtml"
                            Write(Html.ActionLink(device.SerialNumber, MVC.Device.Show(device.SerialNumber), new { target = "_blank" }));
 
             
             #line default
             #line hidden
             
-            #line 100 "..\..\Views\Device\ImportReview.cshtml"
+            #line 102 "..\..\Views\Device\ImportReview.cshtml"
                                                                                                                                       
                             }
 
@@ -504,13 +508,13 @@ WriteLiteral(">\r\n");
 WriteLiteral("\r\n");
 
             
-            #line 103 "..\..\Views\Device\ImportReview.cshtml"
+            #line 105 "..\..\Views\Device\ImportReview.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 103 "..\..\Views\Device\ImportReview.cshtml"
+            #line 105 "..\..\Views\Device\ImportReview.cshtml"
                              if (device.Errors.TryGetValue("SerialNumber", out error))
                             {
 
@@ -524,7 +528,7 @@ WriteLiteral(" class=\"error\"");
 WriteLiteral(">");
 
             
-            #line 105 "..\..\Views\Device\ImportReview.cshtml"
+            #line 107 "..\..\Views\Device\ImportReview.cshtml"
                                               Write(error);
 
             
@@ -533,7 +537,7 @@ WriteLiteral(">");
 WriteLiteral("</div>\r\n");
 
             
-            #line 106 "..\..\Views\Device\ImportReview.cshtml"
+            #line 108 "..\..\Views\Device\ImportReview.cshtml"
                             }
 
             
@@ -546,13 +550,13 @@ WriteLiteral(" class=\"model\"");
 WriteLiteral(">\r\n");
 
             
-            #line 109 "..\..\Views\Device\ImportReview.cshtml"
+            #line 111 "..\..\Views\Device\ImportReview.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 109 "..\..\Views\Device\ImportReview.cshtml"
+            #line 111 "..\..\Views\Device\ImportReview.cshtml"
                              if (device.Errors.TryGetValue("DeviceModelId", out error))
                             {
 
@@ -566,7 +570,7 @@ WriteLiteral(" class=\"error\"");
 WriteLiteral(">");
 
             
-            #line 111 "..\..\Views\Device\ImportReview.cshtml"
+            #line 113 "..\..\Views\Device\ImportReview.cshtml"
                                               Write(error);
 
             
@@ -575,7 +579,7 @@ WriteLiteral(">");
 WriteLiteral("</div>\r\n");
 
             
-            #line 112 "..\..\Views\Device\ImportReview.cshtml"
+            #line 114 "..\..\Views\Device\ImportReview.cshtml"
                             }
                             else
                             {
@@ -591,33 +595,33 @@ WriteLiteral(" class=\"modelImage\"");
 
 WriteLiteral(" alt=\"Model Image\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 5949), Tuple.Create("\"", 6048)
+WriteAttribute("src", Tuple.Create(" src=\"", 6013), Tuple.Create("\"", 6112)
             
-            #line 117 "..\..\Views\Device\ImportReview.cshtml"
-, Tuple.Create(Tuple.Create("", 5955), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(device.DeviceModel.Id, device.DeviceModel.ImageHash()))
+            #line 119 "..\..\Views\Device\ImportReview.cshtml"
+, Tuple.Create(Tuple.Create("", 6019), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(device.DeviceModel.Id, device.DeviceModel.ImageHash()))
             
             #line default
             #line hidden
-, 5955), false)
+, 6019), false)
 );
 
 WriteLiteral(" />\r\n");
 
             
-            #line 118 "..\..\Views\Device\ImportReview.cshtml"
+            #line 120 "..\..\Views\Device\ImportReview.cshtml"
                                 
             
             #line default
             #line hidden
             
-            #line 118 "..\..\Views\Device\ImportReview.cshtml"
+            #line 120 "..\..\Views\Device\ImportReview.cshtml"
                            Write(device.DeviceModel.ToString());
 
             
             #line default
             #line hidden
             
-            #line 118 "..\..\Views\Device\ImportReview.cshtml"
+            #line 120 "..\..\Views\Device\ImportReview.cshtml"
                                                               
                                 }
                                 else
@@ -633,7 +637,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Change</span>\r\n");
 
             
-            #line 123 "..\..\Views\Device\ImportReview.cshtml"
+            #line 125 "..\..\Views\Device\ImportReview.cshtml"
                                 }
                             }
             
@@ -646,13 +650,13 @@ WriteLiteral(" class=\"profile\"");
 WriteLiteral(">\r\n");
 
             
-            #line 126 "..\..\Views\Device\ImportReview.cshtml"
+            #line 128 "..\..\Views\Device\ImportReview.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 126 "..\..\Views\Device\ImportReview.cshtml"
+            #line 128 "..\..\Views\Device\ImportReview.cshtml"
                              if (device.Errors.TryGetValue("DeviceProfileId", out error))
                             {
 
@@ -666,7 +670,7 @@ WriteLiteral(" class=\"error\"");
 WriteLiteral(">");
 
             
-            #line 128 "..\..\Views\Device\ImportReview.cshtml"
+            #line 130 "..\..\Views\Device\ImportReview.cshtml"
                                               Write(error);
 
             
@@ -675,7 +679,7 @@ WriteLiteral(">");
 WriteLiteral("</div>\r\n");
 
             
-            #line 129 "..\..\Views\Device\ImportReview.cshtml"
+            #line 131 "..\..\Views\Device\ImportReview.cshtml"
                             }
                             else
                             {
@@ -686,14 +690,14 @@ WriteLiteral("</div>\r\n");
             #line default
             #line hidden
             
-            #line 134 "..\..\Views\Device\ImportReview.cshtml"
+            #line 136 "..\..\Views\Device\ImportReview.cshtml"
                            Write(device.DeviceProfile.ToString());
 
             
             #line default
             #line hidden
             
-            #line 134 "..\..\Views\Device\ImportReview.cshtml"
+            #line 136 "..\..\Views\Device\ImportReview.cshtml"
                                                                 
                                 }
                                 else
@@ -709,7 +713,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Change</span>\r\n");
 
             
-            #line 139 "..\..\Views\Device\ImportReview.cshtml"
+            #line 141 "..\..\Views\Device\ImportReview.cshtml"
                                 }
                             }
             
@@ -722,13 +726,13 @@ WriteLiteral(" class=\"batch\"");
 WriteLiteral(">\r\n");
 
             
-            #line 142 "..\..\Views\Device\ImportReview.cshtml"
+            #line 144 "..\..\Views\Device\ImportReview.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 142 "..\..\Views\Device\ImportReview.cshtml"
+            #line 144 "..\..\Views\Device\ImportReview.cshtml"
                              if (device.Errors.TryGetValue("DeviceBatchId", out error))
                             {
 
@@ -742,7 +746,7 @@ WriteLiteral(" class=\"error\"");
 WriteLiteral(">");
 
             
-            #line 144 "..\..\Views\Device\ImportReview.cshtml"
+            #line 146 "..\..\Views\Device\ImportReview.cshtml"
                                               Write(error);
 
             
@@ -751,7 +755,7 @@ WriteLiteral(">");
 WriteLiteral("</div>\r\n");
 
             
-            #line 145 "..\..\Views\Device\ImportReview.cshtml"
+            #line 147 "..\..\Views\Device\ImportReview.cshtml"
                             }
                             else
                             {
@@ -770,7 +774,7 @@ WriteLiteral("&lt;None&gt;");
 WriteLiteral("\r\n");
 
             
-            #line 153 "..\..\Views\Device\ImportReview.cshtml"
+            #line 155 "..\..\Views\Device\ImportReview.cshtml"
                                     }
                                     else
                                     {
@@ -779,14 +783,14 @@ WriteLiteral("\r\n");
             #line default
             #line hidden
             
-            #line 156 "..\..\Views\Device\ImportReview.cshtml"
+            #line 158 "..\..\Views\Device\ImportReview.cshtml"
                            Write(device.DeviceBatch.ToString());
 
             
             #line default
             #line hidden
             
-            #line 156 "..\..\Views\Device\ImportReview.cshtml"
+            #line 158 "..\..\Views\Device\ImportReview.cshtml"
                                                               
                                     }
                                 }
@@ -803,7 +807,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Change</span>\r\n");
 
             
-            #line 162 "..\..\Views\Device\ImportReview.cshtml"
+            #line 164 "..\..\Views\Device\ImportReview.cshtml"
                                 }
                             }
             
@@ -816,13 +820,13 @@ WriteLiteral(" class=\"assignedUser\"");
 WriteLiteral(">\r\n");
 
             
-            #line 165 "..\..\Views\Device\ImportReview.cshtml"
+            #line 167 "..\..\Views\Device\ImportReview.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 165 "..\..\Views\Device\ImportReview.cshtml"
+            #line 167 "..\..\Views\Device\ImportReview.cshtml"
                              if (device.Errors.TryGetValue("AssignedUserId", out error))
                             {
 
@@ -836,7 +840,7 @@ WriteLiteral(" class=\"error\"");
 WriteLiteral(">");
 
             
-            #line 167 "..\..\Views\Device\ImportReview.cshtml"
+            #line 169 "..\..\Views\Device\ImportReview.cshtml"
                                               Write(error);
 
             
@@ -845,7 +849,7 @@ WriteLiteral(">");
 WriteLiteral("</div>\r\n");
 
             
-            #line 168 "..\..\Views\Device\ImportReview.cshtml"
+            #line 170 "..\..\Views\Device\ImportReview.cshtml"
                             }
                             else
                             {
@@ -864,7 +868,7 @@ WriteLiteral("&lt;None&gt;");
 WriteLiteral("\r\n");
 
             
-            #line 176 "..\..\Views\Device\ImportReview.cshtml"
+            #line 178 "..\..\Views\Device\ImportReview.cshtml"
                                     }
                                     else
                                     {
@@ -873,14 +877,14 @@ WriteLiteral("\r\n");
             #line default
             #line hidden
             
-            #line 179 "..\..\Views\Device\ImportReview.cshtml"
+            #line 181 "..\..\Views\Device\ImportReview.cshtml"
                            Write(device.AssignedUser.ToString());
 
             
             #line default
             #line hidden
             
-            #line 179 "..\..\Views\Device\ImportReview.cshtml"
+            #line 181 "..\..\Views\Device\ImportReview.cshtml"
                                                                
                                     }
                                 }
@@ -897,7 +901,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Change</span>\r\n");
 
             
-            #line 185 "..\..\Views\Device\ImportReview.cshtml"
+            #line 187 "..\..\Views\Device\ImportReview.cshtml"
                                 }
                             }
             
@@ -910,13 +914,13 @@ WriteLiteral(" class=\"location\"");
 WriteLiteral(">\r\n");
 
             
-            #line 188 "..\..\Views\Device\ImportReview.cshtml"
+            #line 190 "..\..\Views\Device\ImportReview.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 188 "..\..\Views\Device\ImportReview.cshtml"
+            #line 190 "..\..\Views\Device\ImportReview.cshtml"
                              if (device.Errors.TryGetValue("Location", out error))
                             {
 
@@ -930,7 +934,7 @@ WriteLiteral(" class=\"error\"");
 WriteLiteral(">");
 
             
-            #line 190 "..\..\Views\Device\ImportReview.cshtml"
+            #line 192 "..\..\Views\Device\ImportReview.cshtml"
                                               Write(error);
 
             
@@ -939,7 +943,7 @@ WriteLiteral(">");
 WriteLiteral("</div>\r\n");
 
             
-            #line 191 "..\..\Views\Device\ImportReview.cshtml"
+            #line 193 "..\..\Views\Device\ImportReview.cshtml"
                             }
                             else
                             {
@@ -958,7 +962,7 @@ WriteLiteral("&lt;None&gt;");
 WriteLiteral("\r\n");
 
             
-            #line 199 "..\..\Views\Device\ImportReview.cshtml"
+            #line 201 "..\..\Views\Device\ImportReview.cshtml"
                                     }
                                     else
                                     {
@@ -967,14 +971,14 @@ WriteLiteral("\r\n");
             #line default
             #line hidden
             
-            #line 202 "..\..\Views\Device\ImportReview.cshtml"
+            #line 204 "..\..\Views\Device\ImportReview.cshtml"
                            Write(device.Location);
 
             
             #line default
             #line hidden
             
-            #line 202 "..\..\Views\Device\ImportReview.cshtml"
+            #line 204 "..\..\Views\Device\ImportReview.cshtml"
                                                 
                                     }
                                 }
@@ -991,7 +995,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Change</span>\r\n");
 
             
-            #line 208 "..\..\Views\Device\ImportReview.cshtml"
+            #line 210 "..\..\Views\Device\ImportReview.cshtml"
                                 }
                             }
             
@@ -1004,13 +1008,13 @@ WriteLiteral(" class=\"assetNumber\"");
 WriteLiteral(">\r\n");
 
             
-            #line 211 "..\..\Views\Device\ImportReview.cshtml"
+            #line 213 "..\..\Views\Device\ImportReview.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 211 "..\..\Views\Device\ImportReview.cshtml"
+            #line 213 "..\..\Views\Device\ImportReview.cshtml"
                              if (device.Errors.TryGetValue("AssetNumber", out error))
                             {
 
@@ -1024,7 +1028,7 @@ WriteLiteral(" class=\"error\"");
 WriteLiteral(">");
 
             
-            #line 213 "..\..\Views\Device\ImportReview.cshtml"
+            #line 215 "..\..\Views\Device\ImportReview.cshtml"
                                               Write(error);
 
             
@@ -1033,7 +1037,7 @@ WriteLiteral(">");
 WriteLiteral("</div>\r\n");
 
             
-            #line 214 "..\..\Views\Device\ImportReview.cshtml"
+            #line 216 "..\..\Views\Device\ImportReview.cshtml"
                             }
                             else
                             {
@@ -1052,7 +1056,7 @@ WriteLiteral("&lt;None&gt;");
 WriteLiteral("\r\n");
 
             
-            #line 222 "..\..\Views\Device\ImportReview.cshtml"
+            #line 224 "..\..\Views\Device\ImportReview.cshtml"
                                     }
                                     else
                                     {
@@ -1061,14 +1065,14 @@ WriteLiteral("\r\n");
             #line default
             #line hidden
             
-            #line 225 "..\..\Views\Device\ImportReview.cshtml"
+            #line 227 "..\..\Views\Device\ImportReview.cshtml"
                            Write(device.AssetNumber);
 
             
             #line default
             #line hidden
             
-            #line 225 "..\..\Views\Device\ImportReview.cshtml"
+            #line 227 "..\..\Views\Device\ImportReview.cshtml"
                                                    
                                     }
                                 }
@@ -1085,7 +1089,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Change</span>\r\n");
 
             
-            #line 231 "..\..\Views\Device\ImportReview.cshtml"
+            #line 233 "..\..\Views\Device\ImportReview.cshtml"
                                 }
                             }
             
@@ -1094,7 +1098,7 @@ WriteLiteral(">No Change</span>\r\n");
 WriteLiteral("</td>\r\n                    </tr>\r\n");
 
             
-            #line 234 "..\..\Views\Device\ImportReview.cshtml"
+            #line 236 "..\..\Views\Device\ImportReview.cshtml"
                 }
 
             
@@ -1103,7 +1107,7 @@ WriteLiteral("</td>\r\n                    </tr>\r\n");
 WriteLiteral("            </tbody>\r\n        </table>\r\n");
 
             
-            #line 237 "..\..\Views\Device\ImportReview.cshtml"
+            #line 239 "..\..\Views\Device\ImportReview.cshtml"
 
                 if (importDeviceOkCount > 0)
                 {
@@ -1120,7 +1124,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("            ");
 
             
-            #line 241 "..\..\Views\Device\ImportReview.cshtml"
+            #line 243 "..\..\Views\Device\ImportReview.cshtml"
        Write(Html.ActionLinkButton(string.Format("Import {0} Device{1}", importDeviceOkCount, importDeviceOkCount != 1 ? "s" : null), MVC.API.Device.ImportProcess(Model.ImportParseTaskId)));
 
             
@@ -1129,7 +1133,7 @@ WriteLiteral("            ");
 WriteLiteral("\r\n        </div>\r\n");
 
             
-            #line 243 "..\..\Views\Device\ImportReview.cshtml"
+            #line 245 "..\..\Views\Device\ImportReview.cshtml"
                 }
     }
     else
@@ -1141,7 +1145,7 @@ WriteLiteral("\r\n        </div>\r\n");
 WriteLiteral("        <h2>No Devices were found in this file</h2>\r\n");
 
             
-            #line 248 "..\..\Views\Device\ImportReview.cshtml"
+            #line 250 "..\..\Views\Device\ImportReview.cshtml"
     }
 
             
diff --git a/Disco.Web/Views/Device/Index.cshtml b/Disco.Web/Views/Device/Index.cshtml
index a9c6003c..c900a608 100644
--- a/Disco.Web/Views/Device/Index.cshtml
+++ b/Disco.Web/Views/Device/Index.cshtml
@@ -1,10 +1,25 @@
 @{
     ViewBag.Title = "Devices";
 }
-<h3>
-    Search for a Device</h3>
-@Html.Partial(MVC.Shared.Views._SearchDialog, "devices")
-<div class="actionBar">
-    @Html.ActionLinkButton("Import/Export Devices", MVC.Device.ImportExport())
-    @Html.ActionLinkButton("Add Offline Device", MVC.Device.AddOffline())
-</div>
+@if (Authorization.Has(Claims.Device.Search))
+{
+    <h3>Search for a Device</h3>
+    @Html.Partial(MVC.Shared.Views._SearchDialog, "devices")
+}
+@if (Authorization.HasAny(Claims.Device.Actions.Import, Claims.Device.Actions.Export, Claims.Device.Actions.EnrolDevices))
+{
+    <div class="actionBar">
+        @if (Authorization.HasAll(Claims.Device.Actions.Import, Claims.Device.Actions.Export))
+        {
+            @Html.ActionLinkButton("Import/Export Devices", MVC.Device.ImportExport())
+        }else if (Authorization.Has(Claims.Device.Actions.Import)){
+            @Html.ActionLinkButton("Import Devices", MVC.Device.ImportExport())
+        }else if (Authorization.Has(Claims.Device.Actions.Export)){
+            @Html.ActionLinkButton("Export All Devices", MVC.API.Device.ExportAllDevices())
+        }
+        @if (Authorization.Has(Claims.Device.Actions.EnrolDevices))
+        {
+            @Html.ActionLinkButton("Add Offline Device", MVC.Device.AddOffline())
+        }
+    </div>
+}
\ No newline at end of file
diff --git a/Disco.Web/Views/Device/Index.generated.cs b/Disco.Web/Views/Device/Index.generated.cs
index 409bb313..b905f319 100644
--- a/Disco.Web/Views/Device/Index.generated.cs
+++ b/Disco.Web/Views/Device/Index.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Device
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Device/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class Index : Disco.Services.Web.WebViewPage<dynamic>
     {
         public Index()
         {
@@ -48,43 +50,145 @@ namespace Disco.Web.Views.Device
             
             #line default
             #line hidden
-WriteLiteral("\r\n<h3>\r\n    Search for a Device</h3>\r\n");
+WriteLiteral("\r\n");
 
             
-            #line 6 "..\..\Views\Device\Index.cshtml"
+            #line 4 "..\..\Views\Device\Index.cshtml"
+ if (Authorization.Has(Claims.Device.Search))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <h3>Search for a Device</h3>\r\n");
+
+            
+            #line 7 "..\..\Views\Device\Index.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 7 "..\..\Views\Device\Index.cshtml"
 Write(Html.Partial(MVC.Shared.Views._SearchDialog, "devices"));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n<div");
+            
+            #line 7 "..\..\Views\Device\Index.cshtml"
+                                                            
+}
+
+            
+            #line default
+            #line hidden
+            
+            #line 9 "..\..\Views\Device\Index.cshtml"
+ if (Authorization.HasAny(Claims.Device.Actions.Import, Claims.Device.Actions.Export, Claims.Device.Actions.EnrolDevices))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
 
 WriteLiteral(" class=\"actionBar\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("    ");
-
             
-            #line 8 "..\..\Views\Device\Index.cshtml"
-Write(Html.ActionLinkButton("Import/Export Devices", MVC.Device.ImportExport()));
+            #line 12 "..\..\Views\Device\Index.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 12 "..\..\Views\Device\Index.cshtml"
+         if (Authorization.HasAll(Claims.Device.Actions.Import, Claims.Device.Actions.Export))
+        {
+            
+            
+            #line default
+            #line hidden
+            
+            #line 14 "..\..\Views\Device\Index.cshtml"
+       Write(Html.ActionLinkButton("Import/Export Devices", MVC.Device.ImportExport()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
             
-            #line 9 "..\..\Views\Device\Index.cshtml"
-Write(Html.ActionLinkButton("Add Offline Device", MVC.Device.AddOffline()));
+            #line 14 "..\..\Views\Device\Index.cshtml"
+                                                                                      
+        }else if (Authorization.Has(Claims.Device.Actions.Import)){
+            
+            
+            #line default
+            #line hidden
+            
+            #line 16 "..\..\Views\Device\Index.cshtml"
+       Write(Html.ActionLinkButton("Import Devices", MVC.Device.ImportExport()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>\r\n");
+            
+            #line 16 "..\..\Views\Device\Index.cshtml"
+                                                                               
+        }else if (Authorization.Has(Claims.Device.Actions.Export)){
+            
+            
+            #line default
+            #line hidden
+            
+            #line 18 "..\..\Views\Device\Index.cshtml"
+       Write(Html.ActionLinkButton("Export All Devices", MVC.API.Device.ExportAllDevices()));
 
+            
+            #line default
+            #line hidden
+            
+            #line 18 "..\..\Views\Device\Index.cshtml"
+                                                                                           
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 20 "..\..\Views\Device\Index.cshtml"
+         if (Authorization.Has(Claims.Device.Actions.EnrolDevices))
+        {
+            
+            
+            #line default
+            #line hidden
+            
+            #line 22 "..\..\Views\Device\Index.cshtml"
+       Write(Html.ActionLinkButton("Add Offline Device", MVC.Device.AddOffline()));
+
+            
+            #line default
+            #line hidden
+            
+            #line 22 "..\..\Views\Device\Index.cshtml"
+                                                                                 
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    </div>\r\n");
+
+            
+            #line 25 "..\..\Views\Device\Index.cshtml"
+}
+            
+            #line default
+            #line hidden
         }
     }
 }
diff --git a/Disco.Web/Views/Device/Show.cshtml b/Disco.Web/Views/Device/Show.cshtml
index 88f1a4cf..04ba9db5 100644
--- a/Disco.Web/Views/Device/Show.cshtml
+++ b/Disco.Web/Views/Device/Show.cshtml
@@ -17,38 +17,57 @@
     <script type="text/javascript">
         $(function () {
             var $tabs = $('#DeviceDetailTabs');
-            $tabs.tabs({
-                activate: function (event, ui) {
-                    window.setTimeout(function () {
-                        var $window = $(window);
-                        var tabHeight = $tabs.height();
-                        var tabOffset = $tabs.offset();
-                        var windowScrollTop = $window.scrollTop();
-                        var windowHeight = $window.height();
+            if ($tabs.children().length > 1) {
+                $tabs.tabs({
+                    activate: function (event, ui) {
+                        window.setTimeout(function () {
+                            var $window = $(window);
+                            var tabHeight = $tabs.height();
+                            var tabOffset = $tabs.offset();
+                            var windowScrollTop = $window.scrollTop();
+                            var windowHeight = $window.height();
 
-                        var tabTopNotShown = windowScrollTop - tabOffset.top;
-                        if (tabTopNotShown > 0) {
-                            $('html').animate({ scrollTop: tabOffset.top }, 125);
-                        } else {
-                            var tabBottomNotShown = ((windowScrollTop + windowHeight) - (tabHeight + tabOffset.top)) * -1;
-                            if (tabBottomNotShown > 0) {
-                                if (tabHeight > windowHeight)
-                                    $('html').animate({ scrollTop: tabOffset.top }, 125);
-                                else
-                                    $('html').animate({ scrollTop: windowScrollTop + tabBottomNotShown }, 125);
+                            var tabTopNotShown = windowScrollTop - tabOffset.top;
+                            if (tabTopNotShown > 0) {
+                                $('html').animate({ scrollTop: tabOffset.top }, 125);
+                            } else {
+                                var tabBottomNotShown = ((windowScrollTop + windowHeight) - (tabHeight + tabOffset.top)) * -1;
+                                if (tabBottomNotShown > 0) {
+                                    if (tabHeight > windowHeight)
+                                        $('html').animate({ scrollTop: tabOffset.top }, 125);
+                                    else
+                                        $('html').animate({ scrollTop: windowScrollTop + tabBottomNotShown }, 125);
+                                }
                             }
-                        }
-                    }, 1);
-                }
-            });
+                        }, 1);
+                    }
+                });
+            } else {
+                $tabs.hide();
+            }
         });
     </script>
     <div id="DeviceDetailTabs">
         <ul id="DeviceDetailTabItems"></ul>
-        @Html.Partial(MVC.Device.Views.DeviceParts._Jobs, Model)
-        @Html.Partial(MVC.Device.Views.DeviceParts._Details, Model)
-        @Html.Partial(MVC.Device.Views.DeviceParts._AssignmentHistory, Model)
-        @Html.Partial(MVC.Device.Views.DeviceParts._Resources, Model)
-        @Html.Partial(MVC.Device.Views.DeviceParts._Certificates, Model)
+        @if (Authorization.Has(Claims.Device.ShowJobs))
+        {
+            @Html.Partial(MVC.Device.Views.DeviceParts._Jobs, Model)
+        }
+        @if (Authorization.Has(Claims.Device.ShowDetails))
+        {
+            @Html.Partial(MVC.Device.Views.DeviceParts._Details, Model)
+        }
+        @if (Authorization.Has(Claims.Device.ShowAssignmentHistory))
+        {
+            @Html.Partial(MVC.Device.Views.DeviceParts._AssignmentHistory, Model)
+        }
+        @if (Authorization.Has(Claims.Device.ShowAttachments))
+        {
+            @Html.Partial(MVC.Device.Views.DeviceParts._Resources, Model)
+        }
+        @if (Authorization.Has(Claims.Device.ShowCertificates))
+        {
+            @Html.Partial(MVC.Device.Views.DeviceParts._Certificates, Model)
+        }
     </div>
 </div>
diff --git a/Disco.Web/Views/Device/Show.generated.cs b/Disco.Web/Views/Device/Show.generated.cs
index 40a770bd..6065e4a4 100644
--- a/Disco.Web/Views/Device/Show.generated.cs
+++ b/Disco.Web/Views/Device/Show.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Device
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Device/Show.cshtml")]
-    public partial class Show : System.Web.Mvc.WebViewPage<Disco.Web.Models.Device.ShowModel>
+    public partial class Show : Disco.Services.Web.WebViewPage<Disco.Web.Models.Device.ShowModel>
     {
         public Show()
         {
@@ -101,36 +103,27 @@ WriteLiteral("\r\n    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(@">
-        $(function () {
-            var $tabs = $('#DeviceDetailTabs');
-            $tabs.tabs({
-                activate: function (event, ui) {
-                    window.setTimeout(function () {
-                        var $window = $(window);
-                        var tabHeight = $tabs.height();
-                        var tabOffset = $tabs.offset();
-                        var windowScrollTop = $window.scrollTop();
-                        var windowHeight = $window.height();
-
-                        var tabTopNotShown = windowScrollTop - tabOffset.top;
-                        if (tabTopNotShown > 0) {
-                            $('html').animate({ scrollTop: tabOffset.top }, 125);
-                        } else {
-                            var tabBottomNotShown = ((windowScrollTop + windowHeight) - (tabHeight + tabOffset.top)) * -1;
-                            if (tabBottomNotShown > 0) {
-                                if (tabHeight > windowHeight)
-                                    $('html').animate({ scrollTop: tabOffset.top }, 125);
-                                else
-                                    $('html').animate({ scrollTop: windowScrollTop + tabBottomNotShown }, 125);
-                            }
-                        }
-                    }, 1);
-                }
-            });
-        });
-    </script>
-    <div");
+WriteLiteral(">\r\n        $(function () {\r\n            var $tabs = $(\'#DeviceDetailTabs\');\r\n    " +
+"        if ($tabs.children().length > 1) {\r\n                $tabs.tabs({\r\n      " +
+"              activate: function (event, ui) {\r\n                        window.s" +
+"etTimeout(function () {\r\n                            var $window = $(window);\r\n " +
+"                           var tabHeight = $tabs.height();\r\n                    " +
+"        var tabOffset = $tabs.offset();\r\n                            var windowS" +
+"crollTop = $window.scrollTop();\r\n                            var windowHeight = " +
+"$window.height();\r\n\r\n                            var tabTopNotShown = windowScro" +
+"llTop - tabOffset.top;\r\n                            if (tabTopNotShown > 0) {\r\n " +
+"                               $(\'html\').animate({ scrollTop: tabOffset.top }, 1" +
+"25);\r\n                            } else {\r\n                                var " +
+"tabBottomNotShown = ((windowScrollTop + windowHeight) - (tabHeight + tabOffset.t" +
+"op)) * -1;\r\n                                if (tabBottomNotShown > 0) {\r\n      " +
+"                              if (tabHeight > windowHeight)\r\n                   " +
+"                     $(\'html\').animate({ scrollTop: tabOffset.top }, 125);\r\n    " +
+"                                else\r\n                                        $(" +
+"\'html\').animate({ scrollTop: windowScrollTop + tabBottomNotShown }, 125);\r\n     " +
+"                           }\r\n                            }\r\n                   " +
+"     }, 1);\r\n                    }\r\n                });\r\n            } else {\r\n " +
+"               $tabs.hide();\r\n            }\r\n        });\r\n    </script>\r\n    <di" +
+"v");
 
 WriteLiteral(" id=\"DeviceDetailTabs\"");
 
@@ -140,60 +133,136 @@ WriteLiteral(" id=\"DeviceDetailTabItems\"");
 
 WriteLiteral("></ul>\r\n");
 
-WriteLiteral("        ");
-
-            
-            #line 48 "..\..\Views\Device\Show.cshtml"
-   Write(Html.Partial(MVC.Device.Views.DeviceParts._Jobs, Model));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("        ");
-
-            
-            #line 49 "..\..\Views\Device\Show.cshtml"
-   Write(Html.Partial(MVC.Device.Views.DeviceParts._Details, Model));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("        ");
-
-            
-            #line 50 "..\..\Views\Device\Show.cshtml"
-   Write(Html.Partial(MVC.Device.Views.DeviceParts._AssignmentHistory, Model));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("        ");
-
-            
-            #line 51 "..\..\Views\Device\Show.cshtml"
-   Write(Html.Partial(MVC.Device.Views.DeviceParts._Resources, Model));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("        ");
-
             
             #line 52 "..\..\Views\Device\Show.cshtml"
-   Write(Html.Partial(MVC.Device.Views.DeviceParts._Certificates, Model));
+        
+            
+            #line default
+            #line hidden
+            
+            #line 52 "..\..\Views\Device\Show.cshtml"
+         if (Authorization.Has(Claims.Device.ShowJobs))
+        {
+            
+            
+            #line default
+            #line hidden
+            
+            #line 54 "..\..\Views\Device\Show.cshtml"
+       Write(Html.Partial(MVC.Device.Views.DeviceParts._Jobs, Model));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n    </div>\r\n</div>\r\n");
+            
+            #line 54 "..\..\Views\Device\Show.cshtml"
+                                                                    
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 56 "..\..\Views\Device\Show.cshtml"
+         if (Authorization.Has(Claims.Device.ShowDetails))
+        {
+            
+            
+            #line default
+            #line hidden
+            
+            #line 58 "..\..\Views\Device\Show.cshtml"
+       Write(Html.Partial(MVC.Device.Views.DeviceParts._Details, Model));
+
+            
+            #line default
+            #line hidden
+            
+            #line 58 "..\..\Views\Device\Show.cshtml"
+                                                                       
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 60 "..\..\Views\Device\Show.cshtml"
+         if (Authorization.Has(Claims.Device.ShowAssignmentHistory))
+        {
+            
+            
+            #line default
+            #line hidden
+            
+            #line 62 "..\..\Views\Device\Show.cshtml"
+       Write(Html.Partial(MVC.Device.Views.DeviceParts._AssignmentHistory, Model));
+
+            
+            #line default
+            #line hidden
+            
+            #line 62 "..\..\Views\Device\Show.cshtml"
+                                                                                 
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 64 "..\..\Views\Device\Show.cshtml"
+         if (Authorization.Has(Claims.Device.ShowAttachments))
+        {
+            
+            
+            #line default
+            #line hidden
+            
+            #line 66 "..\..\Views\Device\Show.cshtml"
+       Write(Html.Partial(MVC.Device.Views.DeviceParts._Resources, Model));
+
+            
+            #line default
+            #line hidden
+            
+            #line 66 "..\..\Views\Device\Show.cshtml"
+                                                                         
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 68 "..\..\Views\Device\Show.cshtml"
+         if (Authorization.Has(Claims.Device.ShowCertificates))
+        {
+            
+            
+            #line default
+            #line hidden
+            
+            #line 70 "..\..\Views\Device\Show.cshtml"
+       Write(Html.Partial(MVC.Device.Views.DeviceParts._Certificates, Model));
+
+            
+            #line default
+            #line hidden
+            
+            #line 70 "..\..\Views\Device\Show.cshtml"
+                                                                            
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    </div>\r\n</div>\r\n");
 
         }
     }
diff --git a/Disco.Web/Views/Device/_DeviceTable.cshtml b/Disco.Web/Views/Device/_DeviceTable.cshtml
index 61a36d7a..e1ae67ce 100644
--- a/Disco.Web/Views/Device/_DeviceTable.cshtml
+++ b/Disco.Web/Views/Device/_DeviceTable.cshtml
@@ -1,30 +1,26 @@
 @model IEnumerable<Disco.Models.BI.Search.DeviceSearchResultItem>
+@{
+    var canShowDevices = Authorization.Has(Claims.Device.Show);
+}
 <div class="genericData deviceTable">
     @if (Model != null && Model.Count() > 0)
     { 
         <table class="genericData deviceTable">
             <thead>
                 <tr>
-                    <th>
-                        Serial#
+                    <th>Serial#
                     </th>
-                    <th>
-                        Asset#
+                    <th>Asset#
                     </th>
-                    <th>
-                        Name
+                    <th>Name
                     </th>
-                    <th>
-                        Model
+                    <th>Model
                     </th>
-                    <th>
-                        Profile
+                    <th>Profile
                     </th>
-                    <th>
-                        Assigned User
+                    <th>Assigned User
                     </th>
-                    <th>
-                        Jobs
+                    <th>Jobs
                     </th>
                 </tr>
             </thead>
@@ -33,7 +29,10 @@
                 {
                     <tr class="@(item.DecommissionedDate.HasValue ? "decommissioned" : string.Empty)">
                         <td>
-                            @Html.ActionLink(item.SerialNumber, MVC.Device.Show(item.SerialNumber))
+                            @if (canShowDevices)
+                            {@Html.ActionLink(item.SerialNumber, MVC.Device.Show(item.SerialNumber))}
+                            else
+                            {@item.SerialNumber}
                         </td>
                         <td>
                             @item.AssetNumber
diff --git a/Disco.Web/Views/Device/_DeviceTable.generated.cs b/Disco.Web/Views/Device/_DeviceTable.generated.cs
index 1664fe89..5bc70a16 100644
--- a/Disco.Web/Views/Device/_DeviceTable.generated.cs
+++ b/Disco.Web/Views/Device/_DeviceTable.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,32 +28,42 @@ namespace Disco.Web.Views.Device
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Device/_DeviceTable.cshtml")]
-    public partial class DeviceTable : System.Web.Mvc.WebViewPage<IEnumerable<Disco.Models.BI.Search.DeviceSearchResultItem>>
+    public partial class DeviceTable : Disco.Services.Web.WebViewPage<IEnumerable<Disco.Models.BI.Search.DeviceSearchResultItem>>
     {
         public DeviceTable()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<div");
+            
+            #line 2 "..\..\Views\Device\_DeviceTable.cshtml"
+  
+    var canShowDevices = Authorization.Has(Claims.Device.Show);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<div");
 
 WriteLiteral(" class=\"genericData deviceTable\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 3 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 6 "..\..\Views\Device\_DeviceTable.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 3 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 6 "..\..\Views\Device\_DeviceTable.cshtml"
      if (Model != null && Model.Count() > 0)
     { 
 
@@ -67,26 +77,19 @@ WriteLiteral(" class=\"genericData deviceTable\"");
 WriteLiteral(@">
             <thead>
                 <tr>
-                    <th>
-                        Serial#
+                    <th>Serial#
                     </th>
-                    <th>
-                        Asset#
+                    <th>Asset#
                     </th>
-                    <th>
-                        Name
+                    <th>Name
                     </th>
-                    <th>
-                        Model
+                    <th>Model
                     </th>
-                    <th>
-                        Profile
+                    <th>Profile
                     </th>
-                    <th>
-                        Assigned User
+                    <th>Assigned User
                     </th>
-                    <th>
-                        Jobs
+                    <th>Jobs
                     </th>
                 </tr>
             </thead>
@@ -94,13 +97,13 @@ WriteLiteral(@">
 ");
 
             
-            #line 32 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 28 "..\..\Views\Device\_DeviceTable.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 32 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 28 "..\..\Views\Device\_DeviceTable.cshtml"
                  foreach (var item in Model)
                 {
 
@@ -109,33 +112,66 @@ WriteLiteral(@">
             #line hidden
 WriteLiteral("                    <tr");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 1005), Tuple.Create("\"", 1082)
+WriteAttribute("class", Tuple.Create(" class=\"", 895), Tuple.Create("\"", 972)
             
-            #line 34 "..\..\Views\Device\_DeviceTable.cshtml"
-, Tuple.Create(Tuple.Create("", 1013), Tuple.Create<System.Object, System.Int32>(item.DecommissionedDate.HasValue ? "decommissioned" : string.Empty
+            #line 30 "..\..\Views\Device\_DeviceTable.cshtml"
+, Tuple.Create(Tuple.Create("", 903), Tuple.Create<System.Object, System.Int32>(item.DecommissionedDate.HasValue ? "decommissioned" : string.Empty
             
             #line default
             #line hidden
-, 1013), false)
+, 903), false)
 );
 
 WriteLiteral(">\r\n                        <td>\r\n");
 
-WriteLiteral("                            ");
-
             
-            #line 36 "..\..\Views\Device\_DeviceTable.cshtml"
-                       Write(Html.ActionLink(item.SerialNumber, MVC.Device.Show(item.SerialNumber)));
+            #line 32 "..\..\Views\Device\_DeviceTable.cshtml"
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 32 "..\..\Views\Device\_DeviceTable.cshtml"
+                             if (canShowDevices)
+                            {
+            
+            #line default
+            #line hidden
+            
+            #line 33 "..\..\Views\Device\_DeviceTable.cshtml"
+                        Write(Html.ActionLink(item.SerialNumber, MVC.Device.Show(item.SerialNumber)));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                        </td>\r\n                        <td>\r\n");
+            
+            #line 33 "..\..\Views\Device\_DeviceTable.cshtml"
+                                                                                                    }
+                            else
+                            {
+            
+            #line default
+            #line hidden
+            
+            #line 35 "..\..\Views\Device\_DeviceTable.cshtml"
+                        Write(item.SerialNumber);
+
+            
+            #line default
+            #line hidden
+            
+            #line 35 "..\..\Views\Device\_DeviceTable.cshtml"
+                                               }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </td>\r\n                        <td>\r\n");
 
 WriteLiteral("                            ");
 
             
-            #line 39 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 38 "..\..\Views\Device\_DeviceTable.cshtml"
                        Write(item.AssetNumber);
 
             
@@ -144,13 +180,13 @@ WriteLiteral("                            ");
 WriteLiteral("\r\n");
 
             
-            #line 40 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 39 "..\..\Views\Device\_DeviceTable.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 40 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 39 "..\..\Views\Device\_DeviceTable.cshtml"
                              if (item.DecommissionedDate.HasValue)
                             {
             
@@ -165,7 +201,7 @@ WriteLiteral(">(Decommissioned\r\n");
 WriteLiteral("                            ");
 
             
-            #line 42 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 41 "..\..\Views\Device\_DeviceTable.cshtml"
                        Write(CommonHelpers.FriendlyDate(item.DecommissionedDate.Value));
 
             
@@ -174,7 +210,7 @@ WriteLiteral("                            ");
 WriteLiteral(")</span> ");
 
             
-            #line 42 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 41 "..\..\Views\Device\_DeviceTable.cshtml"
                                                                                                }
 
             
@@ -183,13 +219,13 @@ WriteLiteral(")</span> ");
 WriteLiteral("                        </td>\r\n                        <td>\r\n");
 
             
-            #line 45 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 44 "..\..\Views\Device\_DeviceTable.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 45 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 44 "..\..\Views\Device\_DeviceTable.cshtml"
                              if (string.IsNullOrWhiteSpace(item.ComputerName))
                             {
 
@@ -203,7 +239,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">Unknown</span>\r\n");
 
             
-            #line 48 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 47 "..\..\Views\Device\_DeviceTable.cshtml"
                             }
                             else
                             { 
@@ -212,14 +248,14 @@ WriteLiteral(">Unknown</span>\r\n");
             #line default
             #line hidden
             
-            #line 51 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 50 "..\..\Views\Device\_DeviceTable.cshtml"
                            Write(item.ComputerName);
 
             
             #line default
             #line hidden
             
-            #line 51 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 50 "..\..\Views\Device\_DeviceTable.cshtml"
                                                   
                             }
 
@@ -229,13 +265,13 @@ WriteLiteral(">Unknown</span>\r\n");
 WriteLiteral("                        </td>\r\n                        <td>\r\n");
 
             
-            #line 55 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 54 "..\..\Views\Device\_DeviceTable.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 55 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 54 "..\..\Views\Device\_DeviceTable.cshtml"
                              if (item.DeviceModelDescription != null)
                             {
 
@@ -245,7 +281,7 @@ WriteLiteral("                        </td>\r\n                        <td>\r\n"
 WriteLiteral("                                <span>");
 
             
-            #line 57 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 56 "..\..\Views\Device\_DeviceTable.cshtml"
                                  Write(item.DeviceModelDescription);
 
             
@@ -254,7 +290,7 @@ WriteLiteral("                                <span>");
 WriteLiteral("</span>\r\n");
 
             
-            #line 58 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 57 "..\..\Views\Device\_DeviceTable.cshtml"
                             }
                             else
                             { 
@@ -269,7 +305,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">Unknown</span>                    \r\n");
 
             
-            #line 62 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 61 "..\..\Views\Device\_DeviceTable.cshtml"
                             }
 
             
@@ -280,7 +316,7 @@ WriteLiteral("                        </td>\r\n                        <td>\r\n"
 WriteLiteral("                            ");
 
             
-            #line 65 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 64 "..\..\Views\Device\_DeviceTable.cshtml"
                        Write(item.DeviceProfileDescription);
 
             
@@ -289,13 +325,13 @@ WriteLiteral("                            ");
 WriteLiteral("\r\n                        </td>\r\n                        <td>\r\n");
 
             
-            #line 68 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 67 "..\..\Views\Device\_DeviceTable.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 68 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 67 "..\..\Views\Device\_DeviceTable.cshtml"
                              if (string.IsNullOrEmpty(item.AssignedUserId))
                             {
 
@@ -309,7 +345,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">N/A</span>                 \r\n");
 
             
-            #line 71 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 70 "..\..\Views\Device\_DeviceTable.cshtml"
                             }
                             else
                             { 
@@ -320,7 +356,7 @@ WriteLiteral(">N/A</span>                 \r\n");
 WriteLiteral("                                <span>");
 
             
-            #line 74 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 73 "..\..\Views\Device\_DeviceTable.cshtml"
                                  Write(item.AssignedUserDescription);
 
             
@@ -329,7 +365,7 @@ WriteLiteral("                                <span>");
 WriteLiteral("</span>\r\n");
 
             
-            #line 75 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 74 "..\..\Views\Device\_DeviceTable.cshtml"
                             }
 
             
@@ -340,7 +376,7 @@ WriteLiteral("                        </td>\r\n                        <td>\r\n"
 WriteLiteral("                            ");
 
             
-            #line 78 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 77 "..\..\Views\Device\_DeviceTable.cshtml"
                        Write(item.JobCount);
 
             
@@ -349,7 +385,7 @@ WriteLiteral("                            ");
 WriteLiteral("\r\n                        </td>\r\n                    </tr>\r\n");
 
             
-            #line 81 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 80 "..\..\Views\Device\_DeviceTable.cshtml"
                 }
 
             
@@ -358,7 +394,7 @@ WriteLiteral("\r\n                        </td>\r\n                    </tr>\r\n
 WriteLiteral("            </tbody>\r\n        </table>\r\n");
 
             
-            #line 84 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 83 "..\..\Views\Device\_DeviceTable.cshtml"
     }
     else
     { 
@@ -373,7 +409,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Devices Found</span>\r\n");
 
             
-            #line 88 "..\..\Views\Device\_DeviceTable.cshtml"
+            #line 87 "..\..\Views\Device\_DeviceTable.cshtml"
     }
 
             
diff --git a/Disco.Web/Views/Device/_ViewStart.generated.cs b/Disco.Web/Views/Device/_ViewStart.generated.cs
index 8ceabd4e..cbfb3383 100644
--- a/Disco.Web/Views/Device/_ViewStart.generated.cs
+++ b/Disco.Web/Views/Device/_ViewStart.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,6 +28,8 @@ namespace Disco.Web.Views.Device
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
diff --git a/Disco.Web/Views/InitialConfig/Complete.generated.cs b/Disco.Web/Views/InitialConfig/Complete.generated.cs
index 6374a781..518fc9a6 100644
--- a/Disco.Web/Views/InitialConfig/Complete.generated.cs
+++ b/Disco.Web/Views/InitialConfig/Complete.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/InitialConfig/Complete.cshtml")]
-    public partial class Complete : System.Web.Mvc.WebViewPage<Disco.Web.Models.InitialConfig.CompleteModel>
+    public partial class Complete : Disco.Services.Web.WebViewPage<Disco.Web.Models.InitialConfig.CompleteModel>
     {
         public Complete()
         {
diff --git a/Disco.Web/Views/InitialConfig/Database.generated.cs b/Disco.Web/Views/InitialConfig/Database.generated.cs
index 6baaa9c9..92c644a7 100644
--- a/Disco.Web/Views/InitialConfig/Database.generated.cs
+++ b/Disco.Web/Views/InitialConfig/Database.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/InitialConfig/Database.cshtml")]
-    public partial class Database : System.Web.Mvc.WebViewPage<Disco.Web.Models.InitialConfig.DatabaseModel>
+    public partial class Database : Disco.Services.Web.WebViewPage<Disco.Web.Models.InitialConfig.DatabaseModel>
     {
         public Database()
         {
diff --git a/Disco.Web/Views/InitialConfig/FileStore.generated.cs b/Disco.Web/Views/InitialConfig/FileStore.generated.cs
index 40031edf..79192e34 100644
--- a/Disco.Web/Views/InitialConfig/FileStore.generated.cs
+++ b/Disco.Web/Views/InitialConfig/FileStore.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/InitialConfig/FileStore.cshtml")]
-    public partial class FileStore : System.Web.Mvc.WebViewPage<Disco.Web.Models.InitialConfig.FileStoreModel>
+    public partial class FileStore : Disco.Services.Web.WebViewPage<Disco.Web.Models.InitialConfig.FileStoreModel>
     {
         public FileStore()
         {
diff --git a/Disco.Web/Views/InitialConfig/RestartWebApp.generated.cs b/Disco.Web/Views/InitialConfig/RestartWebApp.generated.cs
index 2913d8b7..a4932506 100644
--- a/Disco.Web/Views/InitialConfig/RestartWebApp.generated.cs
+++ b/Disco.Web/Views/InitialConfig/RestartWebApp.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/InitialConfig/RestartWebApp.cshtml")]
-    public partial class RestartWebApp : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class RestartWebApp : Disco.Services.Web.WebViewPage<dynamic>
     {
         public RestartWebApp()
         {
diff --git a/Disco.Web/Views/InitialConfig/Welcome.generated.cs b/Disco.Web/Views/InitialConfig/Welcome.generated.cs
index ce582714..f2b44b3a 100644
--- a/Disco.Web/Views/InitialConfig/Welcome.generated.cs
+++ b/Disco.Web/Views/InitialConfig/Welcome.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/InitialConfig/Welcome.cshtml")]
-    public partial class Welcome : System.Web.Mvc.WebViewPage<Disco.Web.Models.InitialConfig.WelcomeModel>
+    public partial class Welcome : Disco.Services.Web.WebViewPage<Disco.Web.Models.InitialConfig.WelcomeModel>
     {
         public Welcome()
         {
diff --git a/Disco.Web/Views/InitialConfig/_Layout.generated.cs b/Disco.Web/Views/InitialConfig/_Layout.generated.cs
index 8615de1b..0da9706a 100644
--- a/Disco.Web/Views/InitialConfig/_Layout.generated.cs
+++ b/Disco.Web/Views/InitialConfig/_Layout.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/InitialConfig/_Layout.cshtml")]
-    public partial class Layout : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class Layout : Disco.Services.Web.WebViewPage<dynamic>
     {
         public Layout()
         {
diff --git a/Disco.Web/Views/InitialConfig/_ViewStart.generated.cs b/Disco.Web/Views/InitialConfig/_ViewStart.generated.cs
index 57e61768..43cb0b07 100644
--- a/Disco.Web/Views/InitialConfig/_ViewStart.generated.cs
+++ b/Disco.Web/Views/InitialConfig/_ViewStart.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,6 +28,8 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
diff --git a/Disco.Web/Views/Job/Create.cshtml b/Disco.Web/Views/Job/Create.cshtml
index 8cd38156..0e5a1bf6 100644
--- a/Disco.Web/Views/Job/Create.cshtml
+++ b/Disco.Web/Views/Job/Create.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Models.Job.CreateModel
 @{
+    Authorization.Require(Claims.Job.Actions.Create);
+    
     Layout = "~/Views/Shared/_DialogLayout.cshtml";
     ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), "Create");
 }
diff --git a/Disco.Web/Views/Job/Create.generated.cs b/Disco.Web/Views/Job/Create.generated.cs
index e2ca85d9..363c79cc 100644
--- a/Disco.Web/Views/Job/Create.generated.cs
+++ b/Disco.Web/Views/Job/Create.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/Create.cshtml")]
-    public partial class Create : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.CreateModel>
+    public partial class Create : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.CreateModel>
     {
         public Create()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Views.Job
             
             #line 2 "..\..\Views\Job\Create.cshtml"
   
+    Authorization.Require(Claims.Job.Actions.Create);
+    
     Layout = "~/Views/Shared/_DialogLayout.cshtml";
     ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), "Create");
 
@@ -56,13 +60,13 @@ WriteLiteral(" id=\"createJob_Container\"");
 WriteLiteral(">\r\n");
 
             
-            #line 7 "..\..\Views\Job\Create.cshtml"
+            #line 9 "..\..\Views\Job\Create.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 7 "..\..\Views\Job\Create.cshtml"
+            #line 9 "..\..\Views\Job\Create.cshtml"
      using (Html.BeginForm(MVC.Job.Create(), FormMethod.Post))
     {
         
@@ -70,42 +74,42 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 9 "..\..\Views\Job\Create.cshtml"
+            #line 11 "..\..\Views\Job\Create.cshtml"
    Write(Html.HiddenFor(m => m.DeviceSerialNumber));
 
             
             #line default
             #line hidden
             
-            #line 9 "..\..\Views\Job\Create.cshtml"
+            #line 11 "..\..\Views\Job\Create.cshtml"
                                                   
         
             
             #line default
             #line hidden
             
-            #line 10 "..\..\Views\Job\Create.cshtml"
+            #line 12 "..\..\Views\Job\Create.cshtml"
    Write(Html.HiddenFor(m => m.UserId));
 
             
             #line default
             #line hidden
             
-            #line 10 "..\..\Views\Job\Create.cshtml"
+            #line 12 "..\..\Views\Job\Create.cshtml"
                                       
         
             
             #line default
             #line hidden
             
-            #line 11 "..\..\Views\Job\Create.cshtml"
+            #line 13 "..\..\Views\Job\Create.cshtml"
    Write(Html.HiddenFor(m => m.QuickLogDestinationUrl));
 
             
             #line default
             #line hidden
             
-            #line 11 "..\..\Views\Job\Create.cshtml"
+            #line 13 "..\..\Views\Job\Create.cshtml"
                                                       
     
         
@@ -113,28 +117,28 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 13 "..\..\Views\Job\Create.cshtml"
+            #line 15 "..\..\Views\Job\Create.cshtml"
    Write(Html.Partial(MVC.Job.Views._CreateSubject, Model));
 
             
             #line default
             #line hidden
             
-            #line 13 "..\..\Views\Job\Create.cshtml"
+            #line 15 "..\..\Views\Job\Create.cshtml"
                                                           
         
             
             #line default
             #line hidden
             
-            #line 14 "..\..\Views\Job\Create.cshtml"
+            #line 16 "..\..\Views\Job\Create.cshtml"
    Write(Html.ValidationSummary(true));
 
             
             #line default
             #line hidden
             
-            #line 14 "..\..\Views\Job\Create.cshtml"
+            #line 16 "..\..\Views\Job\Create.cshtml"
                                      
         
 
@@ -154,7 +158,7 @@ WriteLiteral(">\r\n                <h3>Type</h3>\r\n");
 WriteLiteral("                ");
 
             
-            #line 19 "..\..\Views\Job\Create.cshtml"
+            #line 21 "..\..\Views\Job\Create.cshtml"
            Write(Html.ValidationMessageFor(m => m.Type));
 
             
@@ -165,7 +169,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 20 "..\..\Views\Job\Create.cshtml"
+            #line 22 "..\..\Views\Job\Create.cshtml"
            Write(CommonHelpers.RadioButtonList("Type", Model.JobTypes.ToSelectListItems(Model.Type), 3));
 
             
@@ -176,7 +180,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 21 "..\..\Views\Job\Create.cshtml"
+            #line 23 "..\..\Views\Job\Create.cshtml"
            Write(Html.ValidationMessageFor(m => m.SubTypes));
 
             
@@ -189,13 +193,13 @@ WriteLiteral(" id=\"createJob_SubTypes\"");
 WriteLiteral(">\r\n");
 
             
-            #line 24 "..\..\Views\Job\Create.cshtml"
+            #line 26 "..\..\Views\Job\Create.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 24 "..\..\Views\Job\Create.cshtml"
+            #line 26 "..\..\Views\Job\Create.cshtml"
                  foreach (var jt in Model.JobTypes)
                 {
 
@@ -204,15 +208,15 @@ WriteLiteral(">\r\n");
             #line hidden
 WriteLiteral("                    <div");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 1037), Tuple.Create("\"", 1068)
-, Tuple.Create(Tuple.Create("", 1042), Tuple.Create("createJob_SubType_", 1042), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 1098), Tuple.Create("\"", 1129)
+, Tuple.Create(Tuple.Create("", 1103), Tuple.Create("createJob_SubType_", 1103), true)
             
-            #line 26 "..\..\Views\Job\Create.cshtml"
-, Tuple.Create(Tuple.Create("", 1060), Tuple.Create<System.Object, System.Int32>(jt.Id
+            #line 28 "..\..\Views\Job\Create.cshtml"
+, Tuple.Create(Tuple.Create("", 1121), Tuple.Create<System.Object, System.Int32>(jt.Id
             
             #line default
             #line hidden
-, 1060), false)
+, 1121), false)
 );
 
 WriteLiteral(" class=\"createJob_SubType\"");
@@ -226,7 +230,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                            ");
 
             
-            #line 28 "..\..\Views\Job\Create.cshtml"
+            #line 30 "..\..\Views\Job\Create.cshtml"
                        Write(CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.Where(jst => jst.JobTypeId == jt.Id).ToList().ToSelectListItems(Model.SubTypes), 3));
 
             
@@ -235,7 +239,7 @@ WriteLiteral("                            ");
 WriteLiteral("\r\n                        </div>\r\n                    </div>   \r\n");
 
             
-            #line 31 "..\..\Views\Job\Create.cshtml"
+            #line 33 "..\..\Views\Job\Create.cshtml"
                 }
 
             
@@ -254,7 +258,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("            ");
 
             
-            #line 35 "..\..\Views\Job\Create.cshtml"
+            #line 37 "..\..\Views\Job\Create.cshtml"
        Write(Html.ValidationMessageFor(m => m.DeviceHeld));
 
             
@@ -265,7 +269,7 @@ WriteLiteral("\r\n");
 WriteLiteral("            ");
 
             
-            #line 36 "..\..\Views\Job\Create.cshtml"
+            #line 38 "..\..\Views\Job\Create.cshtml"
        Write(Html.HiddenFor(m => m.DeviceHeld));
 
             
@@ -318,7 +322,7 @@ WriteLiteral(">\r\n            <table>\r\n                <tr>\r\n
 WriteLiteral("                        ");
 
             
-            #line 58 "..\..\Views\Job\Create.cshtml"
+            #line 60 "..\..\Views\Job\Create.cshtml"
                    Write(Html.EditorFor(m => m.Comments));
 
             
@@ -360,7 +364,7 @@ WriteLiteral(">\r\n                <h3>Task Time</h3>\r\n");
 WriteLiteral("                ");
 
             
-            #line 70 "..\..\Views\Job\Create.cshtml"
+            #line 72 "..\..\Views\Job\Create.cshtml"
            Write(Html.ValidationMessageFor(m => m.QuickLogTaskTimeMinutes));
 
             
@@ -456,7 +460,7 @@ WriteLiteral(" />\r\n                    Minutes\r\n                </span>\r\n
 "      </div>\r\n");
 
             
-            #line 82 "..\..\Views\Job\Create.cshtml"
+            #line 84 "..\..\Views\Job\Create.cshtml"
     }
 
             
diff --git a/Disco.Web/Views/Job/Create_Redirect.cshtml b/Disco.Web/Views/Job/Create_Redirect.cshtml
index 1d2db0ce..791dccd2 100644
--- a/Disco.Web/Views/Job/Create_Redirect.cshtml
+++ b/Disco.Web/Views/Job/Create_Redirect.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Models.Job.CreateRedirectModel
 @{
+    Authorization.Require(Claims.Job.Actions.Create);
+    
     Layout = null;
     ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), "Create - Redirecting...");
 }
diff --git a/Disco.Web/Views/Job/Create_Redirect.generated.cs b/Disco.Web/Views/Job/Create_Redirect.generated.cs
index 596f4db8..81288d1e 100644
--- a/Disco.Web/Views/Job/Create_Redirect.generated.cs
+++ b/Disco.Web/Views/Job/Create_Redirect.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/Create_Redirect.cshtml")]
-    public partial class Create_Redirect : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.CreateRedirectModel>
+    public partial class Create_Redirect : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.CreateRedirectModel>
     {
         public Create_Redirect()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Views.Job
             
             #line 2 "..\..\Views\Job\Create_Redirect.cshtml"
   
+    Authorization.Require(Claims.Job.Actions.Create);
+    
     Layout = null;
     ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), "Create - Redirecting...");
 
@@ -53,14 +57,14 @@ WriteLiteral("\r\n<a");
 
 WriteLiteral(" id=\"redirectLink\"");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 188), Tuple.Create("\"", 214)
+WriteAttribute("href", Tuple.Create(" href=\"", 249), Tuple.Create("\"", 275)
             
-            #line 6 "..\..\Views\Job\Create_Redirect.cshtml"
-, Tuple.Create(Tuple.Create("", 195), Tuple.Create<System.Object, System.Int32>(Model.RedirectLink
+            #line 8 "..\..\Views\Job\Create_Redirect.cshtml"
+, Tuple.Create(Tuple.Create("", 256), Tuple.Create<System.Object, System.Int32>(Model.RedirectLink
             
             #line default
             #line hidden
-, 195), false)
+, 256), false)
 );
 
 WriteLiteral(@">Redirecting...</a>
diff --git a/Disco.Web/Views/Job/Index.cshtml b/Disco.Web/Views/Job/Index.cshtml
index 63eefab8..40f106cf 100644
--- a/Disco.Web/Views/Job/Index.cshtml
+++ b/Disco.Web/Views/Job/Index.cshtml
@@ -1,129 +1,136 @@
 @model Disco.Web.Models.Job.IndexModel
 @{
     ViewBag.Title = "Jobs";
-    Html.BundleDeferred("~/ClientScripts/Modules/Highcharts");
+    
+    if (Authorization.Has(Claims.Job.ShowDailyChart))
+    {
+        Html.BundleDeferred("~/ClientScripts/Modules/Highcharts");
+    }
 }
 <div class="clearfix columnHost">
-    <div class="column50">
-        <h2>Search Jobs</h2>
-        @Html.Partial(MVC.Shared.Views._SearchDialog, "jobs")
-    </div>
-    <div class="column50">
-        <h2>Daily Opened &amp; Closed Jobs</h2>
-        <div id="chartHostJobDailyOpenedClosed" style="height: 175px;">
+    @if (Authorization.Has(Claims.Job.Search))
+    {
+        <div class="column50">
+            <h2>Search Jobs</h2>
+            @Html.Partial(MVC.Shared.Views._SearchDialog, "jobs")
         </div>
-        @{
-            var jsonData = new HtmlString(Json.Encode(Model.DailyOpenedClosedStatistics));
-        }
-        <script type="text/javascript">
-            (function () {
-                var chartData;
+    }
+    @if (Authorization.Has(Claims.Job.ShowDailyChart))
+    {
+        <div class="column50">
+            <h2>Daily Opened &amp; Closed Jobs</h2>
+            <div id="chartHostJobDailyOpenedClosed" style="height: 175px;">
+            </div>
+            @{
+        var jsonData = new HtmlString(Json.Encode(Model.DailyOpenedClosedStatistics));
+            }
+            <script type="text/javascript">
+                (function () {
+                    var chartData;
 
-                function buildChart() {
-                    $(function () {
+                    function buildChart() {
+                        $(function () {
 
-                        var data = chartData;
+                            var data = chartData;
 
-                        var dataTotalOpenJobs = [];
-                        var dataOpenedJobs = [];
-                        var dataClosedJobs = [];
-                        for (var i = 0; i < data.length; i++) {
-                            var dataItem = data[i];
-                            var dataItemDate = new Date(parseInt(dataItem.Timestamp.substr(6, dataItem.Timestamp.length - 8))).getTime(); // $.datepicker.parseDate('yy-mm-dd', dataItem.Timestamp.substr(0, 10)).getTime();
-                            dataTotalOpenJobs.push([dataItemDate, dataItem.TotalJobs]);
-                            dataOpenedJobs.push([dataItemDate, dataItem.OpenedJobs]);
-                            dataClosedJobs.push([dataItemDate, dataItem.ClosedJobs]);
-                        }
-                        Highcharts.setOptions({
-                            global: {
-                                useUTC: false
+                            var dataTotalOpenJobs = [];
+                            var dataOpenedJobs = [];
+                            var dataClosedJobs = [];
+                            for (var i = 0; i < data.length; i++) {
+                                var dataItem = data[i];
+                                var dataItemDate = new Date(parseInt(dataItem.Timestamp.substr(6, dataItem.Timestamp.length - 8))).getTime(); // $.datepicker.parseDate('yy-mm-dd', dataItem.Timestamp.substr(0, 10)).getTime();
+                                dataTotalOpenJobs.push([dataItemDate, dataItem.TotalJobs]);
+                                dataOpenedJobs.push([dataItemDate, dataItem.OpenedJobs]);
+                                dataClosedJobs.push([dataItemDate, dataItem.ClosedJobs]);
                             }
-                        });
-                        new Highcharts.Chart({
-                            chart: {
-                                renderTo: 'chartHostJobDailyOpenedClosed',
-                                height: 175,
-                                animation: false
-                            },
-                            colors: ['#BBBBBB', '#005fab', '#DB761D'],
-                            title: {
-                                text: null
-                            },
-                            plotOptions: {
-                                series: {
-                                    marker: {
-                                        radius: 3
-                                    },
+                            Highcharts.setOptions({
+                                global: {
+                                    useUTC: false
+                                }
+                            });
+                            new Highcharts.Chart({
+                                chart: {
+                                    renderTo: 'chartHostJobDailyOpenedClosed',
+                                    height: 175,
                                     animation: false
-                                }
-                            },
-                            legend: {
-                                align: 'left',
-                                verticalAlign: 'top',
-                                y: 0,
-                                floating: true,
-                                borderWidth: 0
-                            },
-                            xAxis: {
-                                type: 'datetime',
-                                tickInterval: 7 * 24 * 3600 * 1000, // week
-                                tickWidth: 1,
-                                gridLineWidth: 1,
-                                dateTimeLabelFormats: {
-                                    week: '%e %b'
-                                }
-                            },
-                            yAxis: [{
+                                },
+                                colors: ['#BBBBBB', '#005fab', '#DB761D'],
                                 title: {
                                     text: null
                                 },
-                                labels: {
+                                plotOptions: {
+                                    series: {
+                                        marker: {
+                                            radius: 3
+                                        },
+                                        animation: false
+                                    }
+                                },
+                                legend: {
+                                    align: 'left',
+                                    verticalAlign: 'top',
+                                    y: 0,
+                                    floating: true,
+                                    borderWidth: 0
+                                },
+                                xAxis: {
+                                    type: 'datetime',
+                                    tickInterval: 7 * 24 * 3600 * 1000, // week
+                                    tickWidth: 1,
+                                    gridLineWidth: 1,
+                                    dateTimeLabelFormats: {
+                                        week: '%e %b'
+                                    }
+                                },
+                                yAxis: [{
+                                    title: {
+                                        text: null
+                                    },
+                                    labels: {
+                                        enabled: false
+                                    },
+                                    min: 0
+                                }, {
+                                    title: {
+                                        text: null
+                                    },
+                                    labels: {
+                                        enabled: false
+                                    },
+                                    min: 0
+                                }],
+                                series: [{
+                                    name: 'Total Open Jobs',
+                                    data: dataTotalOpenJobs,
+                                    yAxis: 1
+                                }, {
+                                    name: 'Closed Jobs',
+                                    data: dataClosedJobs
+                                }, {
+                                    name: 'Opened Jobs',
+                                    data: dataOpenedJobs
+                                }],
+                                credits: {
                                     enabled: false
-                                },
-                                min: 0
-                            }, {
-                                title: {
-                                    text: null
-                                },
-                                labels: {
-                                    enabled: false
-                                },
-                                min: 0
-                            }],
-                            series: [{
-                                name: 'Total Open Jobs',
-                                data: dataTotalOpenJobs,
-                                yAxis: 1
-                            }, {
-                                name: 'Closed Jobs',
-                                data: dataClosedJobs
-                            }, {
-                                name: 'Opened Jobs',
-                                data: dataOpenedJobs
-                            }],
-                            credits: {
-                                enabled: false
-                            }
+                                }
+                            });
                         });
-                    });
-                }
-                chartData = $.parseJSON('@(jsonData)');
-                buildChart();
-            }());
+                    }
+                    chartData = $.parseJSON('@(jsonData)');
+                    buildChart();
+                }());
 
-        </script>
-    </div>
+            </script>
+        </div>
+    }
 </div>
-<h2>Open Jobs Awaiting Technician Action (@Model.OpenJobs.Items.Count)</h2>
-@Html.Partial(MVC.Shared.Views._JobTable, Model.OpenJobs, new ViewDataDictionary())
-<h2>Long Running Jobs (@Model.LongRunningJobs.Items.Count)</h2>
-@Html.Partial(MVC.Shared.Views._JobTable, Model.LongRunningJobs, new ViewDataDictionary())
-@*<h2>
-    Jobs with Devices Ready for Return (@Model.ReadyForReturnJobs.Items.Count)</h2>
-@Html.Partial(MVC.Shared.Views._JobTable, Model.ReadyForReturnJobs, new ViewDataDictionary())
-<h2>
-    Jobs Waiting for User Action (@Model.WaitingForUserActionJobs.Items.Count)</h2>
-@Html.Partial(MVC.Shared.Views._JobTable, Model.WaitingForUserActionJobs, new ViewDataDictionary())
-<h2>
-    Recently Closed Jobs (@Model.RecentlyClosedJobs.Items.Count)</h2>
-@Html.Partial(MVC.Shared.Views._JobTable, Model.RecentlyClosedJobs, new ViewDataDictionary())*@
+@if (Authorization.Has(Claims.Job.Lists.AwaitingTechnicianAction))
+{
+    <h2>Open Jobs Awaiting Technician Action (@Model.OpenJobs.Items.Count)</h2>
+    @Html.Partial(MVC.Shared.Views._JobTable, Model.OpenJobs, new ViewDataDictionary())
+}
+@if (Authorization.Has(Claims.Job.Lists.LongRunningJobs))
+{
+    <h2>Long Running Jobs (@Model.LongRunningJobs.Items.Count)</h2>
+    @Html.Partial(MVC.Shared.Views._JobTable, Model.LongRunningJobs, new ViewDataDictionary())
+}
\ No newline at end of file
diff --git a/Disco.Web/Views/Job/Index.generated.cs b/Disco.Web/Views/Job/Index.generated.cs
index 4aefe9c3..37b3177e 100644
--- a/Disco.Web/Views/Job/Index.generated.cs
+++ b/Disco.Web/Views/Job/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.IndexModel>
+    public partial class Index : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.IndexModel>
     {
         public Index()
         {
@@ -44,7 +46,11 @@ namespace Disco.Web.Views.Job
             #line 2 "..\..\Views\Job\Index.cshtml"
   
     ViewBag.Title = "Jobs";
-    Html.BundleDeferred("~/ClientScripts/Modules/Highcharts");
+    
+    if (Authorization.Has(Claims.Job.ShowDailyChart))
+    {
+        Html.BundleDeferred("~/ClientScripts/Modules/Highcharts");
+    }
 
             
             #line default
@@ -53,118 +59,176 @@ WriteLiteral("\r\n<div");
 
 WriteLiteral(" class=\"clearfix columnHost\"");
 
-WriteLiteral(">\r\n    <div");
-
-WriteLiteral(" class=\"column50\"");
-
-WriteLiteral(">\r\n        <h2>Search Jobs</h2>\r\n");
-
-WriteLiteral("        ");
+WriteLiteral(">\r\n");
 
             
-            #line 9 "..\..\Views\Job\Index.cshtml"
-   Write(Html.Partial(MVC.Shared.Views._SearchDialog, "jobs"));
+            #line 11 "..\..\Views\Job\Index.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 11 "..\..\Views\Job\Index.cshtml"
+     if (Authorization.Has(Claims.Job.Search))
+    {
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n    </div>\r\n    <div");
+WriteLiteral("        <div");
 
 WriteLiteral(" class=\"column50\"");
 
-WriteLiteral(">\r\n        <h2>Daily Opened &amp; Closed Jobs</h2>\r\n        <div");
+WriteLiteral(">\r\n            <h2>Search Jobs</h2>\r\n");
+
+WriteLiteral("            ");
+
+            
+            #line 15 "..\..\Views\Job\Index.cshtml"
+       Write(Html.Partial(MVC.Shared.Views._SearchDialog, "jobs"));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n        </div>\r\n");
+
+            
+            #line 17 "..\..\Views\Job\Index.cshtml"
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    ");
+
+            
+            #line 18 "..\..\Views\Job\Index.cshtml"
+     if (Authorization.Has(Claims.Job.ShowDailyChart))
+    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        <div");
+
+WriteLiteral(" class=\"column50\"");
+
+WriteLiteral(">\r\n            <h2>Daily Opened &amp; Closed Jobs</h2>\r\n            <div");
 
 WriteLiteral(" id=\"chartHostJobDailyOpenedClosed\"");
 
 WriteLiteral(" style=\"height: 175px;\"");
 
-WriteLiteral(">\r\n        </div>\r\n");
+WriteLiteral(">\r\n            </div>\r\n");
 
             
-            #line 15 "..\..\Views\Job\Index.cshtml"
-        
+            #line 24 "..\..\Views\Job\Index.cshtml"
+            
             
             #line default
             #line hidden
             
-            #line 15 "..\..\Views\Job\Index.cshtml"
-          
-            var jsonData = new HtmlString(Json.Encode(Model.DailyOpenedClosedStatistics));
-        
+            #line 24 "..\..\Views\Job\Index.cshtml"
+              
+        var jsonData = new HtmlString(Json.Encode(Model.DailyOpenedClosedStatistics));
+            
             
             #line default
             #line hidden
-WriteLiteral("\r\n        <script");
+WriteLiteral("\r\n            <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n            (function () {\r\n                var chartData;\r\n\r\n                " +
-"function buildChart() {\r\n                    $(function () {\r\n\r\n                " +
-"        var data = chartData;\r\n\r\n                        var dataTotalOpenJobs =" +
-" [];\r\n                        var dataOpenedJobs = [];\r\n                        " +
-"var dataClosedJobs = [];\r\n                        for (var i = 0; i < data.lengt" +
-"h; i++) {\r\n                            var dataItem = data[i];\r\n                " +
-"            var dataItemDate = new Date(parseInt(dataItem.Timestamp.substr(6, da" +
-"taItem.Timestamp.length - 8))).getTime(); // $.datepicker.parseDate(\'yy-mm-dd\', " +
-"dataItem.Timestamp.substr(0, 10)).getTime();\r\n                            dataTo" +
-"talOpenJobs.push([dataItemDate, dataItem.TotalJobs]);\r\n                         " +
-"   dataOpenedJobs.push([dataItemDate, dataItem.OpenedJobs]);\r\n                  " +
-"          dataClosedJobs.push([dataItemDate, dataItem.ClosedJobs]);\r\n           " +
-"             }\r\n                        Highcharts.setOptions({\r\n               " +
-"             global: {\r\n                                useUTC: false\r\n         " +
-"                   }\r\n                        });\r\n                        new H" +
-"ighcharts.Chart({\r\n                            chart: {\r\n                       " +
-"         renderTo: \'chartHostJobDailyOpenedClosed\',\r\n                           " +
-"     height: 175,\r\n                                animation: false\r\n           " +
-"                 },\r\n                            colors: [\'#BBBBBB\', \'#005fab\', " +
-"\'#DB761D\'],\r\n                            title: {\r\n                             " +
-"   text: null\r\n                            },\r\n                            plotO" +
-"ptions: {\r\n                                series: {\r\n                          " +
-"          marker: {\r\n                                        radius: 3\r\n        " +
-"                            },\r\n                                    animation: f" +
-"alse\r\n                                }\r\n                            },\r\n       " +
-"                     legend: {\r\n                                align: \'left\',\r\n" +
-"                                verticalAlign: \'top\',\r\n                         " +
-"       y: 0,\r\n                                floating: true,\r\n                 " +
-"               borderWidth: 0\r\n                            },\r\n                 " +
-"           xAxis: {\r\n                                type: \'datetime\',\r\n        " +
-"                        tickInterval: 7 * 24 * 3600 * 1000, // week\r\n           " +
-"                     tickWidth: 1,\r\n                                gridLineWidt" +
-"h: 1,\r\n                                dateTimeLabelFormats: {\r\n                " +
-"                    week: \'%e %b\'\r\n                                }\r\n          " +
-"                  },\r\n                            yAxis: [{\r\n                   " +
-"             title: {\r\n                                    text: null\r\n         " +
-"                       },\r\n                                labels: {\r\n          " +
-"                          enabled: false\r\n                                },\r\n  " +
-"                              min: 0\r\n                            }, {\r\n        " +
-"                        title: {\r\n                                    text: null" +
-"\r\n                                },\r\n                                labels: {\r" +
-"\n                                    enabled: false\r\n                           " +
-"     },\r\n                                min: 0\r\n                            }]," +
-"\r\n                            series: [{\r\n                                name: " +
-"\'Total Open Jobs\',\r\n                                data: dataTotalOpenJobs,\r\n  " +
-"                              yAxis: 1\r\n                            }, {\r\n      " +
-"                          name: \'Closed Jobs\',\r\n                                " +
-"data: dataClosedJobs\r\n                            }, {\r\n                        " +
-"        name: \'Opened Jobs\',\r\n                                data: dataOpenedJo" +
-"bs\r\n                            }],\r\n                            credits: {\r\n   " +
-"                             enabled: false\r\n                            }\r\n    " +
-"                    });\r\n                    });\r\n                }\r\n           " +
-"     chartData = $.parseJSON(\'");
+WriteLiteral(">\r\n                (function () {\r\n                    var chartData;\r\n\r\n        " +
+"            function buildChart() {\r\n                        $(function () {\r\n\r\n" +
+"                            var data = chartData;\r\n\r\n                           " +
+" var dataTotalOpenJobs = [];\r\n                            var dataOpenedJobs = [" +
+"];\r\n                            var dataClosedJobs = [];\r\n                      " +
+"      for (var i = 0; i < data.length; i++) {\r\n                                v" +
+"ar dataItem = data[i];\r\n                                var dataItemDate = new D" +
+"ate(parseInt(dataItem.Timestamp.substr(6, dataItem.Timestamp.length - 8))).getTi" +
+"me(); // $.datepicker.parseDate(\'yy-mm-dd\', dataItem.Timestamp.substr(0, 10)).ge" +
+"tTime();\r\n                                dataTotalOpenJobs.push([dataItemDate, " +
+"dataItem.TotalJobs]);\r\n                                dataOpenedJobs.push([data" +
+"ItemDate, dataItem.OpenedJobs]);\r\n                                dataClosedJobs" +
+".push([dataItemDate, dataItem.ClosedJobs]);\r\n                            }\r\n    " +
+"                        Highcharts.setOptions({\r\n                               " +
+" global: {\r\n                                    useUTC: false\r\n                 " +
+"               }\r\n                            });\r\n                            n" +
+"ew Highcharts.Chart({\r\n                                chart: {\r\n               " +
+"                     renderTo: \'chartHostJobDailyOpenedClosed\',\r\n               " +
+"                     height: 175,\r\n                                    animation" +
+": false\r\n                                },\r\n                                col" +
+"ors: [\'#BBBBBB\', \'#005fab\', \'#DB761D\'],\r\n                                title: " +
+"{\r\n                                    text: null\r\n                             " +
+"   },\r\n                                plotOptions: {\r\n                         " +
+"           series: {\r\n                                        marker: {\r\n       " +
+"                                     radius: 3\r\n                                " +
+"        },\r\n                                        animation: false\r\n          " +
+"                          }\r\n                                },\r\n               " +
+"                 legend: {\r\n                                    align: \'left\',\r\n" +
+"                                    verticalAlign: \'top\',\r\n                     " +
+"               y: 0,\r\n                                    floating: true,\r\n     " +
+"                               borderWidth: 0\r\n                                }" +
+",\r\n                                xAxis: {\r\n                                   " +
+" type: \'datetime\',\r\n                                    tickInterval: 7 * 24 * 3" +
+"600 * 1000, // week\r\n                                    tickWidth: 1,\r\n        " +
+"                            gridLineWidth: 1,\r\n                                 " +
+"   dateTimeLabelFormats: {\r\n                                        week: \'%e %b" +
+"\'\r\n                                    }\r\n                                },\r\n  " +
+"                              yAxis: [{\r\n                                    tit" +
+"le: {\r\n                                        text: null\r\n                     " +
+"               },\r\n                                    labels: {\r\n              " +
+"                          enabled: false\r\n                                    }," +
+"\r\n                                    min: 0\r\n                                }," +
+" {\r\n                                    title: {\r\n                              " +
+"          text: null\r\n                                    },\r\n                  " +
+"                  labels: {\r\n                                        enabled: fa" +
+"lse\r\n                                    },\r\n                                   " +
+" min: 0\r\n                                }],\r\n                                se" +
+"ries: [{\r\n                                    name: \'Total Open Jobs\',\r\n        " +
+"                            data: dataTotalOpenJobs,\r\n                          " +
+"          yAxis: 1\r\n                                }, {\r\n                      " +
+"              name: \'Closed Jobs\',\r\n                                    data: da" +
+"taClosedJobs\r\n                                }, {\r\n                            " +
+"        name: \'Opened Jobs\',\r\n                                    data: dataOpen" +
+"edJobs\r\n                                }],\r\n                                cre" +
+"dits: {\r\n                                    enabled: false\r\n                   " +
+"             }\r\n                            });\r\n                        });\r\n  " +
+"                  }\r\n                    chartData = $.parseJSON(\'");
 
             
-            #line 110 "..\..\Views\Job\Index.cshtml"
-                                     Write(jsonData);
+            #line 119 "..\..\Views\Job\Index.cshtml"
+                                         Write(jsonData);
 
             
             #line default
             #line hidden
-WriteLiteral("\');\r\n                buildChart();\r\n            }());\r\n\r\n        </script>\r\n    <" +
-"/div>\r\n</div>\r\n<h2>Open Jobs Awaiting Technician Action (");
+WriteLiteral("\');\r\n                    buildChart();\r\n                }());\r\n\r\n            </sc" +
+"ript>\r\n        </div>\r\n");
 
             
-            #line 117 "..\..\Views\Job\Index.cshtml"
-                                     Write(Model.OpenJobs.Items.Count);
+            #line 125 "..\..\Views\Job\Index.cshtml"
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</div>\r\n");
+
+            
+            #line 127 "..\..\Views\Job\Index.cshtml"
+ if (Authorization.Has(Claims.Job.Lists.AwaitingTechnicianAction))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <h2>Open Jobs Awaiting Technician Action (");
+
+            
+            #line 129 "..\..\Views\Job\Index.cshtml"
+                                         Write(Model.OpenJobs.Items.Count);
 
             
             #line default
@@ -172,17 +236,39 @@ WriteLiteral("\');\r\n                buildChart();\r\n            }());\r\n\r\n
 WriteLiteral(")</h2>\r\n");
 
             
-            #line 118 "..\..\Views\Job\Index.cshtml"
+            #line 130 "..\..\Views\Job\Index.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 130 "..\..\Views\Job\Index.cshtml"
 Write(Html.Partial(MVC.Shared.Views._JobTable, Model.OpenJobs, new ViewDataDictionary()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n<h2>Long Running Jobs (");
+            
+            #line 130 "..\..\Views\Job\Index.cshtml"
+                                                                                       
+}
 
             
-            #line 119 "..\..\Views\Job\Index.cshtml"
-                  Write(Model.LongRunningJobs.Items.Count);
+            #line default
+            #line hidden
+            
+            #line 132 "..\..\Views\Job\Index.cshtml"
+ if (Authorization.Has(Claims.Job.Lists.LongRunningJobs))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <h2>Long Running Jobs (");
+
+            
+            #line 134 "..\..\Views\Job\Index.cshtml"
+                      Write(Model.LongRunningJobs.Items.Count);
 
             
             #line default
@@ -190,16 +276,25 @@ WriteLiteral("\r\n<h2>Long Running Jobs (");
 WriteLiteral(")</h2>\r\n");
 
             
-            #line 120 "..\..\Views\Job\Index.cshtml"
+            #line 135 "..\..\Views\Job\Index.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 135 "..\..\Views\Job\Index.cshtml"
 Write(Html.Partial(MVC.Shared.Views._JobTable, Model.LongRunningJobs, new ViewDataDictionary()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("\r\n");
-
+            
+            #line 135 "..\..\Views\Job\Index.cshtml"
+                                                                                              
+}
+            
+            #line default
+            #line hidden
         }
     }
 }
diff --git a/Disco.Web/Views/Job/JobParts/Components.cshtml b/Disco.Web/Views/Job/JobParts/Components.cshtml
index 0f715c53..5b95cb94 100644
--- a/Disco.Web/Views/Job/JobParts/Components.cshtml
+++ b/Disco.Web/Views/Job/JobParts/Components.cshtml
@@ -1,21 +1,31 @@
 @model Disco.Web.Models.Job.ShowModel
 @{
-    Html.BundleDeferred("~/ClientScripts/Modules/jQuery-NumberFormatter");
+    Authorization.Require(Claims.Job.ShowNonWarrantyComponents);
+
+    var hasEdit = Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.EditComponents);
+    var hasAdd = Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.AddComponents);
+
+    if (hasEdit)
+    {
+        Html.BundleDeferred("~/ClientScripts/Modules/jQuery-NumberFormatter");
     }
+}
 <table id="jobComponents">
     <tr>
-        <th>
-            Description
+        <th>Description
         </th>
-        <th>
-            Cost
-        </th>
-        <th class="actions">
-            &nbsp;
+        <th>Cost
         </th>
+        @if (hasEdit)
+        {
+            <th class="actions">&nbsp;
+            </th>
+        }
     </tr>
-    @foreach (var jc in Model.Job.JobComponents)
+    @if (hasEdit)
     {
+        foreach (var jc in Model.Job.JobComponents)
+        {
         <tr data-jobcomponentid="@jc.Id">
             <td>
                 <input type="text" class="description" value="@jc.Description" />
@@ -27,161 +37,189 @@
                 <span class="remove"></span>
             </td>
         </tr>
+        }
     }
+    else
+    {
+        foreach (var jc in Model.Job.JobComponents)
+        {
+        <tr data-jobcomponentid="@jc.Id">
+            <td>
+                <span class="description">@jc.Description</span>
+            </td>
+            <td>
+                <span class="cost">@jc.Cost.ToString("C")</span>
+            </td>
+        </tr>
+        }
+    }
+
     <tr>
         <td>
-            <a href="#" id="jobComponentsAdd">Add Component</a>
+            @if (hasEdit && hasAdd)
+            {
+                <a href="#" id="jobComponentsAdd">Add Component</a>
+            }
+            &nbsp;
         </td>
-        <td colspan="2" class="totalCost">
-            Total: <span id="jobComponentsTotalCost"></span>
+        <td colspan="@(hasEdit ? 2 : 1)" class="totalCost">Total: <span id="jobComponentsTotalCost">
+            @if (!hasEdit)
+            {
+                @Model.Job.JobComponentsTotalCost().ToString("C")
+            }
+        </span>
         </td>
     </tr>
 </table>
-<div id="dialogRemoveComponent" title="Remove this Component?">
-    <p>
-        <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
-        Are you sure?</p>
-</div>
-<script type="text/javascript">
-    $(function () {
-        var $jobComponents = $('#jobComponents');
+@if (hasEdit)
+{
+    <div id="dialogRemoveComponent" title="Remove this Component?">
+        <p>
+            <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
+            Are you sure?
+        </p>
+    </div>
+    <script type="text/javascript">
+        $(function () {
+            var $jobComponents = $('#jobComponents');
 
-        $jobComponents.on('change', 'input', updateComponent);
-        $jobComponents.on('focus', 'input', function () { $(this).select() });
+            $jobComponents.on('change', 'input', updateComponent);
+            $jobComponents.on('focus', 'input', function () { $(this).select() });
 
 
-        $jobComponents.on('click', 'span.remove', removeComponent);
+            $jobComponents.on('click', 'span.remove', removeComponent);
 
-        $('#jobComponentsAdd').click(function () {
-            var jc = $('<tr><td><input type="text" class="description" /></td><td><input type="text" class="cost" /></td><td><span class="remove"></span></td></tr>');
-            jc.find('input').focus(function () { $(this).select() })
-            jc.insertBefore($jobComponents.find('tr').last());
-            jc.find('input.description').focus();
-            return false;
-        });
+            $('#jobComponentsAdd').click(function () {
+                var jc = $('<tr><td><input type="text" class="description" /></td><td><input type="text" class="cost" /></td><td><span class="remove"></span></td></tr>');
+                jc.find('input').focus(function () { $(this).select() })
+                jc.insertBefore($jobComponents.find('tr').last());
+                jc.find('input.description').focus();
+                return false;
+            });
 
-        $('#dialogRemoveComponent').dialog({
-            resizable: false,
-            height: 140,
-            modal: true,
-            autoOpen: false
-        });
+            $('#dialogRemoveComponent').dialog({
+                resizable: false,
+                height: 140,
+                modal: true,
+                autoOpen: false
+            });
 
-        function removeComponent() {
-            var componentRow = $(this).closest('tr');
-            var id = componentRow.attr('data-jobcomponentid');
-            if (id) {
-                var data = { id: id };
+            function removeComponent() {
+                var componentRow = $(this).closest('tr');
+                var id = componentRow.attr('data-jobcomponentid');
+                if (id) {
+                    var data = { id: id };
 
-                var $dialogRemoveComponent = $('#dialogRemoveComponent');
-                $dialogRemoveComponent.dialog("enable");
-                $dialogRemoveComponent.dialog('option', 'buttons', {
-                    "Remove": function () {
-                        $dialogRemoveComponent.dialog("disable");
-                        $dialogRemoveComponent.dialog("option", "buttons", null);
-                        $.ajax({
-                            url: '@Url.Action(MVC.API.Job.ComponentRemove())',
-                            dataType: 'json',
-                            data: data,
-                            success: function (d) {
-                                if (d == 'OK') {
-                                    componentRow.remove();
-                                    updateTotalCost();
-                                } else {
-                                    alert('Unable to remove component: ' + d);
+                    var $dialogRemoveComponent = $('#dialogRemoveComponent');
+                    $dialogRemoveComponent.dialog("enable");
+                    $dialogRemoveComponent.dialog('option', 'buttons', {
+                        "Remove": function () {
+                            $dialogRemoveComponent.dialog("disable");
+                            $dialogRemoveComponent.dialog("option", "buttons", null);
+                            $.ajax({
+                                url: '@Url.Action(MVC.API.Job.ComponentRemove())',
+                                dataType: 'json',
+                                data: data,
+                                success: function (d) {
+                                    if (d == 'OK') {
+                                        componentRow.remove();
+                                        updateTotalCost();
+                                    } else {
+                                        alert('Unable to remove component: ' + d);
+                                    }
+                                    $dialogRemoveComponent.dialog("close");
+                                },
+                                error: function (jqXHR, textStatus, errorThrown) {
+                                    alert('Unable to remove component: ' + textStatus);
+                                    $dialogRemoveComponent.dialog("close");
                                 }
-                                $dialogRemoveComponent.dialog("close");
-                            },
-                            error: function (jqXHR, textStatus, errorThrown) {
-                                alert('Unable to remove component: ' + textStatus);
-                                $dialogRemoveComponent.dialog("close");
-                            }
-                        });
-                    },
-                    Cancel: function () {
-                        $dialogRemoveComponent.dialog("close");
-                    }
+                            });
+                        },
+                        Cancel: function () {
+                            $dialogRemoveComponent.dialog("close");
+                        }
+                    });
+
+                    $dialogRemoveComponent.dialog('open');
+
+                } else {
+                    // New - Remove
+                    componentRow.remove();
+                    updateTotalCost();
+                }
+            }
+            function updateTotalCost() {
+                var totalCost = 0;
+
+                $jobComponents.find('input.cost').each(function () {
+                    var v = $(this).val();
+                    v = $.parseNumber(v, { format: '#,##0.00', locale: 'au' });
+                    if (!isNaN(v))
+                        totalCost += v;
                 });
+                var totalCostFormatted = $.formatNumber(totalCost, { format: '#,##0.00', locale: 'au' });
+                $('#jobComponentsTotalCost').text('$' + totalCostFormatted);
+            }
+            function updateComponent() {
+                var componentRow = $(this).closest('tr');
 
-                $dialogRemoveComponent.dialog('open');
+                componentRow.find('input').attr('disabled', true).addClass('updating');
 
-            } else {
-                // New - Remove
-                componentRow.remove();
+                var id = componentRow.attr('data-jobcomponentid');
+                if (id) {
+                    // Update
+                    var data = {
+                        id: id,
+                        Description: componentRow.find('input.description').val(),
+                        Cost: componentRow.find('input.cost').val()
+                    };
+                    $.ajax({
+                        url: '@Url.Action(MVC.API.Job.ComponentUpdate())',
+                        dataType: 'json',
+                        data: data,
+                        success: function (d) {
+                            componentRow.find('input').attr('disabled', false).removeClass('updating');
+                            if (d.Result == 'OK') {
+                                componentRow.find('input.description').val(d.Component.Description);
+                                componentRow.find('input.cost').val(d.Component.Cost);
+                            } else {
+                                alert('Unable to update component: ' + d.Result);
+                            }
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            alert('Unable to update component: ' + textStatus);
+                        }
+                    });
+                } else {
+                    // Add
+                    var data = {
+                        id: id,
+                        Description: componentRow.find('input.description').val(),
+                        Cost: componentRow.find('input.cost').val()
+                    };
+                    $.ajax({
+                        url: '@Url.Action(MVC.API.Job.ComponentAdd(Model.Job.Id, null, null))',
+                        dataType: 'json',
+                        data: data,
+                        success: function (d) {
+                            componentRow.find('input').attr('disabled', false).removeClass('updating');
+                            if (d.Result == 'OK') {
+                                componentRow.attr('data-jobcomponentid', d.Component.Id);
+                                componentRow.find('input.description').val(d.Component.Description);
+                                componentRow.find('input.cost').val(d.Component.Cost);
+                            } else {
+                                alert('Unable to add component: ' + d.Result);
+                            }
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            alert('Unable to add component: ' + textStatus);
+                        }
+                    });
+                }
                 updateTotalCost();
             }
-        }
-        function updateTotalCost() {
-            var totalCost = 0;
-
-            $jobComponents.find('input.cost').each(function () {
-                var v = $(this).val();
-                v = $.parseNumber(v, { format: '#,##0.00', locale: 'au' });
-                if (!isNaN(v))
-                    totalCost += v;
-            });
-            var totalCostFormatted = $.formatNumber(totalCost, { format: '#,##0.00', locale: 'au' });
-            $('#jobComponentsTotalCost').text('$' + totalCostFormatted);
-        }
-        function updateComponent() {
-            var componentRow = $(this).closest('tr');
-
-            componentRow.find('input').attr('disabled', true).addClass('updating');
-
-            var id = componentRow.attr('data-jobcomponentid');
-            if (id) {
-                // Update
-                var data = {
-                    id: id,
-                    Description: componentRow.find('input.description').val(),
-                    Cost: componentRow.find('input.cost').val()
-                };
-                $.ajax({
-                    url: '@Url.Action(MVC.API.Job.ComponentUpdate())',
-                    dataType: 'json',
-                    data: data,
-                    success: function (d) {
-                        componentRow.find('input').attr('disabled', false).removeClass('updating');
-                        if (d.Result == 'OK') {
-                            componentRow.find('input.description').val(d.Component.Description);
-                            componentRow.find('input.cost').val(d.Component.Cost);
-                        } else {
-                            alert('Unable to update component: ' + d.Result);
-                        }
-                    },
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        alert('Unable to update component: ' + textStatus);
-                    }
-                });
-            } else {
-                // Add
-                var data = {
-                    id: id,
-                    Description: componentRow.find('input.description').val(),
-                    Cost: componentRow.find('input.cost').val()
-                };
-                $.ajax({
-                    url: '@Url.Action(MVC.API.Job.ComponentAdd(Model.Job.Id, null, null))',
-                    dataType: 'json',
-                    data: data,
-                    success: function (d) {
-                        componentRow.find('input').attr('disabled', false).removeClass('updating');
-                        if (d.Result == 'OK') {
-                            componentRow.attr('data-jobcomponentid', d.Component.Id);
-                            componentRow.find('input.description').val(d.Component.Description);
-                            componentRow.find('input.cost').val(d.Component.Cost);
-                        } else {
-                            alert('Unable to add component: ' + d.Result);
-                        }
-                    },
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        alert('Unable to add component: ' + textStatus);
-                    }
-                });
-            }
             updateTotalCost();
-        }
-        updateTotalCost();
 
-    });
-</script>
+        });
+    </script>
+}
\ No newline at end of file
diff --git a/Disco.Web/Views/Job/JobParts/Components.generated.cs b/Disco.Web/Views/Job/JobParts/Components.generated.cs
index 13587143..51f92c16 100644
--- a/Disco.Web/Views/Job/JobParts/Components.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/Components.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/Components.cshtml")]
-    public partial class Components : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
+    public partial class Components : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.ShowModel>
     {
         public Components()
         {
@@ -43,8 +45,16 @@ namespace Disco.Web.Views.Job.JobParts
             
             #line 2 "..\..\Views\Job\JobParts\Components.cshtml"
   
-    Html.BundleDeferred("~/ClientScripts/Modules/jQuery-NumberFormatter");
-    
+    Authorization.Require(Claims.Job.ShowNonWarrantyComponents);
+
+    var hasEdit = Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.EditComponents);
+    var hasAdd = Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.AddComponents);
+
+    if (hasEdit)
+    {
+        Html.BundleDeferred("~/ClientScripts/Modules/jQuery-NumberFormatter");
+    }
+
             
             #line default
             #line hidden
@@ -52,23 +62,50 @@ WriteLiteral("\r\n<table");
 
 WriteLiteral(" id=\"jobComponents\"");
 
-WriteLiteral(">\r\n    <tr>\r\n        <th>\r\n            Description\r\n        </th>\r\n        <th>\r\n" +
-"            Cost\r\n        </th>\r\n        <th");
+WriteLiteral(">\r\n    <tr>\r\n        <th>Description\r\n        </th>\r\n        <th>Cost\r\n        </" +
+"th>\r\n");
+
+            
+            #line 19 "..\..\Views\Job\JobParts\Components.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 19 "..\..\Views\Job\JobParts\Components.cshtml"
+         if (hasEdit)
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <th");
 
 WriteLiteral(" class=\"actions\"");
 
-WriteLiteral(">\r\n            &nbsp;\r\n        </th>\r\n    </tr>\r\n");
+WriteLiteral(">&nbsp;\r\n            </th>\r\n");
 
             
-            #line 17 "..\..\Views\Job\JobParts\Components.cshtml"
+            #line 23 "..\..\Views\Job\JobParts\Components.cshtml"
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    </tr>\r\n");
+
+            
+            #line 25 "..\..\Views\Job\JobParts\Components.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 17 "..\..\Views\Job\JobParts\Components.cshtml"
-     foreach (var jc in Model.Job.JobComponents)
+            #line 25 "..\..\Views\Job\JobParts\Components.cshtml"
+     if (hasEdit)
     {
+        foreach (var jc in Model.Job.JobComponents)
+        {
 
             
             #line default
@@ -78,7 +115,7 @@ WriteLiteral("        <tr");
 WriteLiteral(" data-jobcomponentid=\"");
 
             
-            #line 19 "..\..\Views\Job\JobParts\Components.cshtml"
+            #line 29 "..\..\Views\Job\JobParts\Components.cshtml"
                             Write(jc.Id);
 
             
@@ -92,14 +129,14 @@ WriteLiteral(" type=\"text\"");
 
 WriteLiteral(" class=\"description\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 513), Tuple.Create("\"", 536)
+WriteAttribute("value", Tuple.Create(" value=\"", 853), Tuple.Create("\"", 876)
             
-            #line 21 "..\..\Views\Job\JobParts\Components.cshtml"
-, Tuple.Create(Tuple.Create("", 521), Tuple.Create<System.Object, System.Int32>(jc.Description
+            #line 31 "..\..\Views\Job\JobParts\Components.cshtml"
+, Tuple.Create(Tuple.Create("", 861), Tuple.Create<System.Object, System.Int32>(jc.Description
             
             #line default
             #line hidden
-, 521), false)
+, 861), false)
 );
 
 WriteLiteral(" />\r\n            </td>\r\n            <td>\r\n                <input");
@@ -108,14 +145,14 @@ WriteLiteral(" type=\"text\"");
 
 WriteLiteral(" class=\"cost\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 626), Tuple.Create("\"", 656)
+WriteAttribute("value", Tuple.Create(" value=\"", 966), Tuple.Create("\"", 996)
             
-            #line 24 "..\..\Views\Job\JobParts\Components.cshtml"
-, Tuple.Create(Tuple.Create("", 634), Tuple.Create<System.Object, System.Int32>(jc.Cost.ToString("C")
+            #line 34 "..\..\Views\Job\JobParts\Components.cshtml"
+, Tuple.Create(Tuple.Create("", 974), Tuple.Create<System.Object, System.Int32>(jc.Cost.ToString("C")
             
             #line default
             #line hidden
-, 634), false)
+, 974), false)
 );
 
 WriteLiteral(" />\r\n            </td>\r\n            <td>\r\n                <span");
@@ -125,170 +162,310 @@ WriteLiteral(" class=\"remove\"");
 WriteLiteral("></span>\r\n            </td>\r\n        </tr>\r\n");
 
             
-            #line 30 "..\..\Views\Job\JobParts\Components.cshtml"
+            #line 40 "..\..\Views\Job\JobParts\Components.cshtml"
+        }
+    }
+    else
+    {
+        foreach (var jc in Model.Job.JobComponents)
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        <tr");
+
+WriteLiteral(" data-jobcomponentid=\"");
+
+            
+            #line 46 "..\..\Views\Job\JobParts\Components.cshtml"
+                            Write(jc.Id);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\"");
+
+WriteLiteral(">\r\n            <td>\r\n                <span");
+
+WriteLiteral(" class=\"description\"");
+
+WriteLiteral(">");
+
+            
+            #line 48 "..\..\Views\Job\JobParts\Components.cshtml"
+                                     Write(jc.Description);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</span>\r\n            </td>\r\n            <td>\r\n                <span");
+
+WriteLiteral(" class=\"cost\"");
+
+WriteLiteral(">");
+
+            
+            #line 51 "..\..\Views\Job\JobParts\Components.cshtml"
+                              Write(jc.Cost.ToString("C"));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</span>\r\n            </td>\r\n        </tr>\r\n");
+
+            
+            #line 54 "..\..\Views\Job\JobParts\Components.cshtml"
+        }
     }
 
             
             #line default
             #line hidden
-WriteLiteral("    <tr>\r\n        <td>\r\n            <a");
+WriteLiteral("\r\n    <tr>\r\n        <td>\r\n");
+
+            
+            #line 59 "..\..\Views\Job\JobParts\Components.cshtml"
+            
+            
+            #line default
+            #line hidden
+            
+            #line 59 "..\..\Views\Job\JobParts\Components.cshtml"
+             if (hasEdit && hasAdd)
+            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <a");
 
 WriteLiteral(" href=\"#\"");
 
 WriteLiteral(" id=\"jobComponentsAdd\"");
 
-WriteLiteral(">Add Component</a>\r\n        </td>\r\n        <td");
+WriteLiteral(">Add Component</a>\r\n");
 
-WriteLiteral(" colspan=\"2\"");
+            
+            #line 62 "..\..\Views\Job\JobParts\Components.cshtml"
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            &nbsp;\r\n        </td>\r\n        <td");
+
+WriteAttribute("colspan", Tuple.Create(" colspan=\"", 1708), Tuple.Create("\"", 1736)
+            
+            #line 65 "..\..\Views\Job\JobParts\Components.cshtml"
+, Tuple.Create(Tuple.Create("", 1718), Tuple.Create<System.Object, System.Int32>(hasEdit ? 2 : 1
+            
+            #line default
+            #line hidden
+, 1718), false)
+);
 
 WriteLiteral(" class=\"totalCost\"");
 
-WriteLiteral(">\r\n            Total: <span");
+WriteLiteral(">Total: <span");
 
 WriteLiteral(" id=\"jobComponentsTotalCost\"");
 
-WriteLiteral("></span>\r\n        </td>\r\n    </tr>\r\n</table>\r\n<div");
+WriteLiteral(">\r\n");
+
+            
+            #line 66 "..\..\Views\Job\JobParts\Components.cshtml"
+            
+            
+            #line default
+            #line hidden
+            
+            #line 66 "..\..\Views\Job\JobParts\Components.cshtml"
+             if (!hasEdit)
+            {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 68 "..\..\Views\Job\JobParts\Components.cshtml"
+           Write(Model.Job.JobComponentsTotalCost().ToString("C"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 68 "..\..\Views\Job\JobParts\Components.cshtml"
+                                                                 
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        </span>\r\n        </td>\r\n    </tr>\r\n</table>\r\n");
+
+            
+            #line 74 "..\..\Views\Job\JobParts\Components.cshtml"
+ if (hasEdit)
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"dialogRemoveComponent\"");
 
 WriteLiteral(" title=\"Remove this Component?\"");
 
-WriteLiteral(">\r\n    <p>\r\n        <span");
+WriteLiteral(">\r\n        <p>\r\n            <span");
 
 WriteLiteral(" class=\"ui-icon ui-icon-alert\"");
 
 WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\"");
 
-WriteLiteral("></span>\r\n        Are you sure?</p>\r\n</div>\r\n<script");
+WriteLiteral("></span>\r\n            Are you sure?\r\n        </p>\r\n    </div>\r\n");
+
+WriteLiteral("    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n    $(function () {\r\n        var $jobComponents = $(\'#jobComponents\');\r\n\r\n    " +
-"    $jobComponents.on(\'change\', \'input\', updateComponent);\r\n        $jobComponen" +
-"ts.on(\'focus\', \'input\', function () { $(this).select() });\r\n\r\n\r\n        $jobComp" +
-"onents.on(\'click\', \'span.remove\', removeComponent);\r\n\r\n        $(\'#jobComponents" +
-"Add\').click(function () {\r\n            var jc = $(\'<tr><td><input type=\"text\" cl" +
-"ass=\"description\" /></td><td><input type=\"text\" class=\"cost\" /></td><td><span cl" +
-"ass=\"remove\"></span></td></tr>\');\r\n            jc.find(\'input\').focus(function (" +
-") { $(this).select() })\r\n            jc.insertBefore($jobComponents.find(\'tr\').l" +
-"ast());\r\n            jc.find(\'input.description\').focus();\r\n            return f" +
-"alse;\r\n        });\r\n\r\n        $(\'#dialogRemoveComponent\').dialog({\r\n            " +
-"resizable: false,\r\n            height: 140,\r\n            modal: true,\r\n         " +
-"   autoOpen: false\r\n        });\r\n\r\n        function removeComponent() {\r\n       " +
-"     var componentRow = $(this).closest(\'tr\');\r\n            var id = componentRo" +
-"w.attr(\'data-jobcomponentid\');\r\n            if (id) {\r\n                var data " +
-"= { id: id };\r\n\r\n                var $dialogRemoveComponent = $(\'#dialogRemoveCo" +
-"mponent\');\r\n                $dialogRemoveComponent.dialog(\"enable\");\r\n          " +
-"      $dialogRemoveComponent.dialog(\'option\', \'buttons\', {\r\n                    " +
-"\"Remove\": function () {\r\n                        $dialogRemoveComponent.dialog(\"" +
-"disable\");\r\n                        $dialogRemoveComponent.dialog(\"option\", \"but" +
-"tons\", null);\r\n                        $.ajax({\r\n                            url" +
-": \'");
+WriteLiteral(">\r\n        $(function () {\r\n            var $jobComponents = $(\'#jobComponents\');" +
+"\r\n\r\n            $jobComponents.on(\'change\', \'input\', updateComponent);\r\n        " +
+"    $jobComponents.on(\'focus\', \'input\', function () { $(this).select() });\r\n\r\n\r\n" +
+"            $jobComponents.on(\'click\', \'span.remove\', removeComponent);\r\n\r\n     " +
+"       $(\'#jobComponentsAdd\').click(function () {\r\n                var jc = $(\'<" +
+"tr><td><input type=\"text\" class=\"description\" /></td><td><input type=\"text\" clas" +
+"s=\"cost\" /></td><td><span class=\"remove\"></span></td></tr>\');\r\n                j" +
+"c.find(\'input\').focus(function () { $(this).select() })\r\n                jc.inse" +
+"rtBefore($jobComponents.find(\'tr\').last());\r\n                jc.find(\'input.desc" +
+"ription\').focus();\r\n                return false;\r\n            });\r\n\r\n          " +
+"  $(\'#dialogRemoveComponent\').dialog({\r\n                resizable: false,\r\n     " +
+"           height: 140,\r\n                modal: true,\r\n                autoOpen:" +
+" false\r\n            });\r\n\r\n            function removeComponent() {\r\n           " +
+"     var componentRow = $(this).closest(\'tr\');\r\n                var id = compone" +
+"ntRow.attr(\'data-jobcomponentid\');\r\n                if (id) {\r\n                 " +
+"   var data = { id: id };\r\n\r\n                    var $dialogRemoveComponent = $(" +
+"\'#dialogRemoveComponent\');\r\n                    $dialogRemoveComponent.dialog(\"e" +
+"nable\");\r\n                    $dialogRemoveComponent.dialog(\'option\', \'buttons\'," +
+" {\r\n                        \"Remove\": function () {\r\n                           " +
+" $dialogRemoveComponent.dialog(\"disable\");\r\n                            $dialogR" +
+"emoveComponent.dialog(\"option\", \"buttons\", null);\r\n                            $" +
+".ajax({\r\n                                url: \'");
 
             
-            #line 83 "..\..\Views\Job\JobParts\Components.cshtml"
-                             Write(Url.Action(MVC.API.Job.ComponentRemove()));
+            #line 120 "..\..\Views\Job\JobParts\Components.cshtml"
+                                 Write(Url.Action(MVC.API.Job.ComponentRemove()));
 
             
             #line default
             #line hidden
-WriteLiteral("\',\r\n                            dataType: \'json\',\r\n                            da" +
-"ta: data,\r\n                            success: function (d) {\r\n                " +
-"                if (d == \'OK\') {\r\n                                    componentR" +
-"ow.remove();\r\n                                    updateTotalCost();\r\n          " +
-"                      } else {\r\n                                    alert(\'Unabl" +
-"e to remove component: \' + d);\r\n                                }\r\n             " +
-"                   $dialogRemoveComponent.dialog(\"close\");\r\n                    " +
-"        },\r\n                            error: function (jqXHR, textStatus, erro" +
-"rThrown) {\r\n                                alert(\'Unable to remove component: \'" +
-" + textStatus);\r\n                                $dialogRemoveComponent.dialog(\"" +
-"close\");\r\n                            }\r\n                        });\r\n          " +
-"          },\r\n                    Cancel: function () {\r\n                       " +
-" $dialogRemoveComponent.dialog(\"close\");\r\n                    }\r\n               " +
-" });\r\n\r\n                $dialogRemoveComponent.dialog(\'open\');\r\n\r\n            } " +
-"else {\r\n                // New - Remove\r\n                componentRow.remove();\r" +
-"\n                updateTotalCost();\r\n            }\r\n        }\r\n        function " +
-"updateTotalCost() {\r\n            var totalCost = 0;\r\n\r\n            $jobComponent" +
-"s.find(\'input.cost\').each(function () {\r\n                var v = $(this).val();\r" +
-"\n                v = $.parseNumber(v, { format: \'#,##0.00\', locale: \'au\' });\r\n  " +
-"              if (!isNaN(v))\r\n                    totalCost += v;\r\n            }" +
-");\r\n            var totalCostFormatted = $.formatNumber(totalCost, { format: \'#," +
-"##0.00\', locale: \'au\' });\r\n            $(\'#jobComponentsTotalCost\').text(\'$\' + t" +
-"otalCostFormatted);\r\n        }\r\n        function updateComponent() {\r\n          " +
-"  var componentRow = $(this).closest(\'tr\');\r\n\r\n            componentRow.find(\'in" +
-"put\').attr(\'disabled\', true).addClass(\'updating\');\r\n\r\n            var id = compo" +
-"nentRow.attr(\'data-jobcomponentid\');\r\n            if (id) {\r\n                // " +
-"Update\r\n                var data = {\r\n                    id: id,\r\n             " +
-"       Description: componentRow.find(\'input.description\').val(),\r\n             " +
-"       Cost: componentRow.find(\'input.cost\').val()\r\n                };\r\n        " +
-"        $.ajax({\r\n                    url: \'");
+WriteLiteral("\',\r\n                                dataType: \'json\',\r\n                          " +
+"      data: data,\r\n                                success: function (d) {\r\n    " +
+"                                if (d == \'OK\') {\r\n                              " +
+"          componentRow.remove();\r\n                                        update" +
+"TotalCost();\r\n                                    } else {\r\n                    " +
+"                    alert(\'Unable to remove component: \' + d);\r\n                " +
+"                    }\r\n                                    $dialogRemoveComponen" +
+"t.dialog(\"close\");\r\n                                },\r\n                        " +
+"        error: function (jqXHR, textStatus, errorThrown) {\r\n                    " +
+"                alert(\'Unable to remove component: \' + textStatus);\r\n           " +
+"                         $dialogRemoveComponent.dialog(\"close\");\r\n              " +
+"                  }\r\n                            });\r\n                        }," +
+"\r\n                        Cancel: function () {\r\n                            $di" +
+"alogRemoveComponent.dialog(\"close\");\r\n                        }\r\n               " +
+"     });\r\n\r\n                    $dialogRemoveComponent.dialog(\'open\');\r\n\r\n      " +
+"          } else {\r\n                    // New - Remove\r\n                    com" +
+"ponentRow.remove();\r\n                    updateTotalCost();\r\n                }\r\n" +
+"            }\r\n            function updateTotalCost() {\r\n                var tot" +
+"alCost = 0;\r\n\r\n                $jobComponents.find(\'input.cost\').each(function (" +
+") {\r\n                    var v = $(this).val();\r\n                    v = $.parse" +
+"Number(v, { format: \'#,##0.00\', locale: \'au\' });\r\n                    if (!isNaN" +
+"(v))\r\n                        totalCost += v;\r\n                });\r\n            " +
+"    var totalCostFormatted = $.formatNumber(totalCost, { format: \'#,##0.00\', loc" +
+"ale: \'au\' });\r\n                $(\'#jobComponentsTotalCost\').text(\'$\' + totalCost" +
+"Formatted);\r\n            }\r\n            function updateComponent() {\r\n          " +
+"      var componentRow = $(this).closest(\'tr\');\r\n\r\n                componentRow." +
+"find(\'input\').attr(\'disabled\', true).addClass(\'updating\');\r\n\r\n                va" +
+"r id = componentRow.attr(\'data-jobcomponentid\');\r\n                if (id) {\r\n   " +
+"                 // Update\r\n                    var data = {\r\n                  " +
+"      id: id,\r\n                        Description: componentRow.find(\'input.des" +
+"cription\').val(),\r\n                        Cost: componentRow.find(\'input.cost\')" +
+".val()\r\n                    };\r\n                    $.ajax({\r\n                  " +
+"      url: \'");
 
             
-            #line 140 "..\..\Views\Job\JobParts\Components.cshtml"
-                     Write(Url.Action(MVC.API.Job.ComponentUpdate()));
+            #line 177 "..\..\Views\Job\JobParts\Components.cshtml"
+                         Write(Url.Action(MVC.API.Job.ComponentUpdate()));
 
             
             #line default
             #line hidden
 WriteLiteral(@"',
-                    dataType: 'json',
-                    data: data,
-                    success: function (d) {
-                        componentRow.find('input').attr('disabled', false).removeClass('updating');
-                        if (d.Result == 'OK') {
-                            componentRow.find('input.description').val(d.Component.Description);
-                            componentRow.find('input.cost').val(d.Component.Cost);
-                        } else {
-                            alert('Unable to update component: ' + d.Result);
+                        dataType: 'json',
+                        data: data,
+                        success: function (d) {
+                            componentRow.find('input').attr('disabled', false).removeClass('updating');
+                            if (d.Result == 'OK') {
+                                componentRow.find('input.description').val(d.Component.Description);
+                                componentRow.find('input.cost').val(d.Component.Cost);
+                            } else {
+                                alert('Unable to update component: ' + d.Result);
+                            }
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            alert('Unable to update component: ' + textStatus);
                         }
-                    },
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        alert('Unable to update component: ' + textStatus);
-                    }
-                });
-            } else {
-                // Add
-                var data = {
-                    id: id,
-                    Description: componentRow.find('input.description').val(),
-                    Cost: componentRow.find('input.cost').val()
-                };
-                $.ajax({
-                    url: '");
+                    });
+                } else {
+                    // Add
+                    var data = {
+                        id: id,
+                        Description: componentRow.find('input.description').val(),
+                        Cost: componentRow.find('input.cost').val()
+                    };
+                    $.ajax({
+                        url: '");
 
             
-            #line 164 "..\..\Views\Job\JobParts\Components.cshtml"
-                     Write(Url.Action(MVC.API.Job.ComponentAdd(Model.Job.Id, null, null)));
+            #line 201 "..\..\Views\Job\JobParts\Components.cshtml"
+                         Write(Url.Action(MVC.API.Job.ComponentAdd(Model.Job.Id, null, null)));
 
             
             #line default
             #line hidden
 WriteLiteral(@"',
-                    dataType: 'json',
-                    data: data,
-                    success: function (d) {
-                        componentRow.find('input').attr('disabled', false).removeClass('updating');
-                        if (d.Result == 'OK') {
-                            componentRow.attr('data-jobcomponentid', d.Component.Id);
-                            componentRow.find('input.description').val(d.Component.Description);
-                            componentRow.find('input.cost').val(d.Component.Cost);
-                        } else {
-                            alert('Unable to add component: ' + d.Result);
+                        dataType: 'json',
+                        data: data,
+                        success: function (d) {
+                            componentRow.find('input').attr('disabled', false).removeClass('updating');
+                            if (d.Result == 'OK') {
+                                componentRow.attr('data-jobcomponentid', d.Component.Id);
+                                componentRow.find('input.description').val(d.Component.Description);
+                                componentRow.find('input.cost').val(d.Component.Cost);
+                            } else {
+                                alert('Unable to add component: ' + d.Result);
+                            }
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            alert('Unable to add component: ' + textStatus);
                         }
-                    },
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        alert('Unable to add component: ' + textStatus);
-                    }
-                });
+                    });
+                }
+                updateTotalCost();
             }
             updateTotalCost();
-        }
-        updateTotalCost();
 
-    });
-</script>
+        });
+    </script>
 ");
 
+            
+            #line 225 "..\..\Views\Job\JobParts\Components.cshtml"
+}
+            
+            #line default
+            #line hidden
         }
     }
 }
diff --git a/Disco.Web/Views/Job/JobParts/Flags.cshtml b/Disco.Web/Views/Job/JobParts/Flags.cshtml
index 5d1e88e6..64c8daa3 100644
--- a/Disco.Web/Views/Job/JobParts/Flags.cshtml
+++ b/Disco.Web/Views/Job/JobParts/Flags.cshtml
@@ -1,6 +1,9 @@
 @model Disco.Web.Models.Job.ShowModel
 @{
+    Authorization.Require(Claims.Job.ShowFlags);
+
     var validFlags = Model.Job.ValidFlagsGrouped();
+    var canEdit = Authorization.Has(Claims.Job.Properties.Flags);
 }
 <div id="jobDetailTab-Flags" class="jobPart">
     <table id="jobFlags">
@@ -15,45 +18,47 @@
                     @foreach (var flagItem in flagGroup.Value)
                     {
                         <div>
-                            <input type="checkbox" value="@flagItem.Item1" id="jobFlag_@(flagItem.Item1)" @(flagItem.Item3 ? new HtmlString("checked=\"checked\"") : new HtmlString(string.Empty)) /><label id="jobFlagLabel_@(flagItem.Item1)" for="jobFlag_@(flagItem.Item1)">@flagItem.Item2</label></div>
+                            <input type="checkbox" value="@flagItem.Item1" id="jobFlag_@(flagItem.Item1)" @(flagItem.Item3 ? new HtmlString("checked=\"checked\"") : new HtmlString(string.Empty)) @(canEdit ? new HtmlString(string.Empty) : new HtmlString("disabled=\"disabled\"")) /><label id="jobFlagLabel_@(flagItem.Item1)" for="jobFlag_@(flagItem.Item1)">@flagItem.Item2</label>
+                        </div>
                     }
                 </td>
             </tr>
         }
     </table>
-    <div id="dialogFlagsAction" title="Add Flag">
-        @using (Html.BeginForm(MVC.API.Job.UpdateFlag(Model.Job.Id, null, null, true)))
-        {
-            <input id="dialogFlagsActionFlag" type="hidden" name="Flag" value="0" />
-            <h3>
-                Reason:</h3>
-            <p>
-                <textarea name="Reason" class="block"></textarea>
-            </p>
-        }
-    </div>
-    <script type="text/javascript">
-        $('#jobDetailTabItems').append('<li><a href="#jobDetailTab-Flags">Flags</a></li>');
-        $(function () {
-            var $flagCheckboxes = $('#jobFlags').find('input[type="checkbox"]');
-            var $dialogFlagsAction = $('#dialogFlagsAction');
-            var $flagCheckbox;
+    @if (canEdit)
+    {
+        <div id="dialogFlagsAction" title="Add Flag">
+            @using (Html.BeginForm(MVC.API.Job.UpdateFlag(Model.Job.Id, null, null, true)))
+            {
+                <input id="dialogFlagsActionFlag" type="hidden" name="Flag" value="0" />
+                <h3>Reason:</h3>
+                <p>
+                    <textarea name="Reason" class="block"></textarea>
+                </p>
+            }
+        </div>
+        <script type="text/javascript">
+            $('#jobDetailTabItems').append('<li><a href="#jobDetailTab-Flags">Flags</a></li>');
+            $(function () {
+                var $flagCheckboxes = $('#jobFlags').find('input[type="checkbox"]');
+                var $dialogFlagsAction = $('#dialogFlagsAction');
+                var $flagCheckbox;
 
-            var updateFlags = function () {
-                $flagCheckbox = $(this);
-                var flagValue = $flagCheckbox.val();
+                var updateFlags = function () {
+                    $flagCheckbox = $(this);
+                    var flagValue = $flagCheckbox.val();
 
-                if ($flagCheckbox.is(':checked')) {
-                    // Add
-                    $('#dialogFlagsActionFlag').val(flagValue);
-                    var title = 'Add Flag: ' + $flagCheckbox.closest('tr').find('th .flagGroupName').text() + ': ' + $('#jobFlagLabel_' + flagValue).text();
-                    $dialogFlagsAction.dialog('option', 'title', title);
-                    $dialogFlagsAction.dialog('open');
-                } else {
-                    // Remove
-                    var $ajaxLoading = $flagCheckbox.closest('tr').find('span.ajaxLoading');
-                    $ajaxLoading.show();
-                    $.getJSON('@(Url.Action(MVC.API.Job.UpdateFlag(Model.Job.Id, null, null, false)))', { Flag: '-' + flagValue }, function (response, result) {
+                    if ($flagCheckbox.is(':checked')) {
+                        // Add
+                        $('#dialogFlagsActionFlag').val(flagValue);
+                        var title = 'Add Flag: ' + $flagCheckbox.closest('tr').find('th .flagGroupName').text() + ': ' + $('#jobFlagLabel_' + flagValue).text();
+                        $dialogFlagsAction.dialog('option', 'title', title);
+                        $dialogFlagsAction.dialog('open');
+                    } else {
+                        // Remove
+                        var $ajaxLoading = $flagCheckbox.closest('tr').find('span.ajaxLoading');
+                        $ajaxLoading.show();
+                        $.getJSON('@(Url.Action(MVC.API.Job.UpdateFlag(Model.Job.Id, null, null, false)))', { Flag: '-' + flagValue }, function (response, result) {
                         if (result != 'success' || response != 'OK') {
                             alert('Unable to change Flag:\n' + response);
                             $ajaxLoading.hide();
@@ -86,5 +91,11 @@
 
             $flagCheckboxes.click(updateFlags);
         });
-    </script>
+        </script>
+    }else
+    {
+        <script>
+            $('#jobDetailTabItems').append('<li><a href="#jobDetailTab-Flags">Flags</a></li>');
+        </script>
+    }
 </div>
diff --git a/Disco.Web/Views/Job/JobParts/Flags.generated.cs b/Disco.Web/Views/Job/JobParts/Flags.generated.cs
index acd7a090..de1f71a9 100644
--- a/Disco.Web/Views/Job/JobParts/Flags.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/Flags.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/Flags.cshtml")]
-    public partial class Flags : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
+    public partial class Flags : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.ShowModel>
     {
         public Flags()
         {
@@ -43,7 +45,10 @@ namespace Disco.Web.Views.Job.JobParts
             
             #line 2 "..\..\Views\Job\JobParts\Flags.cshtml"
   
+    Authorization.Require(Claims.Job.ShowFlags);
+
     var validFlags = Model.Job.ValidFlagsGrouped();
+    var canEdit = Authorization.Has(Claims.Job.Properties.Flags);
 
             
             #line default
@@ -61,13 +66,13 @@ WriteLiteral(" id=\"jobFlags\"");
 WriteLiteral(">\r\n");
 
             
-            #line 7 "..\..\Views\Job\JobParts\Flags.cshtml"
+            #line 10 "..\..\Views\Job\JobParts\Flags.cshtml"
         
             
             #line default
             #line hidden
             
-            #line 7 "..\..\Views\Job\JobParts\Flags.cshtml"
+            #line 10 "..\..\Views\Job\JobParts\Flags.cshtml"
          foreach (var flagGroup in validFlags)
         {
 
@@ -81,7 +86,7 @@ WriteLiteral(" class=\"flagGroupName\"");
 WriteLiteral(">");
 
             
-            #line 11 "..\..\Views\Job\JobParts\Flags.cshtml"
+            #line 14 "..\..\Views\Job\JobParts\Flags.cshtml"
                                            Write(flagGroup.Key);
 
             
@@ -92,7 +97,7 @@ WriteLiteral("</span><br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 12 "..\..\Views\Job\JobParts\Flags.cshtml"
+            #line 15 "..\..\Views\Job\JobParts\Flags.cshtml"
                Write(AjaxHelpers.AjaxLoader());
 
             
@@ -101,13 +106,13 @@ WriteLiteral("                    ");
 WriteLiteral("\r\n                </th>\r\n                <td>\r\n");
 
             
-            #line 15 "..\..\Views\Job\JobParts\Flags.cshtml"
+            #line 18 "..\..\Views\Job\JobParts\Flags.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 15 "..\..\Views\Job\JobParts\Flags.cshtml"
+            #line 18 "..\..\Views\Job\JobParts\Flags.cshtml"
                      foreach (var flagItem in flagGroup.Value)
                     {
 
@@ -118,73 +123,82 @@ WriteLiteral("                        <div>\r\n                            <inpu
 
 WriteLiteral(" type=\"checkbox\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 609), Tuple.Create("\"", 632)
+WriteAttribute("value", Tuple.Create(" value=\"", 728), Tuple.Create("\"", 751)
             
-            #line 18 "..\..\Views\Job\JobParts\Flags.cshtml"
-, Tuple.Create(Tuple.Create("", 617), Tuple.Create<System.Object, System.Int32>(flagItem.Item1
+            #line 21 "..\..\Views\Job\JobParts\Flags.cshtml"
+, Tuple.Create(Tuple.Create("", 736), Tuple.Create<System.Object, System.Int32>(flagItem.Item1
             
             #line default
             #line hidden
-, 617), false)
+, 736), false)
 );
 
-WriteAttribute("id", Tuple.Create(" id=\"", 633), Tuple.Create("\"", 663)
-, Tuple.Create(Tuple.Create("", 638), Tuple.Create("jobFlag_", 638), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 752), Tuple.Create("\"", 782)
+, Tuple.Create(Tuple.Create("", 757), Tuple.Create("jobFlag_", 757), true)
             
-            #line 18 "..\..\Views\Job\JobParts\Flags.cshtml"
-         , Tuple.Create(Tuple.Create("", 646), Tuple.Create<System.Object, System.Int32>(flagItem.Item1
+            #line 21 "..\..\Views\Job\JobParts\Flags.cshtml"
+         , Tuple.Create(Tuple.Create("", 765), Tuple.Create<System.Object, System.Int32>(flagItem.Item1
             
             #line default
             #line hidden
-, 646), false)
+, 765), false)
 );
 
 WriteLiteral(" ");
 
             
-            #line 18 "..\..\Views\Job\JobParts\Flags.cshtml"
+            #line 21 "..\..\Views\Job\JobParts\Flags.cshtml"
                                                                                                       Write(flagItem.Item3 ? new HtmlString("checked=\"checked\"") : new HtmlString(string.Empty));
 
             
+            #line default
+            #line hidden
+WriteLiteral(" ");
+
+            
+            #line 21 "..\..\Views\Job\JobParts\Flags.cshtml"
+                                                                                                                                                                                               Write(canEdit ? new HtmlString(string.Empty) : new HtmlString("disabled=\"disabled\""));
+
+            
             #line default
             #line hidden
 WriteLiteral(" /><label");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 762), Tuple.Create("\"", 797)
-, Tuple.Create(Tuple.Create("", 767), Tuple.Create("jobFlagLabel_", 767), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 965), Tuple.Create("\"", 1000)
+, Tuple.Create(Tuple.Create("", 970), Tuple.Create("jobFlagLabel_", 970), true)
             
-            #line 18 "..\..\Views\Job\JobParts\Flags.cshtml"
-                                                                                                                                               , Tuple.Create(Tuple.Create("", 780), Tuple.Create<System.Object, System.Int32>(flagItem.Item1
+            #line 21 "..\..\Views\Job\JobParts\Flags.cshtml"
+                                                                                                                                                                                                                                   , Tuple.Create(Tuple.Create("", 983), Tuple.Create<System.Object, System.Int32>(flagItem.Item1
             
             #line default
             #line hidden
-, 780), false)
+, 983), false)
 );
 
-WriteAttribute("for", Tuple.Create(" for=\"", 798), Tuple.Create("\"", 829)
-, Tuple.Create(Tuple.Create("", 804), Tuple.Create("jobFlag_", 804), true)
+WriteAttribute("for", Tuple.Create(" for=\"", 1001), Tuple.Create("\"", 1032)
+, Tuple.Create(Tuple.Create("", 1007), Tuple.Create("jobFlag_", 1007), true)
             
-            #line 18 "..\..\Views\Job\JobParts\Flags.cshtml"
-                                                                                                                                                                               , Tuple.Create(Tuple.Create("", 812), Tuple.Create<System.Object, System.Int32>(flagItem.Item1
+            #line 21 "..\..\Views\Job\JobParts\Flags.cshtml"
+                                                                                                                                                                                                                                                                  , Tuple.Create(Tuple.Create("", 1015), Tuple.Create<System.Object, System.Int32>(flagItem.Item1
             
             #line default
             #line hidden
-, 812), false)
+, 1015), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 18 "..\..\Views\Job\JobParts\Flags.cshtml"
-                                                                                                                                                                                                                                                                           Write(flagItem.Item2);
+            #line 21 "..\..\Views\Job\JobParts\Flags.cshtml"
+                                                                                                                                                                                                                                                                                                                                                               Write(flagItem.Item2);
 
             
             #line default
             #line hidden
-WriteLiteral("</label></div>\r\n");
+WriteLiteral("</label>\r\n                        </div>\r\n");
 
             
-            #line 19 "..\..\Views\Job\JobParts\Flags.cshtml"
+            #line 23 "..\..\Views\Job\JobParts\Flags.cshtml"
                     }
 
             
@@ -193,13 +207,29 @@ WriteLiteral("</label></div>\r\n");
 WriteLiteral("                </td>\r\n            </tr>\r\n");
 
             
-            #line 22 "..\..\Views\Job\JobParts\Flags.cshtml"
+            #line 26 "..\..\Views\Job\JobParts\Flags.cshtml"
         }
 
             
             #line default
             #line hidden
-WriteLiteral("    </table>\r\n    <div");
+WriteLiteral("    </table>\r\n");
+
+            
+            #line 28 "..\..\Views\Job\JobParts\Flags.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 28 "..\..\Views\Job\JobParts\Flags.cshtml"
+     if (canEdit)
+    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        <div");
 
 WriteLiteral(" id=\"dialogFlagsAction\"");
 
@@ -208,20 +238,20 @@ WriteLiteral(" title=\"Add Flag\"");
 WriteLiteral(">\r\n");
 
             
-            #line 25 "..\..\Views\Job\JobParts\Flags.cshtml"
-        
+            #line 31 "..\..\Views\Job\JobParts\Flags.cshtml"
+            
             
             #line default
             #line hidden
             
-            #line 25 "..\..\Views\Job\JobParts\Flags.cshtml"
-         using (Html.BeginForm(MVC.API.Job.UpdateFlag(Model.Job.Id, null, null, true)))
-        {
+            #line 31 "..\..\Views\Job\JobParts\Flags.cshtml"
+             using (Html.BeginForm(MVC.API.Job.UpdateFlag(Model.Job.Id, null, null, true)))
+            {
 
             
             #line default
             #line hidden
-WriteLiteral("            <input");
+WriteLiteral("                <input");
 
 WriteLiteral(" id=\"dialogFlagsActionFlag\"");
 
@@ -233,53 +263,55 @@ WriteLiteral(" value=\"0\"");
 
 WriteLiteral(" />\r\n");
 
-WriteLiteral("            <h3>\r\n                Reason:</h3>\r\n");
+WriteLiteral("                <h3>Reason:</h3>\r\n");
 
-WriteLiteral("            <p>\r\n                <textarea");
+WriteLiteral("                <p>\r\n                    <textarea");
 
 WriteLiteral(" name=\"Reason\"");
 
 WriteLiteral(" class=\"block\"");
 
-WriteLiteral("></textarea>\r\n            </p>\r\n");
+WriteLiteral("></textarea>\r\n                </p>\r\n");
 
             
-            #line 33 "..\..\Views\Job\JobParts\Flags.cshtml"
-        }
+            #line 38 "..\..\Views\Job\JobParts\Flags.cshtml"
+            }
 
             
             #line default
             #line hidden
-WriteLiteral("    </div>\r\n    <script");
+WriteLiteral("        </div>\r\n");
+
+WriteLiteral("        <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-        $('#jobDetailTabItems').append('<li><a href=""#jobDetailTab-Flags"">Flags</a></li>');
-        $(function () {
-            var $flagCheckboxes = $('#jobFlags').find('input[type=""checkbox""]');
-            var $dialogFlagsAction = $('#dialogFlagsAction');
-            var $flagCheckbox;
+            $('#jobDetailTabItems').append('<li><a href=""#jobDetailTab-Flags"">Flags</a></li>');
+            $(function () {
+                var $flagCheckboxes = $('#jobFlags').find('input[type=""checkbox""]');
+                var $dialogFlagsAction = $('#dialogFlagsAction');
+                var $flagCheckbox;
 
-            var updateFlags = function () {
-                $flagCheckbox = $(this);
-                var flagValue = $flagCheckbox.val();
+                var updateFlags = function () {
+                    $flagCheckbox = $(this);
+                    var flagValue = $flagCheckbox.val();
 
-                if ($flagCheckbox.is(':checked')) {
-                    // Add
-                    $('#dialogFlagsActionFlag').val(flagValue);
-                    var title = 'Add Flag: ' + $flagCheckbox.closest('tr').find('th .flagGroupName').text() + ': ' + $('#jobFlagLabel_' + flagValue).text();
-                    $dialogFlagsAction.dialog('option', 'title', title);
-                    $dialogFlagsAction.dialog('open');
-                } else {
-                    // Remove
-                    var $ajaxLoading = $flagCheckbox.closest('tr').find('span.ajaxLoading');
-                    $ajaxLoading.show();
-                    $.getJSON('");
+                    if ($flagCheckbox.is(':checked')) {
+                        // Add
+                        $('#dialogFlagsActionFlag').val(flagValue);
+                        var title = 'Add Flag: ' + $flagCheckbox.closest('tr').find('th .flagGroupName').text() + ': ' + $('#jobFlagLabel_' + flagValue).text();
+                        $dialogFlagsAction.dialog('option', 'title', title);
+                        $dialogFlagsAction.dialog('open');
+                    } else {
+                        // Remove
+                        var $ajaxLoading = $flagCheckbox.closest('tr').find('span.ajaxLoading');
+                        $ajaxLoading.show();
+                        $.getJSON('");
 
             
-            #line 56 "..\..\Views\Job\JobParts\Flags.cshtml"
-                           Write(Url.Action(MVC.API.Job.UpdateFlag(Model.Job.Id, null, null, false)));
+            #line 61 "..\..\Views\Job\JobParts\Flags.cshtml"
+                               Write(Url.Action(MVC.API.Job.UpdateFlag(Model.Job.Id, null, null, false)));
 
             
             #line default
@@ -317,10 +349,29 @@ WriteLiteral(@"', { Flag: '-' + flagValue }, function (response, result) {
 
             $flagCheckboxes.click(updateFlags);
         });
-    </script>
-</div>
+        </script>
 ");
 
+            
+            #line 95 "..\..\Views\Job\JobParts\Flags.cshtml"
+    }else
+    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        <script>\r\n            $(\'#jobDetailTabItems\').append(\'<li><a href=\"#jobDe" +
+"tailTab-Flags\">Flags</a></li>\');\r\n        </script>\r\n");
+
+            
+            #line 100 "..\..\Views\Job\JobParts\Flags.cshtml"
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</div>\r\n");
+
         }
     }
 }
diff --git a/Disco.Web/Views/Job/JobParts/Insurance.cshtml b/Disco.Web/Views/Job/JobParts/Insurance.cshtml
index 21b8e5ce..ec9f661c 100644
--- a/Disco.Web/Views/Job/JobParts/Insurance.cshtml
+++ b/Disco.Web/Views/Job/JobParts/Insurance.cshtml
@@ -1,11 +1,15 @@
 @model Disco.Web.Models.Job.ShowModel
+@{
+    Authorization.Require(Claims.Job.ShowNonWarrantyInsurance);
+}
 <table id="jobNonWarrantyInsurance">
     @if (Model.Job.JobMetaNonWarranty.IsInsuranceClaim)
-    { 
-        Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
+    {
+        if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails))
+        {
+            Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
         <tr>
-            <th style="width: 230px;">
-                Date of Loss or Damage
+            <th style="width: 230px;">Date of Loss or Damage
             </th>
             <td>
                 @Html.EditorFor(m => m.Job.JobMetaInsurance.LossOrDamageDate)
@@ -25,8 +29,7 @@
             </td>
         </tr>
         <tr>
-            <th>
-                Event Location
+            <th>Event Location
             </th>
             <td>
                 @Html.EditorFor(m => m.Job.JobMetaInsurance.EventLocation)
@@ -45,8 +48,7 @@
             </td>
         </tr>
         <tr>
-            <th>
-                Description
+            <th>Description
             </th>
             <td>
                 @Html.EditorFor(m => m.Job.JobMetaInsurance.Description)
@@ -65,8 +67,7 @@
             </td>
         </tr>
         <tr>
-            <th style="width: 200px;">
-                &nbsp;
+            <th style="width: 200px;">&nbsp;
             </th>
             <td>
                 @Html.EditorFor(m => m.Job.JobMetaInsurance.ThirdPartyCaused)@Html.LabelFor(m => m.Job.JobMetaInsurance.ThirdPartyCaused)
@@ -74,15 +75,13 @@
                 @AjaxHelpers.AjaxLoader()
                 <div id="Job_JobMetaInsurance_ThirdPartyCaused_Details" style="padding-left: 25px;">
                     <div>
-                        <h5>
-                            Third Party Name</h5>
+                        <h5>Third Party Name</h5>
                         @Html.EditorFor(m => m.Job.JobMetaInsurance.ThirdPartyCausedName)
                         @AjaxHelpers.AjaxSave()
                         @AjaxHelpers.AjaxLoader()
                     </div>
                     <div>
-                        <h5>
-                            Why Third Parties Fault</h5>
+                        <h5>Why Third Parties Fault</h5>
                         @Html.EditorFor(m => m.Job.JobMetaInsurance.ThirdPartyCausedWhy)
                         @AjaxHelpers.AjaxSave()
                         @AjaxHelpers.AjaxLoader()
@@ -133,8 +132,7 @@
             </td>
         </tr>
         <tr>
-            <th>
-                Witnessed by (Name/Address)
+            <th>Witnessed by (Name/Address)
             </th>
             <td>
                 @Html.EditorFor(m => m.Job.JobMetaInsurance.WitnessesNamesAddresses)
@@ -153,8 +151,7 @@
             </td>
         </tr>
         <tr>
-            <th>
-                Burglary/Theft - Method of Entry
+            <th>Burglary/Theft - Method of Entry
             </th>
             <td>
                 @Html.EditorFor(m => m.Job.JobMetaInsurance.BurglaryTheftMethodOfEntry)
@@ -173,8 +170,7 @@
             </td>
         </tr>
         <tr>
-            <th style="width: 200px;">
-                Property Last Seen
+            <th style="width: 200px;">Property Last Seen
             </th>
             <td>
                 @Html.EditorFor(m => m.Job.JobMetaInsurance.PropertyLastSeenDate)
@@ -194,8 +190,7 @@
             </td>
         </tr>
         <tr>
-            <th style="width: 200px;">
-                &nbsp;
+            <th style="width: 200px;">&nbsp;
             </th>
             <td>
                 @Html.EditorFor(m => m.Job.JobMetaInsurance.PoliceNotified)@Html.LabelFor(m => m.Job.JobMetaInsurance.PoliceNotified)
@@ -203,21 +198,18 @@
                 @AjaxHelpers.AjaxLoader()
                 <div id="Job_JobMetaInsurance_PoliceNotified_Details" style="padding-left: 25px;">
                     <div>
-                        <h5>
-                            Station</h5>
+                        <h5>Station</h5>
                         @Html.EditorFor(m => m.Job.JobMetaInsurance.PoliceNotifiedStation)
                         @AjaxHelpers.AjaxSave()
                         @AjaxHelpers.AjaxLoader()
                     </div>
                     <div>
-                        <h5>
-                            Date</h5>
+                        <h5>Date</h5>
                         @Html.EditorFor(m => m.Job.JobMetaInsurance.PoliceNotifiedDate)
                         @AjaxHelpers.AjaxLoader()
                     </div>
                     <div>
-                        <h5>
-                            Crime Report #</h5>
+                        <h5>Crime Report #</h5>
                         @Html.EditorFor(m => m.Job.JobMetaInsurance.PoliceNotifiedCrimeReportNo)
                         @AjaxHelpers.AjaxSave()
                         @AjaxHelpers.AjaxLoader()
@@ -277,8 +269,7 @@
             </td>
         </tr>
         <tr>
-            <th>
-                Action to Recover/Reduce Loss
+            <th>Action to Recover/Reduce Loss
             </th>
             <td>
                 @Html.EditorFor(m => m.Job.JobMetaInsurance.RecoverReduceAction)
@@ -297,8 +288,7 @@
             </td>
         </tr>
         <tr>
-            <th>
-                Other Interested Parties
+            <th>Other Interested Parties
             </th>
             <td>
                 @Html.EditorFor(m => m.Job.JobMetaInsurance.OtherInterestedParties)
@@ -317,8 +307,7 @@
             </td>
         </tr>
         <tr>
-            <th style="width: 200px;">
-                Date of Purchase
+            <th style="width: 200px;">Date of Purchase
             </th>
             <td>
                 @Html.EditorFor(m => m.Job.JobMetaInsurance.DateOfPurchase)
@@ -339,8 +328,214 @@
             </td>
         </tr>
         <tr>
-            <th>
-                Claim Form Sent Date
+            <th>Claim Form Sent Date
+            </th>
+            <td>
+                @CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.ClaimFormSentDate, "Not Sent", "Job_JobMetaInsurance_ClaimFormSentDate")
+                <span id="Job_JobMetaInsurance_ClaimFormSentUserId">@(string.IsNullOrEmpty(Model.Job.JobMetaInsurance.ClaimFormSentUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaInsurance.ClaimFormSentUser.ToString()))</span>
+                <script>
+                    $(function () {
+                        var updateUrl = '@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))';
+                        var jobOpenDate = '@(Model.Job.OpenedDate.ToJavascriptDateTime())';
+
+                        document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Claim Form Sent Date', 'Job_JobMetaInsurance_ClaimFormSentDate', 'Job_JobMetaInsurance_ClaimFormSentUserId', 'InsuranceClaimFormSentDate', 'Not Sent', jobOpenDate, false);
+                    });
+                </script>
+            </td>
+        </tr>
+        }
+        else
+        {
+        <tr>
+            <th style="width: 230px;">Date of Loss or Damage
+            </th>
+            <td>
+                @CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.LossOrDamageDate, "Unknown", null)
+            </td>
+        </tr>
+        <tr>
+            <th>Event Location
+            </th>
+            <td>
+                @if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.EventLocation))
+                {
+                    <span class="smallMessage">&lt;Unknown/None&gt;</span>
+                }
+                else
+                {
+                    @Model.Job.JobMetaInsurance.EventLocation
+                }
+            </td>
+        </tr>
+        <tr>
+            <th>Description
+            </th>
+            <td>
+                @if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.Description))
+                {
+                    <span class="smallMessage">&lt;None&gt;</span>
+                }
+                else
+                {
+                    @Model.Job.JobMetaInsurance.Description
+                }
+            </td>
+        </tr>
+        <tr>
+            <th style="width: 200px;">Caused by Third Party
+            </th>
+            <td>
+                @if (Model.Job.JobMetaInsurance.ThirdPartyCaused)
+                {
+                    <div id="Job_JobMetaInsurance_ThirdPartyCaused_Details" style="padding-left: 25px;">
+                        <div>
+                            <h5>Third Party Name</h5>
+                            @if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.ThirdPartyCausedName))
+                            {
+                                <span class="smallMessage">&lt;Unknown&gt;</span>
+                            }
+                            else
+                            {
+                                @Model.Job.JobMetaInsurance.ThirdPartyCausedName
+                            }
+                        </div>
+                        <div>
+                            <h5>Why Third Parties Fault</h5>
+                            @if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.ThirdPartyCausedWhy))
+                            {
+                                <span class="smallMessage">&lt;Unknown&gt;</span>
+                            }
+                            else
+                            {
+                                @Model.Job.JobMetaInsurance.ThirdPartyCausedWhy
+                            }
+                        </div>
+                    </div>
+                }
+                else
+                {
+                    <span class="smallMessage">&lt;Not Caused by Third Party&gt;</span>
+                }
+            </td>
+        </tr>
+        <tr>
+            <th>Witnessed by (Name/Address)
+            </th>
+            <td>
+                @if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.WitnessesNamesAddresses))
+                {
+                    <span class="smallMessage">&lt;Unknown/None&gt;</span>
+                }
+                else
+                {
+                    @Model.Job.JobMetaInsurance.WitnessesNamesAddresses
+                }
+            </td>
+        </tr>
+        <tr>
+            <th>Burglary/Theft - Method of Entry
+            </th>
+            <td>
+                @if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.BurglaryTheftMethodOfEntry))
+                {
+                    <span class="smallMessage">&lt;Unknown/None&gt;</span>
+                }
+                else
+                {
+                    @Model.Job.JobMetaInsurance.BurglaryTheftMethodOfEntry
+                }
+            </td>
+        </tr>
+        <tr>
+            <th style="width: 200px;">Property Last Seen
+            </th>
+            <td>
+                @CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.PropertyLastSeenDate, "Unknown", null)
+            </td>
+        </tr>
+        <tr>
+            <th style="width: 200px;">&nbsp;
+            Police Notified
+            </th>
+            <td>
+                @if (Model.Job.JobMetaInsurance.PoliceNotified)
+                {
+                    <div id="Job_JobMetaInsurance_PoliceNotified_Details" style="padding-left: 25px;">
+                        <div>
+                            <h5>Station</h5>
+                            @if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.PoliceNotifiedStation))
+                            {
+                                <span class="smallMessage">&lt;Unknown&gt;</span>
+                            }
+                            else
+                            {
+                                @Model.Job.JobMetaInsurance.PoliceNotifiedStation
+                            }
+                        </div>
+                        <div>
+                            <h5>Date</h5>
+                            @CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.PoliceNotifiedDate, "Unknown", null)
+                        </div>
+                        <div>
+                            <h5>Crime Report #</h5>
+                            @if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.PoliceNotifiedCrimeReportNo))
+                            {
+                                <span class="smallMessage">&lt;Unknown&gt;</span>
+                            }
+                            else
+                            {
+                                @Model.Job.JobMetaInsurance.PoliceNotifiedCrimeReportNo
+                            }
+                        </div>
+                    </div>
+                }
+                else
+                {
+                    <span class="smallMessage">&lt;Not Notified&gt;</span>
+                }
+            </td>
+        </tr>
+        <tr>
+            <th>Action to Recover/Reduce Loss
+            </th>
+            <td>
+                @if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.RecoverReduceAction))
+                {
+                    <span class="smallMessage">&lt;Unknown/None&gt;</span>
+                }
+                else
+                {
+                    @Model.Job.JobMetaInsurance.RecoverReduceAction
+                }
+            </td>
+        </tr>
+        <tr>
+            <th>Other Interested Parties
+            </th>
+            <td>
+                @if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.OtherInterestedParties))
+                {
+                    <span class="smallMessage">&lt;Unknown/None&gt;</span>
+                }
+                else
+                {
+                    @Model.Job.JobMetaInsurance.OtherInterestedParties
+                }
+            </td>
+        </tr>
+        <tr>
+            <th style="width: 200px;">Date of Purchase
+            </th>
+            <td>
+                @CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.DateOfPurchase, "Unknown", null)
+            </td>
+        </tr>
+        }
+    }
+    @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.InsuranceClaimFormSent))
+    {
+        <tr>
+            <th>Claim Form Sent Date
             </th>
             <td>
                 @CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.ClaimFormSentDate, "Not Sent", "Job_JobMetaInsurance_ClaimFormSentDate")
@@ -356,21 +551,34 @@
             </td>
         </tr>
     }
-    <tr>
-        <th>
-            Insurance Claim
-        </th>
-        <td>
-            <div style="padding: 8px; text-align: center">
-                @if (Model.Job.JobMetaNonWarranty.IsInsuranceClaim)
-                {
-                    @Html.ActionLinkButton("Remove Insurance Claim", MVC.API.Job.UpdateNonWarrantyIsInsuranceClaim(Model.Job.Id, false, true))
-                }
-                else
-                {
-                    @Html.ActionLinkButton("Add Insurance Claim", MVC.API.Job.UpdateNonWarrantyIsInsuranceClaim(Model.Job.Id, true, true))
-                }
-            </div>
-        </td>
-    </tr>
+    else
+    {
+        <tr>
+            <th>Claim Form Sent Date
+            </th>
+            <td>
+                @CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.ClaimFormSentDate, "Not Sent", "Job_JobMetaInsurance_ClaimFormSentDate")
+                <span id="Job_JobMetaInsurance_ClaimFormSentUserId">@(string.IsNullOrEmpty(Model.Job.JobMetaInsurance.ClaimFormSentUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaInsurance.ClaimFormSentUser.ToString()))</span>
+            </td>
+        </tr>
+    }
+    @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.IsInsuranceClaim))
+    {
+        <tr>
+            <th>Insurance Claim
+            </th>
+            <td>
+                <div style="padding: 8px; text-align: center">
+                    @if (Model.Job.JobMetaNonWarranty.IsInsuranceClaim)
+                    {
+                        @Html.ActionLinkButton("Remove Insurance Claim", MVC.API.Job.UpdateNonWarrantyIsInsuranceClaim(Model.Job.Id, false, true))
+                    }
+                    else
+                    {
+                        @Html.ActionLinkButton("Add Insurance Claim", MVC.API.Job.UpdateNonWarrantyIsInsuranceClaim(Model.Job.Id, true, true))
+                    }
+                </div>
+            </td>
+        </tr>
+    }
 </table>
diff --git a/Disco.Web/Views/Job/JobParts/Insurance.generated.cs b/Disco.Web/Views/Job/JobParts/Insurance.generated.cs
index 281bee0c..88706d34 100644
--- a/Disco.Web/Views/Job/JobParts/Insurance.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/Insurance.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,35 +28,47 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/Insurance.cshtml")]
-    public partial class Insurance : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
+    public partial class Insurance : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.ShowModel>
     {
         public Insurance()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<table");
+            
+            #line 2 "..\..\Views\Job\JobParts\Insurance.cshtml"
+  
+    Authorization.Require(Claims.Job.ShowNonWarrantyInsurance);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<table");
 
 WriteLiteral(" id=\"jobNonWarrantyInsurance\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 3 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 6 "..\..\Views\Job\JobParts\Insurance.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 3 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 6 "..\..\Views\Job\JobParts\Insurance.cshtml"
      if (Model.Job.JobMetaNonWarranty.IsInsuranceClaim)
-    { 
-        Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
+    {
+        if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.InsuranceDetails))
+        {
+            Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
 
             
             #line default
@@ -65,12 +77,12 @@ WriteLiteral("        <tr>\r\n            <th");
 
 WriteLiteral(" style=\"width: 230px;\"");
 
-WriteLiteral(">\r\n                Date of Loss or Damage\r\n            </th>\r\n            <td>\r\n");
+WriteLiteral(">Date of Loss or Damage\r\n            </th>\r\n            <td>\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 11 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 15 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(Html.EditorFor(m => m.Job.JobMetaInsurance.LossOrDamageDate));
 
             
@@ -81,7 +93,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 12 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 16 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
@@ -100,7 +112,7 @@ WriteLiteral(@">
                         '");
 
             
-            #line 19 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 23 "..\..\Views\Job\JobParts\Insurance.cshtml"
                      Write(Url.Action(MVC.API.Job.UpdateInsuranceLossOrDamageDate(Model.Job.Id, null)));
 
             
@@ -110,13 +122,13 @@ WriteLiteral("\',\r\n                        \'LossOrDamageDate\',\r\n
 "                      );\r\n                    });\r\n                </script>\r\n  " +
 "          </td>\r\n        </tr>\r\n");
 
-WriteLiteral("        <tr>\r\n            <th>\r\n                Event Location\r\n            </th>" +
-"\r\n            <td>\r\n");
+WriteLiteral("        <tr>\r\n            <th>Event Location\r\n            </th>\r\n            <td>" +
+"\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 32 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 35 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(Html.EditorFor(m => m.Job.JobMetaInsurance.EventLocation));
 
             
@@ -127,7 +139,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 33 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 36 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
@@ -138,7 +150,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 34 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 37 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
@@ -154,7 +166,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 "         \'");
 
             
-            #line 40 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 43 "..\..\Views\Job\JobParts\Insurance.cshtml"
                         Write(Url.Action(MVC.API.Job.UpdateInsuranceEventLocation(Model.Job.Id, null)));
 
             
@@ -164,13 +176,12 @@ WriteLiteral("\',\r\n                            \'EventLocation\'\r\n
 "                });\r\n                </script>\r\n            </td>\r\n        </tr>" +
 "\r\n");
 
-WriteLiteral("        <tr>\r\n            <th>\r\n                Description\r\n            </th>\r\n " +
-"           <td>\r\n");
+WriteLiteral("        <tr>\r\n            <th>Description\r\n            </th>\r\n            <td>\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 52 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 54 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(Html.EditorFor(m => m.Job.JobMetaInsurance.Description));
 
             
@@ -181,7 +192,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 53 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 55 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
@@ -192,7 +203,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 54 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 56 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
@@ -208,7 +219,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 "    \'");
 
             
-            #line 60 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 62 "..\..\Views\Job\JobParts\Insurance.cshtml"
                         Write(Url.Action(MVC.API.Job.UpdateInsuranceDescription(Model.Job.Id, null)));
 
             
@@ -222,19 +233,19 @@ WriteLiteral("        <tr>\r\n            <th");
 
 WriteLiteral(" style=\"width: 200px;\"");
 
-WriteLiteral(">\r\n                &nbsp;\r\n            </th>\r\n            <td>\r\n");
+WriteLiteral(">&nbsp;\r\n            </th>\r\n            <td>\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 72 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 73 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(Html.EditorFor(m => m.Job.JobMetaInsurance.ThirdPartyCaused));
 
             
             #line default
             #line hidden
             
-            #line 72 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 73 "..\..\Views\Job\JobParts\Insurance.cshtml"
                                                                         Write(Html.LabelFor(m => m.Job.JobMetaInsurance.ThirdPartyCaused));
 
             
@@ -245,7 +256,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 73 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 74 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
@@ -256,7 +267,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 74 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 75 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
@@ -268,8 +279,8 @@ WriteLiteral(" id=\"Job_JobMetaInsurance_ThirdPartyCaused_Details\"");
 
 WriteLiteral(" style=\"padding-left: 25px;\"");
 
-WriteLiteral(">\r\n                    <div>\r\n                        <h5>\r\n                     " +
-"       Third Party Name</h5>\r\n");
+WriteLiteral(">\r\n                    <div>\r\n                        <h5>Third Party Name</h5>\r\n" +
+"");
 
 WriteLiteral("                        ");
 
@@ -303,12 +314,12 @@ WriteLiteral("                        ");
             #line default
             #line hidden
 WriteLiteral("\r\n                    </div>\r\n                    <div>\r\n                        " +
-"<h5>\r\n                            Why Third Parties Fault</h5>\r\n");
+"<h5>Why Third Parties Fault</h5>\r\n");
 
 WriteLiteral("                        ");
 
             
-            #line 86 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 85 "..\..\Views\Job\JobParts\Insurance.cshtml"
                    Write(Html.EditorFor(m => m.Job.JobMetaInsurance.ThirdPartyCausedWhy));
 
             
@@ -319,7 +330,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                        ");
 
             
-            #line 87 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 86 "..\..\Views\Job\JobParts\Insurance.cshtml"
                    Write(AjaxHelpers.AjaxSave());
 
             
@@ -330,7 +341,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                        ");
 
             
-            #line 88 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 87 "..\..\Views\Job\JobParts\Insurance.cshtml"
                    Write(AjaxHelpers.AjaxLoader());
 
             
@@ -368,7 +379,7 @@ WriteLiteral(@">
                             '");
 
             
-            #line 116 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 115 "..\..\Views\Job\JobParts\Insurance.cshtml"
                         Write(Url.Action(MVC.API.Job.UpdateInsuranceThirdPartyCaused(Model.Job.Id, null)));
 
             
@@ -383,7 +394,7 @@ WriteLiteral(@"',
                             '");
 
             
-            #line 122 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 121 "..\..\Views\Job\JobParts\Insurance.cshtml"
                         Write(Url.Action(MVC.API.Job.UpdateInsuranceThirdPartyCausedName(Model.Job.Id, null)));
 
             
@@ -398,7 +409,7 @@ WriteLiteral(@"',
                             '");
 
             
-            #line 128 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 127 "..\..\Views\Job\JobParts\Insurance.cshtml"
                         Write(Url.Action(MVC.API.Job.UpdateInsuranceThirdPartyCausedWhy(Model.Job.Id, null)));
 
             
@@ -408,13 +419,13 @@ WriteLiteral("\',\r\n                            \'ThirdPartyCausedWhy\'\r\n
 "\r\n                    });\r\n                </script>\r\n            </td>\r\n       " +
 " </tr>\r\n");
 
-WriteLiteral("        <tr>\r\n            <th>\r\n                Witnessed by (Name/Address)\r\n    " +
-"        </th>\r\n            <td>\r\n");
+WriteLiteral("        <tr>\r\n            <th>Witnessed by (Name/Address)\r\n            </th>\r\n   " +
+"         <td>\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 140 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 138 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(Html.EditorFor(m => m.Job.JobMetaInsurance.WitnessesNamesAddresses));
 
             
@@ -425,7 +436,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 141 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 139 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
@@ -436,7 +447,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 142 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 140 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
@@ -454,7 +465,7 @@ WriteLiteral(@">
                             '");
 
             
-            #line 148 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 146 "..\..\Views\Job\JobParts\Insurance.cshtml"
                         Write(Url.Action(MVC.API.Job.UpdateInsuranceWitnessesNamesAddresses(Model.Job.Id, null)));
 
             
@@ -464,13 +475,13 @@ WriteLiteral("\',\r\n                            \'WitnessesNamesAddresses\'\r\n
 "  );\r\n                    });\r\n                </script>\r\n            </td>\r\n   " +
 "     </tr>\r\n");
 
-WriteLiteral("        <tr>\r\n            <th>\r\n                Burglary/Theft - Method of Entry\r" +
-"\n            </th>\r\n            <td>\r\n");
+WriteLiteral("        <tr>\r\n            <th>Burglary/Theft - Method of Entry\r\n            </th>" +
+"\r\n            <td>\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 160 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 157 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(Html.EditorFor(m => m.Job.JobMetaInsurance.BurglaryTheftMethodOfEntry));
 
             
@@ -481,7 +492,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 161 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 158 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
@@ -492,7 +503,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 162 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 159 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
@@ -510,7 +521,7 @@ WriteLiteral(@">
                             '");
 
             
-            #line 168 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 165 "..\..\Views\Job\JobParts\Insurance.cshtml"
                         Write(Url.Action(MVC.API.Job.UpdateInsuranceBurglaryTheftMethodOfEntry(Model.Job.Id, null)));
 
             
@@ -524,12 +535,12 @@ WriteLiteral("        <tr>\r\n            <th");
 
 WriteLiteral(" style=\"width: 200px;\"");
 
-WriteLiteral(">\r\n                Property Last Seen\r\n            </th>\r\n            <td>\r\n");
+WriteLiteral(">Property Last Seen\r\n            </th>\r\n            <td>\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 180 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 176 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(Html.EditorFor(m => m.Job.JobMetaInsurance.PropertyLastSeenDate));
 
             
@@ -540,7 +551,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 181 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 177 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
@@ -559,7 +570,7 @@ WriteLiteral(@">
                         '");
 
             
-            #line 188 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 184 "..\..\Views\Job\JobParts\Insurance.cshtml"
                      Write(Url.Action(MVC.API.Job.UpdateInsurancePropertyLastSeenDate(Model.Job.Id, null)));
 
             
@@ -573,19 +584,19 @@ WriteLiteral("        <tr>\r\n            <th");
 
 WriteLiteral(" style=\"width: 200px;\"");
 
-WriteLiteral(">\r\n                &nbsp;\r\n            </th>\r\n            <td>\r\n");
+WriteLiteral(">&nbsp;\r\n            </th>\r\n            <td>\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 201 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 196 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(Html.EditorFor(m => m.Job.JobMetaInsurance.PoliceNotified));
 
             
             #line default
             #line hidden
             
-            #line 201 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 196 "..\..\Views\Job\JobParts\Insurance.cshtml"
                                                                       Write(Html.LabelFor(m => m.Job.JobMetaInsurance.PoliceNotified));
 
             
@@ -596,7 +607,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 202 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 197 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
@@ -607,7 +618,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 203 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 198 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
@@ -619,13 +630,12 @@ WriteLiteral(" id=\"Job_JobMetaInsurance_PoliceNotified_Details\"");
 
 WriteLiteral(" style=\"padding-left: 25px;\"");
 
-WriteLiteral(">\r\n                    <div>\r\n                        <h5>\r\n                     " +
-"       Station</h5>\r\n");
+WriteLiteral(">\r\n                    <div>\r\n                        <h5>Station</h5>\r\n");
 
 WriteLiteral("                        ");
 
             
-            #line 208 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 202 "..\..\Views\Job\JobParts\Insurance.cshtml"
                    Write(Html.EditorFor(m => m.Job.JobMetaInsurance.PoliceNotifiedStation));
 
             
@@ -636,7 +646,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                        ");
 
             
-            #line 209 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 203 "..\..\Views\Job\JobParts\Insurance.cshtml"
                    Write(AjaxHelpers.AjaxSave());
 
             
@@ -647,19 +657,19 @@ WriteLiteral("\r\n");
 WriteLiteral("                        ");
 
             
-            #line 210 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 204 "..\..\Views\Job\JobParts\Insurance.cshtml"
                    Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
 WriteLiteral("\r\n                    </div>\r\n                    <div>\r\n                        " +
-"<h5>\r\n                            Date</h5>\r\n");
+"<h5>Date</h5>\r\n");
 
 WriteLiteral("                        ");
 
             
-            #line 215 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 208 "..\..\Views\Job\JobParts\Insurance.cshtml"
                    Write(Html.EditorFor(m => m.Job.JobMetaInsurance.PoliceNotifiedDate));
 
             
@@ -670,19 +680,19 @@ WriteLiteral("\r\n");
 WriteLiteral("                        ");
 
             
-            #line 216 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 209 "..\..\Views\Job\JobParts\Insurance.cshtml"
                    Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
 WriteLiteral("\r\n                    </div>\r\n                    <div>\r\n                        " +
-"<h5>\r\n                            Crime Report #</h5>\r\n");
+"<h5>Crime Report #</h5>\r\n");
 
 WriteLiteral("                        ");
 
             
-            #line 221 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 213 "..\..\Views\Job\JobParts\Insurance.cshtml"
                    Write(Html.EditorFor(m => m.Job.JobMetaInsurance.PoliceNotifiedCrimeReportNo));
 
             
@@ -693,7 +703,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                        ");
 
             
-            #line 222 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 214 "..\..\Views\Job\JobParts\Insurance.cshtml"
                    Write(AjaxHelpers.AjaxSave());
 
             
@@ -704,7 +714,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                        ");
 
             
-            #line 223 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 215 "..\..\Views\Job\JobParts\Insurance.cshtml"
                    Write(AjaxHelpers.AjaxLoader());
 
             
@@ -742,7 +752,7 @@ WriteLiteral(@">
                             '");
 
             
-            #line 251 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 243 "..\..\Views\Job\JobParts\Insurance.cshtml"
                         Write(Url.Action(MVC.API.Job.UpdateInsurancePoliceNotified(Model.Job.Id, null)));
 
             
@@ -757,7 +767,7 @@ WriteLiteral(@"',
                             '");
 
             
-            #line 257 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 249 "..\..\Views\Job\JobParts\Insurance.cshtml"
                         Write(Url.Action(MVC.API.Job.UpdateInsurancePoliceNotifiedStation(Model.Job.Id, null)));
 
             
@@ -773,7 +783,7 @@ WriteLiteral(@"',
                         '");
 
             
-            #line 264 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 256 "..\..\Views\Job\JobParts\Insurance.cshtml"
                      Write(Url.Action(MVC.API.Job.UpdateInsurancePoliceNotifiedDate(Model.Job.Id, null)));
 
             
@@ -790,7 +800,7 @@ WriteLiteral(@"',
                             '");
 
             
-            #line 272 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 264 "..\..\Views\Job\JobParts\Insurance.cshtml"
                         Write(Url.Action(MVC.API.Job.UpdateInsurancePoliceNotifiedCrimeReportNo(Model.Job.Id, null)));
 
             
@@ -800,13 +810,13 @@ WriteLiteral("\',\r\n                            \'PoliceNotifiedCrimeReportNo\'
 "      );\r\n                    });\r\n                </script>\r\n            </td>\r" +
 "\n        </tr>\r\n");
 
-WriteLiteral("        <tr>\r\n            <th>\r\n                Action to Recover/Reduce Loss\r\n  " +
-"          </th>\r\n            <td>\r\n");
+WriteLiteral("        <tr>\r\n            <th>Action to Recover/Reduce Loss\r\n            </th>\r\n " +
+"           <td>\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 284 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 275 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(Html.EditorFor(m => m.Job.JobMetaInsurance.RecoverReduceAction));
 
             
@@ -817,7 +827,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 285 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 276 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
@@ -828,7 +838,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 286 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 277 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
@@ -844,7 +854,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 "            \'");
 
             
-            #line 292 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 283 "..\..\Views\Job\JobParts\Insurance.cshtml"
                         Write(Url.Action(MVC.API.Job.UpdateInsuranceRecoverReduceAction(Model.Job.Id, null)));
 
             
@@ -854,13 +864,13 @@ WriteLiteral("\',\r\n                            \'RecoverReduceAction\'\r\n
 "\r\n                    });\r\n                </script>\r\n            </td>\r\n       " +
 " </tr>\r\n");
 
-WriteLiteral("        <tr>\r\n            <th>\r\n                Other Interested Parties\r\n       " +
-"     </th>\r\n            <td>\r\n");
+WriteLiteral("        <tr>\r\n            <th>Other Interested Parties\r\n            </th>\r\n      " +
+"      <td>\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 304 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 294 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(Html.EditorFor(m => m.Job.JobMetaInsurance.OtherInterestedParties));
 
             
@@ -871,7 +881,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 305 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 295 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxSave());
 
             
@@ -882,7 +892,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 306 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 296 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
@@ -900,7 +910,7 @@ WriteLiteral(@">
                             '");
 
             
-            #line 312 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 302 "..\..\Views\Job\JobParts\Insurance.cshtml"
                         Write(Url.Action(MVC.API.Job.UpdateInsuranceOtherInterestedParties(Model.Job.Id, null)));
 
             
@@ -914,12 +924,12 @@ WriteLiteral("        <tr>\r\n            <th");
 
 WriteLiteral(" style=\"width: 200px;\"");
 
-WriteLiteral(">\r\n                Date of Purchase\r\n            </th>\r\n            <td>\r\n");
+WriteLiteral(">Date of Purchase\r\n            </th>\r\n            <td>\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 324 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 313 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(Html.EditorFor(m => m.Job.JobMetaInsurance.DateOfPurchase));
 
             
@@ -930,7 +940,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                ");
 
             
-            #line 325 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 314 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(AjaxHelpers.AjaxLoader());
 
             
@@ -949,7 +959,7 @@ WriteLiteral(@">
                         '");
 
             
-            #line 332 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 321 "..\..\Views\Job\JobParts\Insurance.cshtml"
                      Write(Url.Action(MVC.API.Job.UpdateInsuranceDateOfPurchase(Model.Job.Id, null)));
 
             
@@ -959,13 +969,13 @@ WriteLiteral("\',\r\n                        \'DateOfPurchase\',\r\n
 "                     true\r\n                        );\r\n                    });\r\n" +
 "                </script>\r\n            </td>\r\n        </tr>\r\n");
 
-WriteLiteral("        <tr>\r\n            <th>\r\n                Claim Form Sent Date\r\n           " +
-" </th>\r\n            <td>\r\n");
+WriteLiteral("        <tr>\r\n            <th>Claim Form Sent Date\r\n            </th>\r\n          " +
+"  <td>\r\n");
 
 WriteLiteral("                ");
 
             
-            #line 346 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 334 "..\..\Views\Job\JobParts\Insurance.cshtml"
            Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.ClaimFormSentDate, "Not Sent", "Job_JobMetaInsurance_ClaimFormSentDate"));
 
             
@@ -978,7 +988,7 @@ WriteLiteral(" id=\"Job_JobMetaInsurance_ClaimFormSentUserId\"");
 WriteLiteral(">");
 
             
-            #line 347 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 335 "..\..\Views\Job\JobParts\Insurance.cshtml"
                                                                 Write(string.IsNullOrEmpty(Model.Job.JobMetaInsurance.ClaimFormSentUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaInsurance.ClaimFormSentUser.ToString()));
 
             
@@ -988,7 +998,7 @@ WriteLiteral("</span>\r\n                <script>\r\n                    $(funct
 "               var updateUrl = \'");
 
             
-            #line 350 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 338 "..\..\Views\Job\JobParts\Insurance.cshtml"
                                      Write(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)));
 
             
@@ -997,7 +1007,7 @@ WriteLiteral("</span>\r\n                <script>\r\n                    $(funct
 WriteLiteral("\';\r\n                        var jobOpenDate = \'");
 
             
-            #line 351 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 339 "..\..\Views\Job\JobParts\Insurance.cshtml"
                                        Write(Model.Job.OpenedDate.ToJavascriptDateTime());
 
             
@@ -1013,43 +1023,56 @@ WriteLiteral(@"';
 ");
 
             
-            #line 358 "..\..\Views\Job\JobParts\Insurance.cshtml"
-    }
+            #line 346 "..\..\Views\Job\JobParts\Insurance.cshtml"
+        }
+        else
+        {
 
             
             #line default
             #line hidden
-WriteLiteral("    <tr>\r\n        <th>\r\n            Insurance Claim\r\n        </th>\r\n        <td>\r" +
-"\n            <div");
+WriteLiteral("        <tr>\r\n            <th");
 
-WriteLiteral(" style=\"padding: 8px; text-align: center\"");
+WriteLiteral(" style=\"width: 230px;\"");
 
-WriteLiteral(">\r\n");
+WriteLiteral(">Date of Loss or Damage\r\n            </th>\r\n            <td>\r\n");
+
+WriteLiteral("                ");
 
             
-            #line 365 "..\..\Views\Job\JobParts\Insurance.cshtml"
+            #line 353 "..\..\Views\Job\JobParts\Insurance.cshtml"
+           Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.LossOrDamageDate, "Unknown", null));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n            </td>\r\n        </tr>\r\n");
+
+WriteLiteral("        <tr>\r\n            <th>Event Location\r\n            </th>\r\n            <td>" +
+"\r\n");
+
+            
+            #line 360 "..\..\Views\Job\JobParts\Insurance.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 365 "..\..\Views\Job\JobParts\Insurance.cshtml"
-                 if (Model.Job.JobMetaNonWarranty.IsInsuranceClaim)
+            #line 360 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                 if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.EventLocation))
                 {
-                    
-            
-            #line default
-            #line hidden
-            
-            #line 367 "..\..\Views\Job\JobParts\Insurance.cshtml"
-               Write(Html.ActionLinkButton("Remove Insurance Claim", MVC.API.Job.UpdateNonWarrantyIsInsuranceClaim(Model.Job.Id, false, true)));
 
             
             #line default
             #line hidden
+WriteLiteral("                    <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown/None&gt;</span>\r\n");
+
             
-            #line 367 "..\..\Views\Job\JobParts\Insurance.cshtml"
-                                                                                                                                              
+            #line 363 "..\..\Views\Job\JobParts\Insurance.cshtml"
                 }
                 else
                 {
@@ -1058,21 +1081,790 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 371 "..\..\Views\Job\JobParts\Insurance.cshtml"
-               Write(Html.ActionLinkButton("Add Insurance Claim", MVC.API.Job.UpdateNonWarrantyIsInsuranceClaim(Model.Job.Id, true, true)));
+            #line 366 "..\..\Views\Job\JobParts\Insurance.cshtml"
+               Write(Model.Job.JobMetaInsurance.EventLocation);
 
             
             #line default
             #line hidden
             
-            #line 371 "..\..\Views\Job\JobParts\Insurance.cshtml"
-                                                                                                                                          
+            #line 366 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                             
                 }
 
             
             #line default
             #line hidden
-WriteLiteral("            </div>\r\n        </td>\r\n    </tr>\r\n</table>\r\n");
+WriteLiteral("            </td>\r\n        </tr>\r\n");
+
+WriteLiteral("        <tr>\r\n            <th>Description\r\n            </th>\r\n            <td>\r\n");
+
+            
+            #line 374 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 374 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                 if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.Description))
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None&gt;</span>\r\n");
+
+            
+            #line 377 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                }
+                else
+                {
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 380 "..\..\Views\Job\JobParts\Insurance.cshtml"
+               Write(Model.Job.JobMetaInsurance.Description);
+
+            
+            #line default
+            #line hidden
+            
+            #line 380 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                           
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n");
+
+WriteLiteral("        <tr>\r\n            <th");
+
+WriteLiteral(" style=\"width: 200px;\"");
+
+WriteLiteral(">Caused by Third Party\r\n            </th>\r\n            <td>\r\n");
+
+            
+            #line 388 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 388 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                 if (Model.Job.JobMetaInsurance.ThirdPartyCaused)
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <div");
+
+WriteLiteral(" id=\"Job_JobMetaInsurance_ThirdPartyCaused_Details\"");
+
+WriteLiteral(" style=\"padding-left: 25px;\"");
+
+WriteLiteral(">\r\n                        <div>\r\n                            <h5>Third Party Nam" +
+"e</h5>\r\n");
+
+            
+            #line 393 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 393 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                             if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.ThirdPartyCausedName))
+                            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown&gt;</span>\r\n");
+
+            
+            #line 396 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                            }
+                            else
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 399 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                           Write(Model.Job.JobMetaInsurance.ThirdPartyCausedName);
+
+            
+            #line default
+            #line hidden
+            
+            #line 399 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                                                
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </div>\r\n                        <div>\r\n                  " +
+"          <h5>Why Third Parties Fault</h5>\r\n");
+
+            
+            #line 404 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 404 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                             if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.ThirdPartyCausedWhy))
+                            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown&gt;</span>\r\n");
+
+            
+            #line 407 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                            }
+                            else
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 410 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                           Write(Model.Job.JobMetaInsurance.ThirdPartyCausedWhy);
+
+            
+            #line default
+            #line hidden
+            
+            #line 410 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                                               
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </div>\r\n                    </div>\r\n");
+
+            
+            #line 414 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                }
+                else
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Not Caused by Third Party&gt;</span>\r\n");
+
+            
+            #line 418 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n");
+
+WriteLiteral("        <tr>\r\n            <th>Witnessed by (Name/Address)\r\n            </th>\r\n   " +
+"         <td>\r\n");
+
+            
+            #line 425 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 425 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                 if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.WitnessesNamesAddresses))
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown/None&gt;</span>\r\n");
+
+            
+            #line 428 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                }
+                else
+                {
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 431 "..\..\Views\Job\JobParts\Insurance.cshtml"
+               Write(Model.Job.JobMetaInsurance.WitnessesNamesAddresses);
+
+            
+            #line default
+            #line hidden
+            
+            #line 431 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                                       
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n");
+
+WriteLiteral("        <tr>\r\n            <th>Burglary/Theft - Method of Entry\r\n            </th>" +
+"\r\n            <td>\r\n");
+
+            
+            #line 439 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 439 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                 if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.BurglaryTheftMethodOfEntry))
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown/None&gt;</span>\r\n");
+
+            
+            #line 442 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                }
+                else
+                {
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 445 "..\..\Views\Job\JobParts\Insurance.cshtml"
+               Write(Model.Job.JobMetaInsurance.BurglaryTheftMethodOfEntry);
+
+            
+            #line default
+            #line hidden
+            
+            #line 445 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                                          
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n");
+
+WriteLiteral("        <tr>\r\n            <th");
+
+WriteLiteral(" style=\"width: 200px;\"");
+
+WriteLiteral(">Property Last Seen\r\n            </th>\r\n            <td>\r\n");
+
+WriteLiteral("                ");
+
+            
+            #line 453 "..\..\Views\Job\JobParts\Insurance.cshtml"
+           Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.PropertyLastSeenDate, "Unknown", null));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n            </td>\r\n        </tr>\r\n");
+
+WriteLiteral("        <tr>\r\n            <th");
+
+WriteLiteral(" style=\"width: 200px;\"");
+
+WriteLiteral(">&nbsp;\r\n            Police Notified\r\n            </th>\r\n            <td>\r\n");
+
+            
+            #line 461 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 461 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                 if (Model.Job.JobMetaInsurance.PoliceNotified)
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <div");
+
+WriteLiteral(" id=\"Job_JobMetaInsurance_PoliceNotified_Details\"");
+
+WriteLiteral(" style=\"padding-left: 25px;\"");
+
+WriteLiteral(">\r\n                        <div>\r\n                            <h5>Station</h5>\r\n");
+
+            
+            #line 466 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 466 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                             if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.PoliceNotifiedStation))
+                            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown&gt;</span>\r\n");
+
+            
+            #line 469 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                            }
+                            else
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 472 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                           Write(Model.Job.JobMetaInsurance.PoliceNotifiedStation);
+
+            
+            #line default
+            #line hidden
+            
+            #line 472 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                                                 
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </div>\r\n                        <div>\r\n                  " +
+"          <h5>Date</h5>\r\n");
+
+WriteLiteral("                            ");
+
+            
+            #line 477 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                       Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.PoliceNotifiedDate, "Unknown", null));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                        </div>\r\n                        <div>\r\n                " +
+"            <h5>Crime Report #</h5>\r\n");
+
+            
+            #line 481 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 481 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                             if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.PoliceNotifiedCrimeReportNo))
+                            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown&gt;</span>\r\n");
+
+            
+            #line 484 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                            }
+                            else
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 487 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                           Write(Model.Job.JobMetaInsurance.PoliceNotifiedCrimeReportNo);
+
+            
+            #line default
+            #line hidden
+            
+            #line 487 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                                                       
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </div>\r\n                    </div>\r\n");
+
+            
+            #line 491 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                }
+                else
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Not Notified&gt;</span>\r\n");
+
+            
+            #line 495 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n");
+
+WriteLiteral("        <tr>\r\n            <th>Action to Recover/Reduce Loss\r\n            </th>\r\n " +
+"           <td>\r\n");
+
+            
+            #line 502 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 502 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                 if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.RecoverReduceAction))
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown/None&gt;</span>\r\n");
+
+            
+            #line 505 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                }
+                else
+                {
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 508 "..\..\Views\Job\JobParts\Insurance.cshtml"
+               Write(Model.Job.JobMetaInsurance.RecoverReduceAction);
+
+            
+            #line default
+            #line hidden
+            
+            #line 508 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                                   
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n");
+
+WriteLiteral("        <tr>\r\n            <th>Other Interested Parties\r\n            </th>\r\n      " +
+"      <td>\r\n");
+
+            
+            #line 516 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 516 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                 if (string.IsNullOrWhiteSpace(Model.Job.JobMetaInsurance.OtherInterestedParties))
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown/None&gt;</span>\r\n");
+
+            
+            #line 519 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                }
+                else
+                {
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 522 "..\..\Views\Job\JobParts\Insurance.cshtml"
+               Write(Model.Job.JobMetaInsurance.OtherInterestedParties);
+
+            
+            #line default
+            #line hidden
+            
+            #line 522 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                                      
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n");
+
+WriteLiteral("        <tr>\r\n            <th");
+
+WriteLiteral(" style=\"width: 200px;\"");
+
+WriteLiteral(">Date of Purchase\r\n            </th>\r\n            <td>\r\n");
+
+WriteLiteral("                ");
+
+            
+            #line 530 "..\..\Views\Job\JobParts\Insurance.cshtml"
+           Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.DateOfPurchase, "Unknown", null));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n            </td>\r\n        </tr>\r\n");
+
+            
+            #line 533 "..\..\Views\Job\JobParts\Insurance.cshtml"
+        }
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    ");
+
+            
+            #line 535 "..\..\Views\Job\JobParts\Insurance.cshtml"
+     if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.InsuranceClaimFormSent))
+    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        <tr>\r\n            <th>Claim Form Sent Date\r\n            </th>\r\n          " +
+"  <td>\r\n");
+
+WriteLiteral("                ");
+
+            
+            #line 541 "..\..\Views\Job\JobParts\Insurance.cshtml"
+           Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.ClaimFormSentDate, "Not Sent", "Job_JobMetaInsurance_ClaimFormSentDate"));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                <span");
+
+WriteLiteral(" id=\"Job_JobMetaInsurance_ClaimFormSentUserId\"");
+
+WriteLiteral(">");
+
+            
+            #line 542 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                                Write(string.IsNullOrEmpty(Model.Job.JobMetaInsurance.ClaimFormSentUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaInsurance.ClaimFormSentUser.ToString()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</span>\r\n                <script>\r\n                    $(function () {\r\n         " +
+"               var updateUrl = \'");
+
+            
+            #line 545 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                     Write(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\';\r\n                        var jobOpenDate = \'");
+
+            
+            #line 546 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                       Write(Model.Job.OpenedDate.ToJavascriptDateTime());
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"';
+
+                        document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Claim Form Sent Date', 'Job_JobMetaInsurance_ClaimFormSentDate', 'Job_JobMetaInsurance_ClaimFormSentUserId', 'InsuranceClaimFormSentDate', 'Not Sent', jobOpenDate, false);
+                    });
+                </script>
+            </td>
+        </tr>
+");
+
+            
+            #line 553 "..\..\Views\Job\JobParts\Insurance.cshtml"
+    }
+    else
+    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        <tr>\r\n            <th>Claim Form Sent Date\r\n            </th>\r\n          " +
+"  <td>\r\n");
+
+WriteLiteral("                ");
+
+            
+            #line 560 "..\..\Views\Job\JobParts\Insurance.cshtml"
+           Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaInsurance.ClaimFormSentDate, "Not Sent", "Job_JobMetaInsurance_ClaimFormSentDate"));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n                <span");
+
+WriteLiteral(" id=\"Job_JobMetaInsurance_ClaimFormSentUserId\"");
+
+WriteLiteral(">");
+
+            
+            #line 561 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                                Write(string.IsNullOrEmpty(Model.Job.JobMetaInsurance.ClaimFormSentUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaInsurance.ClaimFormSentUser.ToString()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</span>\r\n            </td>\r\n        </tr>\r\n");
+
+            
+            #line 564 "..\..\Views\Job\JobParts\Insurance.cshtml"
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    ");
+
+            
+            #line 565 "..\..\Views\Job\JobParts\Insurance.cshtml"
+     if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.IsInsuranceClaim))
+    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        <tr>\r\n            <th>Insurance Claim\r\n            </th>\r\n            <td" +
+">\r\n                <div");
+
+WriteLiteral(" style=\"padding: 8px; text-align: center\"");
+
+WriteLiteral(">\r\n");
+
+            
+            #line 572 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 572 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                     if (Model.Job.JobMetaNonWarranty.IsInsuranceClaim)
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 574 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                   Write(Html.ActionLinkButton("Remove Insurance Claim", MVC.API.Job.UpdateNonWarrantyIsInsuranceClaim(Model.Job.Id, false, true)));
+
+            
+            #line default
+            #line hidden
+            
+            #line 574 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                                                                                                                  
+                    }
+                    else
+                    {
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 578 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                   Write(Html.ActionLinkButton("Add Insurance Claim", MVC.API.Job.UpdateNonWarrantyIsInsuranceClaim(Model.Job.Id, true, true)));
+
+            
+            #line default
+            #line hidden
+            
+            #line 578 "..\..\Views\Job\JobParts\Insurance.cshtml"
+                                                                                                                                              
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n            </td>\r\n        </tr>\r\n");
+
+            
+            #line 583 "..\..\Views\Job\JobParts\Insurance.cshtml"
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</table>\r\n");
 
         }
     }
diff --git a/Disco.Web/Views/Job/JobParts/JobMetaAdditions.cshtml b/Disco.Web/Views/Job/JobParts/JobMetaAdditions.cshtml
index 84c24f37..5f5cfc63 100644
--- a/Disco.Web/Views/Job/JobParts/JobMetaAdditions.cshtml
+++ b/Disco.Web/Views/Job/JobParts/JobMetaAdditions.cshtml
@@ -1,18 +1,26 @@
 @model Disco.Web.Models.Job.ShowModel
 @using Disco.Models.Repository;
 @{
+    Authorization.Require(Claims.Job.Show);
+    
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
 }
 @switch (Model.Job.JobTypeId)
 {
     case JobType.JobTypeIds.HWar:
-        @Html.Partial(MVC.Job.Views.JobParts.Warranty);
+        if (Authorization.Has(Claims.Job.ShowWarranty))
+        {    
+            @Html.Partial(MVC.Job.Views.JobParts.Warranty);
+        }
         break;
     case JobType.JobTypeIds.HNWar:
         @Html.Partial(MVC.Job.Views.JobParts.NonWarranty);
         break;
     case JobType.JobTypeIds.UMgmt:
-        @Html.Partial(MVC.Job.Views.JobParts.Flags);
+        if (Authorization.Has(Claims.Job.ShowFlags))
+        {    
+            @Html.Partial(MVC.Job.Views.JobParts.Flags);
+        }
         break;
     default:
         break;
diff --git a/Disco.Web/Views/Job/JobParts/JobMetaAdditions1.generated.cs b/Disco.Web/Views/Job/JobParts/JobMetaAdditions1.generated.cs
index a3eeee1b..87b22857 100644
--- a/Disco.Web/Views/Job/JobParts/JobMetaAdditions1.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/JobMetaAdditions1.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -33,12 +33,14 @@ namespace Disco.Web.Views.Job.JobParts
     
     #line default
     #line hidden
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/JobMetaAdditions.cshtml")]
-    public partial class JobMetaAdditions : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
+    public partial class JobMetaAdditions : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.ShowModel>
     {
         public JobMetaAdditions()
         {
@@ -48,6 +50,8 @@ namespace Disco.Web.Views.Job.JobParts
             
             #line 3 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
   
+    Authorization.Require(Claims.Job.Show);
+    
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
 
             
@@ -56,24 +60,27 @@ namespace Disco.Web.Views.Job.JobParts
 WriteLiteral("\r\n");
 
             
-            #line 6 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
+            #line 8 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
  switch (Model.Job.JobTypeId)
 {
     case JobType.JobTypeIds.HWar:
-        
+        if (Authorization.Has(Claims.Job.ShowWarranty))
+        {    
+            
             
             #line default
             #line hidden
             
-            #line 9 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
-   Write(Html.Partial(MVC.Job.Views.JobParts.Warranty));
+            #line 13 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
+       Write(Html.Partial(MVC.Job.Views.JobParts.Warranty));
 
             
             #line default
             #line hidden
             
-            #line 9 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
-                                                      ;
+            #line 13 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
+                                                          ;
+        }
         break;
     case JobType.JobTypeIds.HNWar:
         
@@ -81,31 +88,34 @@ WriteLiteral("\r\n");
             #line default
             #line hidden
             
-            #line 12 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
+            #line 17 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
    Write(Html.Partial(MVC.Job.Views.JobParts.NonWarranty));
 
             
             #line default
             #line hidden
             
-            #line 12 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
+            #line 17 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
                                                          ;
         break;
     case JobType.JobTypeIds.UMgmt:
-        
+        if (Authorization.Has(Claims.Job.ShowFlags))
+        {    
+            
             
             #line default
             #line hidden
             
-            #line 15 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
-   Write(Html.Partial(MVC.Job.Views.JobParts.Flags));
+            #line 22 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
+       Write(Html.Partial(MVC.Job.Views.JobParts.Flags));
 
             
             #line default
             #line hidden
             
-            #line 15 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
-                                                   ;
+            #line 22 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
+                                                       ;
+        }
         break;
     default:
         break;
diff --git a/Disco.Web/Views/Job/JobParts/NonWarranty.cshtml b/Disco.Web/Views/Job/JobParts/NonWarranty.cshtml
index 866d8512..189c8d37 100644
--- a/Disco.Web/Views/Job/JobParts/NonWarranty.cshtml
+++ b/Disco.Web/Views/Job/JobParts/NonWarranty.cshtml
@@ -1,16 +1,39 @@
 @model Disco.Web.Models.Job.ShowModel
-<div id="jobDetailTab-Components" class="jobPart">
-    @Html.Partial(MVC.Job.Views.JobParts.Components)
-</div>
-<div id="jobDetailTab-NonWarrantyFinance" class="jobPart">
-    @Html.Partial(MVC.Job.Views.JobParts.NonWarrantyFinance)
-</div>
-<div id="jobDetailTab-NonWarrantyRepairs" class="jobPart">
-    @Html.Partial(MVC.Job.Views.JobParts.Repairs)
-</div>
-<div id="jobDetailTab-NonWarrantyInsurance" class="jobPart">
-    @Html.Partial(MVC.Job.Views.JobParts.Insurance)
-</div>
-<script type="text/javascript">
-    $('#jobDetailTabItems').append('<li><a href="#jobDetailTab-Components">Components</a></li><li><a href="#jobDetailTab-NonWarrantyFinance">Finance</a></li><li><a href="#jobDetailTab-NonWarrantyRepairs">Repairs</a></li><li><a href="#jobDetailTab-NonWarrantyInsurance">Insurance</a></li>');
-</script>
+@{
+    Authorization.Require(Claims.Job.Show);
+}
+@if (Authorization.Has(Claims.Job.ShowNonWarrantyComponents))
+{
+    <div id="jobDetailTab-Components" class="jobPart">
+        @Html.Partial(MVC.Job.Views.JobParts.Components)
+    </div>
+}
+@if (Authorization.Has(Claims.Job.ShowNonWarrantyFinance))
+{
+    <div id="jobDetailTab-NonWarrantyFinance" class="jobPart">
+        @Html.Partial(MVC.Job.Views.JobParts.NonWarrantyFinance)
+    </div>
+}
+@if (Authorization.Has(Claims.Job.ShowNonWarrantyRepairs))
+{
+    <div id="jobDetailTab-NonWarrantyRepairs" class="jobPart">
+        @Html.Partial(MVC.Job.Views.JobParts.Repairs)
+    </div>
+}
+@if (Authorization.Has(Claims.Job.ShowNonWarrantyInsurance))
+{
+    <div id="jobDetailTab-NonWarrantyInsurance" class="jobPart">
+        @Html.Partial(MVC.Job.Views.JobParts.Insurance)
+    </div>
+}
+@if (Authorization.HasAny(Claims.Job.ShowNonWarrantyComponents, Claims.Job.ShowNonWarrantyFinance, Claims.Job.ShowNonWarrantyRepairs, Claims.Job.ShowNonWarrantyInsurance))
+{
+    <script type="text/javascript">
+        var addTabItems = '';
+        @if (Authorization.Has(Claims.Job.ShowNonWarrantyComponents)){<text>addTabItems += '<li><a href="#jobDetailTab-Components">Components</a></li>';</text>}
+        @if (Authorization.Has(Claims.Job.ShowNonWarrantyFinance)){<text>addTabItems += '<li><a href="#jobDetailTab-NonWarrantyFinance">Finance</a></li>';</text>}
+        @if (Authorization.Has(Claims.Job.ShowNonWarrantyRepairs)){<text>addTabItems += '<li><a href="#jobDetailTab-NonWarrantyRepairs">Repairs</a></li>';</text>}
+        @if (Authorization.Has(Claims.Job.ShowNonWarrantyInsurance)){<text>addTabItems += '<li><a href="#jobDetailTab-NonWarrantyInsurance">Insurance</a></li>';</text>}
+        $('#jobDetailTabItems').append(addTabItems);
+    </script>
+}
\ No newline at end of file
diff --git a/Disco.Web/Views/Job/JobParts/NonWarranty.generated.cs b/Disco.Web/Views/Job/JobParts/NonWarranty.generated.cs
index 6d13ed94..0310b45d 100644
--- a/Disco.Web/Views/Job/JobParts/NonWarranty.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/NonWarranty.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,19 +28,39 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/NonWarranty.cshtml")]
-    public partial class NonWarranty : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
+    public partial class NonWarranty : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.ShowModel>
     {
         public NonWarranty()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<div");
+            
+            #line 2 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+  
+    Authorization.Require(Claims.Job.Show);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n");
+
+            
+            #line 5 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+ if (Authorization.Has(Claims.Job.ShowNonWarrantyComponents))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"jobDetailTab-Components\"");
 
@@ -48,16 +68,33 @@ WriteLiteral(" class=\"jobPart\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("    ");
+WriteLiteral("        ");
 
             
-            #line 3 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
-Write(Html.Partial(MVC.Job.Views.JobParts.Components));
+            #line 8 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+   Write(Html.Partial(MVC.Job.Views.JobParts.Components));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>\r\n<div");
+WriteLiteral("\r\n    </div>\r\n");
+
+            
+            #line 10 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+            
+            #line 11 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+ if (Authorization.Has(Claims.Job.ShowNonWarrantyFinance))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"jobDetailTab-NonWarrantyFinance\"");
 
@@ -65,16 +102,33 @@ WriteLiteral(" class=\"jobPart\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("    ");
+WriteLiteral("        ");
 
             
-            #line 6 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
-Write(Html.Partial(MVC.Job.Views.JobParts.NonWarrantyFinance));
+            #line 14 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+   Write(Html.Partial(MVC.Job.Views.JobParts.NonWarrantyFinance));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>\r\n<div");
+WriteLiteral("\r\n    </div>\r\n");
+
+            
+            #line 16 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+            
+            #line 17 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+ if (Authorization.Has(Claims.Job.ShowNonWarrantyRepairs))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"jobDetailTab-NonWarrantyRepairs\"");
 
@@ -82,16 +136,33 @@ WriteLiteral(" class=\"jobPart\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("    ");
+WriteLiteral("        ");
 
             
-            #line 9 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
-Write(Html.Partial(MVC.Job.Views.JobParts.Repairs));
+            #line 20 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+   Write(Html.Partial(MVC.Job.Views.JobParts.Repairs));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>\r\n<div");
+WriteLiteral("\r\n    </div>\r\n");
+
+            
+            #line 22 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+            
+            #line 23 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+ if (Authorization.Has(Claims.Job.ShowNonWarrantyInsurance))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"jobDetailTab-NonWarrantyInsurance\"");
 
@@ -99,24 +170,134 @@ WriteLiteral(" class=\"jobPart\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("    ");
+WriteLiteral("        ");
 
             
-            #line 12 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
-Write(Html.Partial(MVC.Job.Views.JobParts.Insurance));
+            #line 26 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+   Write(Html.Partial(MVC.Job.Views.JobParts.Insurance));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n</div>\r\n<script");
+WriteLiteral("\r\n    </div>\r\n");
+
+            
+            #line 28 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+            
+            #line 29 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+ if (Authorization.HasAny(Claims.Job.ShowNonWarrantyComponents, Claims.Job.ShowNonWarrantyFinance, Claims.Job.ShowNonWarrantyRepairs, Claims.Job.ShowNonWarrantyInsurance))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(@">
-    $('#jobDetailTabItems').append('<li><a href=""#jobDetailTab-Components"">Components</a></li><li><a href=""#jobDetailTab-NonWarrantyFinance"">Finance</a></li><li><a href=""#jobDetailTab-NonWarrantyRepairs"">Repairs</a></li><li><a href=""#jobDetailTab-NonWarrantyInsurance"">Insurance</a></li>');
-</script>
-");
+WriteLiteral(">\r\n        var addTabItems = \'\';\r\n");
 
+            
+            #line 33 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 33 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+         if (Authorization.Has(Claims.Job.ShowNonWarrantyComponents)){
+            
+            #line default
+            #line hidden
+WriteLiteral("addTabItems += \'<li><a");
+
+WriteLiteral(" href=\"#jobDetailTab-Components\"");
+
+WriteLiteral(">Components</a></li>\';");
+
+            
+            #line 33 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+                                                                                                                                                               }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 34 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+         if (Authorization.Has(Claims.Job.ShowNonWarrantyFinance)){
+            
+            #line default
+            #line hidden
+WriteLiteral("addTabItems += \'<li><a");
+
+WriteLiteral(" href=\"#jobDetailTab-NonWarrantyFinance\"");
+
+WriteLiteral(">Finance</a></li>\';");
+
+            
+            #line 34 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+                                                                                                                                                                 }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 35 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+         if (Authorization.Has(Claims.Job.ShowNonWarrantyRepairs)){
+            
+            #line default
+            #line hidden
+WriteLiteral("addTabItems += \'<li><a");
+
+WriteLiteral(" href=\"#jobDetailTab-NonWarrantyRepairs\"");
+
+WriteLiteral(">Repairs</a></li>\';");
+
+            
+            #line 35 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+                                                                                                                                                                 }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 36 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+         if (Authorization.Has(Claims.Job.ShowNonWarrantyInsurance)){
+            
+            #line default
+            #line hidden
+WriteLiteral("addTabItems += \'<li><a");
+
+WriteLiteral(" href=\"#jobDetailTab-NonWarrantyInsurance\"");
+
+WriteLiteral(">Insurance</a></li>\';");
+
+            
+            #line 36 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+                                                                                                                                                                       }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        $(\'#jobDetailTabItems\').append(addTabItems);\r\n    </script>\r\n");
+
+            
+            #line 39 "..\..\Views\Job\JobParts\NonWarranty.cshtml"
+}
+            
+            #line default
+            #line hidden
         }
     }
 }
diff --git a/Disco.Web/Views/Job/JobParts/NonWarrantyFinance.cshtml b/Disco.Web/Views/Job/JobParts/NonWarrantyFinance.cshtml
index df179ec1..ef0316c0 100644
--- a/Disco.Web/Views/Job/JobParts/NonWarrantyFinance.cshtml
+++ b/Disco.Web/Views/Job/JobParts/NonWarrantyFinance.cshtml
@@ -1,6 +1,8 @@
 @model Disco.Web.Models.Job.ShowModel
 @{
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
+
+    Authorization.Require(Claims.Job.ShowNonWarrantyFinance);
 }
 <table id="jobNonWarrantyFinance">
     <tr>
@@ -43,48 +45,62 @@
         <th>Purchase Order Reference
         </th>
         <td>
-            @Html.TextBoxFor(m => m.Job.JobMetaNonWarranty.PurchaseOrderReference)
-            @AjaxHelpers.AjaxSave()
-            @AjaxHelpers.AjaxLoader()
-            <script type="text/javascript">
-                $(function () {
-                    var $purchaseOrderReference = $('#Job_JobMetaNonWarranty_PurchaseOrderReference');
-                    var $ajaxSave = $purchaseOrderReference.next('.ajaxSave');
-                    $purchaseOrderReference
-                    .watermark('No Reference')
-                    .focus(function () { $purchaseOrderReference.select() })
-                    .keydown(function (e) {
-                        $ajaxSave.show();
-                        if (e.which == 13) {
-                            $(this).blur();
-                        }
-                    }).blur(function () {
-                        $ajaxSave.hide();
-                    })
-                    .change(function () {
-                        $ajaxSave.hide();
-                        $ajaxLoading = $ajaxSave.next('.ajaxLoading').show();
-                        var data = { PurchaseOrderReference: $purchaseOrderReference.val() };
-                        $.ajax({
-                            url: '@Url.Action(MVC.API.Job.UpdateNonWarrantyPurchaseOrderReference(Model.Job.Id, null))',
-                            dataType: 'json',
-                            data: data,
-                            success: function (d) {
-                                if (d == 'OK') {
-                                    $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
-                                } else {
-                                    $ajaxLoading.hide();
-                                    alert('Unable to update purchase order reference: ' + d);
-                                }
-                            },
-                            error: function (jqXHR, textStatus, errorThrown) {
-                                alert('Unable to update purchase order reference: ' + textStatus);
-                                $ajaxLoading.hide();
+            @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.PurchaseOrderReference))
+            {
+                @Html.TextBoxFor(m => m.Job.JobMetaNonWarranty.PurchaseOrderReference)
+                @AjaxHelpers.AjaxSave()
+                @AjaxHelpers.AjaxLoader()
+                <script type="text/javascript">
+                    $(function () {
+                        var $purchaseOrderReference = $('#Job_JobMetaNonWarranty_PurchaseOrderReference');
+                        var $ajaxSave = $purchaseOrderReference.next('.ajaxSave');
+                        $purchaseOrderReference
+                        .watermark('No Reference')
+                        .focus(function () { $purchaseOrderReference.select() })
+                        .keydown(function (e) {
+                            $ajaxSave.show();
+                            if (e.which == 13) {
+                                $(this).blur();
                             }
+                        }).blur(function () {
+                            $ajaxSave.hide();
+                        })
+                        .change(function () {
+                            $ajaxSave.hide();
+                            $ajaxLoading = $ajaxSave.next('.ajaxLoading').show();
+                            var data = { PurchaseOrderReference: $purchaseOrderReference.val() };
+                            $.ajax({
+                                url: '@Url.Action(MVC.API.Job.UpdateNonWarrantyPurchaseOrderReference(Model.Job.Id, null))',
+                                dataType: 'json',
+                                data: data,
+                                success: function (d) {
+                                    if (d == 'OK') {
+                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                    } else {
+                                        $ajaxLoading.hide();
+                                        alert('Unable to update purchase order reference: ' + d);
+                                    }
+                                },
+                                error: function (jqXHR, textStatus, errorThrown) {
+                                    alert('Unable to update purchase order reference: ' + textStatus);
+                                    $ajaxLoading.hide();
+                                }
+                            });
                         });
                     });
-                });
-            </script>
+                </script>
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(Model.Job.JobMetaNonWarranty.PurchaseOrderReference))
+                {
+                <span class="smallMessage">&lt;Unknown/None&gt;</span>
+                }
+                else
+                {
+                @Model.Job.JobMetaNonWarranty.PurchaseOrderReference
+                }
+            }
         </td>
     </tr>
     <tr>
@@ -107,15 +123,21 @@
     </tr>
 </table>
 <script>
-    $(function(){
+    $(function () {
         var updateUrl = '@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))';
         var jobOpenDate = '@(Model.Job.OpenedDate.ToJavascriptDateTime())';
 
-        document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Accounting Charge Required', 'Job_JobMetaNonWarranty_AccountingChargeRequiredDate', 'Job_JobMetaNonWarranty_AccountingChargeRequiredUser', 'NonWarrantyAccountingChargeRequired', 'Not Required', jobOpenDate, false);
-        document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Accounting Charge Added', 'Job_JobMetaNonWarranty_AccountingChargeAddedDate', 'Job_JobMetaNonWarranty_AccountingChargeAddedUser', 'NonWarrantyAccountingChargeAdded', 'Not Added', jobOpenDate, false);
-        document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Accounting Charge Paid', 'Job_JobMetaNonWarranty_AccountingChargePaidDate', 'Job_JobMetaNonWarranty_AccountingChargePaidUser', 'NonWarrantyAccountingChargePaid', 'Not Paid', jobOpenDate, false);
-        document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Purchase Order Raised', 'Job_JobMetaNonWarranty_PurchaseOrderRaisedDate', 'Job_JobMetaNonWarranty_PurchaseOrderRaisedUser', 'NonWarrantyPurchaseOrderRaised', 'Not Raised', jobOpenDate, true);
-        document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Purchase Order Sent', 'Job_JobMetaNonWarranty_PurchaseOrderSentDate', 'Job_JobMetaNonWarranty_PurchaseOrderSentUser', 'NonWarrantyPurchaseOrderSent', 'Not Sent', jobOpenDate, true);
-        document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Invoice Received', 'Job_JobMetaNonWarranty_InvoiceReceivedDate', 'Job_JobMetaNonWarranty_InvoiceReceivedUser', 'NonWarrantyInvoiceReceived', 'Not Received', jobOpenDate, true);
+        @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.AccountingChargeRequired))
+        {<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Accounting Charge Required', 'Job_JobMetaNonWarranty_AccountingChargeRequiredDate', 'Job_JobMetaNonWarranty_AccountingChargeRequiredUser', 'NonWarrantyAccountingChargeRequired', 'Not Required', jobOpenDate, false);</text>}
+        @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.AccountingChargeAdded))
+        {<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Accounting Charge Added', 'Job_JobMetaNonWarranty_AccountingChargeAddedDate', 'Job_JobMetaNonWarranty_AccountingChargeAddedUser', 'NonWarrantyAccountingChargeAdded', 'Not Added', jobOpenDate, false);</text>}
+        @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.AccountingChargePaid))
+        {<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Accounting Charge Paid', 'Job_JobMetaNonWarranty_AccountingChargePaidDate', 'Job_JobMetaNonWarranty_AccountingChargePaidUser', 'NonWarrantyAccountingChargePaid', 'Not Paid', jobOpenDate, false);</text>}
+        @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.PurchaseOrderRaised))
+        {<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Purchase Order Raised', 'Job_JobMetaNonWarranty_PurchaseOrderRaisedDate', 'Job_JobMetaNonWarranty_PurchaseOrderRaisedUser', 'NonWarrantyPurchaseOrderRaised', 'Not Raised', jobOpenDate, true);</text>}
+        @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.PurchaseOrderSent))
+        {<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Purchase Order Sent', 'Job_JobMetaNonWarranty_PurchaseOrderSentDate', 'Job_JobMetaNonWarranty_PurchaseOrderSentUser', 'NonWarrantyPurchaseOrderSent', 'Not Sent', jobOpenDate, true);</text>}
+        @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.InvoiceReceived))
+        {<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Invoice Received', 'Job_JobMetaNonWarranty_InvoiceReceivedDate', 'Job_JobMetaNonWarranty_InvoiceReceivedUser', 'NonWarrantyInvoiceReceived', 'Not Received', jobOpenDate, true);</text>}
     });
 </script>
diff --git a/Disco.Web/Views/Job/JobParts/NonWarrantyFinance.generated.cs b/Disco.Web/Views/Job/JobParts/NonWarrantyFinance.generated.cs
index 86be4502..5f0c9df5 100644
--- a/Disco.Web/Views/Job/JobParts/NonWarrantyFinance.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/NonWarrantyFinance.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/NonWarrantyFinance.cshtml")]
-    public partial class NonWarrantyFinance : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
+    public partial class NonWarrantyFinance : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.ShowModel>
     {
         public NonWarrantyFinance()
         {
@@ -45,6 +47,8 @@ namespace Disco.Web.Views.Job.JobParts
   
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
 
+    Authorization.Require(Claims.Job.ShowNonWarrantyFinance);
+
             
             #line default
             #line hidden
@@ -61,7 +65,7 @@ WriteLiteral(">Accounting Charge Required\r\n        </th>\r\n        <td>\r\n")
 WriteLiteral("            ");
 
             
-            #line 10 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 12 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
        Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.AccountingChargeRequiredDate, "Not Required", "Job_JobMetaNonWarranty_AccountingChargeRequiredDate"));
 
             
@@ -74,7 +78,7 @@ WriteLiteral(" id=\"Job_JobMetaNonWarranty_AccountingChargeRequiredUser\"");
 WriteLiteral(">");
 
             
-            #line 11 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 13 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
                                                                        Write(string.IsNullOrEmpty(Model.Job.JobMetaNonWarranty.AccountingChargeRequiredUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaNonWarranty.AccountingChargeRequiredUser.ToString()));
 
             
@@ -85,7 +89,7 @@ WriteLiteral("</span>\r\n");
 WriteLiteral("            ");
 
             
-            #line 12 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 14 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
        Write(AjaxHelpers.AjaxLoader());
 
             
@@ -100,7 +104,7 @@ WriteLiteral(">Accounting Charge Added\r\n        </th>\r\n        <td>\r\n");
 WriteLiteral("            ");
 
             
-            #line 19 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 21 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
        Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.AccountingChargeAddedDate, "Not Added", "Job_JobMetaNonWarranty_AccountingChargeAddedDate"));
 
             
@@ -113,7 +117,7 @@ WriteLiteral(" id=\"Job_JobMetaNonWarranty_AccountingChargeAddedUser\"");
 WriteLiteral(">");
 
             
-            #line 20 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 22 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
                                                                     Write(string.IsNullOrEmpty(Model.Job.JobMetaNonWarranty.AccountingChargeAddedUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaNonWarranty.AccountingChargeAddedUser.ToString()));
 
             
@@ -124,7 +128,7 @@ WriteLiteral("</span>\r\n");
 WriteLiteral("            ");
 
             
-            #line 21 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 23 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
        Write(AjaxHelpers.AjaxLoader());
 
             
@@ -139,7 +143,7 @@ WriteLiteral(">Accounting Charge Paid\r\n        </th>\r\n        <td>\r\n");
 WriteLiteral("            ");
 
             
-            #line 28 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 30 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
        Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.AccountingChargePaidDate, "Not Paid", "Job_JobMetaNonWarranty_AccountingChargePaidDate"));
 
             
@@ -152,7 +156,7 @@ WriteLiteral(" id=\"Job_JobMetaNonWarranty_AccountingChargePaidUser\"");
 WriteLiteral(">");
 
             
-            #line 29 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 31 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
                                                                    Write(string.IsNullOrEmpty(Model.Job.JobMetaNonWarranty.AccountingChargePaidUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaNonWarranty.AccountingChargePaidUser.ToString()));
 
             
@@ -163,7 +167,7 @@ WriteLiteral("</span>\r\n");
 WriteLiteral("            ");
 
             
-            #line 30 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 32 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
        Write(AjaxHelpers.AjaxLoader());
 
             
@@ -178,7 +182,7 @@ WriteLiteral(">Purchase Order Raised\r\n        </th>\r\n        <td>\r\n");
 WriteLiteral("            ");
 
             
-            #line 37 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 39 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
        Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.PurchaseOrderRaisedDate, "Not Raised", "Job_JobMetaNonWarranty_PurchaseOrderRaisedDate"));
 
             
@@ -191,7 +195,7 @@ WriteLiteral(" id=\"Job_JobMetaNonWarranty_PurchaseOrderRaisedUser\"");
 WriteLiteral(">");
 
             
-            #line 38 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 40 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
                                                                   Write(string.IsNullOrEmpty(Model.Job.JobMetaNonWarranty.PurchaseOrderRaisedUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaNonWarranty.PurchaseOrderRaisedUser.ToString()));
 
             
@@ -202,7 +206,7 @@ WriteLiteral("</span>\r\n");
 WriteLiteral("            ");
 
             
-            #line 39 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 41 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
        Write(AjaxHelpers.AjaxLoader());
 
             
@@ -211,93 +215,159 @@ WriteLiteral("            ");
 WriteLiteral("\r\n        </td>\r\n    </tr>\r\n    <tr>\r\n        <th>Purchase Order Reference\r\n     " +
 "   </th>\r\n        <td>\r\n");
 
-WriteLiteral("            ");
-
-            
-            #line 46 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
-       Write(Html.TextBoxFor(m => m.Job.JobMetaNonWarranty.PurchaseOrderReference));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("            ");
-
-            
-            #line 47 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
-       Write(AjaxHelpers.AjaxSave());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("            ");
-
             
             #line 48 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
-       Write(AjaxHelpers.AjaxLoader());
+            
+            
+            #line default
+            #line hidden
+            
+            #line 48 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+             if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.PurchaseOrderReference))
+            {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 50 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+           Write(Html.TextBoxFor(m => m.Job.JobMetaNonWarranty.PurchaseOrderReference));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            <script");
+            
+            #line 50 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+                                                                                      
+                
+            
+            #line default
+            #line hidden
+            
+            #line 51 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+           Write(AjaxHelpers.AjaxSave());
+
+            
+            #line default
+            #line hidden
+            
+            #line 51 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+                                       
+                
+            
+            #line default
+            #line hidden
+            
+            #line 52 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+           Write(AjaxHelpers.AjaxLoader());
+
+            
+            #line default
+            #line hidden
+            
+            #line 52 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-                $(function () {
-                    var $purchaseOrderReference = $('#Job_JobMetaNonWarranty_PurchaseOrderReference');
-                    var $ajaxSave = $purchaseOrderReference.next('.ajaxSave');
-                    $purchaseOrderReference
-                    .watermark('No Reference')
-                    .focus(function () { $purchaseOrderReference.select() })
-                    .keydown(function (e) {
-                        $ajaxSave.show();
-                        if (e.which == 13) {
-                            $(this).blur();
-                        }
-                    }).blur(function () {
-                        $ajaxSave.hide();
-                    })
-                    .change(function () {
-                        $ajaxSave.hide();
-                        $ajaxLoading = $ajaxSave.next('.ajaxLoading').show();
-                        var data = { PurchaseOrderReference: $purchaseOrderReference.val() };
-                        $.ajax({
-                            url: '");
+                    $(function () {
+                        var $purchaseOrderReference = $('#Job_JobMetaNonWarranty_PurchaseOrderReference');
+                        var $ajaxSave = $purchaseOrderReference.next('.ajaxSave');
+                        $purchaseOrderReference
+                        .watermark('No Reference')
+                        .focus(function () { $purchaseOrderReference.select() })
+                        .keydown(function (e) {
+                            $ajaxSave.show();
+                            if (e.which == 13) {
+                                $(this).blur();
+                            }
+                        }).blur(function () {
+                            $ajaxSave.hide();
+                        })
+                        .change(function () {
+                            $ajaxSave.hide();
+                            $ajaxLoading = $ajaxSave.next('.ajaxLoading').show();
+                            var data = { PurchaseOrderReference: $purchaseOrderReference.val() };
+                            $.ajax({
+                                url: '");
 
             
-            #line 69 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
-                             Write(Url.Action(MVC.API.Job.UpdateNonWarrantyPurchaseOrderReference(Model.Job.Id, null)));
+            #line 73 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+                                 Write(Url.Action(MVC.API.Job.UpdateNonWarrantyPurchaseOrderReference(Model.Job.Id, null)));
 
             
             #line default
             #line hidden
 WriteLiteral(@"',
-                            dataType: 'json',
-                            data: data,
-                            success: function (d) {
-                                if (d == 'OK') {
-                                    $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
-                                } else {
+                                dataType: 'json',
+                                data: data,
+                                success: function (d) {
+                                    if (d == 'OK') {
+                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                    } else {
+                                        $ajaxLoading.hide();
+                                        alert('Unable to update purchase order reference: ' + d);
+                                    }
+                                },
+                                error: function (jqXHR, textStatus, errorThrown) {
+                                    alert('Unable to update purchase order reference: ' + textStatus);
                                     $ajaxLoading.hide();
-                                    alert('Unable to update purchase order reference: ' + d);
                                 }
-                            },
-                            error: function (jqXHR, textStatus, errorThrown) {
-                                alert('Unable to update purchase order reference: ' + textStatus);
-                                $ajaxLoading.hide();
-                            }
+                            });
                         });
                     });
-                });
-            </script>
-        </td>
-    </tr>
-    <tr>
-        <th");
+                </script>
+");
+
+            
+            #line 92 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(Model.Job.JobMetaNonWarranty.PurchaseOrderReference))
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown/None&gt;</span>\r\n");
+
+            
+            #line 98 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+                }
+                else
+                {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 101 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+           Write(Model.Job.JobMetaNonWarranty.PurchaseOrderReference);
+
+            
+            #line default
+            #line hidden
+            
+            #line 101 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+                                                                    
+                }
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        </td>\r\n    </tr>\r\n    <tr>\r\n        <th");
 
 WriteLiteral(" style=\"width: 200px;\"");
 
@@ -306,7 +376,7 @@ WriteLiteral(">Purchase Order Sent\r\n        </th>\r\n        <td>\r\n");
 WriteLiteral("            ");
 
             
-            #line 94 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 110 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
        Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.PurchaseOrderSentDate, "Not Sent", "Job_JobMetaNonWarranty_PurchaseOrderSentDate"));
 
             
@@ -319,7 +389,7 @@ WriteLiteral(" id=\"Job_JobMetaNonWarranty_PurchaseOrderSentUser\"");
 WriteLiteral(">");
 
             
-            #line 95 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 111 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
                                                                 Write(string.IsNullOrEmpty(Model.Job.JobMetaNonWarranty.PurchaseOrderSentUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaNonWarranty.PurchaseOrderSentUser.ToString()));
 
             
@@ -330,7 +400,7 @@ WriteLiteral("</span>\r\n");
 WriteLiteral("            ");
 
             
-            #line 96 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 112 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
        Write(AjaxHelpers.AjaxLoader());
 
             
@@ -345,7 +415,7 @@ WriteLiteral(">Invoice Received\r\n        </th>\r\n        <td>\r\n");
 WriteLiteral("            ");
 
             
-            #line 103 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 119 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
        Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.InvoiceReceivedDate, "Not Received", "Job_JobMetaNonWarranty_InvoiceReceivedDate"));
 
             
@@ -358,7 +428,7 @@ WriteLiteral(" id=\"Job_JobMetaNonWarranty_InvoiceReceivedUser\"");
 WriteLiteral(">");
 
             
-            #line 104 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 120 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
                                                               Write(string.IsNullOrEmpty(Model.Job.JobMetaNonWarranty.InvoiceReceivedUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaNonWarranty.InvoiceReceivedUser.ToString()));
 
             
@@ -369,17 +439,17 @@ WriteLiteral("</span>\r\n");
 WriteLiteral("            ");
 
             
-            #line 105 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 121 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
        Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n        </td>\r\n    </tr>\r\n</table>\r\n<script>\r\n    $(function(){\r\n        var up" +
-"dateUrl = \'");
+WriteLiteral("\r\n        </td>\r\n    </tr>\r\n</table>\r\n<script>\r\n    $(function () {\r\n        var " +
+"updateUrl = \'");
 
             
-            #line 111 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 127 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
                      Write(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)));
 
             
@@ -388,34 +458,139 @@ WriteLiteral("\r\n        </td>\r\n    </tr>\r\n</table>\r\n<script>\r\n    $(fu
 WriteLiteral("\';\r\n        var jobOpenDate = \'");
 
             
-            #line 112 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+            #line 128 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
                        Write(Model.Job.OpenedDate.ToJavascriptDateTime());
 
             
             #line default
             #line hidden
-WriteLiteral("\';\r\n\r\n        document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, \'Account" +
-"ing Charge Required\', \'Job_JobMetaNonWarranty_AccountingChargeRequiredDate\', \'Jo" +
-"b_JobMetaNonWarranty_AccountingChargeRequiredUser\', \'NonWarrantyAccountingCharge" +
-"Required\', \'Not Required\', jobOpenDate, false);\r\n        document.DiscoFunctions" +
-".DateDialogCreateUpdater(updateUrl, \'Accounting Charge Added\', \'Job_JobMetaNonWa" +
-"rranty_AccountingChargeAddedDate\', \'Job_JobMetaNonWarranty_AccountingChargeAdded" +
-"User\', \'NonWarrantyAccountingChargeAdded\', \'Not Added\', jobOpenDate, false);\r\n  " +
-"      document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, \'Accounting Cha" +
-"rge Paid\', \'Job_JobMetaNonWarranty_AccountingChargePaidDate\', \'Job_JobMetaNonWar" +
-"ranty_AccountingChargePaidUser\', \'NonWarrantyAccountingChargePaid\', \'Not Paid\', " +
-"jobOpenDate, false);\r\n        document.DiscoFunctions.DateDialogCreateUpdater(up" +
-"dateUrl, \'Purchase Order Raised\', \'Job_JobMetaNonWarranty_PurchaseOrderRaisedDat" +
-"e\', \'Job_JobMetaNonWarranty_PurchaseOrderRaisedUser\', \'NonWarrantyPurchaseOrderR" +
-"aised\', \'Not Raised\', jobOpenDate, true);\r\n        document.DiscoFunctions.DateD" +
-"ialogCreateUpdater(updateUrl, \'Purchase Order Sent\', \'Job_JobMetaNonWarranty_Pur" +
-"chaseOrderSentDate\', \'Job_JobMetaNonWarranty_PurchaseOrderSentUser\', \'NonWarrant" +
-"yPurchaseOrderSent\', \'Not Sent\', jobOpenDate, true);\r\n        document.DiscoFunc" +
-"tions.DateDialogCreateUpdater(updateUrl, \'Invoice Received\', \'Job_JobMetaNonWarr" +
-"anty_InvoiceReceivedDate\', \'Job_JobMetaNonWarranty_InvoiceReceivedUser\', \'NonWar" +
-"rantyInvoiceReceived\', \'Not Received\', jobOpenDate, true);\r\n    });\r\n</script>\r\n" +
+WriteLiteral("\';\r\n\r\n");
+
+            
+            #line 130 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 130 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+         if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.AccountingChargeRequired))
+        {
+            
+            #line default
+            #line hidden
+WriteLiteral(@"document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Accounting Charge Required', 'Job_JobMetaNonWarranty_AccountingChargeRequiredDate', 'Job_JobMetaNonWarranty_AccountingChargeRequiredUser', 'NonWarrantyAccountingChargeRequired', 'Not Required', jobOpenDate, false);");
+
+            
+            #line 131 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+                                                                                                                                                                                                                                                                                                        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 132 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+         if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.AccountingChargeAdded))
+        {
+            
+            #line default
+            #line hidden
+WriteLiteral(@"document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Accounting Charge Added', 'Job_JobMetaNonWarranty_AccountingChargeAddedDate', 'Job_JobMetaNonWarranty_AccountingChargeAddedUser', 'NonWarrantyAccountingChargeAdded', 'Not Added', jobOpenDate, false);");
+
+            
+            #line 133 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+                                                                                                                                                                                                                                                                                         }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 134 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+         if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.AccountingChargePaid))
+        {
+            
+            #line default
+            #line hidden
+WriteLiteral("document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, \'Accounting Charge Pai" +
+"d\', \'Job_JobMetaNonWarranty_AccountingChargePaidDate\', \'Job_JobMetaNonWarranty_A" +
+"ccountingChargePaidUser\', \'NonWarrantyAccountingChargePaid\', \'Not Paid\', jobOpen" +
+"Date, false);");
+
+            
+            #line 135 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+                                                                                                                                                                                                                                                                                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 136 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+         if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.PurchaseOrderRaised))
+        {
+            
+            #line default
+            #line hidden
+WriteLiteral("document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, \'Purchase Order Raised" +
+"\', \'Job_JobMetaNonWarranty_PurchaseOrderRaisedDate\', \'Job_JobMetaNonWarranty_Pur" +
+"chaseOrderRaisedUser\', \'NonWarrantyPurchaseOrderRaised\', \'Not Raised\', jobOpenDa" +
+"te, true);");
+
+            
+            #line 137 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+                                                                                                                                                                                                                                                                                 }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 138 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+         if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.PurchaseOrderSent))
+        {
+            
+            #line default
+            #line hidden
+WriteLiteral("document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, \'Purchase Order Sent\'," +
+" \'Job_JobMetaNonWarranty_PurchaseOrderSentDate\', \'Job_JobMetaNonWarranty_Purchas" +
+"eOrderSentUser\', \'NonWarrantyPurchaseOrderSent\', \'Not Sent\', jobOpenDate, true);" +
 "");
 
+            
+            #line 139 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+                                                                                                                                                                                                                                                                       }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 140 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+         if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.InvoiceReceived))
+        {
+            
+            #line default
+            #line hidden
+WriteLiteral("document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, \'Invoice Received\', \'J" +
+"ob_JobMetaNonWarranty_InvoiceReceivedDate\', \'Job_JobMetaNonWarranty_InvoiceRecei" +
+"vedUser\', \'NonWarrantyInvoiceReceived\', \'Not Received\', jobOpenDate, true);");
+
+            
+            #line 141 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+                                                                                                                                                                                                                                                                  }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    });\r\n</script>\r\n");
+
         }
     }
 }
diff --git a/Disco.Web/Views/Job/JobParts/Repairs.cshtml b/Disco.Web/Views/Job/JobParts/Repairs.cshtml
index b17cf424..91695085 100644
--- a/Disco.Web/Views/Job/JobParts/Repairs.cshtml
+++ b/Disco.Web/Views/Job/JobParts/Repairs.cshtml
@@ -1,59 +1,77 @@
 @model Disco.Web.Models.Job.ShowModel
 @{
+    Authorization.Require(Claims.Job.ShowNonWarrantyFinance);
+
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
 }
 <table id="jobNonWarrantyRepairs">
     <tr>
-        <th style="width: 200px;">
-            Repairer Name
+        <th style="width: 200px;">Repairer Name
         </th>
         <td>
-            @Html.EditorFor(m => m.Job.JobMetaNonWarranty.RepairerName)
-            @AjaxHelpers.AjaxSave()
-            @AjaxHelpers.AjaxLoader()
-            <script type="text/javascript">
-                $(function () {
-                    document.DiscoFunctions.PropertyChangeHelper(
-                            $('#Job_JobMetaNonWarranty_RepairerName'),
-                            'Unknown',
-                            '@Url.Action(MVC.API.Job.UpdateNonWarrantyRepairerName(Model.Job.Id, null))',
+            @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.RepairerName))
+            {
+                @Html.EditorFor(m => m.Job.JobMetaNonWarranty.RepairerName)
+                @AjaxHelpers.AjaxSave()
+                @AjaxHelpers.AjaxLoader()
+                <script type="text/javascript">
+                    $(function () {
+                        document.DiscoFunctions.PropertyChangeHelper(
+                                $('#Job_JobMetaNonWarranty_RepairerName'),
+                                'Unknown',
+                                '@Url.Action(MVC.API.Job.UpdateNonWarrantyRepairerName(Model.Job.Id, null))',
                             'RepairerName'
                         );
-                });
-            </script>
+                    });
+                </script>
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(Model.Job.JobMetaNonWarranty.RepairerName))
+                {<span class="smallMessage">&lt;Unknown/None&gt;</span>}
+                else
+                {@Model.Job.JobMetaNonWarranty.RepairerName}
+            }
         </td>
     </tr>
     <tr>
-        <th style="width: 200px;">
-            Repair Logged
+        <th style="width: 200px;">Repair Logged
         </th>
         <td>
             @CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.RepairerLoggedDate, "Not Logged", "Job_JobMetaNonWarranty_RepairerLoggedDate")
         </td>
     </tr>
     <tr>
-        <th style="width: 200px;">
-            Repair Reference
+        <th style="width: 200px;">Repair Reference
         </th>
         <td>
-            @Html.EditorFor(m => m.Job.JobMetaNonWarranty.RepairerReference)
-            @AjaxHelpers.AjaxSave()
-            @AjaxHelpers.AjaxLoader()
-            <script type="text/javascript">
-                $(function () {
-                    document.DiscoFunctions.PropertyChangeHelper(
-                            $('#Job_JobMetaNonWarranty_RepairerReference'),
-                            'Unknown',
-                            '@Url.Action(MVC.API.Job.UpdateNonWarrantyRepairerReference(Model.Job.Id, null))',
+            @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.RepairerReference))
+            {
+                @Html.EditorFor(m => m.Job.JobMetaNonWarranty.RepairerReference)
+                @AjaxHelpers.AjaxSave()
+                @AjaxHelpers.AjaxLoader()
+                <script type="text/javascript">
+                    $(function () {
+                        document.DiscoFunctions.PropertyChangeHelper(
+                                $('#Job_JobMetaNonWarranty_RepairerReference'),
+                                'Unknown',
+                                '@Url.Action(MVC.API.Job.UpdateNonWarrantyRepairerReference(Model.Job.Id, null))',
                             'RepairerReference'
                         );
-                });
-            </script>
+                    });
+                </script>
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(Model.Job.JobMetaNonWarranty.RepairerReference))
+                {<span class="smallMessage">&lt;Unknown/None&gt;</span>}
+                else
+                {@Model.Job.JobMetaNonWarranty.RepairerReference}
+            }
         </td>
     </tr>
     <tr>
-        <th style="width: 200px;">
-            Repair Completed
+        <th style="width: 200px;">Repair Completed
         </th>
         <td>
             @CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.RepairerCompletedDate, "Not Completed", "Job_JobMetaNonWarranty_RepairerCompletedDate")
@@ -65,7 +83,9 @@
         var updateUrl = '@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))';
         var jobOpenDate = '@(Model.Job.OpenedDate.ToJavascriptDateTime())';
 
-        document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Repairer Name', 'Job_JobMetaNonWarranty_RepairerLoggedDate', null, 'NonWarrantyRepairerLoggedDate', 'Not Logged', jobOpenDate, false);
-        document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Repair Completed', 'Job_JobMetaNonWarranty_RepairerCompletedDate', null, 'NonWarrantyRepairerCompletedDate', 'Not Completed', jobOpenDate, false);
+        @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.RepairerLoggedDate))
+        {<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Repairer Name', 'Job_JobMetaNonWarranty_RepairerLoggedDate', null, 'NonWarrantyRepairerLoggedDate', 'Not Logged', jobOpenDate, false);</text>}
+        @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.RepairerCompletedDate))
+        {<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Repair Completed', 'Job_JobMetaNonWarranty_RepairerCompletedDate', null, 'NonWarrantyRepairerCompletedDate', 'Not Completed', jobOpenDate, false);</text>}
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/Disco.Web/Views/Job/JobParts/Repairs.generated.cs b/Disco.Web/Views/Job/JobParts/Repairs.generated.cs
index 959f734c..80bfd5ce 100644
--- a/Disco.Web/Views/Job/JobParts/Repairs.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/Repairs.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/Repairs.cshtml")]
-    public partial class Repairs : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
+    public partial class Repairs : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.ShowModel>
     {
         public Repairs()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Views.Job.JobParts
             
             #line 2 "..\..\Views\Job\JobParts\Repairs.cshtml"
   
+    Authorization.Require(Claims.Job.ShowNonWarrantyFinance);
+
     Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers");
 
             
@@ -56,67 +60,134 @@ WriteLiteral(">\r\n    <tr>\r\n        <th");
 
 WriteLiteral(" style=\"width: 200px;\"");
 
-WriteLiteral(">\r\n            Repairer Name\r\n        </th>\r\n        <td>\r\n");
-
-WriteLiteral("            ");
-
-            
-            #line 11 "..\..\Views\Job\JobParts\Repairs.cshtml"
-       Write(Html.EditorFor(m => m.Job.JobMetaNonWarranty.RepairerName));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("            ");
+WriteLiteral(">Repairer Name\r\n        </th>\r\n        <td>\r\n");
 
             
             #line 12 "..\..\Views\Job\JobParts\Repairs.cshtml"
-       Write(AjaxHelpers.AjaxSave());
+            
+            
+            #line default
+            #line hidden
+            
+            #line 12 "..\..\Views\Job\JobParts\Repairs.cshtml"
+             if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.RepairerName))
+            {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 14 "..\..\Views\Job\JobParts\Repairs.cshtml"
+           Write(Html.EditorFor(m => m.Job.JobMetaNonWarranty.RepairerName));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("            ");
-
             
-            #line 13 "..\..\Views\Job\JobParts\Repairs.cshtml"
-       Write(AjaxHelpers.AjaxLoader());
+            #line 14 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                                                                           
+                
+            
+            #line default
+            #line hidden
+            
+            #line 15 "..\..\Views\Job\JobParts\Repairs.cshtml"
+           Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            <script");
+            
+            #line 15 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                                       
+                
+            
+            #line default
+            #line hidden
+            
+            #line 16 "..\..\Views\Job\JobParts\Repairs.cshtml"
+           Write(AjaxHelpers.AjaxLoader());
+
+            
+            #line default
+            #line hidden
+            
+            #line 16 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n                $(function () {\r\n                    document.DiscoFunctions.P" +
-"ropertyChangeHelper(\r\n                            $(\'#Job_JobMetaNonWarranty_Rep" +
-"airerName\'),\r\n                            \'Unknown\',\r\n                          " +
-"  \'");
+WriteLiteral(@">
+                    $(function () {
+                        document.DiscoFunctions.PropertyChangeHelper(
+                                $('#Job_JobMetaNonWarranty_RepairerName'),
+                                'Unknown',
+                                '");
 
             
-            #line 19 "..\..\Views\Job\JobParts\Repairs.cshtml"
-                        Write(Url.Action(MVC.API.Job.UpdateNonWarrantyRepairerName(Model.Job.Id, null)));
+            #line 22 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                            Write(Url.Action(MVC.API.Job.UpdateNonWarrantyRepairerName(Model.Job.Id, null)));
 
             
             #line default
             #line hidden
 WriteLiteral("\',\r\n                            \'RepairerName\'\r\n                        );\r\n     " +
-"           });\r\n            </script>\r\n        </td>\r\n    </tr>\r\n    <tr>\r\n     " +
-"   <th");
+"               });\r\n                </script>\r\n");
+
+            
+            #line 27 "..\..\Views\Job\JobParts\Repairs.cshtml"
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(Model.Job.JobMetaNonWarranty.RepairerName))
+                {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown/None&gt;</span>");
+
+            
+            #line 31 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                                                                       }
+                else
+                {
+            
+            #line default
+            #line hidden
+            
+            #line 33 "..\..\Views\Job\JobParts\Repairs.cshtml"
+            Write(Model.Job.JobMetaNonWarranty.RepairerName);
+
+            
+            #line default
+            #line hidden
+            
+            #line 33 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                                                           }
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        </td>\r\n    </tr>\r\n    <tr>\r\n        <th");
 
 WriteLiteral(" style=\"width: 200px;\"");
 
-WriteLiteral(">\r\n            Repair Logged\r\n        </th>\r\n        <td>\r\n");
+WriteLiteral(">Repair Logged\r\n        </th>\r\n        <td>\r\n");
 
 WriteLiteral("            ");
 
             
-            #line 31 "..\..\Views\Job\JobParts\Repairs.cshtml"
+            #line 41 "..\..\Views\Job\JobParts\Repairs.cshtml"
        Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.RepairerLoggedDate, "Not Logged", "Job_JobMetaNonWarranty_RepairerLoggedDate"));
 
             
@@ -126,67 +197,134 @@ WriteLiteral("\r\n        </td>\r\n    </tr>\r\n    <tr>\r\n        <th");
 
 WriteLiteral(" style=\"width: 200px;\"");
 
-WriteLiteral(">\r\n            Repair Reference\r\n        </th>\r\n        <td>\r\n");
-
-WriteLiteral("            ");
+WriteLiteral(">Repair Reference\r\n        </th>\r\n        <td>\r\n");
 
             
-            #line 39 "..\..\Views\Job\JobParts\Repairs.cshtml"
-       Write(Html.EditorFor(m => m.Job.JobMetaNonWarranty.RepairerReference));
+            #line 48 "..\..\Views\Job\JobParts\Repairs.cshtml"
+            
+            
+            #line default
+            #line hidden
+            
+            #line 48 "..\..\Views\Job\JobParts\Repairs.cshtml"
+             if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.RepairerReference))
+            {
+                
+            
+            #line default
+            #line hidden
+            
+            #line 50 "..\..\Views\Job\JobParts\Repairs.cshtml"
+           Write(Html.EditorFor(m => m.Job.JobMetaNonWarranty.RepairerReference));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("            ");
-
             
-            #line 40 "..\..\Views\Job\JobParts\Repairs.cshtml"
-       Write(AjaxHelpers.AjaxSave());
+            #line 50 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                                                                                
+                
+            
+            #line default
+            #line hidden
+            
+            #line 51 "..\..\Views\Job\JobParts\Repairs.cshtml"
+           Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("            ");
-
             
-            #line 41 "..\..\Views\Job\JobParts\Repairs.cshtml"
-       Write(AjaxHelpers.AjaxLoader());
+            #line 51 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                                       
+                
+            
+            #line default
+            #line hidden
+            
+            #line 52 "..\..\Views\Job\JobParts\Repairs.cshtml"
+           Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n            <script");
+            
+            #line 52 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                                         
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n                $(function () {\r\n                    document.DiscoFunctions.P" +
-"ropertyChangeHelper(\r\n                            $(\'#Job_JobMetaNonWarranty_Rep" +
-"airerReference\'),\r\n                            \'Unknown\',\r\n                     " +
-"       \'");
+WriteLiteral(@">
+                    $(function () {
+                        document.DiscoFunctions.PropertyChangeHelper(
+                                $('#Job_JobMetaNonWarranty_RepairerReference'),
+                                'Unknown',
+                                '");
 
             
-            #line 47 "..\..\Views\Job\JobParts\Repairs.cshtml"
-                        Write(Url.Action(MVC.API.Job.UpdateNonWarrantyRepairerReference(Model.Job.Id, null)));
+            #line 58 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                            Write(Url.Action(MVC.API.Job.UpdateNonWarrantyRepairerReference(Model.Job.Id, null)));
 
             
             #line default
             #line hidden
 WriteLiteral("\',\r\n                            \'RepairerReference\'\r\n                        );\r\n" +
-"                });\r\n            </script>\r\n        </td>\r\n    </tr>\r\n    <tr>\r\n" +
-"        <th");
+"                    });\r\n                </script>\r\n");
+
+            
+            #line 63 "..\..\Views\Job\JobParts\Repairs.cshtml"
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(Model.Job.JobMetaNonWarranty.RepairerReference))
+                {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown/None&gt;</span>");
+
+            
+            #line 67 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                                                                       }
+                else
+                {
+            
+            #line default
+            #line hidden
+            
+            #line 69 "..\..\Views\Job\JobParts\Repairs.cshtml"
+            Write(Model.Job.JobMetaNonWarranty.RepairerReference);
+
+            
+            #line default
+            #line hidden
+            
+            #line 69 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                                                                }
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        </td>\r\n    </tr>\r\n    <tr>\r\n        <th");
 
 WriteLiteral(" style=\"width: 200px;\"");
 
-WriteLiteral(">\r\n            Repair Completed\r\n        </th>\r\n        <td>\r\n");
+WriteLiteral(">Repair Completed\r\n        </th>\r\n        <td>\r\n");
 
 WriteLiteral("            ");
 
             
-            #line 59 "..\..\Views\Job\JobParts\Repairs.cshtml"
+            #line 77 "..\..\Views\Job\JobParts\Repairs.cshtml"
        Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.RepairerCompletedDate, "Not Completed", "Job_JobMetaNonWarranty_RepairerCompletedDate"));
 
             
@@ -196,7 +334,7 @@ WriteLiteral("\r\n        </td>\r\n    </tr>\r\n</table>\r\n<script>\r\n    $(fu
 "updateUrl = \'");
 
             
-            #line 65 "..\..\Views\Job\JobParts\Repairs.cshtml"
+            #line 83 "..\..\Views\Job\JobParts\Repairs.cshtml"
                      Write(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)));
 
             
@@ -205,18 +343,59 @@ WriteLiteral("\r\n        </td>\r\n    </tr>\r\n</table>\r\n<script>\r\n    $(fu
 WriteLiteral("\';\r\n        var jobOpenDate = \'");
 
             
-            #line 66 "..\..\Views\Job\JobParts\Repairs.cshtml"
+            #line 84 "..\..\Views\Job\JobParts\Repairs.cshtml"
                        Write(Model.Job.OpenedDate.ToJavascriptDateTime());
 
             
             #line default
             #line hidden
-WriteLiteral(@"';
+WriteLiteral("\';\r\n\r\n");
 
-        document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Repairer Name', 'Job_JobMetaNonWarranty_RepairerLoggedDate', null, 'NonWarrantyRepairerLoggedDate', 'Not Logged', jobOpenDate, false);
-        document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Repair Completed', 'Job_JobMetaNonWarranty_RepairerCompletedDate', null, 'NonWarrantyRepairerCompletedDate', 'Not Completed', jobOpenDate, false);
-    });
-</script>");
+            
+            #line 86 "..\..\Views\Job\JobParts\Repairs.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 86 "..\..\Views\Job\JobParts\Repairs.cshtml"
+         if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.RepairerLoggedDate))
+        {
+            
+            #line default
+            #line hidden
+WriteLiteral("document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, \'Repairer Name\', \'Job_" +
+"JobMetaNonWarranty_RepairerLoggedDate\', null, \'NonWarrantyRepairerLoggedDate\', \'" +
+"Not Logged\', jobOpenDate, false);");
+
+            
+            #line 87 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                                                                                                                                                                                                                        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 88 "..\..\Views\Job\JobParts\Repairs.cshtml"
+         if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.RepairerCompletedDate))
+        {
+            
+            #line default
+            #line hidden
+WriteLiteral("document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, \'Repair Completed\', \'J" +
+"ob_JobMetaNonWarranty_RepairerCompletedDate\', null, \'NonWarrantyRepairerComplete" +
+"dDate\', \'Not Completed\', jobOpenDate, false);");
+
+            
+            #line 89 "..\..\Views\Job\JobParts\Repairs.cshtml"
+                                                                                                                                                                                                                                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    });\r\n</script>\r\n");
 
         }
     }
diff --git a/Disco.Web/Views/Job/JobParts/Resources.cshtml b/Disco.Web/Views/Job/JobParts/Resources.cshtml
index 37d0c251..8dcdad3d 100644
--- a/Disco.Web/Views/Job/JobParts/Resources.cshtml
+++ b/Disco.Web/Views/Job/JobParts/Resources.cshtml
@@ -1,226 +1,320 @@
 @model Disco.Web.Models.Job.ShowModel
 @{
-    Html.BundleDeferred("~/Style/Shadowbox");
-    Html.BundleDeferred("~/ClientScripts/Modules/Shadowbox");
+    Authorization.RequireAny(Claims.Job.ShowLogs, Claims.Job.ShowAttachments);
+
+    var canShowLogs = Authorization.Has(Claims.Job.ShowLogs);
+    var canShowAttachments = Authorization.Has(Claims.Job.ShowAttachments);
+
+    var canAddLogs = Authorization.Has(Claims.Job.Actions.AddLogs);
+    var canRemoveAnyLogs = Authorization.Has(Claims.Job.Actions.RemoveAnyLogs);
+    var canRemoveOwnLogs = Authorization.Has(Claims.Job.Actions.RemoveOwnLogs);
+
+    var canAddAttachments = Authorization.Has(Claims.Job.Actions.AddAttachments);
+    var canRemoveAnyAttachments = Authorization.Has(Claims.Job.Actions.RemoveAnyAttachments);
+    var canRemoveOwnAttachments = Authorization.Has(Claims.Job.Actions.RemoveOwnAttachments);
+
+    if (canShowAttachments)
+    {
+        Html.BundleDeferred("~/Style/Shadowbox");
+        Html.BundleDeferred("~/ClientScripts/Modules/Shadowbox");
+    }
     Html.BundleDeferred("~/ClientScripts/Modules/jQuery-SignalR");
 }
 <table id="jobShowResources">
-    <tr>
-        <td id="Comments">
-            <div class="commentOutput">
-                @foreach (var jl in Model.Job.JobLogs.OrderBy(m => m.Timestamp))
+    <tr class="@(canShowLogs ? "canShowLogs" : "cannotShowLogs") @(canShowAttachments ? "canShowAttachments" : "cannotShowAttachments")">
+        @if (canShowLogs)
+        {
+            <td id="Comments" class="@(canAddLogs ? "canAddLogs" : "cannotAddLogs")">
+                <div class="commentOutput">
+                    @foreach (var jl in Model.Job.JobLogs.OrderBy(m => m.Timestamp))
+                    {
+                        <div data-logid="@jl.Id">
+                            <span class="author">@jl.TechUser.ToString()</span>@if (canRemoveAnyLogs || (canRemoveOwnLogs && jl.TechUserId == CurrentUser.Id))
+                                                                                      {<text><span class="remove"></span></text>}<span class="timestamp" title="@jl.Timestamp.ToFullDateTime()">@jl.Timestamp.ToFuzzy()</span>
+                            <span class="comment">@jl.Comments.ToMultilineJobRefString()</span>
+                        </div>
+                    }
+                </div>
+                @if (canAddLogs)
                 {
-                    <div data-logid="@jl.Id">
-                        <span class="author">@jl.TechUser.ToString()</span><span class="remove"></span><span class="timestamp" title="@jl.Timestamp.ToFullDateTime()">@jl.Timestamp.ToFuzzy()</span>
-                        <span class="comment">@jl.Comments.ToMultilineJobRefString()</span>
+                    <div class="commentInput clearfix">
+                        <textarea class="commentInput" accesskey="l"></textarea>
+                        <span class="action post commentInputPost"></span>
                     </div>
                 }
-            </div>
-            <div class="commentInput clearfix">
-                <textarea class="commentInput" accesskey="l"></textarea>
-                <span class="action post commentInputPost"></span>
-            </div>
-        </td>
-        <td id="Attachments">
-            <div class="attachmentOutput">
-                @foreach (var ja in Model.Job.JobAttachments)
+            </td>
+        }
+        @if (canShowAttachments)
+        {
+            <td id="Attachments" class="@(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments")">
+                <div class="attachmentOutput">
+                    @foreach (var ja in Model.Job.JobAttachments)
+                    {
+                        <a href="@Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))" data-attachmentid="@ja.Id" data-mimetype="@ja.MimeType">
+                            <span class="icon" title="@ja.Filename">
+                                <img alt="Attachment Thumbnail" src="@(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id)))" /></span>
+                            <span class="comments" title="@ja.Comments">
+                                @{if (!string.IsNullOrEmpty(ja.DocumentTemplateId))
+                                  { @ja.DocumentTemplate.Description}
+                                  else
+                                  { @ja.Comments }}
+                            </span><span class="author">@ja.TechUser.ToString()</span>@if (canRemoveAnyAttachments || (canRemoveOwnAttachments && ja.TechUserId == CurrentUser.Id))
+                                                                                      {<text><span class="remove"></span></text>}<span class="timestamp" title="@ja.Timestamp.ToFullDateTime()">@ja.Timestamp.ToFuzzy()</span>
+                        </a>   
+                    }
+                </div>
+                @if (canAddAttachments)
                 {
-                    <a href="@Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))" data-attachmentid="@ja.Id" data-mimetype="@ja.MimeType">
-                        <span class="icon" title="@ja.Filename">
-                            <img alt="Attachment Thumbnail" src="@(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id)))" /></span>
-                        <span class="comments" title="@ja.Comments">
-                            @{if (!string.IsNullOrEmpty(ja.DocumentTemplateId))
-                              { @ja.DocumentTemplate.Description}
-                              else
-                              { @ja.Comments }}
-                        </span><span class="author">@ja.TechUser.ToString()</span><span class="remove"></span><span class="timestamp" title="@ja.Timestamp.ToFullDateTime()">@ja.Timestamp.ToFuzzy()</span>
-                    </a>   
+                    <div class="attachmentInput clearfix">
+                        <span class="action upload"></span><span class="action photo"></span>
+                    </div>
                 }
-            </div>
-            <div class="attachmentInput clearfix">
-                <span class="action upload"></span><span class="action photo"></span>
-            </div>
-        </td>
+            </td>
+        }
     </tr>
 </table>
-<div id="dialogUpload" class="hiddenDialog" title="Upload Attachment">
-    <div id="silverlightHostUploadAttachment">
+@if (canShowLogs && (canRemoveAnyLogs || canRemoveOwnLogs))
+{
+    <div id="dialogRemoveLog" class="hiddenDialog" title="Remove this Comment?">
+        <p>
+            <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
+            Are you sure?
+        </p>
     </div>
-</div>
-<div id="dialogRemoveLog" class="hiddenDialog" title="Remove this Comment?">
-    <p>
-        <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
-        Are you sure?
-    </p>
-</div>
-<div id="dialogRemoveAttachment" class="hiddenDialog" title="Remove this Attachment?">
-    <p>
-        <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
-        Are you sure?
-    </p>
-</div>
-<script>
-    Shadowbox.init({
-        skipSetup: true,
-        modal: true
-    });
-
-
-    $(function () {
-        var jobId = parseInt('@(Model.Job.Id)');
-
-        //#region Comments
-        var $Comments = $('#Comments');
-        var $CommentOutput = $Comments.find('.commentOutput');
-        var $CommentOutputContainer = $Comments.find('.commentOutputContainer');
-        var $CommentInput = $Comments.find('textarea.commentInput');
-        var $dialogRemoveLog;
-
-        window.setTimeout(function () {
-            $CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom
-        }, 0);
-        $('#jobDetailTabs').on('tabsactivate', function (event, ui) {
-            if (ui.newPanel && ui.newPanel.is('#jobDetailTab-Resources')) {
-                $CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom
-            }
-        });
-
-        $Comments.find('.commentInputPost').click(postComment);
-        $CommentInput.keypress(function (e) {
-            if (e.which == 13 && !e.shiftKey) {
-                postComment();
-                return false;
-            }
-        });
-        $CommentOutput.find('span.remove').click(removePost);
-
-        function postComment() {
-            var comment = $CommentInput.val();
-            if (comment != '') {
-                var data = { comment: comment }
-                $.ajax({
-                    url: '@Url.Action(MVC.API.Job.CommentPost(Model.Job.Id, null))',
-                    dataType: 'json',
-                    data: data,
-                    success: function (d) {
-                        if (d.Result == 'OK') {
-                            // Should be added via Repository Notifications
-                            // addComment(d.Comment, false);
-                            $CommentInput.val('').attr('disabled', false).focus();
-                        } else {
-                            alert('Unable to post comment: ' + d.Result);
-                            $CommentInput.attr('disabled', false);
-                        }
-                    },
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        alert('Unable to post comment: ' + textStatus);
-                        $CommentInput.attr('disabled', false);
-                    }
-                });
-            }
-        }
-        function removePost() {
-            $this = $(this);
-            var data = { id: $this.closest('div').attr('data-logid') };
-
-            if (!$dialogRemoveLog) {
-                $dialogRemoveLog = $('#dialogRemoveLog').dialog({
-                    resizable: false,
-                    height: 140,
-                    modal: true,
-                    autoOpen: false
-                });
-            }
-
-            $dialogRemoveLog.dialog("enable").dialog('option', 'buttons', {
-                "Remove": function () {
-                    $dialogRemoveLog.dialog("disable");
-                    $dialogRemoveLog.dialog("option", "buttons", null);
-                    $.ajax({
-                        url: '@Url.Action(MVC.API.Job.CommentRemove())',
-                        dataType: 'json',
-                        data: data,
-                        success: function (d) {
-                            if (d == 'OK') {
-                                // Should be removed via Repository Notifications
-                                //$this.closest('div').slideUp(300).delay(300).queue(function () {
-                                //    $(this).remove();
-                                //});
-                            } else {
-                                alert('Unable to remove comment: ' + d);
-                            }
-                            $dialogRemoveLog.dialog("close");
-                        },
-                        error: function (jqXHR, textStatus, errorThrown) {
-                            alert('Unable to remove comment: ' + textStatus);
-                            $dialogRemoveLog.dialog("close");
-                        }
-                    });
-                },
-                "Cancel": function () {
-                    $dialogRemoveLog.dialog("close");
-                }
-            }).dialog('open');
-
-            return false;
-        }
-        function loadLiveComment(key) {
-            if (key.JobId == jobId) {
-                $.ajax({
-                    url: '@Url.Action(MVC.API.Job.Comment())',
-                    dataType: 'json',
-                    data: { id: key.Id },
-                    success: function (d) {
-                        if (d && d.JobId == jobId) {
-                            addComment(d, false);
-                        }
-                    },
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        alert('Unable to load live comment ' + id + ': ' + textStatus);
-                    }
-                });
-            }
-        }
-        function addComment(c, quick) {
-            var e = $('<div><span class="author" /><span class="remove" /><span class="timestamp" /><span class="comment" /></div>');
-            e.attr('data-logid', c.Id);
-            e.find('.author').text(c.Author);
-            e.find('.timestamp').text(c.TimestampFuzzy).attr('title', c.TimestampFull);
-            e.find('.remove').click(removePost);
-            var eComment = e.find('.comment').text(c.Comments);
-            var commentHtml = eComment.text().replace(/\r\n|\r|\n/g, '<br />');
-            commentHtml = commentHtml.replace(/\#(\d+)/g, '<a href="@Url.Action(MVC.Job.Show(null))?id=$1">#$1</a>');
-            eComment.html(commentHtml);
-
-            $CommentOutput.append(e);
-
-            if (!quick) {
-                e.animate({ backgroundColor: '#ffff99' }, 500, function () {
-                    e.animate({ backgroundColor: '#f4f4f4' }, 500);
-                });
-                $CommentOutput.animate({ scrollTop: $CommentOutput[0].scrollHeight }, 250)
-            }
-        }
-        //#endregion
-
-        //#region Attachments
+}
+@if (canShowAttachments && canAddAttachments)
+{
+    <div id="dialogUpload" class="hiddenDialog" title="Upload Attachment">
+        <div id="silverlightHostUploadAttachment">
+        </div>
+    </div>
+}
+@if (canShowAttachments && (canRemoveAnyAttachments || canRemoveOwnAttachments))
+{
+    <div id="dialogRemoveAttachment" class="hiddenDialog" title="Remove this Attachment?">
+        <p>
+            <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
+            Are you sure?
+        </p>
+    </div>
+}
+@if (canShowLogs)
+{
+    <script>
         if (!document.DiscoFunctions) {
             document.DiscoFunctions = {};
         }
-        // For Silverlight Backwards-compatibility
-        //  - Repository notifications now handles this
-        document.DiscoFunctions.addAttachment = function () { };
 
-        var $Attachments = $('#Attachments');
-        var $attachmentOutput = $Attachments.find('.attachmentOutput');
-        var $dialogUpload, $dialogRemoveAttachment;
+        $(function () {
+            var jobId = parseInt('@(Model.Job.Id)');
 
-        $attachmentOutput.find('span.remove').click(removeLocalAttachment);
+            //#region Comments
+            var $Comments = $('#Comments');
+            var $CommentOutput = $Comments.find('.commentOutput');
+            var $CommentOutputContainer = $Comments.find('.commentOutputContainer');
 
-        var onLoadNavigation = null;
-        var isLoaded = null;
-        Silverlight.createObject(
-                '@(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap)',
+            window.setTimeout(function () {
+                $CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom
+            }, 0);
+            $('#jobDetailTabs').on('tabsactivate', function (event, ui) {
+                if (ui.newPanel && ui.newPanel.is('#jobDetailTab-Resources')) {
+                    $CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom
+                }
+            });
+
+            @if (canAddLogs)
+            {<text>
+            //#region Add Logs
+
+            var $CommentInput = $Comments.find('textarea.commentInput');
+
+            $Comments.find('.commentInputPost').click(postComment);
+            $CommentInput.keypress(function (e) {
+                if (e.which == 13 && !e.shiftKey) {
+                    postComment();
+                    return false;
+                }
+            });
+
+            function postComment() {
+                var comment = $CommentInput.val();
+                if (comment != '') {
+                    var data = { comment: comment }
+                    $.ajax({
+                        url: '@Url.Action(MVC.API.Job.CommentPost(Model.Job.Id, null))',
+                        dataType: 'json',
+                        data: data,
+                        success: function (d) {
+                            if (d.Result == 'OK') {
+                                // Should be added via Repository Notifications
+                                // addComment(d.Comment, false);
+                                $CommentInput.val('').attr('disabled', false).focus();
+                            } else {
+                                alert('Unable to post comment: ' + d.Result);
+                                $CommentInput.attr('disabled', false);
+                            }
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            alert('Unable to post comment: ' + textStatus);
+                            $CommentInput.attr('disabled', false);
+                        }
+                    });
+                }
+            }
+
+            //#endregion
+            </text>}
+            @if (canRemoveAnyLogs || canRemoveOwnLogs)
+            {<text>
+            //#region Remove Logs
+
+            var $dialogRemoveLog;
+
+            $CommentOutput.find('span.remove').click(removePost);
+
+            function removePost() {
+                $this = $(this);
+                var data = { id: $this.closest('div').attr('data-logid') };
+
+                if (!$dialogRemoveLog) {
+                    $dialogRemoveLog = $('#dialogRemoveLog').dialog({
+                        resizable: false,
+                        height: 140,
+                        modal: true,
+                        autoOpen: false
+                    });
+                }
+
+                $dialogRemoveLog.dialog("enable").dialog('option', 'buttons', {
+                    "Remove": function () {
+                        $dialogRemoveLog.dialog("disable");
+                        $dialogRemoveLog.dialog("option", "buttons", null);
+                        $.ajax({
+                            url: '@Url.Action(MVC.API.Job.CommentRemove())',
+                            dataType: 'json',
+                            data: data,
+                            success: function (d) {
+                                if (d == 'OK') {
+                                    // Should be removed via Repository Notifications
+                                    //$this.closest('div').slideUp(300).delay(300).queue(function () {
+                                    //    $(this).remove();
+                                    //});
+                                } else {
+                                    alert('Unable to remove comment: ' + d);
+                                }
+                                $dialogRemoveLog.dialog("close");
+                            },
+                            error: function (jqXHR, textStatus, errorThrown) {
+                                alert('Unable to remove comment: ' + textStatus);
+                                $dialogRemoveLog.dialog("close");
+                            }
+                        });
+                    },
+                    "Cancel": function () {
+                        $dialogRemoveLog.dialog("close");
+                    }
+                }).dialog('open');
+
+                return false;
+            }
+
+            //#endregion
+            </text>}
+
+            function loadLiveComment(key) {
+                if (key.JobId == jobId) {
+                    $.ajax({
+                        url: '@Url.Action(MVC.API.Job.Comment())',
+                        dataType: 'json',
+                        data: { id: key.Id },
+                        success: function (d) {
+                            if (d && d.JobId == jobId) {
+                                @if (canRemoveAnyLogs)
+                                {<text>addComment(d, false, true);</text>}
+                                else if (canRemoveOwnLogs)
+                                {<text>addComment(d, false, (d.AuthorId === '@(CurrentUser.Id)'));</text>}
+                                else
+                                {<text>addComment(d, false, false);</text>}
+
+                            }
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            alert('Unable to load live comment ' + id + ': ' + textStatus);
+                        }
+                    });
+                }
+            }
+            function liveRemoveComment(key) {
+                $CommentOutput.children('div[data-logid="' + key + '"]').slideUp(300).delay(300).queue(function () {
+                    $(this).remove();
+                });
+            }
+            function addComment(c, quick, canRemove) {
+                var t = '<div><span class="author" />';
+                if (canRemove)
+                    t += '<span class="remove" />';
+                t += '<span class="timestamp" /><span class="comment" /></div>';
+
+                var e = $(t);
+                e.attr('data-logid', c.Id);
+                e.find('.author').text(c.Author);
+                e.find('.timestamp').text(c.TimestampFuzzy).attr('title', c.TimestampFull);
+                if (canRemove)
+                    e.find('.remove').click(removePost);
+                var eComment = e.find('.comment').text(c.Comments);
+                var commentHtml = eComment.text().replace(/\r\n|\r|\n/g, '<br />');
+                commentHtml = commentHtml.replace(/\#(\d+)/g, '<a href="@Url.Action(MVC.Job.Show(null))?id=$1">#$1</a>');
+                eComment.html(commentHtml);
+
+                $CommentOutput.append(e);
+
+                if (!quick) {
+                    e.animate({ backgroundColor: '#ffff99' }, 500, function () {
+                        e.animate({ backgroundColor: '#f4f4f4' }, 500);
+                    });
+                    $CommentOutput.animate({ scrollTop: $CommentOutput[0].scrollHeight }, 250)
+                }
+            }
+
+            // Add Globally Available Functions
+            document.DiscoFunctions.liveLoadComment = loadLiveComment;
+            document.DiscoFunctions.liveRemoveComment = liveRemoveComment;
+            //#endregion
+        });
+    </script>
+}
+@if (canShowAttachments)
+{
+    <script>
+        Shadowbox.init({
+            skipSetup: true,
+            modal: true
+        });
+
+        if (!document.DiscoFunctions) {
+            document.DiscoFunctions = {};
+        }
+
+        $(function () {
+            var jobId = parseInt('@(Model.Job.Id)');
+
+            //#region Attachments
+            var $Attachments = $('#Attachments');
+            var $attachmentOutput = $Attachments.find('.attachmentOutput');
+
+            @if (canAddAttachments)
+            {<text>
+            //#region Add Attachments
+
+            // For Silverlight Backwards-compatibility
+            //  - Repository notifications now handles this
+            document.DiscoFunctions.addAttachment = function () { };
+
+            var $dialogUpload;
+            var onLoadNavigation = null;
+            var isLoaded = null;
+            Silverlight.createObject(
+                    '@(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap)',
                             $('#silverlightHostUploadAttachment').get(0),
                             'silverlightUploadAttachment',
                             { width: '840px', height: '500px', background: 'white', version: '4.0.60310.0' },
@@ -235,189 +329,299 @@
                             'UploadUrl=@(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)))'
                         );
 
-        var $attachmentInput = $Attachments.find('.attachmentInput');
-        $attachmentInput.find('.photo').click(function () {
-            showDialog('/WebCam');
-        });
-        $attachmentInput.find('.upload').click(function () {
-            showDialog('/File');
-        });
+            var $attachmentInput = $Attachments.find('.attachmentInput');
+            $attachmentInput.find('.photo').click(function () {
+                showDialog('/WebCam');
+            });
+            $attachmentInput.find('.upload').click(function () {
+                showDialog('/File');
+            });
 
-        var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
-        function showDialog(navigationPath) {
-            if (!$dialogUpload) {
-                $dialogUpload = $('#dialogUpload').dialog({
-                    autoOpen: false,
-                    draggable: false,
-                    modal: true,
-                    resizable: false,
-                    width: 860,
-                    height: 550,
-                    close: function () {
-                        silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
-                    }
-                });
-            }
-            $dialogUpload.dialog('open');
-            if (isLoaded) {
-                silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
-            } else {
-                onLoadNavigation = navigationPath;
-            }
-        };
-        function addAttachment(key, quick) {
-
-            if (key.JobId == jobId) {
-                var data = { id: key.Id };
-
-                $.ajax({
-                    url: '@Url.Action(MVC.API.Job.Attachment())',
-                    dataType: 'json',
-                    data: data,
-                    success: function (d) {
-                        if (d.Result == 'OK') {
-                            var a = d.Attachment;
-
-                            if (parseInt(a.ParentId) == jobId) {
-                                var e = $('<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span><span class="remove"></span><span class="timestamp"></span></a>');
-
-                                e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '@(Url.Action(MVC.API.Job.AttachmentDownload()))/' + a.Id);
-                                e.find('.icon img').attr('src', '@(Url.Action(MVC.API.Job.AttachmentThumbnail()))/' + a.Id);
-                                e.find('.comments').text(a.Comments);
-                                e.find('.author').text(a.Author);
-                                e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
-                                e.find('.remove').click(removeLocalAttachment);
-                                if (!quick)
-                                    e.hide();
-                                $attachmentOutput.append(e);
-                                if (!quick)
-                                    e.show('slow');
-                                if (a.MimeType.toLowerCase().indexOf('image/') == 0)
-                                    e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments });
-                            }
-                        } else {
-                            alert('Unable to add attachment: ' + d.Result);
+            var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
+            function showDialog(navigationPath) {
+                if (!$dialogUpload) {
+                    $dialogUpload = $('#dialogUpload').dialog({
+                        autoOpen: false,
+                        draggable: false,
+                        modal: true,
+                        resizable: false,
+                        width: 860,
+                        height: 550,
+                        close: function () {
+                            silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
                         }
-                    },
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        alert('Unable to add attachment: ' + textStatus);
-                    }
-                });
-            }
-        }
-        function removeAttachment(key) {
-            if (key.JobId == jobId) {
-                var $element = $attachmentOutput.find('a[data-attachmentid="' + key.Id + '"]');
-                if ($element.length > 0) {
-                    $element.hide(300).delay(300).queue(function () {
-                        if ($element.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
-                            Shadowbox.removeCache(this);
-                        $element.remove();
                     });
                 }
-            }
-        }
+                $dialogUpload.dialog('open');
+                if (isLoaded) {
+                    silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
+                } else {
+                    onLoadNavigation = navigationPath;
+                }
+            };
 
-        function removeLocalAttachment() {
-            $this = $(this).closest('a');
+            //#endregion
+            </text>}
 
-            var data = { id: $this.attr('data-attachmentid') };
+            @if (canRemoveAnyAttachments || canRemoveOwnAttachments)
+            {<text>
+            //#region Remove Attachments
 
-            if (!$dialogRemoveAttachment) {
-                $dialogRemoveAttachment = $('#dialogRemoveAttachment').dialog({
-                    resizable: false,
-                    height: 140,
-                    modal: true,
-                    autoOpen: false
-                });
+            var $dialogRemoveAttachment;
+
+            $attachmentOutput.find('span.remove').click(removeLocalAttachment);
+
+            function removeLocalAttachment() {
+                $this = $(this).closest('a');
+
+                var data = { id: $this.attr('data-attachmentid') };
+
+                if (!$dialogRemoveAttachment) {
+                    $dialogRemoveAttachment = $('#dialogRemoveAttachment').dialog({
+                        resizable: false,
+                        height: 140,
+                        modal: true,
+                        autoOpen: false
+                    });
+                }
+
+                $dialogRemoveAttachment.dialog("enable").dialog('option', 'buttons', {
+                    "Remove": function () {
+                        $dialogRemoveAttachment.dialog("disable");
+                        $dialogRemoveAttachment.dialog("option", "buttons", null);
+                        $.ajax({
+                            url: '@Url.Action(MVC.API.Job.AttachmentRemove())',
+                            dataType: 'json',
+                            data: data,
+                            success: function (d) {
+                                if (d == 'OK') {
+                                    // Should be removed via Repository Notifications
+                                    //$this.hide(300).delay(300).queue(function () {
+                                    //    var $this = $(this);
+                                    //    if ($this.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
+                                    //        Shadowbox.removeCache(this);
+                                    //    $this.remove();
+                                    //});
+                                } else {
+                                    alert('Unable to remove attachment: ' + d);
+                                }
+                                $dialogRemoveAttachment.dialog("close");
+                            },
+                            error: function (jqXHR, textStatus, errorThrown) {
+                                alert('Unable to remove attachment: ' + textStatus);
+                                $dialogRemoveAttachment.dialog("close");
+                            }
+                        });
+                    },
+                    "Cancel": function () {
+                        $dialogRemoveAttachment.dialog("close");
+                    }
+                }).dialog('open');
+
+                return false;
             }
 
-            $dialogRemoveAttachment.dialog("enable").dialog('option', 'buttons', {
-                "Remove": function () {
-                    $dialogRemoveAttachment.dialog("disable");
-                    $dialogRemoveAttachment.dialog("option", "buttons", null);
+            //#endregion
+
+            </text>}
+
+            function addAttachment(key, quick) {
+
+                if (key.JobId == jobId) {
+                    var data = { id: key.Id };
+
                     $.ajax({
-                        url: '@Url.Action(MVC.API.Job.AttachmentRemove())',
+                        url: '@Url.Action(MVC.API.Job.Attachment())',
                         dataType: 'json',
                         data: data,
                         success: function (d) {
-                            if (d == 'OK') {
-                                // Should be removed via Repository Notifications
-                                //$this.hide(300).delay(300).queue(function () {
-                                //    var $this = $(this);
-                                //    if ($this.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
-                                //        Shadowbox.removeCache(this);
-                                //    $this.remove();
-                                //});
+                            if (d.Result == 'OK') {
+                                var a = d.Attachment;
+                                @if (canRemoveAnyAttachments)
+                                {<text>buildAttachment(a, true);</text>}
+                                else if (canRemoveOwnAttachments)
+                                {<text>buildAttachment(a, (a.AuthorId === '@(CurrentUser.Id)'));</text>}
+                                else
+                                {<text>buildAttachment(a, false);</text>}
+
                             } else {
-                                alert('Unable to remove attachment: ' + d);
+                                alert('Unable to add attachment: ' + d.Result);
                             }
-                            $dialogRemoveAttachment.dialog("close");
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
-                            alert('Unable to remove attachment: ' + textStatus);
-                            $dialogRemoveAttachment.dialog("close");
+                            alert('Unable to add attachment: ' + textStatus);
                         }
                     });
-                },
-                "Cancel": function () {
-                    $dialogRemoveAttachment.dialog("close");
                 }
-            }).dialog('open');
-
-            return false;
-        }
-
-        $attachmentOutput.children('a').each(function () {
-            $this = $(this);
-            if ($this.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
-                $this.shadowbox({ gallery: 'attachments', player: 'img', title: $this.find('.comments').text() });
-        });
-        //#endregion
-
-        //#region LiveEvents
-        function liveMessageRecieved(d) {
-            if (d) {
-                window.setTimeout(function () {
-                    switch (d.EntityTypeName) {
-                        case 'JobAttachment':
-                            switch (d.EventType) {
-                                case 0: // Added
-                                    addAttachment(d.EntityKey, false);
-                                    break;
-                                case 1: // Removed
-                                    removeAttachment(d.EntityKey);
-                                    break;
-                            }
-                            break;
-                        case 'JobLog':
-                            switch (d.EventType) {
-                                case 0: // Added
-                                    loadLiveComment(d.EntityKey);
-                                    break;
-                                case 1: // Removed
-                                    if (d.EntityKey.JobId == jobId) {
-                                        $CommentOutput.children('div[data-logid="' + d.EntityKey.Id + '"]').slideUp(300).delay(300).queue(function () {
-                                            $(this).remove();
-                                        });
-                                    }
-                                    break;
-                            }
-                            break;
-                    }
-                }, 100);
             }
-        }
-        var liveMessagesConnection = $.connection('@(Url.Content("~/API/Repository/Notifications"))', { addToGroups: 'JobLog,JobAttachment' })
-        liveMessagesConnection.received(liveMessageRecieved);
-        liveMessagesConnection.error(function (e) {
-            if (e)
-                alert('Error: ' + JSON.stringify(e));
+            function buildAttachment(a, canRemove) {
+                if (parseInt(a.ParentId) == jobId) {
+                    var t = '<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span>';
+                    if (canRemove)
+                        t += '<span class="remove"></span>';
+                    t += '<span class="timestamp"></span></a>';
+
+                    var e = $(t);
+
+                    e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '@(Url.Action(MVC.API.Job.AttachmentDownload()))/' + a.Id);
+                    e.find('.icon img').attr('src', '@(Url.Action(MVC.API.Job.AttachmentThumbnail()))/' + a.Id);
+                    e.find('.comments').text(a.Comments);
+                    e.find('.author').text(a.Author);
+                    e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
+                    if (canRemove)
+                        e.find('.remove').click(removeLocalAttachment);
+                    if (!quick)
+                        e.hide();
+                    $attachmentOutput.append(e);
+                    if (!quick)
+                        e.show('slow');
+                    if (a.MimeType.toLowerCase().indexOf('image/') == 0)
+                        e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments });
+                }
+            }
+
+            function removeAttachment(key) {
+                if (key.JobId == jobId) {
+                    var $element = $attachmentOutput.find('a[data-attachmentid="' + key.Id + '"]');
+                    if ($element.length > 0) {
+                        $element.hide(300).delay(300).queue(function () {
+                            if ($element.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
+                                Shadowbox.removeCache(this);
+                            $element.remove();
+                        });
+                    }
+                }
+            }
+
+
+
+            $attachmentOutput.children('a').each(function () {
+                $this = $(this);
+                if ($this.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
+                    $this.shadowbox({ gallery: 'attachments', player: 'img', title: $this.find('.comments').text() });
+            });
+
+            // Add Globally Available Functions
+            document.DiscoFunctions.liveAddAttachment = addAttachment;
+            document.DiscoFunctions.liveRemoveAttachment = removeAttachment;
+
+            //#endregion
         });
-        liveMessagesConnection.start();
-        //#endregion
-
-    });
 
 
-</script>
+    </script>
+}
+@if (canShowLogs && canShowAttachments)
+{
+    <script>
+        $(function () {
+            var jobId = parseInt('@(Model.Job.Id)');
+
+            //#region LiveEvents
+            function liveMessageRecieved(d) {
+                if (d) {
+                    window.setTimeout(function () {
+                        switch (d.EntityTypeName) {
+                            case 'JobAttachment':
+                                switch (d.EventType) {
+                                    case 0: // Added
+                                        document.DiscoFunctions.liveAddAttachment(d.EntityKey, false);
+                                        break;
+                                    case 1: // Removed
+                                        document.DiscoFunctions.liveRemoveAttachment(d.EntityKey);
+                                        break;
+                                }
+                                break;
+                            case 'JobLog':
+                                switch (d.EventType) {
+                                    case 0: // Added
+                                        document.DiscoFunctions.liveLoadComment(d.EntityKey);
+                                        break;
+                                    case 1: // Removed
+                                        if (d.EntityKey.JobId == jobId) {
+                                            document.DiscoFunctions.liveRemoveComment(d.EntityKey.Id);
+                                        }
+                                        break;
+                                }
+                                break;
+                        }
+                    }, 100);
+                }
+            }
+            var liveMessagesConnection = $.connection('@(Url.Content("~/API/Repository/Notifications"))', { addToGroups: 'JobLog,JobAttachment' })
+            liveMessagesConnection.received(liveMessageRecieved);
+            liveMessagesConnection.error(function (e) {
+                if (e)
+                    alert('Error: ' + JSON.stringify(e));
+            });
+            liveMessagesConnection.start();
+            //#endregion
+        });
+    </script>
+}
+else if (canShowLogs)
+{
+    <script>
+        $(function () {
+            var jobId = parseInt('@(Model.Job.Id)');
+
+            //#region LiveEvents
+            function liveMessageRecieved(d) {
+                if (d) {
+                    window.setTimeout(function () {
+                        switch (d.EventType) {
+                            case 0: // Added
+                                document.DiscoFunctions.liveLoadComment(d.EntityKey);
+                                break;
+                            case 1: // Removed
+                                if (d.EntityKey.JobId == jobId) {
+                                    document.DiscoFunctions.liveRemoveComment(d.EntityKey.Id);
+                                }
+                                break;
+                        }
+                    }, 100);
+                }
+            }
+            var liveMessagesConnection = $.connection('@(Url.Content("~/API/Repository/Notifications"))', { addToGroups: 'JobLog' })
+            liveMessagesConnection.received(liveMessageRecieved);
+            liveMessagesConnection.error(function (e) {
+                if (e)
+                    alert('Error: ' + JSON.stringify(e));
+            });
+            liveMessagesConnection.start();
+            //#endregion
+        });
+    </script>
+}
+else if (canShowAttachments)
+{
+    <script>
+        $(function () {
+            var jobId = parseInt('@(Model.Job.Id)');
+
+            //#region LiveEvents
+            function liveMessageRecieved(d) {
+                if (d) {
+                    window.setTimeout(function () {
+                        switch (d.EventType) {
+                            case 0: // Added
+                                document.DiscoFunctions.liveAddAttachment(d.EntityKey, false);
+                                break;
+                            case 1: // Removed
+                                document.DiscoFunctions.liveRemoveAttachment(d.EntityKey);
+                                break;
+                        }
+                    }, 100);
+                }
+            }
+            var liveMessagesConnection = $.connection('@(Url.Content("~/API/Repository/Notifications"))', { addToGroups: 'JobAttachment' })
+            liveMessagesConnection.received(liveMessageRecieved);
+            liveMessagesConnection.error(function (e) {
+                if (e)
+                    alert('Error: ' + JSON.stringify(e));
+            });
+            liveMessagesConnection.start();
+            //#endregion
+        });
+    </script>
+}
\ No newline at end of file
diff --git a/Disco.Web/Views/Job/JobParts/Resources.generated.cs b/Disco.Web/Views/Job/JobParts/Resources.generated.cs
index 44aa0fe8..6fd0bbb4 100644
--- a/Disco.Web/Views/Job/JobParts/Resources.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/Resources.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/Resources.cshtml")]
-    public partial class Resources : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
+    public partial class Resources : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.ShowModel>
     {
         public Resources()
         {
@@ -43,8 +45,24 @@ namespace Disco.Web.Views.Job.JobParts
             
             #line 2 "..\..\Views\Job\JobParts\Resources.cshtml"
   
-    Html.BundleDeferred("~/Style/Shadowbox");
-    Html.BundleDeferred("~/ClientScripts/Modules/Shadowbox");
+    Authorization.RequireAny(Claims.Job.ShowLogs, Claims.Job.ShowAttachments);
+
+    var canShowLogs = Authorization.Has(Claims.Job.ShowLogs);
+    var canShowAttachments = Authorization.Has(Claims.Job.ShowAttachments);
+
+    var canAddLogs = Authorization.Has(Claims.Job.Actions.AddLogs);
+    var canRemoveAnyLogs = Authorization.Has(Claims.Job.Actions.RemoveAnyLogs);
+    var canRemoveOwnLogs = Authorization.Has(Claims.Job.Actions.RemoveOwnLogs);
+
+    var canAddAttachments = Authorization.Has(Claims.Job.Actions.AddAttachments);
+    var canRemoveAnyAttachments = Authorization.Has(Claims.Job.Actions.RemoveAnyAttachments);
+    var canRemoveOwnAttachments = Authorization.Has(Claims.Job.Actions.RemoveOwnAttachments);
+
+    if (canShowAttachments)
+    {
+        Html.BundleDeferred("~/Style/Shadowbox");
+        Html.BundleDeferred("~/ClientScripts/Modules/Shadowbox");
+    }
     Html.BundleDeferred("~/ClientScripts/Modules/jQuery-SignalR");
 
             
@@ -54,25 +72,178 @@ WriteLiteral("\r\n<table");
 
 WriteLiteral(" id=\"jobShowResources\"");
 
-WriteLiteral(">\r\n    <tr>\r\n        <td");
+WriteLiteral(">\r\n    <tr");
+
+WriteAttribute("class", Tuple.Create(" class=\"", 1045), Tuple.Create("\"", 1173)
+            
+            #line 24 "..\..\Views\Job\JobParts\Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 1053), Tuple.Create<System.Object, System.Int32>(canShowLogs ? "canShowLogs" : "cannotShowLogs"
+            
+            #line default
+            #line hidden
+, 1053), false)
+            
+            #line 24 "..\..\Views\Job\JobParts\Resources.cshtml"
+, Tuple.Create(Tuple.Create(" ", 1102), Tuple.Create<System.Object, System.Int32>(canShowAttachments ? "canShowAttachments" : "cannotShowAttachments"
+            
+            #line default
+            #line hidden
+, 1103), false)
+);
+
+WriteLiteral(">\r\n");
+
+            
+            #line 25 "..\..\Views\Job\JobParts\Resources.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 25 "..\..\Views\Job\JobParts\Resources.cshtml"
+         if (canShowLogs)
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <td");
 
 WriteLiteral(" id=\"Comments\"");
 
-WriteLiteral(">\r\n            <div");
+WriteAttribute("class", Tuple.Create(" class=\"", 1244), Tuple.Create("\"", 1298)
+            
+            #line 27 "..\..\Views\Job\JobParts\Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 1252), Tuple.Create<System.Object, System.Int32>(canAddLogs ? "canAddLogs" : "cannotAddLogs"
+            
+            #line default
+            #line hidden
+, 1252), false)
+);
+
+WriteLiteral(">\r\n                <div");
 
 WriteLiteral(" class=\"commentOutput\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 11 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 29 "..\..\Views\Job\JobParts\Resources.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 29 "..\..\Views\Job\JobParts\Resources.cshtml"
+                     foreach (var jl in Model.Job.JobLogs.OrderBy(m => m.Timestamp))
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <div");
+
+WriteLiteral(" data-logid=\"");
+
+            
+            #line 31 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                    Write(jl.Id);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\"");
+
+WriteLiteral(">\r\n                            <span");
+
+WriteLiteral(" class=\"author\"");
+
+WriteLiteral(">");
+
+            
+            #line 32 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                            Write(jl.TechUser.ToString());
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</span>");
+
+            
+            #line 32 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                                if (canRemoveAnyLogs || (canRemoveOwnLogs && jl.TechUserId == CurrentUser.Id))
+                                                                                      {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"remove\"");
+
+WriteLiteral("></span>");
+
+            
+            #line 33 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                                                                                }
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"timestamp\"");
+
+WriteAttribute("title", Tuple.Create(" title=\"", 1819), Tuple.Create("\"", 1857)
+            
+            #line 33 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                                , Tuple.Create(Tuple.Create("", 1827), Tuple.Create<System.Object, System.Int32>(jl.Timestamp.ToFullDateTime()
+            
+            #line default
+            #line hidden
+, 1827), false)
+);
+
+WriteLiteral(">");
+
+            
+            #line 33 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                                                                                                                                           Write(jl.Timestamp.ToFuzzy());
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</span>\r\n                            <span");
+
+WriteLiteral(" class=\"comment\"");
+
+WriteLiteral(">");
+
+            
+            #line 34 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                             Write(jl.Comments.ToMultilineJobRefString());
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</span>\r\n                        </div>\r\n");
+
+            
+            #line 36 "..\..\Views\Job\JobParts\Resources.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n");
+
+            
+            #line 38 "..\..\Views\Job\JobParts\Resources.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 11 "..\..\Views\Job\JobParts\Resources.cshtml"
-                 foreach (var jl in Model.Job.JobLogs.OrderBy(m => m.Timestamp))
+            #line 38 "..\..\Views\Job\JobParts\Resources.cshtml"
+                 if (canAddLogs)
                 {
 
             
@@ -80,134 +251,97 @@ WriteLiteral(">\r\n");
             #line hidden
 WriteLiteral("                    <div");
 
-WriteLiteral(" data-logid=\"");
-
-            
-            #line 13 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                Write(jl.Id);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\"");
-
-WriteLiteral(">\r\n                        <span");
-
-WriteLiteral(" class=\"author\"");
-
-WriteLiteral(">");
-
-            
-            #line 14 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                        Write(jl.TechUser.ToString());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span><span");
-
-WriteLiteral(" class=\"remove\"");
-
-WriteLiteral("></span><span");
-
-WriteLiteral(" class=\"timestamp\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 608), Tuple.Create("\"", 646)
-            
-            #line 14 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                       , Tuple.Create(Tuple.Create("", 616), Tuple.Create<System.Object, System.Int32>(jl.Timestamp.ToFullDateTime()
-            
-            #line default
-            #line hidden
-, 616), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 14 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                                                                                                                                 Write(jl.Timestamp.ToFuzzy());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n                        <span");
-
-WriteLiteral(" class=\"comment\"");
-
-WriteLiteral(">");
-
-            
-            #line 15 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                         Write(jl.Comments.ToMultilineJobRefString());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n                    </div>\r\n");
-
-            
-            #line 17 "..\..\Views\Job\JobParts\Resources.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            </div>\r\n            <div");
-
 WriteLiteral(" class=\"commentInput clearfix\"");
 
-WriteLiteral(">\r\n                <textarea");
+WriteLiteral(">\r\n                        <textarea");
 
 WriteLiteral(" class=\"commentInput\"");
 
 WriteLiteral(" accesskey=\"l\"");
 
-WriteLiteral("></textarea>\r\n                <span");
+WriteLiteral("></textarea>\r\n                        <span");
 
 WriteLiteral(" class=\"action post commentInputPost\"");
 
-WriteLiteral("></span>\r\n            </div>\r\n        </td>\r\n        <td");
+WriteLiteral("></span>\r\n                    </div>\r\n");
+
+            
+            #line 44 "..\..\Views\Job\JobParts\Resources.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n");
+
+            
+            #line 46 "..\..\Views\Job\JobParts\Resources.cshtml"
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 47 "..\..\Views\Job\JobParts\Resources.cshtml"
+         if (canShowAttachments)
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <td");
 
 WriteLiteral(" id=\"Attachments\"");
 
-WriteLiteral(">\r\n            <div");
+WriteAttribute("class", Tuple.Create(" class=\"", 2489), Tuple.Create("\"", 2564)
+            
+            #line 49 "..\..\Views\Job\JobParts\Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 2497), Tuple.Create<System.Object, System.Int32>(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments"
+            
+            #line default
+            #line hidden
+, 2497), false)
+);
+
+WriteLiteral(">\r\n                <div");
 
 WriteLiteral(" class=\"attachmentOutput\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 26 "..\..\Views\Job\JobParts\Resources.cshtml"
-                
+            #line 51 "..\..\Views\Job\JobParts\Resources.cshtml"
+                    
             
             #line default
             #line hidden
             
-            #line 26 "..\..\Views\Job\JobParts\Resources.cshtml"
-                 foreach (var ja in Model.Job.JobAttachments)
-                {
+            #line 51 "..\..\Views\Job\JobParts\Resources.cshtml"
+                     foreach (var ja in Model.Job.JobAttachments)
+                    {
 
             
             #line default
             #line hidden
-WriteLiteral("                    <a");
+WriteLiteral("                        <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 1245), Tuple.Create("\"", 1302)
+WriteAttribute("href", Tuple.Create(" href=\"", 2732), Tuple.Create("\"", 2789)
             
-            #line 28 "..\..\Views\Job\JobParts\Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 1252), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
+            #line 53 "..\..\Views\Job\JobParts\Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 2739), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
             
             #line default
             #line hidden
-, 1252), false)
+, 2739), false)
 );
 
 WriteLiteral(" data-attachmentid=\"");
 
             
-            #line 28 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                                                               Write(ja.Id);
+            #line 53 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                                                   Write(ja.Id);
 
             
             #line default
@@ -217,153 +351,186 @@ WriteLiteral("\"");
 WriteLiteral(" data-mimetype=\"");
 
             
-            #line 28 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                                                                                      Write(ja.MimeType);
+            #line 53 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                                                                          Write(ja.MimeType);
 
             
             #line default
             #line hidden
 WriteLiteral("\"");
 
-WriteLiteral(">\r\n                        <span");
+WriteLiteral(">\r\n                            <span");
 
 WriteLiteral(" class=\"icon\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 1404), Tuple.Create("\"", 1424)
+WriteAttribute("title", Tuple.Create(" title=\"", 2895), Tuple.Create("\"", 2915)
             
-            #line 29 "..\..\Views\Job\JobParts\Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 1412), Tuple.Create<System.Object, System.Int32>(ja.Filename
+            #line 54 "..\..\Views\Job\JobParts\Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 2903), Tuple.Create<System.Object, System.Int32>(ja.Filename
             
             #line default
             #line hidden
-, 1412), false)
+, 2903), false)
 );
 
-WriteLiteral(">\r\n                            <img");
+WriteLiteral(">\r\n                                <img");
 
 WriteLiteral(" alt=\"Attachment Thumbnail\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 1487), Tuple.Create("\"", 1546)
+WriteAttribute("src", Tuple.Create(" src=\"", 2982), Tuple.Create("\"", 3041)
             
-            #line 30 "..\..\Views\Job\JobParts\Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 1493), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
+            #line 55 "..\..\Views\Job\JobParts\Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 2988), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
             
             #line default
             #line hidden
-, 1493), false)
+, 2988), false)
 );
 
-WriteLiteral(" /></span>\r\n                        <span");
+WriteLiteral(" /></span>\r\n                            <span");
 
 WriteLiteral(" class=\"comments\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 1605), Tuple.Create("\"", 1625)
+WriteAttribute("title", Tuple.Create(" title=\"", 3104), Tuple.Create("\"", 3124)
             
-            #line 31 "..\..\Views\Job\JobParts\Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 1613), Tuple.Create<System.Object, System.Int32>(ja.Comments
+            #line 56 "..\..\Views\Job\JobParts\Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 3112), Tuple.Create<System.Object, System.Int32>(ja.Comments
             
             #line default
             #line hidden
-, 1613), false)
+, 3112), false)
 );
 
 WriteLiteral(">\r\n");
 
             
-            #line 32 "..\..\Views\Job\JobParts\Resources.cshtml"
-                            
+            #line 57 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                
             
             #line default
             #line hidden
             
-            #line 32 "..\..\Views\Job\JobParts\Resources.cshtml"
-                              if (!string.IsNullOrEmpty(ja.DocumentTemplateId))
-                              { 
+            #line 57 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                  if (!string.IsNullOrEmpty(ja.DocumentTemplateId))
+                                  { 
             
             #line default
             #line hidden
             
-            #line 33 "..\..\Views\Job\JobParts\Resources.cshtml"
-                           Write(ja.DocumentTemplate.Description);
+            #line 58 "..\..\Views\Job\JobParts\Resources.cshtml"
+                               Write(ja.DocumentTemplate.Description);
 
             
             #line default
             #line hidden
             
-            #line 33 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                                }
-                              else
-                              { 
+            #line 58 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                    }
+                                  else
+                                  { 
             
             #line default
             #line hidden
             
-            #line 35 "..\..\Views\Job\JobParts\Resources.cshtml"
-                           Write(ja.Comments);
+            #line 60 "..\..\Views\Job\JobParts\Resources.cshtml"
+                               Write(ja.Comments);
 
             
             #line default
             #line hidden
             
-            #line 35 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                             }
+            #line 60 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                 }
             
             #line default
             #line hidden
-WriteLiteral("\r\n                        </span><span");
+WriteLiteral("\r\n                            </span><span");
 
 WriteLiteral(" class=\"author\"");
 
 WriteLiteral(">");
 
             
-            #line 36 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                               Write(ja.TechUser.ToString());
+            #line 61 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                   Write(ja.TechUser.ToString());
 
             
             #line default
             #line hidden
-WriteLiteral("</span><span");
+WriteLiteral("</span>");
+
+            
+            #line 61 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                                       if (canRemoveAnyAttachments || (canRemoveOwnAttachments && ja.TechUserId == CurrentUser.Id))
+                                                                                      {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
 
 WriteLiteral(" class=\"remove\"");
 
-WriteLiteral("></span><span");
+WriteLiteral("></span>");
 
-WriteLiteral(" class=\"timestamp\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 1995), Tuple.Create("\"", 2033)
             
-            #line 36 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                             , Tuple.Create(Tuple.Create("", 2003), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
+            #line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                                                                                }
             
             #line default
             #line hidden
-, 2003), false)
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"timestamp\"");
+
+WriteAttribute("title", Tuple.Create(" title=\"", 3710), Tuple.Create("\"", 3748)
+            
+            #line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                                , Tuple.Create(Tuple.Create("", 3718), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
+            
+            #line default
+            #line hidden
+, 3718), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 36 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                                                                                                                                        Write(ja.Timestamp.ToFuzzy());
+            #line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                                                                                                                                           Write(ja.Timestamp.ToFuzzy());
 
             
             #line default
             #line hidden
-WriteLiteral("</span>\r\n                    </a>   \r\n");
+WriteLiteral("</span>\r\n                        </a>   \r\n");
 
             
-            #line 38 "..\..\Views\Job\JobParts\Resources.cshtml"
-                }
+            #line 64 "..\..\Views\Job\JobParts\Resources.cshtml"
+                    }
 
             
             #line default
             #line hidden
-WriteLiteral("            </div>\r\n            <div");
+WriteLiteral("                </div>\r\n");
+
+            
+            #line 66 "..\..\Views\Job\JobParts\Resources.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 66 "..\..\Views\Job\JobParts\Resources.cshtml"
+                 if (canAddAttachments)
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <div");
 
 WriteLiteral(" class=\"attachmentInput clearfix\"");
 
-WriteLiteral(">\r\n                <span");
+WriteLiteral(">\r\n                        <span");
 
 WriteLiteral(" class=\"action upload\"");
 
@@ -371,19 +538,35 @@ WriteLiteral("></span><span");
 
 WriteLiteral(" class=\"action photo\"");
 
-WriteLiteral("></span>\r\n            </div>\r\n        </td>\r\n    </tr>\r\n</table>\r\n<div");
+WriteLiteral("></span>\r\n                    </div>\r\n");
 
-WriteLiteral(" id=\"dialogUpload\"");
+            
+            #line 71 "..\..\Views\Job\JobParts\Resources.cshtml"
+                }
 
-WriteLiteral(" class=\"hiddenDialog\"");
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n");
 
-WriteLiteral(" title=\"Upload Attachment\"");
+            
+            #line 73 "..\..\Views\Job\JobParts\Resources.cshtml"
+        }
 
-WriteLiteral(">\r\n    <div");
+            
+            #line default
+            #line hidden
+WriteLiteral("    </tr>\r\n</table>\r\n");
 
-WriteLiteral(" id=\"silverlightHostUploadAttachment\"");
+            
+            #line 76 "..\..\Views\Job\JobParts\Resources.cshtml"
+ if (canShowLogs && (canRemoveAnyLogs || canRemoveOwnLogs))
+{
 
-WriteLiteral(">\r\n    </div>\r\n</div>\r\n<div");
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"dialogRemoveLog\"");
 
@@ -391,13 +574,59 @@ WriteLiteral(" class=\"hiddenDialog\"");
 
 WriteLiteral(" title=\"Remove this Comment?\"");
 
-WriteLiteral(">\r\n    <p>\r\n        <span");
+WriteLiteral(">\r\n        <p>\r\n            <span");
 
 WriteLiteral(" class=\"ui-icon ui-icon-alert\"");
 
 WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\"");
 
-WriteLiteral("></span>\r\n        Are you sure?\r\n    </p>\r\n</div>\r\n<div");
+WriteLiteral("></span>\r\n            Are you sure?\r\n        </p>\r\n    </div>\r\n");
+
+            
+            #line 84 "..\..\Views\Job\JobParts\Resources.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+            
+            #line 85 "..\..\Views\Job\JobParts\Resources.cshtml"
+ if (canShowAttachments && canAddAttachments)
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
+
+WriteLiteral(" id=\"dialogUpload\"");
+
+WriteLiteral(" class=\"hiddenDialog\"");
+
+WriteLiteral(" title=\"Upload Attachment\"");
+
+WriteLiteral(">\r\n        <div");
+
+WriteLiteral(" id=\"silverlightHostUploadAttachment\"");
+
+WriteLiteral(">\r\n        </div>\r\n    </div>\r\n");
+
+            
+            #line 91 "..\..\Views\Job\JobParts\Resources.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+            
+            #line 92 "..\..\Views\Job\JobParts\Resources.cshtml"
+ if (canShowAttachments && (canRemoveAnyAttachments || canRemoveOwnAttachments))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <div");
 
 WriteLiteral(" id=\"dialogRemoveAttachment\"");
 
@@ -405,89 +634,94 @@ WriteLiteral(" class=\"hiddenDialog\"");
 
 WriteLiteral(" title=\"Remove this Attachment?\"");
 
-WriteLiteral(">\r\n    <p>\r\n        <span");
+WriteLiteral(">\r\n        <p>\r\n            <span");
 
 WriteLiteral(" class=\"ui-icon ui-icon-alert\"");
 
 WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\"");
 
-WriteLiteral("></span>\r\n        Are you sure?\r\n    </p>\r\n</div>\r\n<script>\r\n    Shadowbox.init({" +
-"\r\n        skipSetup: true,\r\n        modal: true\r\n    });\r\n\r\n\r\n    $(function () " +
-"{\r\n        var jobId = parseInt(\'");
+WriteLiteral("></span>\r\n            Are you sure?\r\n        </p>\r\n    </div>\r\n");
 
             
-            #line 70 "..\..\Views\Job\JobParts\Resources.cshtml"
-                          Write(Model.Job.Id);
+            #line 100 "..\..\Views\Job\JobParts\Resources.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+            
+            #line 101 "..\..\Views\Job\JobParts\Resources.cshtml"
+ if (canShowLogs)
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <script>\r\n        if (!document.DiscoFunctions) {\r\n            document.Disco" +
+"Functions = {};\r\n        }\r\n\r\n        $(function () {\r\n            var jobId = p" +
+"arseInt(\'");
+
+            
+            #line 109 "..\..\Views\Job\JobParts\Resources.cshtml"
+                              Write(Model.Job.Id);
 
             
             #line default
             #line hidden
 WriteLiteral(@"');
 
-        //#region Comments
-        var $Comments = $('#Comments');
-        var $CommentOutput = $Comments.find('.commentOutput');
-        var $CommentOutputContainer = $Comments.find('.commentOutputContainer');
-        var $CommentInput = $Comments.find('textarea.commentInput');
-        var $dialogRemoveLog;
+            //#region Comments
+            var $Comments = $('#Comments');
+            var $CommentOutput = $Comments.find('.commentOutput');
+            var $CommentOutputContainer = $Comments.find('.commentOutputContainer');
 
-        window.setTimeout(function () {
-            $CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom
-        }, 0);
-        $('#jobDetailTabs').on('tabsactivate', function (event, ui) {
-            if (ui.newPanel && ui.newPanel.is('#jobDetailTab-Resources')) {
+            window.setTimeout(function () {
                 $CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom
-            }
-        });
+            }, 0);
+            $('#jobDetailTabs').on('tabsactivate', function (event, ui) {
+                if (ui.newPanel && ui.newPanel.is('#jobDetailTab-Resources')) {
+                    $CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom
+                }
+            });
 
-        $Comments.find('.commentInputPost').click(postComment);
-        $CommentInput.keypress(function (e) {
-            if (e.which == 13 && !e.shiftKey) {
-                postComment();
-                return false;
-            }
-        });
-        $CommentOutput.find('span.remove').click(removePost);
-
-        function postComment() {
-            var comment = $CommentInput.val();
-            if (comment != '') {
-                var data = { comment: comment }
-                $.ajax({
-                    url: '");
+");
 
             
-            #line 102 "..\..\Views\Job\JobParts\Resources.cshtml"
-                     Write(Url.Action(MVC.API.Job.CommentPost(Model.Job.Id, null)));
-
+            #line 125 "..\..\Views\Job\JobParts\Resources.cshtml"
+            
             
             #line default
             #line hidden
-WriteLiteral("\',\r\n                    dataType: \'json\',\r\n                    data: data,\r\n     " +
-"               success: function (d) {\r\n                        if (d.Result == " +
-"\'OK\') {\r\n                            // Should be added via Repository Notificat" +
-"ions\r\n                            // addComment(d.Comment, false);\r\n            " +
-"                $CommentInput.val(\'\').attr(\'disabled\', false).focus();\r\n        " +
-"                } else {\r\n                            alert(\'Unable to post comm" +
-"ent: \' + d.Result);\r\n                            $CommentInput.attr(\'disabled\', " +
-"false);\r\n                        }\r\n                    },\r\n                    " +
-"error: function (jqXHR, textStatus, errorThrown) {\r\n                        aler" +
-"t(\'Unable to post comment: \' + textStatus);\r\n                        $CommentInp" +
-"ut.attr(\'disabled\', false);\r\n                    }\r\n                });\r\n       " +
-"     }\r\n        }\r\n        function removePost() {\r\n            $this = $(this);" +
-"\r\n            var data = { id: $this.closest(\'div\').attr(\'data-logid\') };\r\n\r\n   " +
-"         if (!$dialogRemoveLog) {\r\n                $dialogRemoveLog = $(\'#dialog" +
-"RemoveLog\').dialog({\r\n                    resizable: false,\r\n                   " +
-" height: 140,\r\n                    modal: true,\r\n                    autoOpen: f" +
-"alse\r\n                });\r\n            }\r\n\r\n            $dialogRemoveLog.dialog(" +
-"\"enable\").dialog(\'option\', \'buttons\', {\r\n                \"Remove\": function () {" +
-"\r\n                    $dialogRemoveLog.dialog(\"disable\");\r\n                    $" +
-"dialogRemoveLog.dialog(\"option\", \"buttons\", null);\r\n                    $.ajax({" +
-"\r\n                        url: \'");
+            
+            #line 125 "..\..\Views\Job\JobParts\Resources.cshtml"
+             if (canAddLogs)
+            {
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+            //#region Add Logs
+
+            var $CommentInput = $Comments.find('textarea.commentInput');
+
+            $Comments.find('.commentInputPost').click(postComment);
+            $CommentInput.keypress(function (e) {
+                if (e.which == 13 && !e.shiftKey) {
+                    postComment();
+                    return false;
+                }
+            });
+
+            function postComment() {
+                var comment = $CommentInput.val();
+                if (comment != '') {
+                    var data = { comment: comment }
+                    $.ajax({
+                        url: '");
 
             
-            #line 140 "..\..\Views\Job\JobParts\Resources.cshtml"
-                         Write(Url.Action(MVC.API.Job.CommentRemove()));
+            #line 144 "..\..\Views\Job\JobParts\Resources.cshtml"
+                         Write(Url.Action(MVC.API.Job.CommentPost(Model.Job.Id, null)));
 
             
             #line default
@@ -496,108 +730,305 @@ WriteLiteral(@"',
                         dataType: 'json',
                         data: data,
                         success: function (d) {
-                            if (d == 'OK') {
-                                // Should be removed via Repository Notifications
-                                //$this.closest('div').slideUp(300).delay(300).queue(function () {
-                                //    $(this).remove();
-                                //});
+                            if (d.Result == 'OK') {
+                                // Should be added via Repository Notifications
+                                // addComment(d.Comment, false);
+                                $CommentInput.val('').attr('disabled', false).focus();
                             } else {
-                                alert('Unable to remove comment: ' + d);
+                                alert('Unable to post comment: ' + d.Result);
+                                $CommentInput.attr('disabled', false);
                             }
-                            $dialogRemoveLog.dialog(""close"");
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
-                            alert('Unable to remove comment: ' + textStatus);
-                            $dialogRemoveLog.dialog(""close"");
+                            alert('Unable to post comment: ' + textStatus);
+                            $CommentInput.attr('disabled', false);
                         }
                     });
-                },
-                ""Cancel"": function () {
-                    $dialogRemoveLog.dialog(""close"");
                 }
-            }).dialog('open');
+            }
 
-            return false;
-        }
-        function loadLiveComment(key) {
-            if (key.JobId == jobId) {
-                $.ajax({
-                    url: '");
+            //#endregion
+            ");
 
             
-            #line 170 "..\..\Views\Job\JobParts\Resources.cshtml"
-                     Write(Url.Action(MVC.API.Job.Comment()));
+            #line 166 "..\..\Views\Job\JobParts\Resources.cshtml"
+                   }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            ");
+
+            
+            #line 167 "..\..\Views\Job\JobParts\Resources.cshtml"
+             if (canRemoveAnyLogs || canRemoveOwnLogs)
+            {
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+            //#region Remove Logs
+
+            var $dialogRemoveLog;
+
+            $CommentOutput.find('span.remove').click(removePost);
+
+            function removePost() {
+                $this = $(this);
+                var data = { id: $this.closest('div').attr('data-logid') };
+
+                if (!$dialogRemoveLog) {
+                    $dialogRemoveLog = $('#dialogRemoveLog').dialog({
+                        resizable: false,
+                        height: 140,
+                        modal: true,
+                        autoOpen: false
+                    });
+                }
+
+                $dialogRemoveLog.dialog(""enable"").dialog('option', 'buttons', {
+                    ""Remove"": function () {
+                        $dialogRemoveLog.dialog(""disable"");
+                        $dialogRemoveLog.dialog(""option"", ""buttons"", null);
+                        $.ajax({
+                            url: '");
+
+            
+            #line 193 "..\..\Views\Job\JobParts\Resources.cshtml"
+                             Write(Url.Action(MVC.API.Job.CommentRemove()));
 
             
             #line default
             #line hidden
 WriteLiteral(@"',
-                    dataType: 'json',
-                    data: { id: key.Id },
-                    success: function (d) {
-                        if (d && d.JobId == jobId) {
-                            addComment(d, false);
-                        }
+                            dataType: 'json',
+                            data: data,
+                            success: function (d) {
+                                if (d == 'OK') {
+                                    // Should be removed via Repository Notifications
+                                    //$this.closest('div').slideUp(300).delay(300).queue(function () {
+                                    //    $(this).remove();
+                                    //});
+                                } else {
+                                    alert('Unable to remove comment: ' + d);
+                                }
+                                $dialogRemoveLog.dialog(""close"");
+                            },
+                            error: function (jqXHR, textStatus, errorThrown) {
+                                alert('Unable to remove comment: ' + textStatus);
+                                $dialogRemoveLog.dialog(""close"");
+                            }
+                        });
                     },
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        alert('Unable to load live comment ' + id + ': ' + textStatus);
+                    ""Cancel"": function () {
+                        $dialogRemoveLog.dialog(""close"");
                     }
-                });
+                }).dialog('open');
+
+                return false;
             }
-        }
-        function addComment(c, quick) {
-            var e = $('<div><span class=""author"" /><span class=""remove"" /><span class=""timestamp"" /><span class=""comment"" /></div>');
-            e.attr('data-logid', c.Id);
-            e.find('.author').text(c.Author);
-            e.find('.timestamp').text(c.TimestampFuzzy).attr('title', c.TimestampFull);
-            e.find('.remove').click(removePost);
-            var eComment = e.find('.comment').text(c.Comments);
-            var commentHtml = eComment.text().replace(/\r\n|\r|\n/g, '<br />');
-            commentHtml = commentHtml.replace(/\#(\d+)/g, '<a href=""");
+
+            //#endregion
+            ");
 
             
-            #line 192 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                               Write(Url.Action(MVC.Job.Show(null)));
+            #line 222 "..\..\Views\Job\JobParts\Resources.cshtml"
+                   }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n            function loadLiveComment(key) {\r\n                if (key.JobId == j" +
+"obId) {\r\n                    $.ajax({\r\n                        url: \'");
+
+            
+            #line 227 "..\..\Views\Job\JobParts\Resources.cshtml"
+                         Write(Url.Action(MVC.API.Job.Comment()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\',\r\n                        dataType: \'json\',\r\n                        data: { id" +
+": key.Id },\r\n                        success: function (d) {\r\n                  " +
+"          if (d && d.JobId == jobId) {\r\n");
+
+            
+            #line 232 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 232 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                 if (canRemoveAnyLogs)
+                                {
+            
+            #line default
+            #line hidden
+WriteLiteral("addComment(d, false, true);");
+
+            
+            #line 233 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                         }
+                                else if (canRemoveOwnLogs)
+                                {
+            
+            #line default
+            #line hidden
+WriteLiteral("addComment(d, false, (d.AuthorId === \'");
+
+            
+            #line 235 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                         Write(CurrentUser.Id);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\'));");
+
+            
+            #line 235 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                                                         }
+                                else
+                                {
+            
+            #line default
+            #line hidden
+WriteLiteral("addComment(d, false, false);");
+
+            
+            #line 237 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                          }
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+                            }
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            alert('Unable to load live comment ' + id + ': ' + textStatus);
+                        }
+                    });
+                }
+            }
+            function liveRemoveComment(key) {
+                $CommentOutput.children('div[data-logid=""' + key + '""]').slideUp(300).delay(300).queue(function () {
+                    $(this).remove();
+                });
+            }
+            function addComment(c, quick, canRemove) {
+                var t = '<div><span class=""author"" />';
+                if (canRemove)
+                    t += '<span class=""remove"" />';
+                t += '<span class=""timestamp"" /><span class=""comment"" /></div>';
+
+                var e = $(t);
+                e.attr('data-logid', c.Id);
+                e.find('.author').text(c.Author);
+                e.find('.timestamp').text(c.TimestampFuzzy).attr('title', c.TimestampFull);
+                if (canRemove)
+                    e.find('.remove').click(removePost);
+                var eComment = e.find('.comment').text(c.Comments);
+                var commentHtml = eComment.text().replace(/\r\n|\r|\n/g, '<br />');
+                commentHtml = commentHtml.replace(/\#(\d+)/g, '<a href=""");
+
+            
+            #line 266 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                   Write(Url.Action(MVC.Job.Show(null)));
 
             
             #line default
             #line hidden
 WriteLiteral(@"?id=$1"">#$1</a>');
-            eComment.html(commentHtml);
+                eComment.html(commentHtml);
 
-            $CommentOutput.append(e);
+                $CommentOutput.append(e);
 
-            if (!quick) {
-                e.animate({ backgroundColor: '#ffff99' }, 500, function () {
-                    e.animate({ backgroundColor: '#f4f4f4' }, 500);
-                });
-                $CommentOutput.animate({ scrollTop: $CommentOutput[0].scrollHeight }, 250)
+                if (!quick) {
+                    e.animate({ backgroundColor: '#ffff99' }, 500, function () {
+                        e.animate({ backgroundColor: '#f4f4f4' }, 500);
+                    });
+                    $CommentOutput.animate({ scrollTop: $CommentOutput[0].scrollHeight }, 250)
+                }
             }
-        }
-        //#endregion
 
-        //#region Attachments
+            // Add Globally Available Functions
+            document.DiscoFunctions.liveLoadComment = loadLiveComment;
+            document.DiscoFunctions.liveRemoveComment = liveRemoveComment;
+            //#endregion
+        });
+    </script>
+");
+
+            
+            #line 285 "..\..\Views\Job\JobParts\Resources.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+            
+            #line 286 "..\..\Views\Job\JobParts\Resources.cshtml"
+ if (canShowAttachments)
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"    <script>
+        Shadowbox.init({
+            skipSetup: true,
+            modal: true
+        });
+
         if (!document.DiscoFunctions) {
             document.DiscoFunctions = {};
         }
-        // For Silverlight Backwards-compatibility
-        //  - Repository notifications now handles this
-        document.DiscoFunctions.addAttachment = function () { };
 
-        var $Attachments = $('#Attachments');
-        var $attachmentOutput = $Attachments.find('.attachmentOutput');
-        var $dialogUpload, $dialogRemoveAttachment;
-
-        $attachmentOutput.find('span.remove').click(removeLocalAttachment);
-
-        var onLoadNavigation = null;
-        var isLoaded = null;
-        Silverlight.createObject(
-                '");
+        $(function () {
+            var jobId = parseInt('");
 
             
-            #line 223 "..\..\Views\Job\JobParts\Resources.cshtml"
-             Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap);
+            #line 299 "..\..\Views\Job\JobParts\Resources.cshtml"
+                              Write(Model.Job.Id);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\');\r\n\r\n            //#region Attachments\r\n            var $Attachments = $(\'#Atta" +
+"chments\');\r\n            var $attachmentOutput = $Attachments.find(\'.attachmentOu" +
+"tput\');\r\n\r\n");
+
+            
+            #line 305 "..\..\Views\Job\JobParts\Resources.cshtml"
+            
+            
+            #line default
+            #line hidden
+            
+            #line 305 "..\..\Views\Job\JobParts\Resources.cshtml"
+             if (canAddAttachments)
+            {
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+            //#region Add Attachments
+
+            // For Silverlight Backwards-compatibility
+            //  - Repository notifications now handles this
+            document.DiscoFunctions.addAttachment = function () { };
+
+            var $dialogUpload;
+            var onLoadNavigation = null;
+            var isLoaded = null;
+            Silverlight.createObject(
+                    '");
+
+            
+            #line 317 "..\..\Views\Job\JobParts\Resources.cshtml"
+                 Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap);
 
             
             #line default
@@ -617,7 +1048,7 @@ WriteLiteral(@"',
                             'UploadUrl=");
 
             
-            #line 235 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 329 "..\..\Views\Job\JobParts\Resources.cshtml"
                                    Write(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)));
 
             
@@ -626,184 +1057,441 @@ WriteLiteral(@"',
 WriteLiteral(@"'
                         );
 
-        var $attachmentInput = $Attachments.find('.attachmentInput');
-        $attachmentInput.find('.photo').click(function () {
-            showDialog('/WebCam');
-        });
-        $attachmentInput.find('.upload').click(function () {
-            showDialog('/File');
-        });
+            var $attachmentInput = $Attachments.find('.attachmentInput');
+            $attachmentInput.find('.photo').click(function () {
+                showDialog('/WebCam');
+            });
+            $attachmentInput.find('.upload').click(function () {
+                showDialog('/File');
+            });
 
-        var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
-        function showDialog(navigationPath) {
-            if (!$dialogUpload) {
-                $dialogUpload = $('#dialogUpload').dialog({
-                    autoOpen: false,
-                    draggable: false,
-                    modal: true,
-                    resizable: false,
-                    width: 860,
-                    height: 550,
-                    close: function () {
-                        silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
-                    }
-                });
-            }
-            $dialogUpload.dialog('open');
-            if (isLoaded) {
-                silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
-            } else {
-                onLoadNavigation = navigationPath;
-            }
-        };
-        function addAttachment(key, quick) {
+            var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
+            function showDialog(navigationPath) {
+                if (!$dialogUpload) {
+                    $dialogUpload = $('#dialogUpload').dialog({
+                        autoOpen: false,
+                        draggable: false,
+                        modal: true,
+                        resizable: false,
+                        width: 860,
+                        height: 550,
+                        close: function () {
+                            silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
+                        }
+                    });
+                }
+                $dialogUpload.dialog('open');
+                if (isLoaded) {
+                    silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
+                } else {
+                    onLoadNavigation = navigationPath;
+                }
+            };
 
-            if (key.JobId == jobId) {
-                var data = { id: key.Id };
-
-                $.ajax({
-                    url: '");
+            //#endregion
+            ");
 
             
-            #line 274 "..\..\Views\Job\JobParts\Resources.cshtml"
-                     Write(Url.Action(MVC.API.Job.Attachment()));
+            #line 364 "..\..\Views\Job\JobParts\Resources.cshtml"
+                   }
 
             
             #line default
             #line hidden
-WriteLiteral(@"',
-                    dataType: 'json',
-                    data: data,
-                    success: function (d) {
-                        if (d.Result == 'OK') {
-                            var a = d.Attachment;
-
-                            if (parseInt(a.ParentId) == jobId) {
-                                var e = $('<a><span class=""icon""><img alt=""Attachment Thumbnail"" /></span><span class=""comments""></span><span class=""author""></span><span class=""remove""></span><span class=""timestamp""></span></a>');
-
-                                e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '");
+WriteLiteral("\r\n");
 
             
-            #line 284 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                                                                              Write(Url.Action(MVC.API.Job.AttachmentDownload()));
+            #line 366 "..\..\Views\Job\JobParts\Resources.cshtml"
+            
+            
+            #line default
+            #line hidden
+            
+            #line 366 "..\..\Views\Job\JobParts\Resources.cshtml"
+             if (canRemoveAnyAttachments || canRemoveOwnAttachments)
+            {
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+            //#region Remove Attachments
+
+            var $dialogRemoveAttachment;
+
+            $attachmentOutput.find('span.remove').click(removeLocalAttachment);
+
+            function removeLocalAttachment() {
+                $this = $(this).closest('a');
+
+                var data = { id: $this.attr('data-attachmentid') };
+
+                if (!$dialogRemoveAttachment) {
+                    $dialogRemoveAttachment = $('#dialogRemoveAttachment').dialog({
+                        resizable: false,
+                        height: 140,
+                        modal: true,
+                        autoOpen: false
+                    });
+                }
+
+                $dialogRemoveAttachment.dialog(""enable"").dialog('option', 'buttons', {
+                    ""Remove"": function () {
+                        $dialogRemoveAttachment.dialog(""disable"");
+                        $dialogRemoveAttachment.dialog(""option"", ""buttons"", null);
+                        $.ajax({
+                            url: '");
+
+            
+            #line 393 "..\..\Views\Job\JobParts\Resources.cshtml"
+                             Write(Url.Action(MVC.API.Job.AttachmentRemove()));
 
             
             #line default
             #line hidden
-WriteLiteral("/\' + a.Id);\r\n                                e.find(\'.icon img\').attr(\'src\', \'");
+WriteLiteral("\',\r\n                            dataType: \'json\',\r\n                            da" +
+"ta: data,\r\n                            success: function (d) {\r\n                " +
+"                if (d == \'OK\') {\r\n                                    // Should " +
+"be removed via Repository Notifications\r\n                                    //$" +
+"this.hide(300).delay(300).queue(function () {\r\n                                 " +
+"   //    var $this = $(this);\r\n                                    //    if ($th" +
+"is.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n                " +
+"                    //        Shadowbox.removeCache(this);\r\n                    " +
+"                //    $this.remove();\r\n                                    //});" +
+"\r\n                                } else {\r\n                                    " +
+"alert(\'Unable to remove attachment: \' + d);\r\n                                }\r\n" +
+"                                $dialogRemoveAttachment.dialog(\"close\");\r\n      " +
+"                      },\r\n                            error: function (jqXHR, te" +
+"xtStatus, errorThrown) {\r\n                                alert(\'Unable to remov" +
+"e attachment: \' + textStatus);\r\n                                $dialogRemoveAtt" +
+"achment.dialog(\"close\");\r\n                            }\r\n                       " +
+" });\r\n                    },\r\n                    \"Cancel\": function () {\r\n     " +
+"                   $dialogRemoveAttachment.dialog(\"close\");\r\n                   " +
+" }\r\n                }).dialog(\'open\');\r\n\r\n                return false;\r\n       " +
+"     }\r\n\r\n            //#endregion\r\n\r\n            ");
 
             
-            #line 285 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                             Write(Url.Action(MVC.API.Job.AttachmentThumbnail()));
+            #line 426 "..\..\Views\Job\JobParts\Resources.cshtml"
+                   }
 
             
             #line default
             #line hidden
-WriteLiteral("/\' + a.Id);\r\n                                e.find(\'.comments\').text(a.Comments)" +
-";\r\n                                e.find(\'.author\').text(a.Author);\r\n          " +
-"                      e.find(\'.timestamp\').text(a.TimestampFuzzy).attr(\'title\', " +
-"a.TimestampFull);\r\n                                e.find(\'.remove\').click(remov" +
-"eLocalAttachment);\r\n                                if (!quick)\r\n               " +
-"                     e.hide();\r\n                                $attachmentOutpu" +
-"t.append(e);\r\n                                if (!quick)\r\n                     " +
-"               e.show(\'slow\');\r\n                                if (a.MimeType.t" +
-"oLowerCase().indexOf(\'image/\') == 0)\r\n                                    e.shad" +
-"owbox({ gallery: \'attachments\', player: \'img\', title: a.Comments });\r\n          " +
-"                  }\r\n                        } else {\r\n                         " +
-"   alert(\'Unable to add attachment: \' + d.Result);\r\n                        }\r\n " +
-"                   },\r\n                    error: function (jqXHR, textStatus, e" +
-"rrorThrown) {\r\n                        alert(\'Unable to add attachment: \' + text" +
-"Status);\r\n                    }\r\n                });\r\n            }\r\n        }\r\n" +
-"        function removeAttachment(key) {\r\n            if (key.JobId == jobId) {\r" +
-"\n                var $element = $attachmentOutput.find(\'a[data-attachmentid=\"\' +" +
-" key.Id + \'\"]\');\r\n                if ($element.length > 0) {\r\n                  " +
-"  $element.hide(300).delay(300).queue(function () {\r\n                        if " +
-"($element.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n         " +
-"                   Shadowbox.removeCache(this);\r\n                        $elemen" +
-"t.remove();\r\n                    });\r\n                }\r\n            }\r\n        " +
-"}\r\n\r\n        function removeLocalAttachment() {\r\n            $this = $(this).clo" +
-"sest(\'a\');\r\n\r\n            var data = { id: $this.attr(\'data-attachmentid\') };\r\n\r" +
-"\n            if (!$dialogRemoveAttachment) {\r\n                $dialogRemoveAttac" +
-"hment = $(\'#dialogRemoveAttachment\').dialog({\r\n                    resizable: fa" +
-"lse,\r\n                    height: 140,\r\n                    modal: true,\r\n      " +
-"              autoOpen: false\r\n                });\r\n            }\r\n\r\n           " +
-" $dialogRemoveAttachment.dialog(\"enable\").dialog(\'option\', \'buttons\', {\r\n       " +
-"         \"Remove\": function () {\r\n                    $dialogRemoveAttachment.di" +
-"alog(\"disable\");\r\n                    $dialogRemoveAttachment.dialog(\"option\", \"" +
-"buttons\", null);\r\n                    $.ajax({\r\n                        url: \'");
+WriteLiteral("\r\n            function addAttachment(key, quick) {\r\n\r\n                if (key.Job" +
+"Id == jobId) {\r\n                    var data = { id: key.Id };\r\n\r\n              " +
+"      $.ajax({\r\n                        url: \'");
 
             
-            #line 340 "..\..\Views\Job\JobParts\Resources.cshtml"
-                         Write(Url.Action(MVC.API.Job.AttachmentRemove()));
+            #line 434 "..\..\Views\Job\JobParts\Resources.cshtml"
+                         Write(Url.Action(MVC.API.Job.Attachment()));
 
             
             #line default
             #line hidden
 WriteLiteral("\',\r\n                        dataType: \'json\',\r\n                        data: data" +
 ",\r\n                        success: function (d) {\r\n                            " +
-"if (d == \'OK\') {\r\n                                // Should be removed via Repos" +
-"itory Notifications\r\n                                //$this.hide(300).delay(300" +
-").queue(function () {\r\n                                //    var $this = $(this)" +
-";\r\n                                //    if ($this.attr(\'data-mimetype\').toLower" +
-"Case().indexOf(\'image/\') == 0)\r\n                                //        Shadow" +
-"box.removeCache(this);\r\n                                //    $this.remove();\r\n " +
-"                               //});\r\n                            } else {\r\n    " +
-"                            alert(\'Unable to remove attachment: \' + d);\r\n       " +
-"                     }\r\n                            $dialogRemoveAttachment.dial" +
-"og(\"close\");\r\n                        },\r\n                        error: functio" +
-"n (jqXHR, textStatus, errorThrown) {\r\n                            alert(\'Unable " +
-"to remove attachment: \' + textStatus);\r\n                            $dialogRemov" +
-"eAttachment.dialog(\"close\");\r\n                        }\r\n                    });" +
-"\r\n                },\r\n                \"Cancel\": function () {\r\n                 " +
-"   $dialogRemoveAttachment.dialog(\"close\");\r\n                }\r\n            }).d" +
-"ialog(\'open\');\r\n\r\n            return false;\r\n        }\r\n\r\n        $attachmentOut" +
-"put.children(\'a\').each(function () {\r\n            $this = $(this);\r\n            " +
-"if ($this.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n         " +
-"       $this.shadowbox({ gallery: \'attachments\', player: \'img\', title: $this.fin" +
-"d(\'.comments\').text() });\r\n        });\r\n        //#endregion\r\n\r\n        //#regio" +
-"n LiveEvents\r\n        function liveMessageRecieved(d) {\r\n            if (d) {\r\n " +
-"               window.setTimeout(function () {\r\n                    switch (d.En" +
-"tityTypeName) {\r\n                        case \'JobAttachment\':\r\n                " +
-"            switch (d.EventType) {\r\n                                case 0: // A" +
-"dded\r\n                                    addAttachment(d.EntityKey, false);\r\n  " +
-"                                  break;\r\n                                case 1" +
-": // Removed\r\n                                    removeAttachment(d.EntityKey);" +
-"\r\n                                    break;\r\n                            }\r\n   " +
-"                         break;\r\n                        case \'JobLog\':\r\n       " +
-"                     switch (d.EventType) {\r\n                                cas" +
-"e 0: // Added\r\n                                    loadLiveComment(d.EntityKey);" +
-"\r\n                                    break;\r\n                                ca" +
-"se 1: // Removed\r\n                                    if (d.EntityKey.JobId == j" +
-"obId) {\r\n                                        $CommentOutput.children(\'div[da" +
-"ta-logid=\"\' + d.EntityKey.Id + \'\"]\').slideUp(300).delay(300).queue(function () {" +
-"\r\n                                            $(this).remove();\r\n               " +
-"                         });\r\n                                    }\r\n           " +
-"                         break;\r\n                            }\r\n                " +
-"            break;\r\n                    }\r\n                }, 100);\r\n           " +
-" }\r\n        }\r\n        var liveMessagesConnection = $.connection(\'");
+"if (d.Result == \'OK\') {\r\n                                var a = d.Attachment;\r\n" +
+"");
 
             
-            #line 411 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                               Write(Url.Content("~/API/Repository/Notifications"));
+            #line 440 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 440 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                 if (canRemoveAnyAttachments)
+                                {
+            
+            #line default
+            #line hidden
+WriteLiteral("buildAttachment(a, true);");
+
+            
+            #line 441 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                       }
+                                else if (canRemoveOwnAttachments)
+                                {
+            
+            #line default
+            #line hidden
+WriteLiteral("buildAttachment(a, (a.AuthorId === \'");
+
+            
+            #line 443 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                       Write(CurrentUser.Id);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\'));");
+
+            
+            #line 443 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                                                       }
+                                else
+                                {
+            
+            #line default
+            #line hidden
+WriteLiteral("buildAttachment(a, false);");
+
+            
+            #line 445 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+                            } else {
+                                alert('Unable to add attachment: ' + d.Result);
+                            }
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            alert('Unable to add attachment: ' + textStatus);
+                        }
+                    });
+                }
+            }
+            function buildAttachment(a, canRemove) {
+                if (parseInt(a.ParentId) == jobId) {
+                    var t = '<a><span class=""icon""><img alt=""Attachment Thumbnail"" /></span><span class=""comments""></span><span class=""author""></span>';
+                    if (canRemove)
+                        t += '<span class=""remove""></span>';
+                    t += '<span class=""timestamp""></span></a>';
+
+                    var e = $(t);
+
+                    e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '");
+
+            
+            #line 466 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                                                                  Write(Url.Action(MVC.API.Job.AttachmentDownload()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("/\' + a.Id);\r\n                    e.find(\'.icon img\').attr(\'src\', \'");
+
+            
+            #line 467 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                 Write(Url.Action(MVC.API.Job.AttachmentThumbnail()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("/\' + a.Id);\r\n                    e.find(\'.comments\').text(a.Comments);\r\n         " +
+"           e.find(\'.author\').text(a.Author);\r\n                    e.find(\'.times" +
+"tamp\').text(a.TimestampFuzzy).attr(\'title\', a.TimestampFull);\r\n                 " +
+"   if (canRemove)\r\n                        e.find(\'.remove\').click(removeLocalAt" +
+"tachment);\r\n                    if (!quick)\r\n                        e.hide();\r\n" +
+"                    $attachmentOutput.append(e);\r\n                    if (!quick" +
+")\r\n                        e.show(\'slow\');\r\n                    if (a.MimeType.t" +
+"oLowerCase().indexOf(\'image/\') == 0)\r\n                        e.shadowbox({ gall" +
+"ery: \'attachments\', player: \'img\', title: a.Comments });\r\n                }\r\n   " +
+"         }\r\n\r\n            function removeAttachment(key) {\r\n                if (" +
+"key.JobId == jobId) {\r\n                    var $element = $attachmentOutput.find" +
+"(\'a[data-attachmentid=\"\' + key.Id + \'\"]\');\r\n                    if ($element.len" +
+"gth > 0) {\r\n                        $element.hide(300).delay(300).queue(function" +
+" () {\r\n                            if ($element.attr(\'data-mimetype\').toLowerCas" +
+"e().indexOf(\'image/\') == 0)\r\n                                Shadowbox.removeCac" +
+"he(this);\r\n                            $element.remove();\r\n                     " +
+"   });\r\n                    }\r\n                }\r\n            }\r\n\r\n\r\n\r\n         " +
+"   $attachmentOutput.children(\'a\').each(function () {\r\n                $this = $" +
+"(this);\r\n                if ($this.attr(\'data-mimetype\').toLowerCase().indexOf(\'" +
+"image/\') == 0)\r\n                    $this.shadowbox({ gallery: \'attachments\', pl" +
+"ayer: \'img\', title: $this.find(\'.comments\').text() });\r\n            });\r\n\r\n     " +
+"       // Add Globally Available Functions\r\n            document.DiscoFunctions." +
+"liveAddAttachment = addAttachment;\r\n            document.DiscoFunctions.liveRemo" +
+"veAttachment = removeAttachment;\r\n\r\n            //#endregion\r\n        });\r\n\r\n\r\n " +
+"   </script>\r\n");
+
+            
+            #line 513 "..\..\Views\Job\JobParts\Resources.cshtml"
+}
+
+            
+            #line default
+            #line hidden
+            
+            #line 514 "..\..\Views\Job\JobParts\Resources.cshtml"
+ if (canShowLogs && canShowAttachments)
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <script>\r\n        $(function () {\r\n            var jobId = parseInt(\'");
+
+            
+            #line 518 "..\..\Views\Job\JobParts\Resources.cshtml"
+                              Write(Model.Job.Id);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\');\r\n\r\n            //#region LiveEvents\r\n            function liveMessageRecieved" +
+"(d) {\r\n                if (d) {\r\n                    window.setTimeout(function " +
+"() {\r\n                        switch (d.EntityTypeName) {\r\n                     " +
+"       case \'JobAttachment\':\r\n                                switch (d.EventTyp" +
+"e) {\r\n                                    case 0: // Added\r\n                    " +
+"                    document.DiscoFunctions.liveAddAttachment(d.EntityKey, false" +
+");\r\n                                        break;\r\n                            " +
+"        case 1: // Removed\r\n                                        document.Dis" +
+"coFunctions.liveRemoveAttachment(d.EntityKey);\r\n                                " +
+"        break;\r\n                                }\r\n                             " +
+"   break;\r\n                            case \'JobLog\':\r\n                         " +
+"       switch (d.EventType) {\r\n                                    case 0: // Ad" +
+"ded\r\n                                        document.DiscoFunctions.liveLoadCom" +
+"ment(d.EntityKey);\r\n                                        break;\r\n            " +
+"                        case 1: // Removed\r\n                                    " +
+"    if (d.EntityKey.JobId == jobId) {\r\n                                         " +
+"   document.DiscoFunctions.liveRemoveComment(d.EntityKey.Id);\r\n                 " +
+"                       }\r\n                                        break;\r\n      " +
+"                          }\r\n                                break;\r\n           " +
+"             }\r\n                    }, 100);\r\n                }\r\n            }\r\n" +
+"            var liveMessagesConnection = $.connection(\'");
+
+            
+            #line 551 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                   Write(Url.Content("~/API/Repository/Notifications"));
 
             
             #line default
             #line hidden
 WriteLiteral(@"', { addToGroups: 'JobLog,JobAttachment' })
-        liveMessagesConnection.received(liveMessageRecieved);
-        liveMessagesConnection.error(function (e) {
-            if (e)
-                alert('Error: ' + JSON.stringify(e));
+            liveMessagesConnection.received(liveMessageRecieved);
+            liveMessagesConnection.error(function (e) {
+                if (e)
+                    alert('Error: ' + JSON.stringify(e));
+            });
+            liveMessagesConnection.start();
+            //#endregion
         });
-        liveMessagesConnection.start();
-        //#endregion
-
-    });
-
-
-</script>
+    </script>
 ");
 
+            
+            #line 561 "..\..\Views\Job\JobParts\Resources.cshtml"
+}
+else if (canShowLogs)
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <script>\r\n        $(function () {\r\n            var jobId = parseInt(\'");
+
+            
+            #line 566 "..\..\Views\Job\JobParts\Resources.cshtml"
+                              Write(Model.Job.Id);
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"');
+
+            //#region LiveEvents
+            function liveMessageRecieved(d) {
+                if (d) {
+                    window.setTimeout(function () {
+                        switch (d.EventType) {
+                            case 0: // Added
+                                document.DiscoFunctions.liveLoadComment(d.EntityKey);
+                                break;
+                            case 1: // Removed
+                                if (d.EntityKey.JobId == jobId) {
+                                    document.DiscoFunctions.liveRemoveComment(d.EntityKey.Id);
+                                }
+                                break;
+                        }
+                    }, 100);
+                }
+            }
+            var liveMessagesConnection = $.connection('");
+
+            
+            #line 585 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                   Write(Url.Content("~/API/Repository/Notifications"));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"', { addToGroups: 'JobLog' })
+            liveMessagesConnection.received(liveMessageRecieved);
+            liveMessagesConnection.error(function (e) {
+                if (e)
+                    alert('Error: ' + JSON.stringify(e));
+            });
+            liveMessagesConnection.start();
+            //#endregion
+        });
+    </script>
+");
+
+            
+            #line 595 "..\..\Views\Job\JobParts\Resources.cshtml"
+}
+else if (canShowAttachments)
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <script>\r\n        $(function () {\r\n            var jobId = parseInt(\'");
+
+            
+            #line 600 "..\..\Views\Job\JobParts\Resources.cshtml"
+                              Write(Model.Job.Id);
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"');
+
+            //#region LiveEvents
+            function liveMessageRecieved(d) {
+                if (d) {
+                    window.setTimeout(function () {
+                        switch (d.EventType) {
+                            case 0: // Added
+                                document.DiscoFunctions.liveAddAttachment(d.EntityKey, false);
+                                break;
+                            case 1: // Removed
+                                document.DiscoFunctions.liveRemoveAttachment(d.EntityKey);
+                                break;
+                        }
+                    }, 100);
+                }
+            }
+            var liveMessagesConnection = $.connection('");
+
+            
+            #line 617 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                   Write(Url.Content("~/API/Repository/Notifications"));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"', { addToGroups: 'JobAttachment' })
+            liveMessagesConnection.received(liveMessageRecieved);
+            liveMessagesConnection.error(function (e) {
+                if (e)
+                    alert('Error: ' + JSON.stringify(e));
+            });
+            liveMessagesConnection.start();
+            //#endregion
+        });
+    </script>
+");
+
+            
+            #line 627 "..\..\Views\Job\JobParts\Resources.cshtml"
+}
+            
+            #line default
+            #line hidden
         }
     }
 }
diff --git a/Disco.Web/Views/Job/JobParts/Warranty.cshtml b/Disco.Web/Views/Job/JobParts/Warranty.cshtml
index 9e4d720e..4235ca38 100644
--- a/Disco.Web/Views/Job/JobParts/Warranty.cshtml
+++ b/Disco.Web/Views/Job/JobParts/Warranty.cshtml
@@ -1,127 +1,172 @@
 @model Disco.Web.Models.Job.ShowModel
+@{
+    Authorization.Require(Claims.Job.ShowWarranty);
+}
 <div id="jobDetailTab-Warranty" class="jobPart">
     <table id="jobNonWarrantyFinance">
         <tr>
-            <th style="width: 200px;">
-                Warranty Provider
+            <th style="width: 200px;">Warranty Provider
             </th>
             <td>
-                @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalName)
-                @AjaxHelpers.AjaxSave()
-                @AjaxHelpers.AjaxLoader()
-                <script type="text/javascript">
-                    $(function () {
-                        document.DiscoFunctions.PropertyChangeHelper(
-                            $('#Job_JobMetaWarranty_ExternalName'),
-                            'Unknown',
-                            '@Url.Action(MVC.API.Job.UpdateWarrantyExternalName(Model.Job.Id, null))',
+                @if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalName))
+                {
+                    @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalName)
+                    @AjaxHelpers.AjaxSave()
+                    @AjaxHelpers.AjaxLoader()
+                    <script type="text/javascript">
+                        $(function () {
+                            document.DiscoFunctions.PropertyChangeHelper(
+                                $('#Job_JobMetaWarranty_ExternalName'),
+                                'Unknown',
+                                '@Url.Action(MVC.API.Job.UpdateWarrantyExternalName(Model.Job.Id, null))',
                             'ExternalName'
                         );
-                    });
-                </script>
+                        });
+                    </script>
+                }
+                else
+                {
+                    if (string.IsNullOrWhiteSpace(Model.Job.JobMetaWarranty.ExternalName))
+                    {<span class="smallMessage">&lt;Unknown/None&gt;</span>}
+                    else
+                    {<span id="Job_JobMetaWarranty_ExternalName">@Model.Job.JobMetaWarranty.ExternalName</span>}
+                }
             </td>
         </tr>
         <tr>
-            <th style="width: 200px;">
-                Warranty Logged
+            <th style="width: 200px;">Warranty Logged
             </th>
             <td>
-                @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalLoggedDate)
-                @AjaxHelpers.AjaxLoader()
-                <script type="text/javascript">
-                    $(function () {
-                        var dateField = $('#Job_JobMetaWarranty_ExternalLoggedDate');
-                        document.DiscoFunctions.DateChangeHelper(
-                        dateField,
-                        'Unknown',
-                        '@(Url.Action(MVC.API.Job.UpdateWarrantyExternalLoggedDate(Model.Job.Id, null)))',
+                @if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalLoggedDate))
+                {
+                    @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalLoggedDate)
+                    @AjaxHelpers.AjaxLoader()
+                    <script type="text/javascript">
+                        $(function () {
+                            var dateField = $('#Job_JobMetaWarranty_ExternalLoggedDate');
+                            document.DiscoFunctions.DateChangeHelper(
+                            dateField,
+                            'Unknown',
+                            '@(Url.Action(MVC.API.Job.UpdateWarrantyExternalLoggedDate(Model.Job.Id, null)))',
                         'ExternalLoggedDate',
                         null
                         );
-                    });
-                </script>
+                        });
+                    </script>
+                }
+                else
+                {
+                    @CommonHelpers.FriendlyDate(Model.Job.JobMetaWarranty.ExternalLoggedDate, "Unknown/None", null)
+                }
             </td>
         </tr>
         <tr>
-            <th style="width: 200px;">
-                Warranty Reference
+            <th style="width: 200px;">Warranty Reference
             </th>
             <td>
-                @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalReference)
-                @AjaxHelpers.AjaxSave()
-                @AjaxHelpers.AjaxLoader()
-                <script type="text/javascript">
-                    $(function () {
-                        document.DiscoFunctions.PropertyChangeHelper(
-                            $('#Job_JobMetaWarranty_ExternalReference'),
-                            'Unknown',
-                            '@Url.Action(MVC.API.Job.UpdateWarrantyExternalReference(Model.Job.Id, null))',
+                @if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalReference))
+                {
+                    @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalReference)
+                    @AjaxHelpers.AjaxSave()
+                    @AjaxHelpers.AjaxLoader()
+                    <script type="text/javascript">
+                        $(function () {
+                            document.DiscoFunctions.PropertyChangeHelper(
+                                $('#Job_JobMetaWarranty_ExternalReference'),
+                                'Unknown',
+                                '@Url.Action(MVC.API.Job.UpdateWarrantyExternalReference(Model.Job.Id, null))',
                             'ExternalReference'
                         );
-                    });
-                </script>
+                        });
+                    </script>
+                }
+                else
+                {
+                    if (string.IsNullOrWhiteSpace(Model.Job.JobMetaWarranty.ExternalReference))
+                    {<span class="smallMessage">&lt;Unknown/None&gt;</span>}
+                    else
+                    {@Model.Job.JobMetaWarranty.ExternalReference}
+                }
             </td>
         </tr>
         <tr>
-            <th style="width: 200px;">
-                Warranty Completed
+            <th style="width: 200px;">Warranty Completed
             </th>
             <td>
-                @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalCompletedDate)
-                @AjaxHelpers.AjaxLoader()
-                <script type="text/javascript">
-                    $(function () {
-                        var dateField = $('#Job_JobMetaWarranty_ExternalCompletedDate');
-                        document.DiscoFunctions.DateChangeHelper(
-                        dateField,
-                        'Unknown',
-                        '@(Url.Action(MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, null)))',
+                @if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalCompletedDate))
+                {
+                    @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalCompletedDate)
+                    @AjaxHelpers.AjaxLoader()
+                    <script type="text/javascript">
+                        $(function () {
+                            var dateField = $('#Job_JobMetaWarranty_ExternalCompletedDate');
+                            document.DiscoFunctions.DateChangeHelper(
+                            dateField,
+                            'Unknown',
+                            '@(Url.Action(MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, null)))',
                         'ExternalCompletedDate',
                         null
                         );
-                    });
-                </script>
-            </td>
-        </tr>
-        <tr id="jobWarrantyProviderDetailContainer" style="display: none">
-            <th style="width: 200px;">
-                Provider Details
-            </th>
-            <td>
-                <div id="jobWarrantyProviderDetailLoading">
-                    <span class="ajaxHelperIcon ajaxLoading" title="Loading..."></span> Loading...
-                </div>
-                <div id="jobWarrantyProviderDetailHost" class="clearfix" style="display: none">
-                </div>
+                        });
+                    </script>
+                }
+                else
+                {
+                    @CommonHelpers.FriendlyDate(Model.Job.JobMetaWarranty.ExternalCompletedDate, "Unknown/None", null)
+                }
             </td>
         </tr>
+        @if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails))
+        {
+            <tr id="jobWarrantyProviderDetailContainer" style="display: none">
+                <th style="width: 200px;">Provider Details
+                </th>
+                <td>
+                    <div id="jobWarrantyProviderDetailLoading">
+                        <span class="ajaxHelperIcon ajaxLoading" title="Loading..."></span>Loading...
+                    </div>
+                    <div id="jobWarrantyProviderDetailHost" class="clearfix" style="display: none">
+                    </div>
+                </td>
+            </tr>
+        }
     </table>
 </div>
 <script type="text/javascript">
     $('#jobDetailTabItems').append('<li><a href="#jobDetailTab-Warranty">Warranty</a></li>');
+    @if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails))
+    {<text>
     $(function () {
         var warrantyProviderDetailLoaded = false;
 
         $('#jobDetailTabs').on('tabsactivate', function (e, ui) {
             if ($(ui.newPanel).is('#jobDetailTab-Warranty')) {
                 if (!warrantyProviderDetailLoaded) {
-                    var warrantyExternalName = $('#Job_JobMetaWarranty_ExternalName').val();
-                    if (warrantyExternalName) {
-                        $('#jobWarrantyProviderDetailContainer').show();
-                        $('#jobWarrantyProviderDetailLoading span').show();
-                        $('#jobWarrantyProviderDetailHost').load(
-                            '@(Url.Action(MVC.Job.WarrantyProviderJobDetails()))',
-                            { id: '@(Model.Job.Id)' },
-                            function () {
-                                $('#jobWarrantyProviderDetailLoading').hide();
-                                $(this).slideDown();
-                            }
-                        );
+                    var warrantyExternalName;
+                    var $warrantyExternalName = $('#Job_JobMetaWarranty_ExternalName');
+                    if ($warrantyExternalName.length > 0) {
+                        if ($warrantyExternalName[0].nodeName === 'INPUT')
+                            warrantyExternalName = $warrantyExternalName.val();
+                        else
+                            warrantyExternalName = $warrantyExternalName.text();
+                        if (warrantyExternalName) {
+                            $('#jobWarrantyProviderDetailContainer').show();
+                            $('#jobWarrantyProviderDetailLoading span').show();
+                            $('#jobWarrantyProviderDetailHost').load(
+                                '@(Url.Action(MVC.Job.WarrantyProviderJobDetails()))',
+                                { id: '@(Model.Job.Id)' },
+                                function () {
+                                    $('#jobWarrantyProviderDetailLoading').hide();
+                                    $(this).slideDown();
+                                }
+                            );
 
-                        warrantyProviderDetailLoaded = true;
+                            warrantyProviderDetailLoaded = true;
+                        }
                     }
                 }
             }
         });
     });
+    </text>}
 </script>
diff --git a/Disco.Web/Views/Job/JobParts/Warranty.generated.cs b/Disco.Web/Views/Job/JobParts/Warranty.generated.cs
index 036ef43a..54caed7d 100644
--- a/Disco.Web/Views/Job/JobParts/Warranty.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/Warranty.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,19 +28,29 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/Warranty.cshtml")]
-    public partial class Warranty : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
+    public partial class Warranty : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.ShowModel>
     {
         public Warranty()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<div");
+            
+            #line 2 "..\..\Views\Job\JobParts\Warranty.cshtml"
+  
+    Authorization.Require(Claims.Job.ShowWarranty);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<div");
 
 WriteLiteral(" id=\"jobDetailTab-Warranty\"");
 
@@ -54,228 +64,482 @@ WriteLiteral(">\r\n        <tr>\r\n            <th");
 
 WriteLiteral(" style=\"width: 200px;\"");
 
-WriteLiteral(">\r\n                Warranty Provider\r\n            </th>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 9 "..\..\Views\Job\JobParts\Warranty.cshtml"
-           Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalName));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 10 "..\..\Views\Job\JobParts\Warranty.cshtml"
-           Write(AjaxHelpers.AjaxSave());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
+WriteLiteral(">Warranty Provider\r\n            </th>\r\n            <td>\r\n");
 
             
             #line 11 "..\..\Views\Job\JobParts\Warranty.cshtml"
-           Write(AjaxHelpers.AjaxLoader());
+                
+            
+            #line default
+            #line hidden
+            
+            #line 11 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                 if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalName))
+                {
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 13 "..\..\Views\Job\JobParts\Warranty.cshtml"
+               Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalName));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 13 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                                                            
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 14 "..\..\Views\Job\JobParts\Warranty.cshtml"
+               Write(AjaxHelpers.AjaxSave());
+
+            
+            #line default
+            #line hidden
+            
+            #line 14 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                           
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 15 "..\..\Views\Job\JobParts\Warranty.cshtml"
+               Write(AjaxHelpers.AjaxLoader());
+
+            
+            #line default
+            #line hidden
+            
+            #line 15 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                             
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n                    $(function () {\r\n                        document.DiscoFun" +
-"ctions.PropertyChangeHelper(\r\n                            $(\'#Job_JobMetaWarrant" +
-"y_ExternalName\'),\r\n                            \'Unknown\',\r\n                     " +
-"       \'");
+WriteLiteral(@">
+                        $(function () {
+                            document.DiscoFunctions.PropertyChangeHelper(
+                                $('#Job_JobMetaWarranty_ExternalName'),
+                                'Unknown',
+                                '");
 
             
-            #line 17 "..\..\Views\Job\JobParts\Warranty.cshtml"
-                        Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalName(Model.Job.Id, null)));
+            #line 21 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                            Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalName(Model.Job.Id, null)));
 
             
             #line default
             #line hidden
 WriteLiteral("\',\r\n                            \'ExternalName\'\r\n                        );\r\n     " +
-"               });\r\n                </script>\r\n            </td>\r\n        </tr>\r" +
-"\n        <tr>\r\n            <th");
-
-WriteLiteral(" style=\"width: 200px;\"");
-
-WriteLiteral(">\r\n                Warranty Logged\r\n            </th>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
+"                   });\r\n                    </script>\r\n");
 
             
-            #line 29 "..\..\Views\Job\JobParts\Warranty.cshtml"
-           Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalLoggedDate));
-
+            #line 26 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                }
+                else
+                {
+                    if (string.IsNullOrWhiteSpace(Model.Job.JobMetaWarranty.ExternalName))
+                    {
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
+WriteLiteral("<span");
 
-WriteLiteral("                ");
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown/None&gt;</span>");
 
             
             #line 30 "..\..\Views\Job\JobParts\Warranty.cshtml"
-           Write(AjaxHelpers.AjaxLoader());
+                                                                           }
+                    else
+                    {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" id=\"Job_JobMetaWarranty_ExternalName\"");
+
+WriteLiteral(">");
+
+            
+            #line 32 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                                            Write(Model.Job.JobMetaWarranty.ExternalName);
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+WriteLiteral("</span>");
+
+            
+            #line 32 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                                                                                               }
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th");
+
+WriteLiteral(" style=\"width: 200px;\"");
+
+WriteLiteral(">Warranty Logged\r\n            </th>\r\n            <td>\r\n");
+
+            
+            #line 40 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 40 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                 if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalLoggedDate))
+                {
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 42 "..\..\Views\Job\JobParts\Warranty.cshtml"
+               Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalLoggedDate));
+
+            
+            #line default
+            #line hidden
+            
+            #line 42 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                                                                  
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 43 "..\..\Views\Job\JobParts\Warranty.cshtml"
+               Write(AjaxHelpers.AjaxLoader());
+
+            
+            #line default
+            #line hidden
+            
+            #line 43 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                             
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-                    $(function () {
-                        var dateField = $('#Job_JobMetaWarranty_ExternalLoggedDate');
-                        document.DiscoFunctions.DateChangeHelper(
-                        dateField,
-                        'Unknown',
-                        '");
+                        $(function () {
+                            var dateField = $('#Job_JobMetaWarranty_ExternalLoggedDate');
+                            document.DiscoFunctions.DateChangeHelper(
+                            dateField,
+                            'Unknown',
+                            '");
 
             
-            #line 37 "..\..\Views\Job\JobParts\Warranty.cshtml"
-                     Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalLoggedDate(Model.Job.Id, null)));
+            #line 50 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                         Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalLoggedDate(Model.Job.Id, null)));
 
             
             #line default
             #line hidden
 WriteLiteral("\',\r\n                        \'ExternalLoggedDate\',\r\n                        null\r\n" +
-"                        );\r\n                    });\r\n                </script>\r\n" +
-"            </td>\r\n        </tr>\r\n        <tr>\r\n            <th");
+"                        );\r\n                        });\r\n                    </s" +
+"cript>\r\n");
+
+            
+            #line 56 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                }
+                else
+                {
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 59 "..\..\Views\Job\JobParts\Warranty.cshtml"
+               Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaWarranty.ExternalLoggedDate, "Unknown/None", null));
+
+            
+            #line default
+            #line hidden
+            
+            #line 59 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                                                                                                   
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th");
 
 WriteLiteral(" style=\"width: 200px;\"");
 
-WriteLiteral(">\r\n                Warranty Reference\r\n            </th>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
+WriteLiteral(">Warranty Reference\r\n            </th>\r\n            <td>\r\n");
 
             
-            #line 50 "..\..\Views\Job\JobParts\Warranty.cshtml"
-           Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalReference));
+            #line 67 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 67 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                 if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalReference))
+                {
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 69 "..\..\Views\Job\JobParts\Warranty.cshtml"
+               Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalReference));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 51 "..\..\Views\Job\JobParts\Warranty.cshtml"
-           Write(AjaxHelpers.AjaxSave());
+            #line 69 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                                                                 
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 70 "..\..\Views\Job\JobParts\Warranty.cshtml"
+               Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 52 "..\..\Views\Job\JobParts\Warranty.cshtml"
-           Write(AjaxHelpers.AjaxLoader());
+            #line 70 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                           
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 71 "..\..\Views\Job\JobParts\Warranty.cshtml"
+               Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 71 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                             
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n                    $(function () {\r\n                        document.DiscoFun" +
-"ctions.PropertyChangeHelper(\r\n                            $(\'#Job_JobMetaWarrant" +
-"y_ExternalReference\'),\r\n                            \'Unknown\',\r\n                " +
-"            \'");
+WriteLiteral(@">
+                        $(function () {
+                            document.DiscoFunctions.PropertyChangeHelper(
+                                $('#Job_JobMetaWarranty_ExternalReference'),
+                                'Unknown',
+                                '");
 
             
-            #line 58 "..\..\Views\Job\JobParts\Warranty.cshtml"
-                        Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalReference(Model.Job.Id, null)));
+            #line 77 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                            Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalReference(Model.Job.Id, null)));
 
             
             #line default
             #line hidden
 WriteLiteral("\',\r\n                            \'ExternalReference\'\r\n                        );\r\n" +
-"                    });\r\n                </script>\r\n            </td>\r\n        <" +
-"/tr>\r\n        <tr>\r\n            <th");
+"                        });\r\n                    </script>\r\n");
+
+            
+            #line 82 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                }
+                else
+                {
+                    if (string.IsNullOrWhiteSpace(Model.Job.JobMetaWarranty.ExternalReference))
+                    {
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;Unknown/None&gt;</span>");
+
+            
+            #line 86 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                                                           }
+                    else
+                    {
+            
+            #line default
+            #line hidden
+            
+            #line 88 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                Write(Model.Job.JobMetaWarranty.ExternalReference);
+
+            
+            #line default
+            #line hidden
+            
+            #line 88 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                                                 }
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th");
 
 WriteLiteral(" style=\"width: 200px;\"");
 
-WriteLiteral(">\r\n                Warranty Completed\r\n            </th>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
+WriteLiteral(">Warranty Completed\r\n            </th>\r\n            <td>\r\n");
 
             
-            #line 70 "..\..\Views\Job\JobParts\Warranty.cshtml"
-           Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalCompletedDate));
+            #line 96 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 96 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                 if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalCompletedDate))
+                {
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 98 "..\..\Views\Job\JobParts\Warranty.cshtml"
+               Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalCompletedDate));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
             
-            #line 71 "..\..\Views\Job\JobParts\Warranty.cshtml"
-           Write(AjaxHelpers.AjaxLoader());
+            #line 98 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                                                                     
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 99 "..\..\Views\Job\JobParts\Warranty.cshtml"
+               Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                <script");
+            
+            #line 99 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                             
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-                    $(function () {
-                        var dateField = $('#Job_JobMetaWarranty_ExternalCompletedDate');
-                        document.DiscoFunctions.DateChangeHelper(
-                        dateField,
-                        'Unknown',
-                        '");
+                        $(function () {
+                            var dateField = $('#Job_JobMetaWarranty_ExternalCompletedDate');
+                            document.DiscoFunctions.DateChangeHelper(
+                            dateField,
+                            'Unknown',
+                            '");
 
             
-            #line 78 "..\..\Views\Job\JobParts\Warranty.cshtml"
-                     Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, null)));
+            #line 106 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                         Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, null)));
 
             
             #line default
             #line hidden
 WriteLiteral("\',\r\n                        \'ExternalCompletedDate\',\r\n                        nul" +
-"l\r\n                        );\r\n                    });\r\n                </script" +
-">\r\n            </td>\r\n        </tr>\r\n        <tr");
+"l\r\n                        );\r\n                        });\r\n                    " +
+"</script>\r\n");
+
+            
+            #line 112 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                }
+                else
+                {
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 115 "..\..\Views\Job\JobParts\Warranty.cshtml"
+               Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaWarranty.ExternalCompletedDate, "Unknown/None", null));
+
+            
+            #line default
+            #line hidden
+            
+            #line 115 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                                                                                                      
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </td>\r\n        </tr>\r\n");
+
+            
+            #line 119 "..\..\Views\Job\JobParts\Warranty.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 119 "..\..\Views\Job\JobParts\Warranty.cshtml"
+         if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails))
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <tr");
 
 WriteLiteral(" id=\"jobWarrantyProviderDetailContainer\"");
 
 WriteLiteral(" style=\"display: none\"");
 
-WriteLiteral(">\r\n            <th");
+WriteLiteral(">\r\n                <th");
 
 WriteLiteral(" style=\"width: 200px;\"");
 
-WriteLiteral(">\r\n                Provider Details\r\n            </th>\r\n            <td>\r\n       " +
-"         <div");
+WriteLiteral(">Provider Details\r\n                </th>\r\n                <td>\r\n                 " +
+"   <div");
 
 WriteLiteral(" id=\"jobWarrantyProviderDetailLoading\"");
 
-WriteLiteral(">\r\n                    <span");
+WriteLiteral(">\r\n                        <span");
 
 WriteLiteral(" class=\"ajaxHelperIcon ajaxLoading\"");
 
 WriteLiteral(" title=\"Loading...\"");
 
-WriteLiteral("></span> Loading...\r\n                </div>\r\n                <div");
+WriteLiteral("></span>Loading...\r\n                    </div>\r\n                    <div");
 
 WriteLiteral(" id=\"jobWarrantyProviderDetailHost\"");
 
@@ -283,57 +547,95 @@ WriteLiteral(" class=\"clearfix\"");
 
 WriteLiteral(" style=\"display: none\"");
 
-WriteLiteral(">\r\n                </div>\r\n            </td>\r\n        </tr>\r\n    </table>\r\n</div>" +
-"\r\n<script");
+WriteLiteral(">\r\n                    </div>\r\n                </td>\r\n            </tr>\r\n");
+
+            
+            #line 132 "..\..\Views\Job\JobParts\Warranty.cshtml"
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    </table>\r\n</div>\r\n<script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(@">
-    $('#jobDetailTabItems').append('<li><a href=""#jobDetailTab-Warranty"">Warranty</a></li>');
+WriteLiteral(">\r\n    $(\'#jobDetailTabItems\').append(\'<li><a href=\"#jobDetailTab-Warranty\">Warra" +
+"nty</a></li>\');\r\n");
+
+            
+            #line 137 "..\..\Views\Job\JobParts\Warranty.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 137 "..\..\Views\Job\JobParts\Warranty.cshtml"
+     if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails))
+    {
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
     $(function () {
         var warrantyProviderDetailLoaded = false;
 
         $('#jobDetailTabs').on('tabsactivate', function (e, ui) {
             if ($(ui.newPanel).is('#jobDetailTab-Warranty')) {
                 if (!warrantyProviderDetailLoaded) {
-                    var warrantyExternalName = $('#Job_JobMetaWarranty_ExternalName').val();
-                    if (warrantyExternalName) {
-                        $('#jobWarrantyProviderDetailContainer').show();
-                        $('#jobWarrantyProviderDetailLoading span').show();
-                        $('#jobWarrantyProviderDetailHost').load(
-                            '");
+                    var warrantyExternalName;
+                    var $warrantyExternalName = $('#Job_JobMetaWarranty_ExternalName');
+                    if ($warrantyExternalName.length > 0) {
+                        if ($warrantyExternalName[0].nodeName === 'INPUT')
+                            warrantyExternalName = $warrantyExternalName.val();
+                        else
+                            warrantyExternalName = $warrantyExternalName.text();
+                        if (warrantyExternalName) {
+                            $('#jobWarrantyProviderDetailContainer').show();
+                            $('#jobWarrantyProviderDetailLoading span').show();
+                            $('#jobWarrantyProviderDetailHost').load(
+                                '");
 
             
-            #line 113 "..\..\Views\Job\JobParts\Warranty.cshtml"
-                         Write(Url.Action(MVC.Job.WarrantyProviderJobDetails()));
+            #line 156 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                             Write(Url.Action(MVC.Job.WarrantyProviderJobDetails()));
 
             
             #line default
             #line hidden
-WriteLiteral("\',\r\n                            { id: \'");
+WriteLiteral("\',\r\n                                { id: \'");
 
             
-            #line 114 "..\..\Views\Job\JobParts\Warranty.cshtml"
-                               Write(Model.Job.Id);
+            #line 157 "..\..\Views\Job\JobParts\Warranty.cshtml"
+                                   Write(Model.Job.Id);
 
             
             #line default
             #line hidden
 WriteLiteral(@"' },
-                            function () {
-                                $('#jobWarrantyProviderDetailLoading').hide();
-                                $(this).slideDown();
-                            }
-                        );
+                                function () {
+                                    $('#jobWarrantyProviderDetailLoading').hide();
+                                    $(this).slideDown();
+                                }
+                            );
 
-                        warrantyProviderDetailLoaded = true;
+                            warrantyProviderDetailLoaded = true;
+                        }
                     }
                 }
             }
         });
     });
-</script>
-");
+    ");
+
+            
+            #line 171 "..\..\Views\Job\JobParts\Warranty.cshtml"
+           }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</script>\r\n");
 
         }
     }
diff --git a/Disco.Web/Views/Job/JobParts/_Subject.cshtml b/Disco.Web/Views/Job/JobParts/_Subject.cshtml
index c8080548..2e583c2a 100644
--- a/Disco.Web/Views/Job/JobParts/_Subject.cshtml
+++ b/Disco.Web/Views/Job/JobParts/_Subject.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Models.Job.ShowModel
-
+@{
+    Authorization.Require(Claims.Job.Show);
+}
 <table id="Job_Show_Subjects">
     <tr>
         <td id="Job_Show_Job">
@@ -17,7 +19,9 @@
                                 <td>
                                     <span title="Expected to Close">Expected:</span>
                                 </td>
-                                <td>@Html.TextBoxFor(m => m.Job.ExpectedClosedDate, new { @class = "small discreet" }) @AjaxHelpers.AjaxSave() @AjaxHelpers.AjaxLoader()
+                                <td>@if (Authorization.Has(Claims.Job.Properties.ExpectedClosedDate))
+                                    {
+                                    @Html.TextBoxFor(m => m.Job.ExpectedClosedDate, new { @class = "small discreet" }) @AjaxHelpers.AjaxSave() @AjaxHelpers.AjaxLoader()
                                     <script type="text/javascript">
                                         $(function () {
                                             var $ajaxSave = $('#Job_ExpectedClosedDate').next('.ajaxSave');
@@ -58,6 +62,11 @@
                                                 });
                                         });
                                     </script>
+                                    }
+                                    else
+                                    {
+                                    @CommonHelpers.FriendlyDate(Model.Job.ExpectedClosedDate)
+                                    }
                                 </td>
                             </tr>
                         }
@@ -93,81 +102,90 @@
                                         <li title="@jobSubType.Id">@jobSubType.Description</li>
                                     }
                                 </ul>
-                                @if (!Model.Job.ClosedDate.HasValue)
+                                @if (Authorization.Has(Claims.Job.Actions.UpdateSubTypes) && !Model.Job.ClosedDate.HasValue)
                                 {
                                     <a href="#" id="Job_Show_Job_SubTypes_Update">Update Sub Types</a>
                                 }
                             </td>
                         </tr>
                     </table>
-                    <div id="Job_Show_Job_SubTypes_Update_Dialog" title="Update Job Types">
-                        <div>
-                            <h2>
-                                @Model.Job.JobType.Description</h2>
-                            @using (Html.BeginForm(MVC.API.Job.UpdateSubTypes(Model.Job.Id, redirect: true), FormMethod.Post, new { id = "formUpdateJobTypes" }))
-                            {
-                                @CommonHelpers.CheckBoxList("SubTypes", Model.UpdatableJobSubTypes.ToSelectListItems(Model.Job.JobSubTypes.ToList()), 3)    
-                                <hr />
-                                <div>
-                                    <input type="checkbox" value="true" id="UpdateJobTypesAddComponents" name="AddComponents"
-                                        checked="checked" /><label for="UpdateJobTypesAddComponents">Add Components for newly added Sub Types</label>
-                                </div>
-                            }
+                    @if (Authorization.Has(Claims.Job.Actions.UpdateSubTypes))
+                    {
+                        <div id="Job_Show_Job_SubTypes_Update_Dialog" title="Update Job Types">
+                            <div>
+                                <h2>
+                                    @Model.Job.JobType.Description</h2>
+                                @using (Html.BeginForm(MVC.API.Job.UpdateSubTypes(Model.Job.Id, redirect: true), FormMethod.Post, new { id = "formUpdateJobTypes" }))
+                                {
+                                    @CommonHelpers.CheckBoxList("SubTypes", Model.UpdatableJobSubTypes.ToSelectListItems(Model.Job.JobSubTypes.ToList()), 3)    
+                                    <hr />
+                                    <div>
+                                        <input type="checkbox" value="true" id="UpdateJobTypesAddComponents" name="AddComponents"
+                                            checked="checked" /><label for="UpdateJobTypesAddComponents">Add Components for newly added Sub Types</label>
+                                    </div>
+                                }
+                            </div>
                         </div>
-                    </div>
-                    <script>
-                        $(function(){
-                            var $Job_Show_Job_SubTypes_Update_Dialog = null;
+                        <script>
+                            $(function(){
+                                var $Job_Show_Job_SubTypes_Update_Dialog = null;
 
-                            $('#Job_Show_Job_SubTypes_Update').click(function () {
-                                if (!$Job_Show_Job_SubTypes_Update_Dialog) {
-                                    $Job_Show_Job_SubTypes_Update_Dialog = $('#Job_Show_Job_SubTypes_Update_Dialog');
-                                    $Job_Show_Job_SubTypes_Update_Dialog.dialog({
-                                        resizable: false,
-                                        modal: true,
-                                        autoOpen: false,
-                                        width: 700,
-                                        buttons: {
-                                            "Save": function () {
-                                                $('#formUpdateJobTypes').submit();
-                                                $Job_Show_Job_SubTypes_Update_Dialog.dialog("disable");
-                                            },
-                                            Cancel: function () {
-                                                $(this).dialog("close");
+                                $('#Job_Show_Job_SubTypes_Update').click(function () {
+                                    if (!$Job_Show_Job_SubTypes_Update_Dialog) {
+                                        $Job_Show_Job_SubTypes_Update_Dialog = $('#Job_Show_Job_SubTypes_Update_Dialog');
+                                        $Job_Show_Job_SubTypes_Update_Dialog.dialog({
+                                            resizable: false,
+                                            modal: true,
+                                            autoOpen: false,
+                                            width: 700,
+                                            buttons: {
+                                                "Save": function () {
+                                                    $('#formUpdateJobTypes').submit();
+                                                    $Job_Show_Job_SubTypes_Update_Dialog.dialog("disable");
+                                                },
+                                                Cancel: function () {
+                                                    $(this).dialog("close");
+                                                }
                                             }
-                                        }
-                                    });
-                                }
+                                        });
+                                    }
 
-                                $Job_Show_Job_SubTypes_Update_Dialog.dialog('open');
-                                return false;
+                                    $Job_Show_Job_SubTypes_Update_Dialog.dialog('open');
+                                    return false;
+                                });
                             });
-                        });
-                    </script>
+                        </script>
+                    }
                 </div>
-                <div id="Job_Show_GenerateDocument_Container" class="status">
-                    @Html.DropDownList("Job_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems)
-                    <script type="text/javascript">
-                        $(function () {
-                            var generatePdfUrl = '@Url.Action(MVC.API.Job.GeneratePdf(Model.Job.Id.ToString(), null))?DocumentTemplateId=';
-                            var $documentTemplates = $('#Job_Show_GenerateDocument');
-                            $documentTemplates.change(function () {
-                                var v = $documentTemplates.val();
-                                if (v) {
-                                    window.location.href = generatePdfUrl + v;
-                                    $documentTemplates.val('').blur();
-                                }
+                @if (Authorization.Has(Claims.Job.Actions.GenerateDocuments))
+                {
+                    <div id="Job_Show_GenerateDocument_Container" class="status">
+                        @Html.DropDownList("Job_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems)
+                        <script type="text/javascript">
+                            $(function () {
+                                var generatePdfUrl = '@Url.Action(MVC.API.Job.GeneratePdf(Model.Job.Id.ToString(), null))?DocumentTemplateId=';
+                                var $documentTemplates = $('#Job_Show_GenerateDocument');
+                                $documentTemplates.change(function () {
+                                    var v = $documentTemplates.val();
+                                    if (v) {
+                                        window.location.href = generatePdfUrl + v;
+                                        $documentTemplates.val('').blur();
+                                    }
+                                });
                             });
-                        });
-                    </script>
-                </div>
+                        </script>
+                    </div>
+                }
             </div>
         </td>
         @if (Model.Job.Device != null)
         {
             <td id="Job_Show_Device">
                 <div>
-                    <h2 id="Job_Show_Device_SerialNumber" title="Serial Number">@Html.ActionLink(Model.Job.DeviceSerialNumber, MVC.Device.Show(Model.Job.DeviceSerialNumber))</h2>
+                    <h2 id="Job_Show_Device_SerialNumber" title="Serial Number">@if (Authorization.Has(Claims.Device.Show))
+                                                                                {@Html.ActionLink(Model.Job.DeviceSerialNumber, MVC.Device.Show(Model.Job.DeviceSerialNumber))}
+                                                                                else
+                                                                                {@Model.Job.DeviceSerialNumber}</h2>
                     <div class="clearfix">
                         <div id="Job_Show_Device_Details">
                             <img id="Job_Show_Device_Model_Image" alt="Model Image" src="@Url.Action(MVC.API.DeviceModel.Image(Model.Job.Device.DeviceModelId, Model.Job.Device.DeviceModel.ImageHash()))" />
@@ -247,7 +265,22 @@
                             <table class="none">
                                 <tr>
                                     <td>Location:</td>
-                                    <td>@Html.TextBoxFor(m => m.Job.DeviceHeldLocation, new { @class = "small discreet" }) @AjaxHelpers.AjaxSave() @AjaxHelpers.AjaxLoader()</td>
+                                    <td>
+                                        <span id="Job_Show_Device_DeviceHeld_Location">
+                                            @if (Authorization.Has(Claims.Job.Properties.DeviceHeldLocation))
+                                            {
+                                                @Html.TextBoxFor(m => m.Job.DeviceHeldLocation, new { @class = "small discreet" }) @AjaxHelpers.AjaxSave() @AjaxHelpers.AjaxLoader()
+                                            }
+                                            else if (string.IsNullOrEmpty(Model.Job.DeviceHeldLocation))
+                                            {
+                                                <span class="smallMessage">&lt;None/Unknown&gt;</span>
+                                            }
+                                            else
+                                            {
+                                                @Model.Job.DeviceHeldLocation
+                                            }
+                                        </span>
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>Held Since:</td>
@@ -268,47 +301,49 @@
                                     </tr>
                                 }
                             </table>
+                            @if (Authorization.Has(Claims.Job.Properties.DeviceHeldLocation))
+                            {
+                                <script type="text/javascript">
+                                    $(function () {
+                                        var $deviceHeldLocation = $('#Job_DeviceHeldLocation');
+                                        var $ajaxSave = $deviceHeldLocation.next('.ajaxSave');
 
-                            <script type="text/javascript">
-                                $(function () {
-                                    var $deviceHeldLocation = $('#Job_DeviceHeldLocation');
-                                    var $ajaxSave = $deviceHeldLocation.next('.ajaxSave');
-
-                                    $deviceHeldLocation
-                                        .watermark('Unknown')
-                                        .focus(function () { $deviceHeldLocation.select() })
-                                        .keydown(function (e) {
-                                            $ajaxSave.show();
-                                            if (e.which == 13) {
-                                                $(this).blur();
-                                            }
-                                        }).blur(function () {
-                                            $ajaxSave.hide();
-                                        })
-                                        .change(function () {
-                                            $ajaxSave.hide();
-                                            $ajaxLoading = $ajaxSave.next('.ajaxLoading').show();
-                                            var data = { DeviceHeldLocation: $deviceHeldLocation.val() };
-                                            $.ajax({
-                                                url: '@Url.Action(MVC.API.Job.UpdateDeviceHeldLocation(Model.Job.Id, null))',
-                                                dataType: 'json',
-                                                data: data,
-                                                success: function (d) {
-                                                    if (d == 'OK') {
-                                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
-                                                    } else {
-                                                        $ajaxLoading.hide();
-                                                        alert('Unable to update device held location: ' + d);
-                                                    }
-                                                },
-                                                error: function (jqXHR, textStatus, errorThrown) {
-                                                    alert('Unable to update device held location: ' + textStatus);
-                                                    $ajaxLoading.hide();
+                                        $deviceHeldLocation
+                                            .watermark('Unknown')
+                                            .focus(function () { $deviceHeldLocation.select() })
+                                            .keydown(function (e) {
+                                                $ajaxSave.show();
+                                                if (e.which == 13) {
+                                                    $(this).blur();
                                                 }
+                                            }).blur(function () {
+                                                $ajaxSave.hide();
+                                            })
+                                            .change(function () {
+                                                $ajaxSave.hide();
+                                                $ajaxLoading = $ajaxSave.next('.ajaxLoading').show();
+                                                var data = { DeviceHeldLocation: $deviceHeldLocation.val() };
+                                                $.ajax({
+                                                    url: '@Url.Action(MVC.API.Job.UpdateDeviceHeldLocation(Model.Job.Id, null))',
+                                                    dataType: 'json',
+                                                    data: data,
+                                                    success: function (d) {
+                                                        if (d == 'OK') {
+                                                            $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                                        } else {
+                                                            $ajaxLoading.hide();
+                                                            alert('Unable to update device held location: ' + d);
+                                                        }
+                                                    },
+                                                    error: function (jqXHR, textStatus, errorThrown) {
+                                                        alert('Unable to update device held location: ' + textStatus);
+                                                        $ajaxLoading.hide();
+                                                    }
+                                                });
                                             });
-                                        });
-                                });
-                            </script>
+                                    });
+                                </script>
+                            }
                         </div>
                     }
                 </div>
@@ -318,8 +353,12 @@
         {
             <td id="Job_Show_User">
                 <div>
-                    <h2 id="Job_Show_User_DisplayName" title="Display Name">@Html.ActionLink(Model.Job.User.DisplayName, MVC.User.Show(Model.Job.UserId))</h2>
-                    <div id="Job_Show_User_Id" title="Id">@Model.Job.UserId <span id="Job_Show_User_Type" title="Type">[@(Model.Job.User.Type)]</span></div>
+                    <h2 id="Job_Show_User_DisplayName" title="Display Name">@if (Authorization.Has(Claims.User.Show))
+                                                                            {@Html.ActionLink(Model.Job.User.DisplayName, MVC.User.Show(Model.Job.UserId))}
+                                                                            else
+                                                                            {@Model.Job.User.DisplayName}
+                    </h2>
+                    <div id="Job_Show_User_Id" title="Id">@Model.Job.UserId</div>
                     @if (!string.IsNullOrWhiteSpace(Model.Job.User.PhoneNumber))
                     {<div id="Job_Show_User_PhoneNumber" title="Phone Number">Phone: @Model.Job.User.PhoneNumber</div>}
                     @if (!string.IsNullOrWhiteSpace(Model.Job.User.EmailAddress))
diff --git a/Disco.Web/Views/Job/JobParts/_Subject.generated.cs b/Disco.Web/Views/Job/JobParts/_Subject.generated.cs
index 484ac789..9fe7be3f 100644
--- a/Disco.Web/Views/Job/JobParts/_Subject.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/_Subject.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,19 +28,29 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/_Subject.cshtml")]
-    public partial class Subject : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
+    public partial class Subject : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.ShowModel>
     {
         public Subject()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<table");
+            
+            #line 2 "..\..\Views\Job\JobParts\_Subject.cshtml"
+  
+    Authorization.Require(Claims.Job.Show);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<table");
 
 WriteLiteral(" id=\"Job_Show_Subjects\"");
 
@@ -64,7 +74,7 @@ WriteLiteral(" id=\"Job_Show_Job_Dates_Opened\"");
 WriteLiteral(">");
 
             
-            #line 12 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 14 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                 Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.OpenedDate, Model.Job.OpenedTechUser));
 
             
@@ -73,13 +83,13 @@ WriteLiteral(">");
 WriteLiteral("</span></td>\r\n                        </tr>\r\n");
 
             
-            #line 14 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 16 "..\..\Views\Job\JobParts\_Subject.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 14 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 16 "..\..\Views\Job\JobParts\_Subject.cshtml"
                          if (!Model.Job.ClosedDate.HasValue || Model.Job.ExpectedClosedDate.HasValue)
                         {
 
@@ -95,31 +105,54 @@ WriteLiteral(">Expected:</span>\r\n                                </td>\r\n
 "         <td>");
 
             
-            #line 20 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 22 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                     if (Authorization.Has(Claims.Job.Properties.ExpectedClosedDate))
+                                    {
+                                    
+            
+            #line default
+            #line hidden
+            
+            #line 24 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                Write(Html.TextBoxFor(m => m.Job.ExpectedClosedDate, new { @class = "small discreet" }));
 
             
             #line default
             #line hidden
-WriteLiteral(" ");
-
             
-            #line 20 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 24 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                                                       
+            
+            #line default
+            #line hidden
+            
+            #line 24 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                   Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral(" ");
-
             
-            #line 20 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 24 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                                                                               
+            
+            #line default
+            #line hidden
+            
+            #line 24 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                           Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                                    <script");
+            
+            #line 24 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                                                                                                        
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -137,7 +170,7 @@ WriteLiteral(@">
                                                     minDate: ");
 
             
-            #line 32 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 36 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                          Write(Model.Job.OpenedDate.ToJavascriptDate());
 
             
@@ -161,7 +194,7 @@ WriteLiteral(@",
                                                             $.getJSON('");
 
             
-            #line 47 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 51 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                    Write(Url.Action(MVC.API.Job.UpdateExpectedClosedDate(Model.Job.Id, null)));
 
             
@@ -181,12 +214,36 @@ WriteLiteral(@"', data, function (response, result) {
                                                 });
                                         });
                                     </script>
-                                </td>
-                            </tr>
 ");
 
             
-            #line 63 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 65 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                    }
+                                    else
+                                    {
+                                    
+            
+            #line default
+            #line hidden
+            
+            #line 68 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                               Write(CommonHelpers.FriendlyDate(Model.Job.ExpectedClosedDate));
+
+            
+            #line default
+            #line hidden
+            
+            #line 68 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                             
+                                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                </td>\r\n                            </tr>\r\n");
+
+            
+            #line 72 "..\..\Views\Job\JobParts\_Subject.cshtml"
                         }
 
             
@@ -195,7 +252,7 @@ WriteLiteral(@"', data, function (response, result) {
 WriteLiteral("                        ");
 
             
-            #line 64 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 73 "..\..\Views\Job\JobParts\_Subject.cshtml"
                          if (Model.Job.ClosedDate.HasValue)
                         {
 
@@ -210,7 +267,7 @@ WriteLiteral(" id=\"Job_Show_Job_Dates_Closed\"");
 WriteLiteral(">");
 
             
-            #line 69 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 78 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                     Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.ClosedDate, Model.Job.ClosedTechUser));
 
             
@@ -219,7 +276,7 @@ WriteLiteral(">");
 WriteLiteral("</span></td>\r\n                            </tr>\r\n");
 
             
-            #line 71 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 80 "..\..\Views\Job\JobParts\_Subject.cshtml"
                         }
 
             
@@ -233,20 +290,20 @@ WriteLiteral(" class=\"status\"");
 
 WriteLiteral(">\r\n                    <h2");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 5104), Tuple.Create("\"", 5133)
+WriteAttribute("title", Tuple.Create(" title=\"", 5550), Tuple.Create("\"", 5579)
             
-            #line 75 "..\..\Views\Job\JobParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 5112), Tuple.Create<System.Object, System.Int32>(Model.Job.JobType.Id
+            #line 84 "..\..\Views\Job\JobParts\_Subject.cshtml"
+, Tuple.Create(Tuple.Create("", 5558), Tuple.Create<System.Object, System.Int32>(Model.Job.JobType.Id
             
             #line default
             #line hidden
-, 5112), false)
+, 5558), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 75 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 84 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                  Write(Model.Job.JobType.Description);
 
             
@@ -259,13 +316,13 @@ WriteLiteral(" class=\"none\"");
 WriteLiteral(">\r\n                        <tr>\r\n");
 
             
-            #line 78 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 87 "..\..\Views\Job\JobParts\_Subject.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 78 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 87 "..\..\Views\Job\JobParts\_Subject.cshtml"
                               
                                 var jobSubTypeFirst = (int)Math.Ceiling((double)(Model.Job.JobSubTypes.Count + 1) / 2);
                             
@@ -279,13 +336,13 @@ WriteLiteral(" id=\"Job_Show_Job_SubTypes_1\"");
 WriteLiteral(">\r\n");
 
             
-            #line 83 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 92 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                     
             
             #line default
             #line hidden
             
-            #line 83 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 92 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                      foreach (var jobSubType in Model.Job.JobSubTypes.Take(jobSubTypeFirst))
                                     {
 
@@ -294,20 +351,20 @@ WriteLiteral(">\r\n");
             #line hidden
 WriteLiteral("                                        <li");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 5721), Tuple.Create("\"", 5743)
+WriteAttribute("title", Tuple.Create(" title=\"", 6167), Tuple.Create("\"", 6189)
             
-            #line 85 "..\..\Views\Job\JobParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 5729), Tuple.Create<System.Object, System.Int32>(jobSubType.Id
+            #line 94 "..\..\Views\Job\JobParts\_Subject.cshtml"
+, Tuple.Create(Tuple.Create("", 6175), Tuple.Create<System.Object, System.Int32>(jobSubType.Id
             
             #line default
             #line hidden
-, 5729), false)
+, 6175), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 85 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 94 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                               Write(jobSubType.Description);
 
             
@@ -316,7 +373,7 @@ WriteLiteral(">");
 WriteLiteral("</li>\r\n");
 
             
-            #line 86 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 95 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                     }
 
             
@@ -330,13 +387,13 @@ WriteLiteral(" id=\"Job_Show_Job_SubTypes_2\"");
 WriteLiteral(">\r\n");
 
             
-            #line 91 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 100 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                     
             
             #line default
             #line hidden
             
-            #line 91 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 100 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                      foreach (var jobSubType in Model.Job.JobSubTypes.Skip(jobSubTypeFirst))
                                     {
 
@@ -345,20 +402,20 @@ WriteLiteral(">\r\n");
             #line hidden
 WriteLiteral("                                        <li");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 6181), Tuple.Create("\"", 6203)
+WriteAttribute("title", Tuple.Create(" title=\"", 6627), Tuple.Create("\"", 6649)
             
-            #line 93 "..\..\Views\Job\JobParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 6189), Tuple.Create<System.Object, System.Int32>(jobSubType.Id
+            #line 102 "..\..\Views\Job\JobParts\_Subject.cshtml"
+, Tuple.Create(Tuple.Create("", 6635), Tuple.Create<System.Object, System.Int32>(jobSubType.Id
             
             #line default
             #line hidden
-, 6189), false)
+, 6635), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 93 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 102 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                               Write(jobSubType.Description);
 
             
@@ -367,7 +424,7 @@ WriteLiteral(">");
 WriteLiteral("</li>\r\n");
 
             
-            #line 94 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 103 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                     }
 
             
@@ -376,14 +433,14 @@ WriteLiteral("</li>\r\n");
 WriteLiteral("                                </ul>\r\n");
 
             
-            #line 96 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 105 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                 
             
             #line default
             #line hidden
             
-            #line 96 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                 if (!Model.Job.ClosedDate.HasValue)
+            #line 105 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                 if (Authorization.Has(Claims.Job.Actions.UpdateSubTypes) && !Model.Job.ClosedDate.HasValue)
                                 {
 
             
@@ -398,26 +455,42 @@ WriteLiteral(" id=\"Job_Show_Job_SubTypes_Update\"");
 WriteLiteral(">Update Sub Types</a>\r\n");
 
             
-            #line 99 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 108 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                 }
 
             
             #line default
             #line hidden
 WriteLiteral("                            </td>\r\n                        </tr>\r\n               " +
-"     </table>\r\n                    <div");
+"     </table>\r\n");
+
+            
+            #line 112 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 112 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                     if (Authorization.Has(Claims.Job.Actions.UpdateSubTypes))
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <div");
 
 WriteLiteral(" id=\"Job_Show_Job_SubTypes_Update_Dialog\"");
 
 WriteLiteral(" title=\"Update Job Types\"");
 
-WriteLiteral(">\r\n                        <div>\r\n                            <h2>\r\n");
+WriteLiteral(">\r\n                            <div>\r\n                                <h2>\r\n");
 
-WriteLiteral("                                ");
+WriteLiteral("                                    ");
 
             
-            #line 106 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                           Write(Model.Job.JobType.Description);
+            #line 117 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                               Write(Model.Job.JobType.Description);
 
             
             #line default
@@ -425,37 +498,37 @@ WriteLiteral("                                ");
 WriteLiteral("</h2>\r\n");
 
             
-            #line 107 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                            
-            
-            #line default
-            #line hidden
-            
-            #line 107 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                             using (Html.BeginForm(MVC.API.Job.UpdateSubTypes(Model.Job.Id, redirect: true), FormMethod.Post, new { id = "formUpdateJobTypes" }))
-                            {
+            #line 118 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                 
             
             #line default
             #line hidden
             
-            #line 109 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                           Write(CommonHelpers.CheckBoxList("SubTypes", Model.UpdatableJobSubTypes.ToSelectListItems(Model.Job.JobSubTypes.ToList()), 3));
+            #line 118 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                 using (Html.BeginForm(MVC.API.Job.UpdateSubTypes(Model.Job.Id, redirect: true), FormMethod.Post, new { id = "formUpdateJobTypes" }))
+                                {
+                                    
+            
+            #line default
+            #line hidden
+            
+            #line 120 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                               Write(CommonHelpers.CheckBoxList("SubTypes", Model.UpdatableJobSubTypes.ToSelectListItems(Model.Job.JobSubTypes.ToList()), 3));
 
             
             #line default
             #line hidden
             
-            #line 109 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                                                                                                                            
+            #line 120 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                                                                                                
 
             
             #line default
             #line hidden
-WriteLiteral("                                <hr />\r\n");
+WriteLiteral("                                    <hr />\r\n");
 
-WriteLiteral("                                <div>\r\n                                    <input" +
-"");
+WriteLiteral("                                    <div>\r\n                                      " +
+"  <input");
 
 WriteLiteral(" type=\"checkbox\"");
 
@@ -465,44 +538,71 @@ WriteLiteral(" id=\"UpdateJobTypesAddComponents\"");
 
 WriteLiteral(" name=\"AddComponents\"");
 
-WriteLiteral("\r\n                                        checked=\"checked\"");
+WriteLiteral("\r\n                                            checked=\"checked\"");
 
 WriteLiteral(" /><label");
 
 WriteLiteral(" for=\"UpdateJobTypesAddComponents\"");
 
 WriteLiteral(">Add Components for newly added Sub Types</label>\r\n                              " +
-"  </div>\r\n");
+"      </div>\r\n");
 
             
-            #line 115 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                            }
+            #line 126 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                }
 
             
             #line default
             #line hidden
-WriteLiteral("                        </div>\r\n                    </div>\r\n                    <" +
-"script>\r\n                        $(function(){\r\n                            var " +
-"$Job_Show_Job_SubTypes_Update_Dialog = null;\r\n\r\n                            $(\'#" +
-"Job_Show_Job_SubTypes_Update\').click(function () {\r\n                            " +
-"    if (!$Job_Show_Job_SubTypes_Update_Dialog) {\r\n                              " +
-"      $Job_Show_Job_SubTypes_Update_Dialog = $(\'#Job_Show_Job_SubTypes_Update_Di" +
-"alog\');\r\n                                    $Job_Show_Job_SubTypes_Update_Dialo" +
-"g.dialog({\r\n                                        resizable: false,\r\n         " +
-"                               modal: true,\r\n                                   " +
-"     autoOpen: false,\r\n                                        width: 700,\r\n    " +
-"                                    buttons: {\r\n                                " +
-"            \"Save\": function () {\r\n                                             " +
-"   $(\'#formUpdateJobTypes\').submit();\r\n                                         " +
+WriteLiteral("                            </div>\r\n                        </div>\r\n");
+
+WriteLiteral("                        <script>\r\n                            $(function(){\r\n    " +
+"                            var $Job_Show_Job_SubTypes_Update_Dialog = null;\r\n\r\n" +
+"                                $(\'#Job_Show_Job_SubTypes_Update\').click(functio" +
+"n () {\r\n                                    if (!$Job_Show_Job_SubTypes_Update_D" +
+"ialog) {\r\n                                        $Job_Show_Job_SubTypes_Update_" +
+"Dialog = $(\'#Job_Show_Job_SubTypes_Update_Dialog\');\r\n                           " +
+"             $Job_Show_Job_SubTypes_Update_Dialog.dialog({\r\n                    " +
+"                        resizable: false,\r\n                                     " +
+"       modal: true,\r\n                                            autoOpen: false" +
+",\r\n                                            width: 700,\r\n                    " +
+"                        buttons: {\r\n                                            " +
+"    \"Save\": function () {\r\n                                                    $" +
+"(\'#formUpdateJobTypes\').submit();\r\n                                             " +
 "       $Job_Show_Job_SubTypes_Update_Dialog.dialog(\"disable\");\r\n                " +
-"                            },\r\n                                            Canc" +
-"el: function () {\r\n                                                $(this).dialo" +
-"g(\"close\");\r\n                                            }\r\n                    " +
-"                    }\r\n                                    });\r\n                " +
-"                }\r\n\r\n                                $Job_Show_Job_SubTypes_Upda" +
-"te_Dialog.dialog(\'open\');\r\n                                return false;\r\n      " +
-"                      });\r\n                        });\r\n                    </sc" +
-"ript>\r\n                </div>\r\n                <div");
+"                                },\r\n                                            " +
+"    Cancel: function () {\r\n                                                    $" +
+"(this).dialog(\"close\");\r\n                                                }\r\n    " +
+"                                        }\r\n                                     " +
+"   });\r\n                                    }\r\n\r\n                               " +
+"     $Job_Show_Job_SubTypes_Update_Dialog.dialog(\'open\');\r\n                     " +
+"               return false;\r\n                                });\r\n             " +
+"               });\r\n                        </script>\r\n");
+
+            
+            #line 158 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n");
+
+            
+            #line 160 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 160 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                 if (Authorization.Has(Claims.Job.Actions.GenerateDocuments))
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <div");
 
 WriteLiteral(" id=\"Job_Show_GenerateDocument_Container\"");
 
@@ -510,53 +610,60 @@ WriteLiteral(" class=\"status\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("                    ");
+WriteLiteral("                        ");
 
             
-            #line 149 "..\..\Views\Job\JobParts\_Subject.cshtml"
-               Write(Html.DropDownList("Job_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems));
+            #line 163 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                   Write(Html.DropDownList("Job_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    <script");
+WriteLiteral("\r\n                        <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n                        $(function () {\r\n                            var gener" +
-"atePdfUrl = \'");
+WriteLiteral(">\r\n                            $(function () {\r\n                                v" +
+"ar generatePdfUrl = \'");
 
             
-            #line 152 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                             Write(Url.Action(MVC.API.Job.GeneratePdf(Model.Job.Id.ToString(), null)));
+            #line 166 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                 Write(Url.Action(MVC.API.Job.GeneratePdf(Model.Job.Id.ToString(), null)));
 
             
             #line default
             #line hidden
 WriteLiteral(@"?DocumentTemplateId=';
-                            var $documentTemplates = $('#Job_Show_GenerateDocument');
-                            $documentTemplates.change(function () {
-                                var v = $documentTemplates.val();
-                                if (v) {
-                                    window.location.href = generatePdfUrl + v;
-                                    $documentTemplates.val('').blur();
-                                }
+                                var $documentTemplates = $('#Job_Show_GenerateDocument');
+                                $documentTemplates.change(function () {
+                                    var v = $documentTemplates.val();
+                                    if (v) {
+                                        window.location.href = generatePdfUrl + v;
+                                        $documentTemplates.val('').blur();
+                                    }
+                                });
                             });
-                        });
-                    </script>
-                </div>
-            </div>
-        </td>
+                        </script>
+                    </div>
 ");
 
             
-            #line 166 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 178 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </div>\r\n        </td>\r\n");
+
+            
+            #line 181 "..\..\Views\Job\JobParts\_Subject.cshtml"
         
             
             #line default
             #line hidden
             
-            #line 166 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 181 "..\..\Views\Job\JobParts\_Subject.cshtml"
          if (Model.Job.Device != null)
         {
 
@@ -576,12 +683,40 @@ WriteLiteral(" title=\"Serial Number\"");
 WriteLiteral(">");
 
             
-            #line 170 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                                           Write(Html.ActionLink(Model.Job.DeviceSerialNumber, MVC.Device.Show(Model.Job.DeviceSerialNumber)));
+            #line 185 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                 if (Authorization.Has(Claims.Device.Show))
+                                                                                {
+            
+            #line default
+            #line hidden
+            
+            #line 186 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                            Write(Html.ActionLink(Model.Job.DeviceSerialNumber, MVC.Device.Show(Model.Job.DeviceSerialNumber)));
 
             
             #line default
             #line hidden
+            
+            #line 186 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                                                                                                              }
+                                                                                else
+                                                                                {
+            
+            #line default
+            #line hidden
+            
+            #line 188 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                            Write(Model.Job.DeviceSerialNumber);
+
+            
+            #line default
+            #line hidden
+            
+            #line 188 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                                              }
+            
+            #line default
+            #line hidden
 WriteLiteral("</h2>\r\n                    <div");
 
 WriteLiteral(" class=\"clearfix\"");
@@ -596,14 +731,14 @@ WriteLiteral(" id=\"Job_Show_Device_Model_Image\"");
 
 WriteLiteral(" alt=\"Model Image\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 10879), Tuple.Create("\"", 10997)
+WriteAttribute("src", Tuple.Create(" src=\"", 12182), Tuple.Create("\"", 12300)
             
-            #line 173 "..\..\Views\Job\JobParts\_Subject.cshtml"
-        , Tuple.Create(Tuple.Create("", 10885), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.Job.Device.DeviceModelId, Model.Job.Device.DeviceModel.ImageHash()))
+            #line 191 "..\..\Views\Job\JobParts\_Subject.cshtml"
+        , Tuple.Create(Tuple.Create("", 12188), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.Job.Device.DeviceModelId, Model.Job.Device.DeviceModel.ImageHash()))
             
             #line default
             #line hidden
-, 10885), false)
+, 12188), false)
 );
 
 WriteLiteral(" />\r\n                            <div");
@@ -615,7 +750,7 @@ WriteLiteral(" title=\"Computer Name\"");
 WriteLiteral(">");
 
             
-            #line 174 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 192 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                     Write(Model.Job.Device.ComputerName);
 
             
@@ -630,7 +765,7 @@ WriteLiteral(" title=\"Model\"");
 WriteLiteral(">");
 
             
-            #line 175 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 193 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                      Write(Html.ActionLink(Model.Job.Device.DeviceModel.ToString(), MVC.Config.DeviceModel.Index(Model.Job.Device.DeviceModelId)));
 
             
@@ -639,13 +774,13 @@ WriteLiteral(">");
 WriteLiteral("</div>\r\n");
 
             
-            #line 176 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 194 "..\..\Views\Job\JobParts\_Subject.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 176 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 194 "..\..\Views\Job\JobParts\_Subject.cshtml"
                              if (Model.Job.Device.DeviceBatch != null)
                             {
 
@@ -661,7 +796,7 @@ WriteLiteral(" title=\"Batch\"");
 WriteLiteral(">");
 
             
-            #line 178 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 196 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                          Write(Html.ActionLink(Model.Job.Device.DeviceBatch.Name, MVC.Config.DeviceBatch.Index(Model.Job.Device.DeviceBatchId)));
 
             
@@ -670,7 +805,7 @@ WriteLiteral(">");
 WriteLiteral("</div>\r\n");
 
             
-            #line 179 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 197 "..\..\Views\Job\JobParts\_Subject.cshtml"
                             }
 
             
@@ -679,13 +814,13 @@ WriteLiteral("</div>\r\n");
 WriteLiteral("                        </div>\r\n");
 
             
-            #line 181 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 199 "..\..\Views\Job\JobParts\_Subject.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 181 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 199 "..\..\Views\Job\JobParts\_Subject.cshtml"
                          if (Model.Job.Device.DeviceBatch != null)
                         {
                             if (Model.Job.JobTypeId == JobType.JobTypeIds.HWar)
@@ -706,7 +841,7 @@ WriteLiteral(" id=\"Job_Show_Device_Details_HWar_ValidUntil\"");
 WriteLiteral(">");
 
             
-            #line 187 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 205 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                           Write(Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToFuzzy("Unknown"));
 
             
@@ -715,13 +850,13 @@ WriteLiteral(">");
 WriteLiteral("</span></div>\r\n");
 
             
-            #line 188 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 206 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                 
             
             #line default
             #line hidden
             
-            #line 188 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 206 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                  if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.WarrantyDetails))
                                 {
 
@@ -742,23 +877,23 @@ WriteLiteral(" id=\"Job_Show_Device_Details_HWar_Details_Dialog\"");
 
 WriteLiteral(" class=\"dialog\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 12575), Tuple.Create("\"", 12640)
-, Tuple.Create(Tuple.Create("", 12583), Tuple.Create("Warranty", 12583), true)
-, Tuple.Create(Tuple.Create(" ", 12591), Tuple.Create("Details", 12592), true)
-, Tuple.Create(Tuple.Create(" ", 12599), Tuple.Create("for", 12600), true)
+WriteAttribute("title", Tuple.Create(" title=\"", 13878), Tuple.Create("\"", 13943)
+, Tuple.Create(Tuple.Create("", 13886), Tuple.Create("Warranty", 13886), true)
+, Tuple.Create(Tuple.Create(" ", 13894), Tuple.Create("Details", 13895), true)
+, Tuple.Create(Tuple.Create(" ", 13902), Tuple.Create("for", 13903), true)
             
-            #line 191 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                    , Tuple.Create(Tuple.Create(" ", 12603), Tuple.Create<System.Object, System.Int32>(Model.Job.Device.DeviceBatch.Name
+            #line 209 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                    , Tuple.Create(Tuple.Create(" ", 13906), Tuple.Create<System.Object, System.Int32>(Model.Job.Device.DeviceBatch.Name
             
             #line default
             #line hidden
-, 12604), false)
+, 13907), false)
 );
 
 WriteLiteral(">\r\n                                        <div>");
 
             
-            #line 192 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 210 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                          Write(new HtmlString(Model.Job.Device.DeviceBatch.WarrantyDetails));
 
             
@@ -788,7 +923,7 @@ WriteLiteral(@">
 ");
 
             
-            #line 209 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 227 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                 }
 
             
@@ -797,7 +932,7 @@ WriteLiteral(@">
 WriteLiteral("                            </div>    \r\n");
 
             
-            #line 211 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 229 "..\..\Views\Job\JobParts\_Subject.cshtml"
                             }
                             if (Model.Job.JobTypeId == JobType.JobTypeIds.HNWar)
                             {
@@ -817,7 +952,7 @@ WriteLiteral(" id=\"Job_Show_Device_Details_HNWar_InsuranceSupplier\"");
 WriteLiteral(">");
 
             
-            #line 216 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 234 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                      Write(Model.Job.Device.DeviceBatch.InsuranceSupplier);
 
             
@@ -830,7 +965,7 @@ WriteLiteral(" id=\"Job_Show_Device_Details_HNWar_ValidUntil\"");
 WriteLiteral(">");
 
             
-            #line 217 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 235 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                            Write(Model.Job.Device.DeviceBatch.InsuredUntil.ToFuzzy("Unknown"));
 
             
@@ -839,13 +974,13 @@ WriteLiteral(">");
 WriteLiteral("</span></div>\r\n");
 
             
-            #line 218 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 236 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                 
             
             #line default
             #line hidden
             
-            #line 218 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 236 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                  if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.InsuranceDetails))
                                 {
 
@@ -866,23 +1001,23 @@ WriteLiteral(" id=\"Job_Show_Device_Details_HNWar_Details_Dialog\"");
 
 WriteLiteral(" class=\"dialog\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 14823), Tuple.Create("\"", 14889)
-, Tuple.Create(Tuple.Create("", 14831), Tuple.Create("Insurance", 14831), true)
-, Tuple.Create(Tuple.Create(" ", 14840), Tuple.Create("Details", 14841), true)
-, Tuple.Create(Tuple.Create(" ", 14848), Tuple.Create("for", 14849), true)
+WriteAttribute("title", Tuple.Create(" title=\"", 16126), Tuple.Create("\"", 16192)
+, Tuple.Create(Tuple.Create("", 16134), Tuple.Create("Insurance", 16134), true)
+, Tuple.Create(Tuple.Create(" ", 16143), Tuple.Create("Details", 16144), true)
+, Tuple.Create(Tuple.Create(" ", 16151), Tuple.Create("for", 16152), true)
             
-            #line 221 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                      , Tuple.Create(Tuple.Create(" ", 14852), Tuple.Create<System.Object, System.Int32>(Model.Job.Device.DeviceBatch.Name
+            #line 239 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                      , Tuple.Create(Tuple.Create(" ", 16155), Tuple.Create<System.Object, System.Int32>(Model.Job.Device.DeviceBatch.Name
             
             #line default
             #line hidden
-, 14853), false)
+, 16156), false)
 );
 
 WriteLiteral(">\r\n                                        <div>");
 
             
-            #line 222 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 240 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                          Write(new HtmlString(Model.Job.Device.DeviceBatch.InsuranceDetails));
 
             
@@ -912,7 +1047,7 @@ WriteLiteral(@">
 ");
 
             
-            #line 239 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 257 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                 }
 
             
@@ -921,7 +1056,7 @@ WriteLiteral(@">
 WriteLiteral("                            </div>    \r\n");
 
             
-            #line 241 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 259 "..\..\Views\Job\JobParts\_Subject.cshtml"
                             }
                         }
 
@@ -931,13 +1066,13 @@ WriteLiteral("                            </div>    \r\n");
 WriteLiteral("                    </div>\r\n");
 
             
-            #line 244 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 262 "..\..\Views\Job\JobParts\_Subject.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 244 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 262 "..\..\Views\Job\JobParts\_Subject.cshtml"
                      if (Model.Job.DeviceHeld.HasValue)
                     {
 
@@ -955,43 +1090,113 @@ WriteLiteral(">\r\n                            <table");
 WriteLiteral(" class=\"none\"");
 
 WriteLiteral(">\r\n                                <tr>\r\n                                    <td>" +
-"Location:</td>\r\n                                    <td>");
+"Location:</td>\r\n                                    <td>\r\n                      " +
+"                  <span");
+
+WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_Location\"");
+
+WriteLiteral(">\r\n");
 
             
-            #line 250 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                   Write(Html.TextBoxFor(m => m.Job.DeviceHeldLocation, new { @class = "small discreet" }));
+            #line 270 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                            
+            
+            #line default
+            #line hidden
+            
+            #line 270 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                             if (Authorization.Has(Claims.Job.Properties.DeviceHeldLocation))
+                                            {
+                                                
+            
+            #line default
+            #line hidden
+            
+            #line 272 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                           Write(Html.TextBoxFor(m => m.Job.DeviceHeldLocation, new { @class = "small discreet" }));
 
             
             #line default
             #line hidden
-WriteLiteral(" ");
-
             
-            #line 250 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                                                                                      Write(AjaxHelpers.AjaxSave());
+            #line 272 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                                                                   
+            
+            #line default
+            #line hidden
+            
+            #line 272 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                                                              Write(AjaxHelpers.AjaxSave());
 
             
             #line default
             #line hidden
-WriteLiteral(" ");
-
             
-            #line 250 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                                                                                                              Write(AjaxHelpers.AjaxLoader());
+            #line 272 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                                                                                           
+            
+            #line default
+            #line hidden
+            
+            #line 272 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                                                                                      Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
-WriteLiteral("</td>\r\n                                </tr>\r\n                                <tr" +
-">\r\n                                    <td>Held Since:</td>\r\n                   " +
-"                 <td><span");
+            
+            #line 272 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                                                                                                                    
+                                            }
+                                            else if (string.IsNullOrEmpty(Model.Job.DeviceHeldLocation))
+                                            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                                <span");
+
+WriteLiteral(" class=\"smallMessage\"");
+
+WriteLiteral(">&lt;None/Unknown&gt;</span>\r\n");
+
+            
+            #line 277 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                            }
+                                            else
+                                            {
+                                                
+            
+            #line default
+            #line hidden
+            
+            #line 280 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                           Write(Model.Job.DeviceHeldLocation);
+
+            
+            #line default
+            #line hidden
+            
+            #line 280 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                             
+                                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"                                        </span>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>Held Since:</td>
+                                    <td><span");
 
 WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_DeviceHeld\"");
 
 WriteLiteral(">");
 
             
-            #line 254 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 287 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                     Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.DeviceHeld, Model.Job.DeviceHeldTechUser));
 
             
@@ -1000,13 +1205,13 @@ WriteLiteral(">");
 WriteLiteral("</span></td>\r\n                                </tr>\r\n");
 
             
-            #line 256 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 289 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                 
             
             #line default
             #line hidden
             
-            #line 256 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 289 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                  if (Model.Job.DeviceReadyForReturn.HasValue)
                                 {
 
@@ -1021,7 +1226,7 @@ WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_DeviceReadyForReturn\"");
 WriteLiteral(">");
 
             
-            #line 260 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 293 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                   Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.DeviceReadyForReturn, Model.Job.DeviceReadyForReturnTechUser));
 
             
@@ -1030,7 +1235,7 @@ WriteLiteral(">");
 WriteLiteral("</span></td>\r\n                                    </tr>\r\n");
 
             
-            #line 262 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 295 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                 }
 
             
@@ -1039,7 +1244,7 @@ WriteLiteral("</span></td>\r\n                                    </tr>\r\n");
 WriteLiteral("                                ");
 
             
-            #line 263 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 296 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                  if (Model.Job.DeviceReturnedDate.HasValue)
                                 {
 
@@ -1054,7 +1259,7 @@ WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_DeviceReturnedDate\"");
 WriteLiteral(">");
 
             
-            #line 267 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 300 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                 Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.DeviceReturnedDate, Model.Job.DeviceReturnedTechUser));
 
             
@@ -1063,70 +1268,94 @@ WriteLiteral(">");
 WriteLiteral("</span></td>\r\n                                    </tr>\r\n");
 
             
-            #line 269 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 302 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                 }
 
             
             #line default
             #line hidden
-WriteLiteral("                            </table>\r\n\r\n                            <script");
+WriteLiteral("                            </table>\r\n");
+
+            
+            #line 304 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 304 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                             if (Authorization.Has(Claims.Job.Properties.DeviceHeldLocation))
+                            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(@">
-                                $(function () {
-                                    var $deviceHeldLocation = $('#Job_DeviceHeldLocation');
-                                    var $ajaxSave = $deviceHeldLocation.next('.ajaxSave');
+                                    $(function () {
+                                        var $deviceHeldLocation = $('#Job_DeviceHeldLocation');
+                                        var $ajaxSave = $deviceHeldLocation.next('.ajaxSave');
 
-                                    $deviceHeldLocation
-                                        .watermark('Unknown')
-                                        .focus(function () { $deviceHeldLocation.select() })
-                                        .keydown(function (e) {
-                                            $ajaxSave.show();
-                                            if (e.which == 13) {
-                                                $(this).blur();
-                                            }
-                                        }).blur(function () {
-                                            $ajaxSave.hide();
-                                        })
-                                        .change(function () {
-                                            $ajaxSave.hide();
-                                            $ajaxLoading = $ajaxSave.next('.ajaxLoading').show();
-                                            var data = { DeviceHeldLocation: $deviceHeldLocation.val() };
-                                            $.ajax({
-                                                url: '");
+                                        $deviceHeldLocation
+                                            .watermark('Unknown')
+                                            .focus(function () { $deviceHeldLocation.select() })
+                                            .keydown(function (e) {
+                                                $ajaxSave.show();
+                                                if (e.which == 13) {
+                                                    $(this).blur();
+                                                }
+                                            }).blur(function () {
+                                                $ajaxSave.hide();
+                                            })
+                                            .change(function () {
+                                                $ajaxSave.hide();
+                                                $ajaxLoading = $ajaxSave.next('.ajaxLoading').show();
+                                                var data = { DeviceHeldLocation: $deviceHeldLocation.val() };
+                                                $.ajax({
+                                                    url: '");
 
             
-            #line 293 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                 Write(Url.Action(MVC.API.Job.UpdateDeviceHeldLocation(Model.Job.Id, null)));
+            #line 327 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                     Write(Url.Action(MVC.API.Job.UpdateDeviceHeldLocation(Model.Job.Id, null)));
 
             
             #line default
             #line hidden
 WriteLiteral(@"',
-                                                dataType: 'json',
-                                                data: data,
-                                                success: function (d) {
-                                                    if (d == 'OK') {
-                                                        $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
-                                                    } else {
+                                                    dataType: 'json',
+                                                    data: data,
+                                                    success: function (d) {
+                                                        if (d == 'OK') {
+                                                            $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                                        } else {
+                                                            $ajaxLoading.hide();
+                                                            alert('Unable to update device held location: ' + d);
+                                                        }
+                                                    },
+                                                    error: function (jqXHR, textStatus, errorThrown) {
+                                                        alert('Unable to update device held location: ' + textStatus);
                                                         $ajaxLoading.hide();
-                                                        alert('Unable to update device held location: ' + d);
                                                     }
-                                                },
-                                                error: function (jqXHR, textStatus, errorThrown) {
-                                                    alert('Unable to update device held location: ' + textStatus);
-                                                    $ajaxLoading.hide();
-                                                }
+                                                });
                                             });
-                                        });
-                                });
-                            </script>
-                        </div>
+                                    });
+                                </script>
 ");
 
             
-            #line 313 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 346 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </div>\r\n");
+
+            
+            #line 348 "..\..\Views\Job\JobParts\_Subject.cshtml"
                     }
 
             
@@ -1135,7 +1364,7 @@ WriteLiteral(@"',
 WriteLiteral("                </div>\r\n            </td>\r\n");
 
             
-            #line 316 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 351 "..\..\Views\Job\JobParts\_Subject.cshtml"
         }
 
             
@@ -1144,7 +1373,7 @@ WriteLiteral("                </div>\r\n            </td>\r\n");
 WriteLiteral("        ");
 
             
-            #line 317 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 352 "..\..\Views\Job\JobParts\_Subject.cshtml"
          if (Model.Job.User != null)
         {
 
@@ -1164,13 +1393,42 @@ WriteLiteral(" title=\"Display Name\"");
 WriteLiteral(">");
 
             
-            #line 321 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                                       Write(Html.ActionLink(Model.Job.User.DisplayName, MVC.User.Show(Model.Job.UserId)));
+            #line 356 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                             if (Authorization.Has(Claims.User.Show))
+                                                                            {
+            
+            #line default
+            #line hidden
+            
+            #line 357 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                        Write(Html.ActionLink(Model.Job.User.DisplayName, MVC.User.Show(Model.Job.UserId)));
 
             
             #line default
             #line hidden
-WriteLiteral("</h2>\r\n                    <div");
+            
+            #line 357 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                                                                                          }
+                                                                            else
+                                                                            {
+            
+            #line default
+            #line hidden
+            
+            #line 359 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                        Write(Model.Job.User.DisplayName);
+
+            
+            #line default
+            #line hidden
+            
+            #line 359 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                                                                                                        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    </h2>\r\n                    <div");
 
 WriteLiteral(" id=\"Job_Show_User_Id\"");
 
@@ -1179,37 +1437,22 @@ WriteLiteral(" title=\"Id\"");
 WriteLiteral(">");
 
             
-            #line 322 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 361 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                      Write(Model.Job.UserId);
 
             
             #line default
             #line hidden
-WriteLiteral(" <span");
-
-WriteLiteral(" id=\"Job_Show_User_Type\"");
-
-WriteLiteral(" title=\"Type\"");
-
-WriteLiteral(">[");
+WriteLiteral("</div>\r\n");
 
             
-            #line 322 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                                                                                    Write(Model.Job.User.Type);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("]</span></div>\r\n");
-
-            
-            #line 323 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 362 "..\..\Views\Job\JobParts\_Subject.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 323 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 362 "..\..\Views\Job\JobParts\_Subject.cshtml"
                      if (!string.IsNullOrWhiteSpace(Model.Job.User.PhoneNumber))
                     {
             
@@ -1224,7 +1467,7 @@ WriteLiteral(" title=\"Phone Number\"");
 WriteLiteral(">Phone: ");
 
             
-            #line 324 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 363 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                 Write(Model.Job.User.PhoneNumber);
 
             
@@ -1233,7 +1476,7 @@ WriteLiteral(">Phone: ");
 WriteLiteral("</div>");
 
             
-            #line 324 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 363 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                       }
 
             
@@ -1242,7 +1485,7 @@ WriteLiteral("</div>");
 WriteLiteral("                    ");
 
             
-            #line 325 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 364 "..\..\Views\Job\JobParts\_Subject.cshtml"
                      if (!string.IsNullOrWhiteSpace(Model.Job.User.EmailAddress))
                     {
             
@@ -1256,21 +1499,21 @@ WriteLiteral(" title=\"Email Address\"");
 
 WriteLiteral(">Email: <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 21807), Tuple.Create("\"", 21851)
-, Tuple.Create(Tuple.Create("", 21814), Tuple.Create("mailto:", 21814), true)
+WriteAttribute("href", Tuple.Create(" href=\"", 24636), Tuple.Create("\"", 24680)
+, Tuple.Create(Tuple.Create("", 24643), Tuple.Create("mailto:", 24643), true)
             
-            #line 326 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                       , Tuple.Create(Tuple.Create("", 21821), Tuple.Create<System.Object, System.Int32>(Model.Job.User.EmailAddress
+            #line 365 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                       , Tuple.Create(Tuple.Create("", 24650), Tuple.Create<System.Object, System.Int32>(Model.Job.User.EmailAddress
             
             #line default
             #line hidden
-, 21821), false)
+, 24650), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 326 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 365 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                   Write(Model.Job.User.EmailAddress);
 
             
@@ -1279,7 +1522,7 @@ WriteLiteral(">");
 WriteLiteral("</a></div>");
 
             
-            #line 326 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 365 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                                                              }
 
             
@@ -1288,7 +1531,7 @@ WriteLiteral("</a></div>");
 WriteLiteral("                    ");
 
             
-            #line 327 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 366 "..\..\Views\Job\JobParts\_Subject.cshtml"
                      if (Model.Job.WaitingForUserAction.HasValue)
                     {
 
@@ -1305,7 +1548,7 @@ WriteLiteral(">\r\n                            <h4>Awaiting Action</h4>\r\n
 "    Since: ");
 
             
-            #line 331 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 370 "..\..\Views\Job\JobParts\_Subject.cshtml"
                               Write(Model.Job.WaitingForUserAction.ToFuzzy());
 
             
@@ -1314,7 +1557,7 @@ WriteLiteral(">\r\n                            <h4>Awaiting Action</h4>\r\n
 WriteLiteral("\r\n                        </div>\r\n");
 
             
-            #line 333 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 372 "..\..\Views\Job\JobParts\_Subject.cshtml"
                     }
 
             
@@ -1323,7 +1566,7 @@ WriteLiteral("\r\n                        </div>\r\n");
 WriteLiteral("                </div>\r\n            </td>\r\n");
 
             
-            #line 336 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 375 "..\..\Views\Job\JobParts\_Subject.cshtml"
         }
 
             
@@ -1340,13 +1583,13 @@ WriteLiteral(" id=\"Job_Show_Job_Actions\"");
 WriteLiteral(">\r\n");
 
             
-            #line 340 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 379 "..\..\Views\Job\JobParts\_Subject.cshtml"
             
             
             #line default
             #line hidden
             
-            #line 340 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 379 "..\..\Views\Job\JobParts\_Subject.cshtml"
              if (Model.Job.CanForceClose())
             { 
                 
@@ -1354,14 +1597,14 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 342 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 381 "..\..\Views\Job\JobParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Forcibly Close Job", MVC.API.Job.Close(Model.Job.Id, true), "Job_Show_Job_Actions_ForceClose_Button"));
 
             
             #line default
             #line hidden
             
-            #line 342 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 381 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                                   
 
             
@@ -1378,13 +1621,13 @@ WriteLiteral(" title=\"Forcibly Close this Job?\"");
 WriteLiteral(">\r\n");
 
             
-            #line 344 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 383 "..\..\Views\Job\JobParts\_Subject.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 344 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 383 "..\..\Views\Job\JobParts\_Subject.cshtml"
                      using (Html.BeginForm(MVC.API.Job.ForceClose(Model.Job.Id, null, true)))
                     {
 
@@ -1411,7 +1654,7 @@ WriteLiteral(" class=\"block\"");
 WriteLiteral("></textarea>\r\n                        </p>\r\n");
 
             
-            #line 354 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 393 "..\..\Views\Job\JobParts\_Subject.cshtml"
                     }
 
             
@@ -1444,7 +1687,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 "                    });\r\n                    });\r\n                </script>\r\n");
 
             
-            #line 387 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 426 "..\..\Views\Job\JobParts\_Subject.cshtml"
             }
 
             
@@ -1453,13 +1696,13 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 WriteLiteral("\r\n");
 
             
-            #line 389 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 428 "..\..\Views\Job\JobParts\_Subject.cshtml"
             
             
             #line default
             #line hidden
             
-            #line 389 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 428 "..\..\Views\Job\JobParts\_Subject.cshtml"
              if (Model.Job.CanClose())
             { 
                 
@@ -1467,14 +1710,14 @@ WriteLiteral("\r\n");
             #line default
             #line hidden
             
-            #line 391 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 430 "..\..\Views\Job\JobParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Close Job", MVC.API.Job.Close(Model.Job.Id, true), "Job_Show_Job_Actions_Close_Button"));
 
             
             #line default
             #line hidden
             
-            #line 391 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 430 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                     
 
             
@@ -1523,7 +1766,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 "     });\r\n                    });\r\n                </script>\r\n");
 
             
-            #line 429 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 468 "..\..\Views\Job\JobParts\_Subject.cshtml"
             }
 
             
@@ -1532,7 +1775,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 WriteLiteral("            ");
 
             
-            #line 430 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 469 "..\..\Views\Job\JobParts\_Subject.cshtml"
              if (Model.Job.CanReopen())
             { 
                 
@@ -1540,14 +1783,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 432 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 471 "..\..\Views\Job\JobParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Reopen Job", MVC.API.Job.Reopen(Model.Job.Id, true), "Job_Show_Job_Actions_Reopen_Button"));
 
             
             #line default
             #line hidden
             
-            #line 432 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 471 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                        
 
             
@@ -1597,7 +1840,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 "          });\r\n                </script>\r\n");
 
             
-            #line 471 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 510 "..\..\Views\Job\JobParts\_Subject.cshtml"
             }
 
             
@@ -1606,7 +1849,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 WriteLiteral("            ");
 
             
-            #line 472 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 511 "..\..\Views\Job\JobParts\_Subject.cshtml"
              if (Model.Job.CanDelete())
             { 
                 
@@ -1614,14 +1857,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 474 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 513 "..\..\Views\Job\JobParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Delete Job", MVC.API.Job.Delete(Model.Job.Id, true), "Job_Show_Job_Actions_Delete_Button"));
 
             
             #line default
             #line hidden
             
-            #line 474 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 513 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                        
 
             
@@ -1672,7 +1915,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 "   </script>\r\n");
 
             
-            #line 513 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 552 "..\..\Views\Job\JobParts\_Subject.cshtml"
             }
 
             
@@ -1681,7 +1924,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 WriteLiteral("            ");
 
             
-            #line 514 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 553 "..\..\Views\Job\JobParts\_Subject.cshtml"
              if (Model.Job.CanLogWarranty())
             { 
                 
@@ -1689,14 +1932,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 516 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 555 "..\..\Views\Job\JobParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Log Warranty", MVC.Job.LogWarranty(Model.Job.Id, null, null), "Job_Show_Job_Actions_LogWarranty_Button"));
 
             
             #line default
             #line hidden
             
-            #line 516 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 555 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                                      
             }
 
@@ -1706,7 +1949,7 @@ WriteLiteral("            ");
 WriteLiteral("            ");
 
             
-            #line 518 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 557 "..\..\Views\Job\JobParts\_Subject.cshtml"
              if (Model.Job.CanWarrantyCompleted())
             { 
                 
@@ -1714,14 +1957,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 520 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 559 "..\..\Views\Job\JobParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Warranty Complete", MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_WarrantyComplete_Button", "alert"));
 
             
             #line default
             #line hidden
             
-            #line 520 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 559 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                                                                                      
             }
 
@@ -1731,7 +1974,7 @@ WriteLiteral("            ");
 WriteLiteral("            ");
 
             
-            #line 522 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 561 "..\..\Views\Job\JobParts\_Subject.cshtml"
              if (Model.Job.CanInsuranceClaimFormSent())
             { 
                 
@@ -1739,14 +1982,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 524 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 563 "..\..\Views\Job\JobParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Insurance Claim Sent", MVC.API.Job.UpdateInsuranceClaimFormSentDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_InsuranceClaimSent_Button", "alert"));
 
             
             #line default
             #line hidden
             
-            #line 524 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 563 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                                                                                        
             }
 
@@ -1756,7 +1999,7 @@ WriteLiteral("            ");
 WriteLiteral("            ");
 
             
-            #line 526 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 565 "..\..\Views\Job\JobParts\_Subject.cshtml"
              if (Model.Job.CanLogRepair())
             { 
                 
@@ -1764,14 +2007,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 528 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 567 "..\..\Views\Job\JobParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Repairs Logged", MVC.API.Job.LogRepair(Model.Job.Id, null, null, true), "Job_Show_Job_Actions_LogRepair_Button"));
 
             
             #line default
             #line hidden
             
-            #line 528 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 567 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                                              
 
             
@@ -1788,13 +2031,13 @@ WriteLiteral(" title=\"Repairs Logged\"");
 WriteLiteral(">\r\n");
 
             
-            #line 530 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 569 "..\..\Views\Job\JobParts\_Subject.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 530 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 569 "..\..\Views\Job\JobParts\_Subject.cshtml"
                      using (Html.BeginForm(MVC.API.Job.LogRepair(Model.Job.Id, null, null, true)))
                     {
 
@@ -1826,7 +2069,7 @@ WriteLiteral(" name=\"RepairerReference\"");
 WriteLiteral(" />\r\n                        </p>\r\n");
 
             
-            #line 540 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 579 "..\..\Views\Job\JobParts\_Subject.cshtml"
                     }
 
             
@@ -1864,7 +2107,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 "           });\r\n                    });\r\n                </script>\r\n");
 
             
-            #line 578 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 617 "..\..\Views\Job\JobParts\_Subject.cshtml"
             }
 
             
@@ -1873,7 +2116,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 WriteLiteral("            ");
 
             
-            #line 579 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 618 "..\..\Views\Job\JobParts\_Subject.cshtml"
              if (Model.Job.CanRepairComplete())
             { 
                 
@@ -1881,14 +2124,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 581 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 620 "..\..\Views\Job\JobParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Repairs Complete", MVC.API.Job.UpdateNonWarrantyRepairerCompletedDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_RepairComplete_Button", "alert"));
 
             
             #line default
             #line hidden
             
-            #line 581 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 620 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                                                                                      
             }
 
@@ -1898,7 +2141,7 @@ WriteLiteral("            ");
 WriteLiteral("            ");
 
             
-            #line 583 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 622 "..\..\Views\Job\JobParts\_Subject.cshtml"
              if (Model.Job.CanConvertHWarToHNWar())
             { 
                 
@@ -1906,14 +2149,14 @@ WriteLiteral("            ");
             #line default
             #line hidden
             
-            #line 585 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 624 "..\..\Views\Job\JobParts\_Subject.cshtml"
            Write(Html.ActionLinkSmallButton("Convert to Non-Warranty", MVC.API.Job.ConvertHWarToHNWar(Model.Job.Id, true), "Job_Show_Job_Actions_ConvertToHNWar_Button"));
 
             
             #line default
             #line hidden
             
-            #line 585 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 624 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                                                         
 
             
@@ -1964,7 +2207,7 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 "   \r\n                    });\r\n                </script>\r\n");
 
             
-            #line 626 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 665 "..\..\Views\Job\JobParts\_Subject.cshtml"
             }
 
             
@@ -1973,13 +2216,13 @@ WriteLiteral(">\r\n                    $(function () {\r\n
 WriteLiteral("        </td>\r\n");
 
             
-            #line 628 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 667 "..\..\Views\Job\JobParts\_Subject.cshtml"
         
             
             #line default
             #line hidden
             
-            #line 628 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 667 "..\..\Views\Job\JobParts\_Subject.cshtml"
          if (Model.Job.Device != null)
         {
 
@@ -1993,13 +2236,13 @@ WriteLiteral(" id=\"Job_Show_Device_Actions\"");
 WriteLiteral(">\r\n");
 
             
-            #line 631 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 670 "..\..\Views\Job\JobParts\_Subject.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 631 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 670 "..\..\Views\Job\JobParts\_Subject.cshtml"
                  if (Model.Job.CanDeviceHeld())
                 { 
                     
@@ -2007,14 +2250,14 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 633 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 672 "..\..\Views\Job\JobParts\_Subject.cshtml"
                Write(Html.ActionLinkSmallButton("Held", MVC.API.Job.DeviceHeld(Model.Job.Id, true), "Job_Show_Device_Actions_Held_Button"));
 
             
             #line default
             #line hidden
             
-            #line 633 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 672 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                           
                 }
 
@@ -2024,7 +2267,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                ");
 
             
-            #line 635 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 674 "..\..\Views\Job\JobParts\_Subject.cshtml"
                  if (Model.Job.CanDeviceReadyForReturn())
                 { 
                     
@@ -2032,14 +2275,14 @@ WriteLiteral("                ");
             #line default
             #line hidden
             
-            #line 637 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 676 "..\..\Views\Job\JobParts\_Subject.cshtml"
                Write(Html.ActionLinkSmallButton("Ready For Return", MVC.API.Job.DeviceReadyForReturn(Model.Job.Id, true), "Job_Show_Device_Actions_DeviceReadyForReturn_Button", "alert"));
 
             
             #line default
             #line hidden
             
-            #line 637 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 676 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                                                                          
                 }
 
@@ -2049,7 +2292,7 @@ WriteLiteral("                ");
 WriteLiteral("                ");
 
             
-            #line 639 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 678 "..\..\Views\Job\JobParts\_Subject.cshtml"
                  if (Model.Job.CanDeviceReturned())
                 { 
                     
@@ -2057,14 +2300,14 @@ WriteLiteral("                ");
             #line default
             #line hidden
             
-            #line 641 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 680 "..\..\Views\Job\JobParts\_Subject.cshtml"
                Write(Html.ActionLinkSmallButton("Returned", MVC.API.Job.DeviceReturned(Model.Job.Id, true), "Job_Show_Device_Actions_DeviceReturned_Button", Model.Job.CanDeviceReadyForReturn() ? null : "alert"));
 
             
             #line default
             #line hidden
             
-            #line 641 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 680 "..\..\Views\Job\JobParts\_Subject.cshtml"
                                                                                                                                                                                                                   
                 }
 
@@ -2074,7 +2317,7 @@ WriteLiteral("                ");
 WriteLiteral("            </td>\r\n");
 
             
-            #line 644 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 683 "..\..\Views\Job\JobParts\_Subject.cshtml"
         }
 
             
@@ -2083,7 +2326,7 @@ WriteLiteral("            </td>\r\n");
 WriteLiteral("        ");
 
             
-            #line 645 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 684 "..\..\Views\Job\JobParts\_Subject.cshtml"
          if (Model.Job.User != null)
         {
 
@@ -2097,13 +2340,13 @@ WriteLiteral(" id=\"Job_Show_User_Actions\"");
 WriteLiteral(">\r\n\r\n\r\n");
 
             
-            #line 650 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 689 "..\..\Views\Job\JobParts\_Subject.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 650 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 689 "..\..\Views\Job\JobParts\_Subject.cshtml"
                  if (Model.Job.CanWaitingForUserAction())
                 { 
 
@@ -2131,13 +2374,13 @@ WriteLiteral(" title=\"Waiting for User Action\"");
 WriteLiteral(">\r\n");
 
             
-            #line 654 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 693 "..\..\Views\Job\JobParts\_Subject.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 654 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 693 "..\..\Views\Job\JobParts\_Subject.cshtml"
                          using (Html.BeginForm(MVC.API.Job.WaitingForUserAction(Model.Job.Id, null, true)))
                         {
 
@@ -2155,7 +2398,7 @@ WriteLiteral(" class=\"block\"");
 WriteLiteral("></textarea>\r\n                            </p>\r\n");
 
             
-            #line 660 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 699 "..\..\Views\Job\JobParts\_Subject.cshtml"
                         }
 
             
@@ -2190,7 +2433,7 @@ WriteLiteral(">\r\n                        $(function () {\r\n
 "                    });\r\n                    </script>\r\n");
 
             
-            #line 693 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 732 "..\..\Views\Job\JobParts\_Subject.cshtml"
                 }
 
             
@@ -2199,7 +2442,7 @@ WriteLiteral(">\r\n                        $(function () {\r\n
 WriteLiteral("                ");
 
             
-            #line 694 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 733 "..\..\Views\Job\JobParts\_Subject.cshtml"
                  if (Model.Job.CanNotWaitingForUserAction())
                 { 
 
@@ -2227,13 +2470,13 @@ WriteLiteral(" title=\"Not Waiting for User Action\"");
 WriteLiteral(">\r\n");
 
             
-            #line 698 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 737 "..\..\Views\Job\JobParts\_Subject.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 698 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 737 "..\..\Views\Job\JobParts\_Subject.cshtml"
                          using (Html.BeginForm(MVC.API.Job.NotWaitingForUserAction(Model.Job.Id, null, true)))
                         {
 
@@ -2251,7 +2494,7 @@ WriteLiteral(" class=\"block\"");
 WriteLiteral("></textarea>\r\n                            </p>\r\n");
 
             
-            #line 704 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 743 "..\..\Views\Job\JobParts\_Subject.cshtml"
                         }
 
             
@@ -2287,7 +2530,7 @@ WriteLiteral(">\r\n                        $(function () {\r\n
 "    });\r\n                    </script>\r\n");
 
             
-            #line 738 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 777 "..\..\Views\Job\JobParts\_Subject.cshtml"
                 }
 
             
@@ -2296,7 +2539,7 @@ WriteLiteral(">\r\n                        $(function () {\r\n
 WriteLiteral("\r\n            </td>\r\n");
 
             
-            #line 741 "..\..\Views\Job\JobParts\_Subject.cshtml"
+            #line 780 "..\..\Views\Job\JobParts\_Subject.cshtml"
         }
 
             
diff --git a/Disco.Web/Views/Job/List.generated.cs b/Disco.Web/Views/Job/List.generated.cs
index 14f640cd..4ebe143e 100644
--- a/Disco.Web/Views/Job/List.generated.cs
+++ b/Disco.Web/Views/Job/List.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/List.cshtml")]
-    public partial class List : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ListModel>
+    public partial class List : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.ListModel>
     {
         public List()
         {
diff --git a/Disco.Web/Views/Job/LogWarranty.cshtml b/Disco.Web/Views/Job/LogWarranty.cshtml
index 311fec08..c0b5003f 100644
--- a/Disco.Web/Views/Job/LogWarranty.cshtml
+++ b/Disco.Web/Views/Job/LogWarranty.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Models.Job.LogWarrantyModel
 @{
+    Authorization.Require(Claims.Job.Actions.LogWarranty);
+    
     ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), string.Format("Job: {0}", Model.Job.Id), MVC.Job.Show(Model.Job.Id), "Log Warranty");
 }
 @using (Html.BeginForm(MVC.Job.LogWarranty(), FormMethod.Post))
diff --git a/Disco.Web/Views/Job/LogWarranty.generated.cs b/Disco.Web/Views/Job/LogWarranty.generated.cs
index 6946c3a1..2638ff16 100644
--- a/Disco.Web/Views/Job/LogWarranty.generated.cs
+++ b/Disco.Web/Views/Job/LogWarranty.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/LogWarranty.cshtml")]
-    public partial class LogWarranty : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.LogWarrantyModel>
+    public partial class LogWarranty : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.LogWarrantyModel>
     {
         public LogWarranty()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Views.Job
             
             #line 2 "..\..\Views\Job\LogWarranty.cshtml"
   
+    Authorization.Require(Claims.Job.Actions.LogWarranty);
+    
     ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), string.Format("Job: {0}", Model.Job.Id), MVC.Job.Show(Model.Job.Id), "Log Warranty");
 
             
@@ -51,7 +55,7 @@ namespace Disco.Web.Views.Job
 WriteLiteral("\r\n");
 
             
-            #line 5 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 7 "..\..\Views\Job\LogWarranty.cshtml"
  using (Html.BeginForm(MVC.Job.LogWarranty(), FormMethod.Post))
 {
     
@@ -59,42 +63,42 @@ WriteLiteral("\r\n");
             #line default
             #line hidden
             
-            #line 7 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 9 "..\..\Views\Job\LogWarranty.cshtml"
 Write(Html.ValidationSummary(true));
 
             
             #line default
             #line hidden
             
-            #line 7 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 9 "..\..\Views\Job\LogWarranty.cshtml"
                                  
     
             
             #line default
             #line hidden
             
-            #line 8 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 10 "..\..\Views\Job\LogWarranty.cshtml"
 Write(Html.HiddenFor(m => m.JobId));
 
             
             #line default
             #line hidden
             
-            #line 8 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 10 "..\..\Views\Job\LogWarranty.cshtml"
                                  
     
             
             #line default
             #line hidden
             
-            #line 9 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 11 "..\..\Views\Job\LogWarranty.cshtml"
 Write(Html.ValidationMessageFor(m => m.JobId));
 
             
             #line default
             #line hidden
             
-            #line 9 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 11 "..\..\Views\Job\LogWarranty.cshtml"
                                             
 
             
@@ -124,7 +128,7 @@ WriteLiteral(">\r\n        <table>\r\n            <tr>\r\n                <th>In
 WriteLiteral("                    ");
 
             
-            #line 17 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 19 "..\..\Views\Job\LogWarranty.cshtml"
                Write(Model.JobId);
 
             
@@ -136,7 +140,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 WriteLiteral("                    ");
 
             
-            #line 24 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 26 "..\..\Views\Job\LogWarranty.cshtml"
                Write(Model.Job.Device.SerialNumber);
 
             
@@ -148,7 +152,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 WriteLiteral("                    ");
 
             
-            #line 31 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 33 "..\..\Views\Job\LogWarranty.cshtml"
                Write(Model.Job.Device.DeviceModel.Manufacturer);
 
             
@@ -157,7 +161,7 @@ WriteLiteral("                    ");
 WriteLiteral(" ");
 
             
-            #line 31 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 33 "..\..\Views\Job\LogWarranty.cshtml"
                                                           Write(Model.Job.Device.DeviceModel.Model);
 
             
@@ -169,7 +173,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 WriteLiteral("                    ");
 
             
-            #line 38 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 40 "..\..\Views\Job\LogWarranty.cshtml"
                Write(Model.TechUser.DisplayName);
 
             
@@ -182,7 +186,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">\r\n                        Email Address: ");
 
             
-            #line 40 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 42 "..\..\Views\Job\LogWarranty.cshtml"
                                   Write(Model.TechUser.EmailAddress);
 
             
@@ -191,7 +195,7 @@ WriteLiteral(">\r\n                        Email Address: ");
 WriteLiteral("<br />\r\n                        Phone Number: ");
 
             
-            #line 41 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 43 "..\..\Views\Job\LogWarranty.cshtml"
                                  Write(Model.TechUser.PhoneNumber);
 
             
@@ -207,7 +211,7 @@ WriteLiteral(">Repair Address:\r\n                </th>\r\n                <td>\
 WriteLiteral("                    ");
 
             
-            #line 49 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 51 "..\..\Views\Job\LogWarranty.cshtml"
                Write(Html.DropDownListFor(model => model.OrganisationAddressId, Model.OrganisationAddresses.ToSelectListItems(Model.OrganisationAddressId, (Model.OrganisationAddress == null))));
 
             
@@ -218,7 +222,7 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 50 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 52 "..\..\Views\Job\LogWarranty.cshtml"
                Write(Html.ValidationMessageFor(m => m.OrganisationAddressId));
 
             
@@ -232,14 +236,14 @@ WriteLiteral(" style=\"display: none\"");
 
 WriteLiteral(">\r\n                        <img");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 2075), Tuple.Create("\"", 2134)
+WriteAttribute("src", Tuple.Create(" src=\"", 2141), Tuple.Create("\"", 2200)
             
-            #line 52 "..\..\Views\Job\LogWarranty.cshtml"
-, Tuple.Create(Tuple.Create("", 2081), Tuple.Create<System.Object, System.Int32>(Links.ClientSource.Style.Images.Status.loading_gif
+            #line 54 "..\..\Views\Job\LogWarranty.cshtml"
+, Tuple.Create(Tuple.Create("", 2147), Tuple.Create<System.Object, System.Int32>(Links.ClientSource.Style.Images.Status.loading_gif
             
             #line default
             #line hidden
-, 2081), false)
+, 2147), false)
 );
 
 WriteLiteral(" alt=\"Loading\"");
@@ -255,13 +259,13 @@ WriteLiteral(" id=\"organisationAddressDetails\"");
 WriteLiteral(">\r\n");
 
             
-            #line 56 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 58 "..\..\Views\Job\LogWarranty.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 56 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 58 "..\..\Views\Job\LogWarranty.cshtml"
                           
     var oa = Model.OrganisationAddress;
     if (oa != null)
@@ -273,7 +277,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                            <span>");
 
             
-            #line 60 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 62 "..\..\Views\Job\LogWarranty.cshtml"
                              Write(oa.Address);
 
             
@@ -286,7 +290,7 @@ WriteLiteral("                            <br />\r\n");
 WriteLiteral("                            <span>");
 
             
-            #line 62 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 64 "..\..\Views\Job\LogWarranty.cshtml"
                              Write(oa.Suburb);
 
             
@@ -295,7 +299,7 @@ WriteLiteral("                            <span>");
 WriteLiteral(", ");
 
             
-            #line 62 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 64 "..\..\Views\Job\LogWarranty.cshtml"
                                          Write(oa.Postcode);
 
             
@@ -308,7 +312,7 @@ WriteLiteral("                            <br />\r\n");
 WriteLiteral("                            <span>");
 
             
-            #line 64 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 66 "..\..\Views\Job\LogWarranty.cshtml"
                              Write(oa.State);
 
             
@@ -317,7 +321,7 @@ WriteLiteral("                            <span>");
 WriteLiteral(", ");
 
             
-            #line 64 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 66 "..\..\Views\Job\LogWarranty.cshtml"
                                         Write(oa.Country);
 
             
@@ -326,7 +330,7 @@ WriteLiteral(", ");
 WriteLiteral("</span>\r\n");
 
             
-            #line 65 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 67 "..\..\Views\Job\LogWarranty.cshtml"
     }
                         
             
@@ -339,7 +343,7 @@ WriteLiteral("\r\n                    </div>\r\n                </td>\r\n
 WriteLiteral("                    ");
 
             
-            #line 74 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 76 "..\..\Views\Job\LogWarranty.cshtml"
                Write(Html.DropDownListFor(model => model.WarrantyProviderId, Model.WarrantyProviders.ToSelectListItems(Model.WarrantyProviderId, true)));
 
             
@@ -350,7 +354,7 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 75 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 77 "..\..\Views\Job\LogWarranty.cshtml"
                Write(Html.ValidationMessageFor(m => m.WarrantyProviderId));
 
             
@@ -372,7 +376,7 @@ WriteLiteral(">\r\n        <h2>Fault Description</h2>\r\n        <table>\r\n
 WriteLiteral("                    ");
 
             
-            #line 85 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 87 "..\..\Views\Job\LogWarranty.cshtml"
                Write(Html.EditorFor(model => model.FaultDescription));
 
             
@@ -383,7 +387,7 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 86 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 88 "..\..\Views\Job\LogWarranty.cshtml"
                Write(Html.ValidationMessageFor(m => m.FaultDescription));
 
             
@@ -392,7 +396,7 @@ WriteLiteral("                    ");
 WriteLiteral("\r\n                </td>\r\n            </tr>\r\n        </table>\r\n    </div>\r\n");
 
             
-            #line 91 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 93 "..\..\Views\Job\LogWarranty.cshtml"
     if (Model.WarrantyProvider != null && Model.WarrantyProviderSubmitJobViewType != null)
     { 
 
@@ -408,7 +412,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("        ");
 
             
-            #line 94 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 96 "..\..\Views\Job\LogWarranty.cshtml"
    Write(Html.PartialCompiled(Model.WarrantyProviderSubmitJobViewType, Model.WarrantyProviderSubmitJobModel));
 
             
@@ -417,7 +421,7 @@ WriteLiteral("        ");
 WriteLiteral("\r\n    </div>\r\n");
 
             
-            #line 96 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 98 "..\..\Views\Job\LogWarranty.cshtml"
     }
 
             
@@ -438,7 +442,7 @@ WriteLiteral(" value=\"Preview Warranty Claim\"");
 WriteLiteral(" />\r\n    </div>\r\n");
 
             
-            #line 100 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 102 "..\..\Views\Job\LogWarranty.cshtml"
 }
 
             
@@ -465,7 +469,7 @@ WriteLiteral(@">
                 window.location.href = '");
 
             
-            #line 115 "..\..\Views\Job\LogWarranty.cshtml"
+            #line 117 "..\..\Views\Job\LogWarranty.cshtml"
                                     Write(Url.Action(MVC.Job.LogWarranty(Model.JobId, null, null)));
 
             
diff --git a/Disco.Web/Views/Job/LogWarrantyDisclose.cshtml b/Disco.Web/Views/Job/LogWarrantyDisclose.cshtml
index d43f01e6..18f1630a 100644
--- a/Disco.Web/Views/Job/LogWarrantyDisclose.cshtml
+++ b/Disco.Web/Views/Job/LogWarrantyDisclose.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Models.Job.LogWarrantyModel
 @{
+    Authorization.Require(Claims.Job.Actions.LogWarranty);
+    
     ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), string.Format("Job: {0}", Model.Job.Id), MVC.Job.Show(Model.Job.Id), "Log Warranty");
 }
 @using (Html.BeginForm(MVC.Job.LogWarranty(), FormMethod.Post))
diff --git a/Disco.Web/Views/Job/LogWarrantyDisclose.generated.cs b/Disco.Web/Views/Job/LogWarrantyDisclose.generated.cs
index 8efdfd45..f7effe7c 100644
--- a/Disco.Web/Views/Job/LogWarrantyDisclose.generated.cs
+++ b/Disco.Web/Views/Job/LogWarrantyDisclose.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/LogWarrantyDisclose.cshtml")]
-    public partial class LogWarrantyDisclose : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.LogWarrantyModel>
+    public partial class LogWarrantyDisclose : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.LogWarrantyModel>
     {
         public LogWarrantyDisclose()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Views.Job
             
             #line 2 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
   
+    Authorization.Require(Claims.Job.Actions.LogWarranty);
+    
     ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), string.Format("Job: {0}", Model.Job.Id), MVC.Job.Show(Model.Job.Id), "Log Warranty");
 
             
@@ -51,7 +55,7 @@ namespace Disco.Web.Views.Job
 WriteLiteral("\r\n");
 
             
-            #line 5 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 7 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
  using (Html.BeginForm(MVC.Job.LogWarranty(), FormMethod.Post))
 {
     
@@ -59,84 +63,84 @@ WriteLiteral("\r\n");
             #line default
             #line hidden
             
-            #line 7 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 9 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
 Write(Html.ValidationSummary(true));
 
             
             #line default
             #line hidden
             
-            #line 7 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 9 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                  
     
             
             #line default
             #line hidden
             
-            #line 8 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 10 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
 Write(Html.HiddenFor(m => m.JobId));
 
             
             #line default
             #line hidden
             
-            #line 8 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 10 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                  
     
             
             #line default
             #line hidden
             
-            #line 9 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 11 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
 Write(Html.HiddenFor(m => m.OrganisationAddressId));
 
             
             #line default
             #line hidden
             
-            #line 9 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 11 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                                  
     
             
             #line default
             #line hidden
             
-            #line 10 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 12 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
 Write(Html.HiddenFor(m => m.WarrantyProviderId));
 
             
             #line default
             #line hidden
             
-            #line 10 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 12 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                               
     
             
             #line default
             #line hidden
             
-            #line 11 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 13 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
 Write(Html.HiddenFor(m => m.FaultDescription));
 
             
             #line default
             #line hidden
             
-            #line 11 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 13 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                             
     
             
             #line default
             #line hidden
             
-            #line 12 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 14 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
 Write(Html.HiddenFor(m => m.WarrantyProviderPropertiesJson));
 
             
             #line default
             #line hidden
             
-            #line 12 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 14 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                                           
 
             
@@ -166,7 +170,7 @@ WriteLiteral(">\r\n        <table>\r\n            <tr>\r\n                <th>\r
 WriteLiteral("                    ");
 
             
-            #line 21 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 23 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                Write(Model.JobId);
 
             
@@ -179,7 +183,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 WriteLiteral("                    ");
 
             
-            #line 29 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 31 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                Write(Model.Job.Device.SerialNumber);
 
             
@@ -192,7 +196,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 WriteLiteral("                    ");
 
             
-            #line 37 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 39 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                Write(Model.Job.Device.DeviceModel.Manufacturer);
 
             
@@ -201,7 +205,7 @@ WriteLiteral("                    ");
 WriteLiteral(" ");
 
             
-            #line 37 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 39 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                                           Write(Model.Job.Device.DeviceModel.Model);
 
             
@@ -214,7 +218,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 WriteLiteral("                    ");
 
             
-            #line 45 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 47 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                Write(Model.TechUser.DisplayName);
 
             
@@ -227,7 +231,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">\r\n                        Email Address: ");
 
             
-            #line 47 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 49 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                   Write(Model.TechUser.EmailAddress);
 
             
@@ -236,7 +240,7 @@ WriteLiteral(">\r\n                        Email Address: ");
 WriteLiteral("<br />\r\n                        Phone Number: ");
 
             
-            #line 48 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 50 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                  Write(Model.TechUser.PhoneNumber);
 
             
@@ -257,7 +261,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                        ");
 
             
-            #line 58 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 60 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                    Write(Model.OrganisationAddress.Name);
 
             
@@ -270,7 +274,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">\r\n                            <span>");
 
             
-            #line 60 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 62 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                              Write(Model.OrganisationAddress.Address);
 
             
@@ -279,7 +283,7 @@ WriteLiteral(">\r\n                            <span>");
 WriteLiteral("</span><br />\r\n                            <span>");
 
             
-            #line 61 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 63 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                              Write(Model.OrganisationAddress.Suburb);
 
             
@@ -288,7 +292,7 @@ WriteLiteral("</span><br />\r\n                            <span>");
 WriteLiteral(", ");
 
             
-            #line 61 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 63 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                                                 Write(Model.OrganisationAddress.Postcode);
 
             
@@ -297,7 +301,7 @@ WriteLiteral(", ");
 WriteLiteral("</span><br />\r\n                            <span>");
 
             
-            #line 62 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 64 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                              Write(Model.OrganisationAddress.State);
 
             
@@ -306,7 +310,7 @@ WriteLiteral("</span><br />\r\n                            <span>");
 WriteLiteral(", ");
 
             
-            #line 62 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 64 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                                                Write(Model.OrganisationAddress.Country);
 
             
@@ -319,7 +323,7 @@ WriteLiteral("</span>\r\n                        </div>\r\n                    <
 WriteLiteral("                    ");
 
             
-            #line 72 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 74 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                Write(Model.WarrantyProvider.Name);
 
             
@@ -328,7 +332,7 @@ WriteLiteral("                    ");
 WriteLiteral(" (");
 
             
-            #line 72 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 74 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                              Write(Model.WarrantyProvider.Id);
 
             
@@ -337,7 +341,7 @@ WriteLiteral(" (");
 WriteLiteral(") ");
 
             
-            #line 72 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 74 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                                                          Write(Model.WarrantyProvider.PluginManifest.Version.ToString(3));
 
             
@@ -350,7 +354,7 @@ WriteLiteral("\r\n                </td>\r\n            </tr>\r\n            <tr>
 WriteLiteral("                    ");
 
             
-            #line 80 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 82 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                Write(Model.FaultDescription.ToMultilineString());
 
             
@@ -365,13 +369,13 @@ WriteLiteral(" id=\"warrantyDisclosedInformation\"");
 WriteLiteral(">\r\n                        <table>\r\n");
 
             
-            #line 90 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 92 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 90 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 92 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                              foreach (var dp in Model.DiscloseProperties)
                             {
 
@@ -381,7 +385,7 @@ WriteLiteral(">\r\n                        <table>\r\n");
 WriteLiteral("                                <tr>\r\n                                    <th>");
 
             
-            #line 93 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 95 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                    Write(dp.Key);
 
             
@@ -391,7 +395,7 @@ WriteLiteral(":\r\n                                    </th>\r\n
 " <td>");
 
             
-            #line 95 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 97 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                                    Write(dp.Value);
 
             
@@ -401,7 +405,7 @@ WriteLiteral("\r\n                                    </td>\r\n
 ">   \r\n");
 
             
-            #line 98 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 100 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
                             }
 
             
@@ -425,7 +429,7 @@ WriteLiteral(" value=\"Submit Warranty Claim\"");
 WriteLiteral(" />\r\n    </div>\r\n");
 
             
-            #line 108 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
+            #line 110 "..\..\Views\Job\LogWarrantyDisclose.cshtml"
 }
             
             #line default
diff --git a/Disco.Web/Views/Job/LogWarrantyError.cshtml b/Disco.Web/Views/Job/LogWarrantyError.cshtml
index 9f07de5c..4aded91e 100644
--- a/Disco.Web/Views/Job/LogWarrantyError.cshtml
+++ b/Disco.Web/Views/Job/LogWarrantyError.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Models.Job.LogWarrantyModel
 @{
+    Authorization.Require(Claims.Job.Actions.LogWarranty);
+    
     ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), string.Format("Job: {0}", Model.Job.Id), MVC.Job.Show(Model.Job.Id), "Log Warranty Error");
 }
 <div class="form" style="width: 650px">
diff --git a/Disco.Web/Views/Job/LogWarrantyError.generated.cs b/Disco.Web/Views/Job/LogWarrantyError.generated.cs
index 6240873d..597e4b4c 100644
--- a/Disco.Web/Views/Job/LogWarrantyError.generated.cs
+++ b/Disco.Web/Views/Job/LogWarrantyError.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/LogWarrantyError.cshtml")]
-    public partial class LogWarrantyError : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.LogWarrantyModel>
+    public partial class LogWarrantyError : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.LogWarrantyModel>
     {
         public LogWarrantyError()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Views.Job
             
             #line 2 "..\..\Views\Job\LogWarrantyError.cshtml"
   
+    Authorization.Require(Claims.Job.Actions.LogWarranty);
+    
     ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), string.Format("Job: {0}", Model.Job.Id), MVC.Job.Show(Model.Job.Id), "Log Warranty Error");
 
             
@@ -58,7 +62,7 @@ WriteLiteral(">\r\n    <h2>\r\n        Submission Error</h2>\r\n    <table>\r\n
 "  <td>\r\n                <div>\r\n                    <strong>");
 
             
-            #line 12 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 14 "..\..\Views\Job\LogWarrantyError.cshtml"
                        Write(Model.Error.Message);
 
             
@@ -81,7 +85,7 @@ WriteLiteral(" style=\"display: none\"");
 WriteLiteral(">\r\n                    <br />\r\n                    <strong>Error Type: </strong>");
 
             
-            #line 17 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 19 "..\..\Views\Job\LogWarrantyError.cshtml"
                                             Write(Model.Error.GetType().Name);
 
             
@@ -97,7 +101,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                        ");
 
             
-            #line 21 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 23 "..\..\Views\Job\LogWarrantyError.cshtml"
                    Write(Model.Error.StackTrace.ToMultilineString());
 
             
@@ -106,13 +110,13 @@ WriteLiteral("                        ");
 WriteLiteral("\r\n                    </div>\r\n");
 
             
-            #line 23 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 25 "..\..\Views\Job\LogWarrantyError.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 23 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 25 "..\..\Views\Job\LogWarrantyError.cshtml"
                      if (Model.Error.InnerException != null)
                     { 
 
@@ -125,7 +129,7 @@ WriteLiteral("                        <div>\r\n                            <stro
 "n:</strong> ");
 
             
-            #line 27 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 29 "..\..\Views\Job\LogWarrantyError.cshtml"
                                                          Write(Model.Error.InnerException.Message);
 
             
@@ -134,7 +138,7 @@ WriteLiteral("                        <div>\r\n                            <stro
 WriteLiteral("<br />\r\n                            <strong>Error Type:</strong> ");
 
             
-            #line 28 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 30 "..\..\Views\Job\LogWarrantyError.cshtml"
                                                     Write(Model.Error.GetType().Name);
 
             
@@ -150,7 +154,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                                ");
 
             
-            #line 31 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 33 "..\..\Views\Job\LogWarrantyError.cshtml"
                            Write(Model.Error.InnerException.StackTrace);
 
             
@@ -159,7 +163,7 @@ WriteLiteral("                                ");
 WriteLiteral("\r\n                            </div>\r\n                        </div>\r\n");
 
             
-            #line 34 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 36 "..\..\Views\Job\LogWarrantyError.cshtml"
                     }
 
             
@@ -196,7 +200,7 @@ WriteLiteral(">\r\n    <h2>\r\n        Warranty Submission Details</h2>\r\n    <
 WriteLiteral("                ");
 
             
-            #line 57 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 59 "..\..\Views\Job\LogWarrantyError.cshtml"
            Write(Model.JobId);
 
             
@@ -208,7 +212,7 @@ WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n
 WriteLiteral("                ");
 
             
-            #line 65 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 67 "..\..\Views\Job\LogWarrantyError.cshtml"
            Write(Model.Job.Device.SerialNumber);
 
             
@@ -220,7 +224,7 @@ WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n
 WriteLiteral("                ");
 
             
-            #line 73 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 75 "..\..\Views\Job\LogWarrantyError.cshtml"
            Write(Model.Job.Device.DeviceModel.Manufacturer);
 
             
@@ -229,7 +233,7 @@ WriteLiteral("                ");
 WriteLiteral(" ");
 
             
-            #line 73 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 75 "..\..\Views\Job\LogWarrantyError.cshtml"
                                                       Write(Model.Job.Device.DeviceModel.Model);
 
             
@@ -241,7 +245,7 @@ WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n
 WriteLiteral("                ");
 
             
-            #line 81 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 83 "..\..\Views\Job\LogWarrantyError.cshtml"
            Write(Model.TechUser.DisplayName);
 
             
@@ -254,7 +258,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">\r\n                    Email Address: ");
 
             
-            #line 83 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 85 "..\..\Views\Job\LogWarrantyError.cshtml"
                               Write(Model.TechUser.EmailAddress);
 
             
@@ -263,7 +267,7 @@ WriteLiteral(">\r\n                    Email Address: ");
 WriteLiteral("<br />\r\n                    Phone Number: ");
 
             
-            #line 84 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 86 "..\..\Views\Job\LogWarrantyError.cshtml"
                              Write(Model.TechUser.PhoneNumber);
 
             
@@ -284,7 +288,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                    ");
 
             
-            #line 94 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 96 "..\..\Views\Job\LogWarrantyError.cshtml"
                Write(Model.OrganisationAddress.Name);
 
             
@@ -297,7 +301,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">\r\n                        <span>");
 
             
-            #line 96 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 98 "..\..\Views\Job\LogWarrantyError.cshtml"
                          Write(Model.OrganisationAddress.Address);
 
             
@@ -306,7 +310,7 @@ WriteLiteral(">\r\n                        <span>");
 WriteLiteral("</span><br />\r\n                        <span>");
 
             
-            #line 97 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 99 "..\..\Views\Job\LogWarrantyError.cshtml"
                          Write(Model.OrganisationAddress.Suburb);
 
             
@@ -315,7 +319,7 @@ WriteLiteral("</span><br />\r\n                        <span>");
 WriteLiteral(", ");
 
             
-            #line 97 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 99 "..\..\Views\Job\LogWarrantyError.cshtml"
                                                             Write(Model.OrganisationAddress.Postcode);
 
             
@@ -324,7 +328,7 @@ WriteLiteral(", ");
 WriteLiteral("</span><br />\r\n                        <span>");
 
             
-            #line 98 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 100 "..\..\Views\Job\LogWarrantyError.cshtml"
                          Write(Model.OrganisationAddress.State);
 
             
@@ -333,7 +337,7 @@ WriteLiteral("</span><br />\r\n                        <span>");
 WriteLiteral(", ");
 
             
-            #line 98 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 100 "..\..\Views\Job\LogWarrantyError.cshtml"
                                                            Write(Model.OrganisationAddress.Country);
 
             
@@ -346,7 +350,7 @@ WriteLiteral("</span>\r\n                    </div>\r\n                </div>\r\
 WriteLiteral("                ");
 
             
-            #line 108 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 110 "..\..\Views\Job\LogWarrantyError.cshtml"
            Write(Model.WarrantyProvider.Name);
 
             
@@ -355,7 +359,7 @@ WriteLiteral("                ");
 WriteLiteral(" (");
 
             
-            #line 108 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 110 "..\..\Views\Job\LogWarrantyError.cshtml"
                                          Write(Model.WarrantyProvider.Id);
 
             
@@ -364,7 +368,7 @@ WriteLiteral(" (");
 WriteLiteral(") ");
 
             
-            #line 108 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 110 "..\..\Views\Job\LogWarrantyError.cshtml"
                                                                      Write(Model.WarrantyProvider.PluginManifest.Version.ToString(3));
 
             
@@ -376,7 +380,7 @@ WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n
 WriteLiteral("                ");
 
             
-            #line 116 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 118 "..\..\Views\Job\LogWarrantyError.cshtml"
            Write(Model.FaultDescription.ToMultilineString());
 
             
@@ -391,7 +395,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("    ");
 
             
-            #line 122 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 124 "..\..\Views\Job\LogWarrantyError.cshtml"
 Write(Html.ActionLinkButton("Try Again", MVC.Job.LogWarranty(Model.JobId, null, null)));
 
             
@@ -402,7 +406,7 @@ WriteLiteral("\r\n");
 WriteLiteral("    ");
 
             
-            #line 123 "..\..\Views\Job\LogWarrantyError.cshtml"
+            #line 125 "..\..\Views\Job\LogWarrantyError.cshtml"
 Write(Html.ActionLinkButton("Return to Job", MVC.Job.Show(Model.JobId)));
 
             
diff --git a/Disco.Web/Views/Job/Show.cshtml b/Disco.Web/Views/Job/Show.cshtml
index a49503f5..56877cd8 100644
--- a/Disco.Web/Views/Job/Show.cshtml
+++ b/Disco.Web/Views/Job/Show.cshtml
@@ -1,8 +1,15 @@
 @model Disco.Web.Models.Job.ShowModel
 @{
     ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), string.Format("Job: {0}", Model.Job.Id.ToString()));
-    Html.BundleDeferred("~/ClientScripts/Modules/Silverlight");
+
+    if (Authorization.Has(Claims.Job.Actions.AddAttachments))
+    {
+        Html.BundleDeferred("~/ClientScripts/Modules/Silverlight");
+    }
+
     Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-TimePicker");
+
+    Authorization.Require(Claims.Job.Show);
 }
 <div id="Job_Show">
     <div id="Job_Show_Status">
@@ -18,39 +25,57 @@
     <script type="text/javascript">
         $(function () {
             var $tabs = $('#jobDetailTabs');
-            $tabs.tabs({
-                activate: function (event, ui) {
-                    window.setTimeout(function () {
-                        var $window = $(window);
-                        var tabHeight = $tabs.height();
-                        var tabOffset = $tabs.offset();
-                        var windowScrollTop = $window.scrollTop();
-                        var windowHeight = $window.height();
+            if ($tabs.children().length > 1) {
+                $tabs.tabs({
+                    activate: function (event, ui) {
+                        window.setTimeout(function () {
+                            var $window = $(window);
+                            var tabHeight = $tabs.height();
+                            var tabOffset = $tabs.offset();
+                            var windowScrollTop = $window.scrollTop();
+                            var windowHeight = $window.height();
 
-                        var tabTopNotShown = windowScrollTop - tabOffset.top;
-                        if (tabTopNotShown > 0) {
-                            $('html').animate({ scrollTop: tabOffset.top }, 125);
-                        } else {
-                            var tabBottomNotShown = ((windowScrollTop + windowHeight) - (tabHeight + tabOffset.top)) * -1;
-                            if (tabBottomNotShown > 0) {
-                                if (tabHeight > windowHeight)
-                                    $('html').animate({ scrollTop: tabOffset.top }, 125);
-                                else
-                                    $('html').animate({ scrollTop: windowScrollTop + tabBottomNotShown }, 125);
+                            var tabTopNotShown = windowScrollTop - tabOffset.top;
+                            if (tabTopNotShown > 0) {
+                                $('html').animate({ scrollTop: tabOffset.top }, 125);
+                            } else {
+                                var tabBottomNotShown = ((windowScrollTop + windowHeight) - (tabHeight + tabOffset.top)) * -1;
+                                if (tabBottomNotShown > 0) {
+                                    if (tabHeight > windowHeight)
+                                        $('html').animate({ scrollTop: tabOffset.top }, 125);
+                                    else
+                                        $('html').animate({ scrollTop: windowScrollTop + tabBottomNotShown }, 125);
+                                }
                             }
-                        }
-                    }, 1);
-                }
-            });
+                        }, 1);
+                    }
+                });
+            } else {
+                $tabs.hide();
+            }
         });
     </script>
     <div id="jobDetailTabs">
         <ul id="jobDetailTabItems">
-            <li><a href="#jobDetailTab-Resources">Log and Attachments</a></li>
+            @if (Authorization.HasAll(Claims.Job.ShowLogs, Claims.Job.ShowAttachments))
+            {
+                <li><a href="#jobDetailTab-Resources">Log and Attachments</a></li>
+            }
+            else if (Authorization.Has(Claims.Job.ShowLogs))
+            {
+                <li><a href="#jobDetailTab-Resources">Log</a></li>
+            }
+            else if (Authorization.Has(Claims.Job.ShowLogs))
+            {
+                <li><a href="#jobDetailTab-Resources">Attachments</a></li>
+            }
         </ul>
-        <div id="jobDetailTab-Resources" class="jobPart">
-            @Html.Partial(MVC.Job.Views.JobParts.Resources, Model)
-        </div>
+        @if (Authorization.HasAny(Claims.Job.ShowLogs, Claims.Job.ShowAttachments))
+        {
+            <div id="jobDetailTab-Resources" class="jobPart">
+                @Html.Partial(MVC.Job.Views.JobParts.Resources, Model)
+            </div>
+        }
         @Html.Partial(MVC.Job.Views.JobParts.JobMetaAdditions, Model)
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/Disco.Web/Views/Job/Show.generated.cs b/Disco.Web/Views/Job/Show.generated.cs
index f8fea687..30862408 100644
--- a/Disco.Web/Views/Job/Show.generated.cs
+++ b/Disco.Web/Views/Job/Show.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/Show.cshtml")]
-    public partial class Show : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
+    public partial class Show : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.ShowModel>
     {
         public Show()
         {
@@ -44,9 +46,16 @@ namespace Disco.Web.Views.Job
             #line 2 "..\..\Views\Job\Show.cshtml"
   
     ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), string.Format("Job: {0}", Model.Job.Id.ToString()));
-    Html.BundleDeferred("~/ClientScripts/Modules/Silverlight");
+
+    if (Authorization.Has(Claims.Job.Actions.AddAttachments))
+    {
+        Html.BundleDeferred("~/ClientScripts/Modules/Silverlight");
+    }
+
     Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-TimePicker");
 
+    Authorization.Require(Claims.Job.Show);
+
             
             #line default
             #line hidden
@@ -61,35 +70,35 @@ WriteLiteral(" id=\"Job_Show_Status\"");
 WriteLiteral(">\r\n");
 
             
-            #line 9 "..\..\Views\Job\Show.cshtml"
+            #line 16 "..\..\Views\Job\Show.cshtml"
         
             
             #line default
             #line hidden
             
-            #line 9 "..\..\Views\Job\Show.cshtml"
+            #line 16 "..\..\Views\Job\Show.cshtml"
            var jobStatusInfo = Model.Job.Status();
             
             #line default
             #line hidden
 WriteLiteral("\r\n        <span");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 420), Tuple.Create("\"", 464)
-, Tuple.Create(Tuple.Create("", 428), Tuple.Create("icon", 428), true)
-, Tuple.Create(Tuple.Create(" ", 432), Tuple.Create("JobStatus", 433), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 552), Tuple.Create("\"", 596)
+, Tuple.Create(Tuple.Create("", 560), Tuple.Create("icon", 560), true)
+, Tuple.Create(Tuple.Create(" ", 564), Tuple.Create("JobStatus", 565), true)
             
-            #line 10 "..\..\Views\Job\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 442), Tuple.Create<System.Object, System.Int32>(jobStatusInfo.Item1
+            #line 17 "..\..\Views\Job\Show.cshtml"
+, Tuple.Create(Tuple.Create("", 574), Tuple.Create<System.Object, System.Int32>(jobStatusInfo.Item1
             
             #line default
             #line hidden
-, 442), false)
+, 574), false)
 );
 
 WriteLiteral("></span>");
 
             
-            #line 10 "..\..\Views\Job\Show.cshtml"
+            #line 17 "..\..\Views\Job\Show.cshtml"
                                                              Write(jobStatusInfo.Item2);
 
             
@@ -105,7 +114,7 @@ WriteLiteral(">\r\n            $(function () {\r\n                $(\'#Job_Show_
 WriteLiteral("    ");
 
             
-            #line 17 "..\..\Views\Job\Show.cshtml"
+            #line 24 "..\..\Views\Job\Show.cshtml"
 Write(Html.Partial(MVC.Job.Views.JobParts._Subject, Model));
 
             
@@ -115,36 +124,26 @@ WriteLiteral("\r\n    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(@">
-        $(function () {
-            var $tabs = $('#jobDetailTabs');
-            $tabs.tabs({
-                activate: function (event, ui) {
-                    window.setTimeout(function () {
-                        var $window = $(window);
-                        var tabHeight = $tabs.height();
-                        var tabOffset = $tabs.offset();
-                        var windowScrollTop = $window.scrollTop();
-                        var windowHeight = $window.height();
-
-                        var tabTopNotShown = windowScrollTop - tabOffset.top;
-                        if (tabTopNotShown > 0) {
-                            $('html').animate({ scrollTop: tabOffset.top }, 125);
-                        } else {
-                            var tabBottomNotShown = ((windowScrollTop + windowHeight) - (tabHeight + tabOffset.top)) * -1;
-                            if (tabBottomNotShown > 0) {
-                                if (tabHeight > windowHeight)
-                                    $('html').animate({ scrollTop: tabOffset.top }, 125);
-                                else
-                                    $('html').animate({ scrollTop: windowScrollTop + tabBottomNotShown }, 125);
-                            }
-                        }
-                    }, 1);
-                }
-            });
-        });
-    </script>
-    <div");
+WriteLiteral(">\r\n        $(function () {\r\n            var $tabs = $(\'#jobDetailTabs\');\r\n       " +
+"     if ($tabs.children().length > 1) {\r\n                $tabs.tabs({\r\n         " +
+"           activate: function (event, ui) {\r\n                        window.setT" +
+"imeout(function () {\r\n                            var $window = $(window);\r\n    " +
+"                        var tabHeight = $tabs.height();\r\n                       " +
+"     var tabOffset = $tabs.offset();\r\n                            var windowScro" +
+"llTop = $window.scrollTop();\r\n                            var windowHeight = $wi" +
+"ndow.height();\r\n\r\n                            var tabTopNotShown = windowScrollT" +
+"op - tabOffset.top;\r\n                            if (tabTopNotShown > 0) {\r\n    " +
+"                            $(\'html\').animate({ scrollTop: tabOffset.top }, 125)" +
+";\r\n                            } else {\r\n                                var tab" +
+"BottomNotShown = ((windowScrollTop + windowHeight) - (tabHeight + tabOffset.top)" +
+") * -1;\r\n                                if (tabBottomNotShown > 0) {\r\n         " +
+"                           if (tabHeight > windowHeight)\r\n                      " +
+"                  $(\'html\').animate({ scrollTop: tabOffset.top }, 125);\r\n       " +
+"                             else\r\n                                        $(\'ht" +
+"ml\').animate({ scrollTop: windowScrollTop + tabBottomNotShown }, 125);\r\n        " +
+"                        }\r\n                            }\r\n                      " +
+"  }, 1);\r\n                    }\r\n                });\r\n            } else {\r\n    " +
+"            $tabs.hide();\r\n            }\r\n        });\r\n    </script>\r\n    <div");
 
 WriteLiteral(" id=\"jobDetailTabs\"");
 
@@ -152,11 +151,82 @@ WriteLiteral(">\r\n        <ul");
 
 WriteLiteral(" id=\"jobDetailTabItems\"");
 
-WriteLiteral(">\r\n            <li><a");
+WriteLiteral(">\r\n");
+
+            
+            #line 60 "..\..\Views\Job\Show.cshtml"
+            
+            
+            #line default
+            #line hidden
+            
+            #line 60 "..\..\Views\Job\Show.cshtml"
+             if (Authorization.HasAll(Claims.Job.ShowLogs, Claims.Job.ShowAttachments))
+            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <li><a");
 
 WriteLiteral(" href=\"#jobDetailTab-Resources\"");
 
-WriteLiteral(">Log and Attachments</a></li>\r\n        </ul>\r\n        <div");
+WriteLiteral(">Log and Attachments</a></li>\r\n");
+
+            
+            #line 63 "..\..\Views\Job\Show.cshtml"
+            }
+            else if (Authorization.Has(Claims.Job.ShowLogs))
+            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <li><a");
+
+WriteLiteral(" href=\"#jobDetailTab-Resources\"");
+
+WriteLiteral(">Log</a></li>\r\n");
+
+            
+            #line 67 "..\..\Views\Job\Show.cshtml"
+            }
+            else if (Authorization.Has(Claims.Job.ShowLogs))
+            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <li><a");
+
+WriteLiteral(" href=\"#jobDetailTab-Resources\"");
+
+WriteLiteral(">Attachments</a></li>\r\n");
+
+            
+            #line 71 "..\..\Views\Job\Show.cshtml"
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        </ul>\r\n");
+
+            
+            #line 73 "..\..\Views\Job\Show.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 73 "..\..\Views\Job\Show.cshtml"
+         if (Authorization.HasAny(Claims.Job.ShowLogs, Claims.Job.ShowAttachments))
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <div");
 
 WriteLiteral(" id=\"jobDetailTab-Resources\"");
 
@@ -164,27 +234,34 @@ WriteLiteral(" class=\"jobPart\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("            ");
+WriteLiteral("                ");
 
             
-            #line 52 "..\..\Views\Job\Show.cshtml"
-       Write(Html.Partial(MVC.Job.Views.JobParts.Resources, Model));
+            #line 76 "..\..\Views\Job\Show.cshtml"
+           Write(Html.Partial(MVC.Job.Views.JobParts.Resources, Model));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n        </div>\r\n");
+WriteLiteral("\r\n            </div>\r\n");
 
+            
+            #line 78 "..\..\Views\Job\Show.cshtml"
+        }
+
+            
+            #line default
+            #line hidden
 WriteLiteral("        ");
 
             
-            #line 54 "..\..\Views\Job\Show.cshtml"
+            #line 79 "..\..\Views\Job\Show.cshtml"
    Write(Html.Partial(MVC.Job.Views.JobParts.JobMetaAdditions, Model));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n    </div>\r\n</div>");
+WriteLiteral("\r\n    </div>\r\n</div>\r\n");
 
         }
     }
diff --git a/Disco.Web/Views/Job/WarrantyProviderJobDetails.cshtml b/Disco.Web/Views/Job/WarrantyProviderJobDetails.cshtml
index 960448b8..02d907b4 100644
--- a/Disco.Web/Views/Job/WarrantyProviderJobDetails.cshtml
+++ b/Disco.Web/Views/Job/WarrantyProviderJobDetails.cshtml
@@ -1,6 +1,8 @@
 @model Disco.Web.Models.Job.WarrantyProviderJobDetailsModel
 @{ Layout = null;
 
+   Authorization.Require(Claims.Job.Properties.WarrantyProperties.ProviderDetails);
+   
    if (Model.JobDetailsException != null)
    {
     <h3>
diff --git a/Disco.Web/Views/Job/WarrantyProviderJobDetails.generated.cs b/Disco.Web/Views/Job/WarrantyProviderJobDetails.generated.cs
index 34845e55..7f4e07ae 100644
--- a/Disco.Web/Views/Job/WarrantyProviderJobDetails.generated.cs
+++ b/Disco.Web/Views/Job/WarrantyProviderJobDetails.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Job
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/WarrantyProviderJobDetails.cshtml")]
-    public partial class WarrantyProviderJobDetails : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.WarrantyProviderJobDetailsModel>
+    public partial class WarrantyProviderJobDetails : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.WarrantyProviderJobDetailsModel>
     {
         public WarrantyProviderJobDetails()
         {
@@ -44,6 +46,8 @@ namespace Disco.Web.Views.Job
             #line 2 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
    Layout = null;
 
+   Authorization.Require(Claims.Job.Properties.WarrantyProperties.ProviderDetails);
+   
    if (Model.JobDetailsException != null)
    {
 
@@ -55,7 +59,7 @@ WriteLiteral("    <h3>\r\n        Error:</h3>\r\n");
 WriteLiteral("    <div>\r\n        <strong>");
 
             
-            #line 9 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 11 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
            Write(Model.JobDetailsException.Message);
 
             
@@ -82,7 +86,7 @@ WriteLiteral(" style=\"display: none\"");
 WriteLiteral(">\r\n        <br />\r\n        <strong>Error Type: </strong>");
 
             
-            #line 14 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 16 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
                                 Write(Model.JobDetailsException.GetType().Name);
 
             
@@ -97,7 +101,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("            ");
 
             
-            #line 18 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 20 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
        Write(Model.JobDetailsException.StackTrace.ToMultilineString());
 
             
@@ -106,13 +110,13 @@ WriteLiteral("            ");
 WriteLiteral("\r\n        </div>\r\n");
 
             
-            #line 20 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 22 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
         
             
             #line default
             #line hidden
             
-            #line 20 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 22 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
          if (Model.JobDetailsException.InnerException != null)
         { 
 
@@ -124,7 +128,7 @@ WriteLiteral("            <hr />\r\n");
 WriteLiteral("            <div>\r\n                <strong>Inner Exception:</strong> ");
 
             
-            #line 24 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 26 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
                                              Write(Model.JobDetailsException.InnerException.Message);
 
             
@@ -133,7 +137,7 @@ WriteLiteral("            <div>\r\n                <strong>Inner Exception:</str
 WriteLiteral("<br />\r\n                <strong>Error Type:</strong> ");
 
             
-            #line 25 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 27 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
                                         Write(Model.JobDetailsException.GetType().Name);
 
             
@@ -148,7 +152,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                    ");
 
             
-            #line 28 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 30 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
                Write(Model.JobDetailsException.InnerException.StackTrace);
 
             
@@ -157,7 +161,7 @@ WriteLiteral("                    ");
 WriteLiteral("\r\n                </div>\r\n            </div>\r\n");
 
             
-            #line 31 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 33 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
         }
 
             
@@ -179,7 +183,7 @@ WriteLiteral(@">
 ");
 
             
-            #line 41 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 43 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
    }
    else
    {
@@ -190,14 +194,14 @@ WriteLiteral(@">
             #line default
             #line hidden
             
-            #line 46 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 48 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
 Write(Html.PartialCompiled(Model.ViewType, Model.ViewModel));
 
             
             #line default
             #line hidden
             
-            #line 46 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 48 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
                                                           
        }
        else
@@ -213,7 +217,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">");
 
             
-            #line 50 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 52 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
                           Write(Model.JobDetailsNotSupportedMessage);
 
             
@@ -222,7 +226,7 @@ WriteLiteral(">");
 WriteLiteral("</span>\r\n");
 
             
-            #line 51 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
+            #line 53 "..\..\Views\Job\WarrantyProviderJobDetails.cshtml"
        }
    }
 
diff --git a/Disco.Web/Views/Job/_CreateSubject.cshtml b/Disco.Web/Views/Job/_CreateSubject.cshtml
index 691f3667..08d6387d 100644
--- a/Disco.Web/Views/Job/_CreateSubject.cshtml
+++ b/Disco.Web/Views/Job/_CreateSubject.cshtml
@@ -1,4 +1,7 @@
 @model Disco.Web.Models.Job.CreateModel
+@{
+    Authorization.Require(Claims.Job.Actions.Create);
+}
 <table>
     <tr>
         <td>
@@ -19,7 +22,7 @@
             { 
                 <span><strong>Serial Number:</strong> @Model.Device.SerialNumber</span><br />
                 <span><strong>Name:</strong> @Model.Device.ComputerName</span><br />
-                <span><strong>Model:</strong> @Model.Device.DeviceModel.ToString()</span><br />
+                <span><strong>Model:</strong> @Model.Device.DeviceModel.ToString()</span>
             }
         </td>
         <td>
@@ -33,8 +36,7 @@
             else
             {
                 <span><strong>Id:</strong> @Model.User.Id</span><br />
-                <span><strong>Name:</strong> @Model.User.DisplayName</span><br />
-                <span><strong>Type:</strong> @Model.User.Type</span>
+                <span><strong>Name:</strong> @Model.User.DisplayName</span>
             }
         </td>
     </tr>
diff --git a/Disco.Web/Views/Job/_CreateSubject.generated.cs b/Disco.Web/Views/Job/_CreateSubject.generated.cs
index b8020d54..ade3c891 100644
--- a/Disco.Web/Views/Job/_CreateSubject.generated.cs
+++ b/Disco.Web/Views/Job/_CreateSubject.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,28 +28,38 @@ namespace Disco.Web.Views.Job
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/_CreateSubject.cshtml")]
-    public partial class CreateSubject : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.CreateModel>
+    public partial class CreateSubject : Disco.Services.Web.WebViewPage<Disco.Web.Models.Job.CreateModel>
     {
         public CreateSubject()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<table>\r\n    <tr>\r\n        <td>\r\n            <h2>Device</h2>\r\n        </td>\r\n");
+            
+            #line 2 "..\..\Views\Job\_CreateSubject.cshtml"
+  
+    Authorization.Require(Claims.Job.Actions.Create);
 
             
-            #line 7 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line default
+            #line hidden
+WriteLiteral("\r\n<table>\r\n    <tr>\r\n        <td>\r\n            <h2>Device</h2>\r\n        </td>\r\n");
+
+            
+            #line 10 "..\..\Views\Job\_CreateSubject.cshtml"
         
             
             #line default
             #line hidden
             
-            #line 7 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 10 "..\..\Views\Job\_CreateSubject.cshtml"
          if (Model.Device != null)
         {
 
@@ -66,20 +76,20 @@ WriteLiteral(" class=\"modelImage\"");
 
 WriteLiteral(" alt=\"Model Image\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 260), Tuple.Create("\"", 370)
+WriteAttribute("src", Tuple.Create(" src=\"", 322), Tuple.Create("\"", 432)
             
-            #line 10 "..\..\Views\Job\_CreateSubject.cshtml"
-, Tuple.Create(Tuple.Create("", 266), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash()))
+            #line 13 "..\..\Views\Job\_CreateSubject.cshtml"
+, Tuple.Create(Tuple.Create("", 328), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash()))
             
             #line default
             #line hidden
-, 266), false)
+, 328), false)
 );
 
 WriteLiteral(" />\r\n            </td>\r\n");
 
             
-            #line 12 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 15 "..\..\Views\Job\_CreateSubject.cshtml"
         }
 
             
@@ -92,13 +102,13 @@ WriteLiteral(" style=\"width: 50%\"");
 WriteLiteral(">\r\n");
 
             
-            #line 14 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 17 "..\..\Views\Job\_CreateSubject.cshtml"
             
             
             #line default
             #line hidden
             
-            #line 14 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 17 "..\..\Views\Job\_CreateSubject.cshtml"
              if (Model.Device == null)
             { 
 
@@ -112,7 +122,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Device referenced to this Job</span>\r\n");
 
             
-            #line 17 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 20 "..\..\Views\Job\_CreateSubject.cshtml"
             }
             else
             { 
@@ -123,7 +133,7 @@ WriteLiteral(">No Device referenced to this Job</span>\r\n");
 WriteLiteral("                <span><strong>Serial Number:</strong> ");
 
             
-            #line 20 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 23 "..\..\Views\Job\_CreateSubject.cshtml"
                                                  Write(Model.Device.SerialNumber);
 
             
@@ -136,7 +146,7 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                <span><strong>Name:</strong> ");
 
             
-            #line 21 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 24 "..\..\Views\Job\_CreateSubject.cshtml"
                                         Write(Model.Device.ComputerName);
 
             
@@ -149,18 +159,16 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                <span><strong>Model:</strong> ");
 
             
-            #line 22 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 25 "..\..\Views\Job\_CreateSubject.cshtml"
                                          Write(Model.Device.DeviceModel.ToString());
 
             
             #line default
             #line hidden
-WriteLiteral("</span>");
-
-WriteLiteral("<br />\r\n");
+WriteLiteral("</span>\r\n");
 
             
-            #line 23 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 26 "..\..\Views\Job\_CreateSubject.cshtml"
             }
 
             
@@ -174,13 +182,13 @@ WriteLiteral(" style=\"width: 50%\"");
 WriteLiteral(">\r\n");
 
             
-            #line 29 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 32 "..\..\Views\Job\_CreateSubject.cshtml"
             
             
             #line default
             #line hidden
             
-            #line 29 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 32 "..\..\Views\Job\_CreateSubject.cshtml"
              if (Model.User == null)
             { 
 
@@ -194,7 +202,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No User referenced to this Job</span>\r\n");
 
             
-            #line 32 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 35 "..\..\Views\Job\_CreateSubject.cshtml"
             }
             else
             {
@@ -205,7 +213,7 @@ WriteLiteral(">No User referenced to this Job</span>\r\n");
 WriteLiteral("                <span><strong>Id:</strong> ");
 
             
-            #line 35 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 38 "..\..\Views\Job\_CreateSubject.cshtml"
                                       Write(Model.User.Id);
 
             
@@ -218,29 +226,16 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                <span><strong>Name:</strong> ");
 
             
-            #line 36 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 39 "..\..\Views\Job\_CreateSubject.cshtml"
                                         Write(Model.User.DisplayName);
 
             
-            #line default
-            #line hidden
-WriteLiteral("</span>");
-
-WriteLiteral("<br />\r\n");
-
-WriteLiteral("                <span><strong>Type:</strong> ");
-
-            
-            #line 37 "..\..\Views\Job\_CreateSubject.cshtml"
-                                        Write(Model.User.Type);
-
-            
             #line default
             #line hidden
 WriteLiteral("</span>\r\n");
 
             
-            #line 38 "..\..\Views\Job\_CreateSubject.cshtml"
+            #line 40 "..\..\Views\Job\_CreateSubject.cshtml"
             }
 
             
diff --git a/Disco.Web/Views/Job/_ViewStart.generated.cs b/Disco.Web/Views/Job/_ViewStart.generated.cs
index a54afe8c..29775660 100644
--- a/Disco.Web/Views/Job/_ViewStart.generated.cs
+++ b/Disco.Web/Views/Job/_ViewStart.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,6 +28,8 @@ namespace Disco.Web.Views.Job
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
diff --git a/Disco.Web/Views/Search/Query.cshtml b/Disco.Web/Views/Search/Query.cshtml
index 1ff01289..e63aac83 100644
--- a/Disco.Web/Views/Search/Query.cshtml
+++ b/Disco.Web/Views/Search/Query.cshtml
@@ -6,7 +6,7 @@
     Query: '<span style="font-weight: bold;">@(Model.FriendlyTerm != null ? Model.FriendlyTerm : Model.Term)</span>'</h2>
 @if (Model.Success)
 {
-    if (Model.Jobs != null)
+    if (Model.Jobs != null && Authorization.Has(Claims.Job.Search))
     { 
     <h2>
         Jobs</h2>
@@ -14,7 +14,7 @@
         @Html.Partial(MVC.Shared.Views._JobTable, @Model.Jobs)
     </div>
     }
-    if (Model.Devices != null)
+    if (Model.Devices != null && Authorization.Has(Claims.Device.Search))
     { 
     <h2>
         Devices</h2>
@@ -22,7 +22,7 @@
         @Html.Partial(MVC.Device.Views._DeviceTable, @Model.Devices)
     </div>
     }
-    if (Model.Users != null)
+    if (Model.Users != null && Authorization.Has(Claims.User.Search))
     { 
     <h2>
         Users</h2>
diff --git a/Disco.Web/Views/Search/Query.generated.cs b/Disco.Web/Views/Search/Query.generated.cs
index 0ed8b131..2c79e436 100644
--- a/Disco.Web/Views/Search/Query.generated.cs
+++ b/Disco.Web/Views/Search/Query.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Search
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Search/Query.cshtml")]
-    public partial class Query : System.Web.Mvc.WebViewPage<Disco.Web.Models.Search.QueryModel>
+    public partial class Query : Disco.Services.Web.WebViewPage<Disco.Web.Models.Search.QueryModel>
     {
         public Query()
         {
@@ -67,7 +69,7 @@ WriteLiteral("</span>\'</h2>\r\n");
             #line 7 "..\..\Views\Search\Query.cshtml"
  if (Model.Success)
 {
-    if (Model.Jobs != null)
+    if (Model.Jobs != null && Authorization.Has(Claims.Job.Search))
     { 
 
             
@@ -91,7 +93,7 @@ WriteLiteral("\r\n    </div>\r\n");
             
             #line 16 "..\..\Views\Search\Query.cshtml"
     }
-    if (Model.Devices != null)
+    if (Model.Devices != null && Authorization.Has(Claims.Device.Search))
     { 
 
             
@@ -115,7 +117,7 @@ WriteLiteral("\r\n    </div>\r\n");
             
             #line 24 "..\..\Views\Search\Query.cshtml"
     }
-    if (Model.Users != null)
+    if (Model.Users != null && Authorization.Has(Claims.User.Search))
     { 
 
             
diff --git a/Disco.Web/Views/Shared/Error.generated.cs b/Disco.Web/Views/Shared/Error.generated.cs
index 4d27ec2c..6ce4375d 100644
--- a/Disco.Web/Views/Shared/Error.generated.cs
+++ b/Disco.Web/Views/Shared/Error.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Shared
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/Error.cshtml")]
-    public partial class Error : System.Web.Mvc.WebViewPage<System.Web.Mvc.HandleErrorInfo>
+    public partial class Error : Disco.Services.Web.WebViewPage<System.Web.Mvc.HandleErrorInfo>
     {
         public Error()
         {
diff --git a/Disco.Web/Views/Shared/_DialogLayout.generated.cs b/Disco.Web/Views/Shared/_DialogLayout.generated.cs
index c144bcea..4e4287cc 100644
--- a/Disco.Web/Views/Shared/_DialogLayout.generated.cs
+++ b/Disco.Web/Views/Shared/_DialogLayout.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Shared
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_DialogLayout.cshtml")]
-    public partial class DialogLayout : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class DialogLayout : Disco.Services.Web.WebViewPage<dynamic>
     {
         public DialogLayout()
         {
diff --git a/Disco.Web/Views/Shared/_EmptyLayout.generated.cs b/Disco.Web/Views/Shared/_EmptyLayout.generated.cs
index 299e4f3a..bc80727b 100644
--- a/Disco.Web/Views/Shared/_EmptyLayout.generated.cs
+++ b/Disco.Web/Views/Shared/_EmptyLayout.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Shared
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_EmptyLayout.cshtml")]
-    public partial class EmptyLayout : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class EmptyLayout : Disco.Services.Web.WebViewPage<dynamic>
     {
         public EmptyLayout()
         {
diff --git a/Disco.Web/Views/Shared/_JobTable.generated.cs b/Disco.Web/Views/Shared/_JobTable.generated.cs
index a3210e8a..be74ce9a 100644
--- a/Disco.Web/Views/Shared/_JobTable.generated.cs
+++ b/Disco.Web/Views/Shared/_JobTable.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Shared
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_JobTable.cshtml")]
-    public partial class JobTable : System.Web.Mvc.WebViewPage<Disco.Models.BI.Job.JobTableModel>
+    public partial class JobTable : Disco.Services.Web.WebViewPage<Disco.Models.BI.Job.JobTableModel>
     {
         public JobTable()
         {
diff --git a/Disco.Web/Views/Shared/_JobTableRender.cshtml b/Disco.Web/Views/Shared/_JobTableRender.cshtml
index a2cc1062..f932f210 100644
--- a/Disco.Web/Views/Shared/_JobTableRender.cshtml
+++ b/Disco.Web/Views/Shared/_JobTableRender.cshtml
@@ -9,36 +9,28 @@
             <thead>
                 <tr>
                     @if (Model.ShowId)
-                    { <th class="id">
-                        Ref
+                    { <th class="id">Ref
                     </th> }
                     @if (Model.ShowStatus)
-                    { <th class="status">
-                        Status
+                    { <th class="status">Status
                     </th> }
                     @if (Model.ShowDates)
-                    { <th class="dates">
-                        Dates
+                    { <th class="dates">Dates
                     </th> }
                     @if (Model.ShowType)
-                    { <th class="type">
-                        Type
+                    { <th class="type">Type
                     </th> }
                     @if (Model.ShowDevice)
-                    {<th class="device">
-                        Device
+                    {<th class="device">Device
                     </th> }
                     @if (Model.ShowUser)
-                    { <th class="user">
-                        User
+                    { <th class="user">User
                     </th> }
                     @if (Model.ShowTechnician)
-                    { <th class="technician">
-                        Technician
+                    { <th class="technician">Technician
                     </th> }
                     @if (Model.ShowLocation)
-                    { <th class="location">
-                        Location
+                    { <th class="location">Location
                     </th> }
                 </tr>
             </thead>
@@ -48,7 +40,14 @@
                     <tr data-id="@(item.Id)" data-status="@(Model.ShowStatus ? item.StatusId : null)">
                         @if (Model.ShowId)
                         { <td class="id">
-                            @Html.ActionLink(item.Id.ToString(), MVC.Job.Show(item.Id))
+                            @if (Authorization.Has(Claims.Job.Show))
+                            {
+                                @Html.ActionLink(item.Id.ToString(), MVC.Job.Show(item.Id))
+                            }
+                            else
+                            {
+                                @item.Id.ToString()
+                            }
                         </td> }
                         @if (Model.ShowStatus)
                         { <td class="status">
@@ -68,7 +67,14 @@
                         { <td class="device">
                             @if (item.DeviceSerialNumber != null)
                             {
+                                if (Authorization.Has(Claims.Device.Show))
+                                {
                                 @Html.ActionLink(item.DeviceSerialNumber, MVC.Device.Show(item.DeviceSerialNumber), new { Title = item.DeviceModelDescription })
+                                }
+                                else
+                                {
+                                <span title="@item.DeviceModelDescription">@item.DeviceSerialNumber</span>
+                                }
                             }
                             else
                             { 
@@ -79,7 +85,14 @@
                         {<td class="user">
                             @if (item.UserId != null)
                             {
+                                if (Authorization.Has(Claims.User.Show))
+                                {
                                 @Html.ActionLink(string.Format("{0} ({1})", item.UserDisplayName, item.UserId), MVC.User.Show(item.UserId))
+                                }
+                                else
+                                {
+                                @(string.Format("{0} ({1})", item.UserDisplayName, item.UserId))
+                                }
                             }
                             else
                             { 
diff --git a/Disco.Web/Views/Shared/_JobTableRender.generated.cs b/Disco.Web/Views/Shared/_JobTableRender.generated.cs
index 80161513..e13bb355 100644
--- a/Disco.Web/Views/Shared/_JobTableRender.generated.cs
+++ b/Disco.Web/Views/Shared/_JobTableRender.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Shared
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_JobTableRender.cshtml")]
-    public partial class JobTableRender : System.Web.Mvc.WebViewPage<Disco.Models.BI.Job.JobTableModel>
+    public partial class JobTableRender : Disco.Services.Web.WebViewPage<Disco.Models.BI.Job.JobTableModel>
     {
         public JobTableRender()
         {
@@ -121,10 +123,10 @@ WriteLiteral(" <th");
 
 WriteLiteral(" class=\"id\"");
 
-WriteLiteral(">\r\n                        Ref\r\n                    </th> ");
+WriteLiteral(">Ref\r\n                    </th> ");
 
             
-            #line 14 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 13 "..\..\Views\Shared\_JobTableRender.cshtml"
                           }
 
             
@@ -133,7 +135,7 @@ WriteLiteral(">\r\n                        Ref\r\n                    </th> ");
 WriteLiteral("                    ");
 
             
-            #line 15 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 14 "..\..\Views\Shared\_JobTableRender.cshtml"
                      if (Model.ShowStatus)
                     {
             
@@ -143,10 +145,10 @@ WriteLiteral(" <th");
 
 WriteLiteral(" class=\"status\"");
 
-WriteLiteral(">\r\n                        Status\r\n                    </th> ");
+WriteLiteral(">Status\r\n                    </th> ");
 
             
-            #line 18 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 16 "..\..\Views\Shared\_JobTableRender.cshtml"
                           }
 
             
@@ -155,7 +157,7 @@ WriteLiteral(">\r\n                        Status\r\n                    </th> "
 WriteLiteral("                    ");
 
             
-            #line 19 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 17 "..\..\Views\Shared\_JobTableRender.cshtml"
                      if (Model.ShowDates)
                     {
             
@@ -165,7 +167,29 @@ WriteLiteral(" <th");
 
 WriteLiteral(" class=\"dates\"");
 
-WriteLiteral(">\r\n                        Dates\r\n                    </th> ");
+WriteLiteral(">Dates\r\n                    </th> ");
+
+            
+            #line 19 "..\..\Views\Shared\_JobTableRender.cshtml"
+                          }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    ");
+
+            
+            #line 20 "..\..\Views\Shared\_JobTableRender.cshtml"
+                     if (Model.ShowType)
+                    {
+            
+            #line default
+            #line hidden
+WriteLiteral(" <th");
+
+WriteLiteral(" class=\"type\"");
+
+WriteLiteral(">Type\r\n                    </th> ");
 
             
             #line 22 "..\..\Views\Shared\_JobTableRender.cshtml"
@@ -178,28 +202,6 @@ WriteLiteral("                    ");
 
             
             #line 23 "..\..\Views\Shared\_JobTableRender.cshtml"
-                     if (Model.ShowType)
-                    {
-            
-            #line default
-            #line hidden
-WriteLiteral(" <th");
-
-WriteLiteral(" class=\"type\"");
-
-WriteLiteral(">\r\n                        Type\r\n                    </th> ");
-
-            
-            #line 26 "..\..\Views\Shared\_JobTableRender.cshtml"
-                          }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    ");
-
-            
-            #line 27 "..\..\Views\Shared\_JobTableRender.cshtml"
                      if (Model.ShowDevice)
                     {
             
@@ -209,10 +211,10 @@ WriteLiteral("<th");
 
 WriteLiteral(" class=\"device\"");
 
-WriteLiteral(">\r\n                        Device\r\n                    </th> ");
+WriteLiteral(">Device\r\n                    </th> ");
 
             
-            #line 30 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 25 "..\..\Views\Shared\_JobTableRender.cshtml"
                           }
 
             
@@ -221,7 +223,7 @@ WriteLiteral(">\r\n                        Device\r\n                    </th> "
 WriteLiteral("                    ");
 
             
-            #line 31 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 26 "..\..\Views\Shared\_JobTableRender.cshtml"
                      if (Model.ShowUser)
                     {
             
@@ -231,10 +233,10 @@ WriteLiteral(" <th");
 
 WriteLiteral(" class=\"user\"");
 
-WriteLiteral(">\r\n                        User\r\n                    </th> ");
+WriteLiteral(">User\r\n                    </th> ");
 
             
-            #line 34 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 28 "..\..\Views\Shared\_JobTableRender.cshtml"
                           }
 
             
@@ -243,7 +245,7 @@ WriteLiteral(">\r\n                        User\r\n                    </th> ");
 WriteLiteral("                    ");
 
             
-            #line 35 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 29 "..\..\Views\Shared\_JobTableRender.cshtml"
                      if (Model.ShowTechnician)
                     {
             
@@ -253,10 +255,10 @@ WriteLiteral(" <th");
 
 WriteLiteral(" class=\"technician\"");
 
-WriteLiteral(">\r\n                        Technician\r\n                    </th> ");
+WriteLiteral(">Technician\r\n                    </th> ");
 
             
-            #line 38 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 31 "..\..\Views\Shared\_JobTableRender.cshtml"
                           }
 
             
@@ -265,7 +267,7 @@ WriteLiteral(">\r\n                        Technician\r\n                    </t
 WriteLiteral("                    ");
 
             
-            #line 39 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 32 "..\..\Views\Shared\_JobTableRender.cshtml"
                      if (Model.ShowLocation)
                     {
             
@@ -275,10 +277,10 @@ WriteLiteral(" <th");
 
 WriteLiteral(" class=\"location\"");
 
-WriteLiteral(">\r\n                        Location\r\n                    </th> ");
+WriteLiteral(">Location\r\n                    </th> ");
 
             
-            #line 42 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 34 "..\..\Views\Shared\_JobTableRender.cshtml"
                           }
 
             
@@ -287,13 +289,13 @@ WriteLiteral(">\r\n                        Location\r\n                    </th>
 WriteLiteral("                </tr>\r\n            </thead>\r\n            <tbody>\r\n");
 
             
-            #line 46 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 38 "..\..\Views\Shared\_JobTableRender.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 46 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 38 "..\..\Views\Shared\_JobTableRender.cshtml"
                  foreach (var item in Model.Items)
                 {
 
@@ -305,7 +307,7 @@ WriteLiteral("                    <tr");
 WriteLiteral(" data-id=\"");
 
             
-            #line 48 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 40 "..\..\Views\Shared\_JobTableRender.cshtml"
                              Write(item.Id);
 
             
@@ -316,7 +318,7 @@ WriteLiteral("\"");
 WriteLiteral(" data-status=\"");
 
             
-            #line 48 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 40 "..\..\Views\Shared\_JobTableRender.cshtml"
                                                       Write(Model.ShowStatus ? item.StatusId : null);
 
             
@@ -327,13 +329,13 @@ WriteLiteral("\"");
 WriteLiteral(">\r\n");
 
             
-            #line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 41 "..\..\Views\Shared\_JobTableRender.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 41 "..\..\Views\Shared\_JobTableRender.cshtml"
                          if (Model.ShowId)
                         {
             
@@ -345,19 +347,56 @@ WriteLiteral(" class=\"id\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("                            ");
-
             
-            #line 51 "..\..\Views\Shared\_JobTableRender.cshtml"
-                       Write(Html.ActionLink(item.Id.ToString(), MVC.Job.Show(item.Id)));
+            #line 43 "..\..\Views\Shared\_JobTableRender.cshtml"
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 43 "..\..\Views\Shared\_JobTableRender.cshtml"
+                             if (Authorization.Has(Claims.Job.Show))
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 45 "..\..\Views\Shared\_JobTableRender.cshtml"
+                           Write(Html.ActionLink(item.Id.ToString(), MVC.Job.Show(item.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                        </td> ");
+            
+            #line 45 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                           
+                            }
+                            else
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
+                           Write(item.Id.ToString());
 
             
-            #line 52 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line default
+            #line hidden
+            
+            #line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                   
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </td> ");
+
+            
+            #line 51 "..\..\Views\Shared\_JobTableRender.cshtml"
                               }
 
             
@@ -366,7 +405,7 @@ WriteLiteral("\r\n                        </td> ");
 WriteLiteral("                        ");
 
             
-            #line 53 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 52 "..\..\Views\Shared\_JobTableRender.cshtml"
                          if (Model.ShowStatus)
                         {
             
@@ -378,16 +417,16 @@ WriteLiteral(" class=\"status\"");
 
 WriteLiteral(">\r\n                            <span");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 2259), Tuple.Create("\"", 2297)
-, Tuple.Create(Tuple.Create("", 2267), Tuple.Create("icon", 2267), true)
-, Tuple.Create(Tuple.Create(" ", 2271), Tuple.Create("JobStatus", 2272), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 2336), Tuple.Create("\"", 2374)
+, Tuple.Create(Tuple.Create("", 2344), Tuple.Create("icon", 2344), true)
+, Tuple.Create(Tuple.Create(" ", 2348), Tuple.Create("JobStatus", 2349), true)
             
-            #line 55 "..\..\Views\Shared\_JobTableRender.cshtml"
-, Tuple.Create(Tuple.Create("", 2281), Tuple.Create<System.Object, System.Int32>(item.StatusId
+            #line 54 "..\..\Views\Shared\_JobTableRender.cshtml"
+, Tuple.Create(Tuple.Create("", 2358), Tuple.Create<System.Object, System.Int32>(item.StatusId
             
             #line default
             #line hidden
-, 2281), false)
+, 2358), false)
 );
 
 WriteLiteral("></span>\r\n");
@@ -395,7 +434,7 @@ WriteLiteral("></span>\r\n");
 WriteLiteral("                            ");
 
             
-            #line 56 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 55 "..\..\Views\Shared\_JobTableRender.cshtml"
                        Write(item.StatusDescription);
 
             
@@ -404,7 +443,7 @@ WriteLiteral("                            ");
 WriteLiteral("\r\n                        </td> ");
 
             
-            #line 57 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 56 "..\..\Views\Shared\_JobTableRender.cshtml"
                               }
 
             
@@ -413,7 +452,7 @@ WriteLiteral("\r\n                        </td> ");
 WriteLiteral("                        ");
 
             
-            #line 58 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 57 "..\..\Views\Shared\_JobTableRender.cshtml"
                          if (Model.ShowDates)
                         {
             
@@ -428,7 +467,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                            ");
 
             
-            #line 60 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 59 "..\..\Views\Shared\_JobTableRender.cshtml"
                        Write(CommonHelpers.FriendlyDate(item.OpenedDate));
 
             
@@ -437,7 +476,7 @@ WriteLiteral("                            ");
 WriteLiteral("\r\n                            - ");
 
             
-            #line 61 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 60 "..\..\Views\Shared\_JobTableRender.cshtml"
                          Write(CommonHelpers.FriendlyDate(item.ClosedDate));
 
             
@@ -446,7 +485,7 @@ WriteLiteral("\r\n                            - ");
 WriteLiteral("\r\n                        </td>");
 
             
-            #line 62 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 61 "..\..\Views\Shared\_JobTableRender.cshtml"
                              }
 
             
@@ -455,7 +494,7 @@ WriteLiteral("\r\n                        </td>");
 WriteLiteral("                        ");
 
             
-            #line 63 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 62 "..\..\Views\Shared\_JobTableRender.cshtml"
                          if (Model.ShowType)
                         {
             
@@ -467,20 +506,20 @@ WriteLiteral(" class=\"type\"");
 
 WriteLiteral(">\r\n                            <span");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 2793), Tuple.Create("\"", 2822)
+WriteAttribute("title", Tuple.Create(" title=\"", 2870), Tuple.Create("\"", 2899)
             
-            #line 65 "..\..\Views\Shared\_JobTableRender.cshtml"
-, Tuple.Create(Tuple.Create("", 2801), Tuple.Create<System.Object, System.Int32>(item.TypeDescription
+            #line 64 "..\..\Views\Shared\_JobTableRender.cshtml"
+, Tuple.Create(Tuple.Create("", 2878), Tuple.Create<System.Object, System.Int32>(item.TypeDescription
             
             #line default
             #line hidden
-, 2801), false)
+, 2878), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 65 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 64 "..\..\Views\Shared\_JobTableRender.cshtml"
                                                            Write(item.TypeId);
 
             
@@ -489,7 +528,7 @@ WriteLiteral(">");
 WriteLiteral("</span>\r\n                        </td>");
 
             
-            #line 66 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 65 "..\..\Views\Shared\_JobTableRender.cshtml"
                              }
 
             
@@ -498,7 +537,7 @@ WriteLiteral("</span>\r\n                        </td>");
 WriteLiteral("                        ");
 
             
-            #line 67 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 66 "..\..\Views\Shared\_JobTableRender.cshtml"
                          if (Model.ShowDevice)
                         {
             
@@ -511,29 +550,64 @@ WriteLiteral(" class=\"device\"");
 WriteLiteral(">\r\n");
 
             
-            #line 69 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 68 "..\..\Views\Shared\_JobTableRender.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 69 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 68 "..\..\Views\Shared\_JobTableRender.cshtml"
                              if (item.DeviceSerialNumber != null)
                             {
+                                if (Authorization.Has(Claims.Device.Show))
+                                {
                                 
             
             #line default
             #line hidden
             
-            #line 71 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 72 "..\..\Views\Shared\_JobTableRender.cshtml"
                            Write(Html.ActionLink(item.DeviceSerialNumber, MVC.Device.Show(item.DeviceSerialNumber), new { Title = item.DeviceModelDescription }));
 
             
             #line default
             #line hidden
             
-            #line 71 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 72 "..\..\Views\Shared\_JobTableRender.cshtml"
                                                                                                                                                                 
+                                }
+                                else
+                                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <span");
+
+WriteAttribute("title", Tuple.Create(" title=\"", 3565), Tuple.Create("\"", 3601)
+            
+            #line 76 "..\..\Views\Shared\_JobTableRender.cshtml"
+, Tuple.Create(Tuple.Create("", 3573), Tuple.Create<System.Object, System.Int32>(item.DeviceModelDescription
+            
+            #line default
+            #line hidden
+, 3573), false)
+);
+
+WriteLiteral(">");
+
+            
+            #line 76 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                      Write(item.DeviceSerialNumber);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</span>\r\n");
+
+            
+            #line 77 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                }
                             }
                             else
                             { 
@@ -548,7 +622,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">N/A</span>\r\n");
 
             
-            #line 76 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 82 "..\..\Views\Shared\_JobTableRender.cshtml"
                             }
 
             
@@ -557,7 +631,7 @@ WriteLiteral(">N/A</span>\r\n");
 WriteLiteral("                        </td> ");
 
             
-            #line 77 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 83 "..\..\Views\Shared\_JobTableRender.cshtml"
                               }
 
             
@@ -566,7 +640,7 @@ WriteLiteral("                        </td> ");
 WriteLiteral("                        ");
 
             
-            #line 78 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 84 "..\..\Views\Shared\_JobTableRender.cshtml"
                          if (Model.ShowUser)
                         {
             
@@ -579,29 +653,49 @@ WriteLiteral(" class=\"user\"");
 WriteLiteral(">\r\n");
 
             
-            #line 80 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 86 "..\..\Views\Shared\_JobTableRender.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 80 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 86 "..\..\Views\Shared\_JobTableRender.cshtml"
                              if (item.UserId != null)
                             {
+                                if (Authorization.Has(Claims.User.Show))
+                                {
                                 
             
             #line default
             #line hidden
             
-            #line 82 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 90 "..\..\Views\Shared\_JobTableRender.cshtml"
                            Write(Html.ActionLink(string.Format("{0} ({1})", item.UserDisplayName, item.UserId), MVC.User.Show(item.UserId)));
 
             
             #line default
             #line hidden
             
-            #line 82 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 90 "..\..\Views\Shared\_JobTableRender.cshtml"
                                                                                                                                            
+                                }
+                                else
+                                {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 94 "..\..\Views\Shared\_JobTableRender.cshtml"
+                            Write(string.Format("{0} ({1})", item.UserDisplayName, item.UserId));
+
+            
+            #line default
+            #line hidden
+            
+            #line 94 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                                
+                                }
                             }
                             else
                             { 
@@ -616,7 +710,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">N/A</span>\r\n");
 
             
-            #line 87 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 100 "..\..\Views\Shared\_JobTableRender.cshtml"
                             }
 
             
@@ -625,7 +719,7 @@ WriteLiteral(">N/A</span>\r\n");
 WriteLiteral("                        </td>");
 
             
-            #line 88 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 101 "..\..\Views\Shared\_JobTableRender.cshtml"
                              }
 
             
@@ -634,7 +728,7 @@ WriteLiteral("                        </td>");
 WriteLiteral("                        ");
 
             
-            #line 89 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 102 "..\..\Views\Shared\_JobTableRender.cshtml"
                          if (Model.ShowTechnician)
                         {
             
@@ -646,20 +740,20 @@ WriteLiteral(" class=\"technician\"");
 
 WriteLiteral(">\r\n                            <span");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 4148), Tuple.Create("\"", 4187)
+WriteAttribute("title", Tuple.Create(" title=\"", 4937), Tuple.Create("\"", 4976)
             
-            #line 91 "..\..\Views\Shared\_JobTableRender.cshtml"
-, Tuple.Create(Tuple.Create("", 4156), Tuple.Create<System.Object, System.Int32>(item.OpenedTechUserDisplayName
+            #line 104 "..\..\Views\Shared\_JobTableRender.cshtml"
+, Tuple.Create(Tuple.Create("", 4945), Tuple.Create<System.Object, System.Int32>(item.OpenedTechUserDisplayName
             
             #line default
             #line hidden
-, 4156), false)
+, 4945), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 91 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 104 "..\..\Views\Shared\_JobTableRender.cshtml"
                                                                      Write(item.OpenedTechUserId);
 
             
@@ -668,7 +762,7 @@ WriteLiteral(">");
 WriteLiteral("\r\n                            </span>\r\n                        </td>");
 
             
-            #line 93 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 106 "..\..\Views\Shared\_JobTableRender.cshtml"
                              }
 
             
@@ -677,7 +771,7 @@ WriteLiteral("\r\n                            </span>\r\n
 WriteLiteral("                        ");
 
             
-            #line 94 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 107 "..\..\Views\Shared\_JobTableRender.cshtml"
                          if (Model.ShowLocation)
                         {
             
@@ -690,7 +784,7 @@ WriteLiteral(" class=\"technician\"");
 WriteLiteral(">\r\n                            <span>");
 
             
-            #line 96 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 109 "..\..\Views\Shared\_JobTableRender.cshtml"
                               Write(item.Location ?? "Unknown");
 
             
@@ -699,7 +793,7 @@ WriteLiteral(">\r\n                            <span>");
 WriteLiteral("\r\n                            </span>\r\n                        </td>");
 
             
-            #line 98 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 111 "..\..\Views\Shared\_JobTableRender.cshtml"
                              }
 
             
@@ -708,7 +802,7 @@ WriteLiteral("\r\n                            </span>\r\n
 WriteLiteral("                    </tr>\r\n");
 
             
-            #line 100 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 113 "..\..\Views\Shared\_JobTableRender.cshtml"
                 }
 
             
@@ -717,7 +811,7 @@ WriteLiteral("                    </tr>\r\n");
 WriteLiteral("            </tbody>\r\n        </table>\r\n");
 
             
-            #line 103 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 116 "..\..\Views\Shared\_JobTableRender.cshtml"
     }
     else
     { 
@@ -732,7 +826,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Jobs Found</span>\r\n");
 
             
-            #line 107 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 120 "..\..\Views\Shared\_JobTableRender.cshtml"
     }
 
             
diff --git a/Disco.Web/Views/Shared/_Layout.cshtml b/Disco.Web/Views/Shared/_Layout.cshtml
index 82212baa..99e5c81d 100644
--- a/Disco.Web/Views/Shared/_Layout.cshtml
+++ b/Disco.Web/Views/Shared/_Layout.cshtml
@@ -22,28 +22,72 @@
                         <img src="@Links.ClientSource.Style.Images.Heading_png" alt="DISCO - ICT Asset Management" /></a>
                 </div>
                 <div id="headerMenu">
-                    <span>Welcome @Html.ActionLink(DiscoApplication.CurrentUser.ToString(), MVC.User.Show(DiscoApplication.CurrentUser.Id))</span>
-                    @using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get)) { @Html.TextBox("term", null, new { accesskey = "s" }) }
+                    <span>Welcome @if (Authorization.Has(Claims.User.Show))
+                                  { @Html.ActionLink(CurrentUser.ToString(), MVC.User.Show(CurrentUser.Id))}
+                                  else
+                                  {@CurrentUser.ToString()}</span>
+                    @using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get))
+                    { @Html.TextBox("term", null, new { accesskey = "s" }) }
                 </div>
             </div>
             <nav>
                 <ul id="menu">
                     <li class="hasSubMenu">@Html.ActionLink("Jobs", MVC.Job.Index(), accesskey: "1")
                         <ul class="subMenu">
-                            <li>@Html.ActionLink("Devices Ready for Return", MVC.Job.DevicesReadyForReturn())</li>
-                            <li>@Html.ActionLink("Device Held Locations", MVC.Job.Locations())</li>
-                            <li>@Html.ActionLink("Awaiting User Action", MVC.Job.AwaitingUserAction())</li>
-                            <li class="hasSubMenu">@Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance())
-                                <ul class="subMenu">
-                                    <li>@Html.ActionLink("Accounting Charge", MVC.Job.AwaitingFinanceCharge())</li>
-                                    <li>@Html.ActionLink("Accounting Payment", MVC.Job.AwaitingFinancePayment())</li>
-                                    <li>@Html.ActionLink("Agreement Breach", MVC.Job.AwaitingFinanceAgreementBreach())</li>
-                                    <li>@Html.ActionLink("Insurance Processing", MVC.Job.AwaitingFinanceInsuranceProcessing())</li>
-                                </ul>
-                            </li>
-                            <li>@Html.ActionLink("Awaiting Device Repair", MVC.Job.DevicesAwaitingRepair())</li>
-                            <li>@Html.ActionLink("All Open", MVC.Job.AllOpen())</li>
-                            <li>@Html.ActionLink("Recently Closed", MVC.Job.RecentlyClosed())</li>
+                            @if (Authorization.Has(Claims.Job.Lists.DevicesReadyForReturn))
+                            {
+                                <li>@Html.ActionLink("Devices Ready for Return", MVC.Job.DevicesReadyForReturn())</li>
+                            }
+                            @if (Authorization.Has(Claims.Job.Lists.Locations))
+                            {
+                                <li>@Html.ActionLink("Device Held Locations", MVC.Job.Locations())</li>
+                            }
+                            @if (Authorization.Has(Claims.Job.Lists.AwaitingUserAction))
+                            {
+                                <li>@Html.ActionLink("Awaiting User Action", MVC.Job.AwaitingUserAction())</li>
+                            }
+                            @if (Authorization.Has(Claims.Job.Lists.AwaitingFinance))
+                            {
+                                if (Authorization.HasAny(Claims.Job.Lists.AwaitingFinanceCharge, Claims.Job.Lists.AwaitingFinancePayment, Claims.Job.Lists.AwaitingFinanceAgreementBreach, Claims.Job.Lists.AwaitingFinanceInsuranceProcessing))
+                                {
+                                <li class="hasSubMenu">@Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance())
+                                    <ul class="subMenu">
+                                        @if (Authorization.Has(Claims.Job.Lists.AwaitingFinanceCharge))
+                                        {
+                                            <li>@Html.ActionLink("Accounting Charge", MVC.Job.AwaitingFinanceCharge())</li>
+                                        }
+                                        @if (Authorization.Has(Claims.Job.Lists.AwaitingFinancePayment))
+                                        {
+                                            <li>@Html.ActionLink("Accounting Payment", MVC.Job.AwaitingFinancePayment())</li>
+                                        }
+                                        @if (Authorization.Has(Claims.Job.Lists.AwaitingFinanceAgreementBreach))
+                                        {
+                                            <li>@Html.ActionLink("Agreement Breach", MVC.Job.AwaitingFinanceAgreementBreach())</li>
+                                        }
+                                        @if (Authorization.Has(Claims.Job.Lists.AwaitingFinanceInsuranceProcessing))
+                                        {
+                                            <li>@Html.ActionLink("Insurance Processing", MVC.Job.AwaitingFinanceInsuranceProcessing())</li>
+                                        }
+                                    </ul>
+                                </li>
+                                }
+                                else
+                                {
+                                <li>@Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance())</li>
+                                }
+                            }
+                            @if (Authorization.Has(Claims.Job.Lists.DevicesAwaitingRepair))
+                            {
+                                <li>@Html.ActionLink("Awaiting Device Repair", MVC.Job.DevicesAwaitingRepair())</li>
+                            }
+                            @if (Authorization.Has(Claims.Job.Lists.AllOpen))
+                            {
+                                <li>@Html.ActionLink("All Open", MVC.Job.AllOpen())</li>
+                            }
+                            @if (Authorization.Has(Claims.Job.Lists.RecentlyClosed))
+                            {
+                                <li>@Html.ActionLink("Recently Closed", MVC.Job.RecentlyClosed())</li>
+                            }
                         </ul>
                     </li>
                     <li class="sep"></li>
@@ -51,8 +95,11 @@
                     <li class="sep"></li>
                     <li>@Html.ActionLink("Users", MVC.User.Index(), accesskey: "3")</li>
                     <li class="moveRight">@Html.ActionLink("Public Reports", MVC.Public.Public.Index())</li>
-                    <li class="sep"></li>
-                    <li>@Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0")</li>
+                    @if (Authorization.Has(Claims.Config.Show))
+                    {
+                        <li class="sep"></li>
+                        <li>@Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0")</li>
+                    }
                 </ul>
             </nav>
         </header>
diff --git a/Disco.Web/Views/Shared/_Layout.generated.cs b/Disco.Web/Views/Shared/_Layout.generated.cs
index b2955497..ff265f8c 100644
--- a/Disco.Web/Views/Shared/_Layout.generated.cs
+++ b/Disco.Web/Views/Shared/_Layout.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Shared
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_Layout.cshtml")]
-    public partial class Layout : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class Layout : Disco.Services.Web.WebViewPage<dynamic>
     {
         public Layout()
         {
@@ -154,35 +156,64 @@ WriteLiteral(">\r\n                    <span>Welcome ");
 
             
             #line 25 "..\..\Views\Shared\_Layout.cshtml"
-                             Write(Html.ActionLink(DiscoApplication.CurrentUser.ToString(), MVC.User.Show(DiscoApplication.CurrentUser.Id)));
+                                   if (Authorization.Has(Claims.User.Show))
+                                  { 
+            
+            #line default
+            #line hidden
+            
+            #line 26 "..\..\Views\Shared\_Layout.cshtml"
+                               Write(Html.ActionLink(CurrentUser.ToString(), MVC.User.Show(CurrentUser.Id)));
 
             
             #line default
             #line hidden
+            
+            #line 26 "..\..\Views\Shared\_Layout.cshtml"
+                                                                                                           }
+                                  else
+                                  {
+            
+            #line default
+            #line hidden
+            
+            #line 28 "..\..\Views\Shared\_Layout.cshtml"
+                              Write(CurrentUser.ToString());
+
+            
+            #line default
+            #line hidden
+            
+            #line 28 "..\..\Views\Shared\_Layout.cshtml"
+                                                          }
+            
+            #line default
+            #line hidden
 WriteLiteral("</span>\r\n");
 
             
-            #line 26 "..\..\Views\Shared\_Layout.cshtml"
+            #line 29 "..\..\Views\Shared\_Layout.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 26 "..\..\Views\Shared\_Layout.cshtml"
-                     using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get)) { 
+            #line 29 "..\..\Views\Shared\_Layout.cshtml"
+                     using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get))
+                    { 
             
             #line default
             #line hidden
             
-            #line 26 "..\..\Views\Shared\_Layout.cshtml"
-                                                                             Write(Html.TextBox("term", null, new { accesskey = "s" }));
+            #line 30 "..\..\Views\Shared\_Layout.cshtml"
+                 Write(Html.TextBox("term", null, new { accesskey = "s" }));
 
             
             #line default
             #line hidden
             
-            #line 26 "..\..\Views\Shared\_Layout.cshtml"
-                                                                                                                                       }
+            #line 30 "..\..\Views\Shared\_Layout.cshtml"
+                                                                           }
 
             
             #line default
@@ -199,7 +230,7 @@ WriteLiteral(" class=\"hasSubMenu\"");
 WriteLiteral(">");
 
             
-            #line 31 "..\..\Views\Shared\_Layout.cshtml"
+            #line 35 "..\..\Views\Shared\_Layout.cshtml"
                                       Write(Html.ActionLink("Jobs", MVC.Job.Index(), accesskey: "1"));
 
             
@@ -209,123 +240,367 @@ WriteLiteral("\r\n                        <ul");
 
 WriteLiteral(" class=\"subMenu\"");
 
-WriteLiteral(">\r\n                            <li>");
+WriteLiteral(">\r\n");
 
             
-            #line 33 "..\..\Views\Shared\_Layout.cshtml"
-                           Write(Html.ActionLink("Devices Ready for Return", MVC.Job.DevicesReadyForReturn()));
+            #line 37 "..\..\Views\Shared\_Layout.cshtml"
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 37 "..\..\Views\Shared\_Layout.cshtml"
+                             if (Authorization.Has(Claims.Job.Lists.DevicesReadyForReturn))
+                            {
 
             
             #line default
             #line hidden
-WriteLiteral("</li>\r\n                            <li>");
+WriteLiteral("                                <li>");
 
             
-            #line 34 "..\..\Views\Shared\_Layout.cshtml"
-                           Write(Html.ActionLink("Device Held Locations", MVC.Job.Locations()));
+            #line 39 "..\..\Views\Shared\_Layout.cshtml"
+                               Write(Html.ActionLink("Devices Ready for Return", MVC.Job.DevicesReadyForReturn()));
 
             
             #line default
             #line hidden
-WriteLiteral("</li>\r\n                            <li>");
+WriteLiteral("</li>\r\n");
 
             
-            #line 35 "..\..\Views\Shared\_Layout.cshtml"
-                           Write(Html.ActionLink("Awaiting User Action", MVC.Job.AwaitingUserAction()));
+            #line 40 "..\..\Views\Shared\_Layout.cshtml"
+                            }
 
             
             #line default
             #line hidden
-WriteLiteral("</li>\r\n                            <li");
+WriteLiteral("                            ");
+
+            
+            #line 41 "..\..\Views\Shared\_Layout.cshtml"
+                             if (Authorization.Has(Claims.Job.Lists.Locations))
+                            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <li>");
+
+            
+            #line 43 "..\..\Views\Shared\_Layout.cshtml"
+                               Write(Html.ActionLink("Device Held Locations", MVC.Job.Locations()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</li>\r\n");
+
+            
+            #line 44 "..\..\Views\Shared\_Layout.cshtml"
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            ");
+
+            
+            #line 45 "..\..\Views\Shared\_Layout.cshtml"
+                             if (Authorization.Has(Claims.Job.Lists.AwaitingUserAction))
+                            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <li>");
+
+            
+            #line 47 "..\..\Views\Shared\_Layout.cshtml"
+                               Write(Html.ActionLink("Awaiting User Action", MVC.Job.AwaitingUserAction()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</li>\r\n");
+
+            
+            #line 48 "..\..\Views\Shared\_Layout.cshtml"
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            ");
+
+            
+            #line 49 "..\..\Views\Shared\_Layout.cshtml"
+                             if (Authorization.Has(Claims.Job.Lists.AwaitingFinance))
+                            {
+                                if (Authorization.HasAny(Claims.Job.Lists.AwaitingFinanceCharge, Claims.Job.Lists.AwaitingFinancePayment, Claims.Job.Lists.AwaitingFinanceAgreementBreach, Claims.Job.Lists.AwaitingFinanceInsuranceProcessing))
+                                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <li");
 
 WriteLiteral(" class=\"hasSubMenu\"");
 
 WriteLiteral(">");
 
             
-            #line 36 "..\..\Views\Shared\_Layout.cshtml"
-                                              Write(Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance()));
+            #line 53 "..\..\Views\Shared\_Layout.cshtml"
+                                                  Write(Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                                <ul");
+WriteLiteral("\r\n                                    <ul");
 
 WriteLiteral(" class=\"subMenu\"");
 
-WriteLiteral(">\r\n                                    <li>");
+WriteLiteral(">\r\n");
 
             
-            #line 38 "..\..\Views\Shared\_Layout.cshtml"
-                                   Write(Html.ActionLink("Accounting Charge", MVC.Job.AwaitingFinanceCharge()));
+            #line 55 "..\..\Views\Shared\_Layout.cshtml"
+                                        
+            
+            #line default
+            #line hidden
+            
+            #line 55 "..\..\Views\Shared\_Layout.cshtml"
+                                         if (Authorization.Has(Claims.Job.Lists.AwaitingFinanceCharge))
+                                        {
 
             
             #line default
             #line hidden
-WriteLiteral("</li>\r\n                                    <li>");
+WriteLiteral("                                            <li>");
 
             
-            #line 39 "..\..\Views\Shared\_Layout.cshtml"
-                                   Write(Html.ActionLink("Accounting Payment", MVC.Job.AwaitingFinancePayment()));
+            #line 57 "..\..\Views\Shared\_Layout.cshtml"
+                                           Write(Html.ActionLink("Accounting Charge", MVC.Job.AwaitingFinanceCharge()));
 
             
             #line default
             #line hidden
-WriteLiteral("</li>\r\n                                    <li>");
+WriteLiteral("</li>\r\n");
 
             
-            #line 40 "..\..\Views\Shared\_Layout.cshtml"
-                                   Write(Html.ActionLink("Agreement Breach", MVC.Job.AwaitingFinanceAgreementBreach()));
+            #line 58 "..\..\Views\Shared\_Layout.cshtml"
+                                        }
 
             
             #line default
             #line hidden
-WriteLiteral("</li>\r\n                                    <li>");
+WriteLiteral("                                        ");
 
             
-            #line 41 "..\..\Views\Shared\_Layout.cshtml"
-                                   Write(Html.ActionLink("Insurance Processing", MVC.Job.AwaitingFinanceInsuranceProcessing()));
+            #line 59 "..\..\Views\Shared\_Layout.cshtml"
+                                         if (Authorization.Has(Claims.Job.Lists.AwaitingFinancePayment))
+                                        {
 
             
             #line default
             #line hidden
-WriteLiteral("</li>\r\n                                </ul>\r\n                            </li>\r\n" +
-"                            <li>");
+WriteLiteral("                                            <li>");
 
             
-            #line 44 "..\..\Views\Shared\_Layout.cshtml"
-                           Write(Html.ActionLink("Awaiting Device Repair", MVC.Job.DevicesAwaitingRepair()));
+            #line 61 "..\..\Views\Shared\_Layout.cshtml"
+                                           Write(Html.ActionLink("Accounting Payment", MVC.Job.AwaitingFinancePayment()));
 
             
             #line default
             #line hidden
-WriteLiteral("</li>\r\n                            <li>");
+WriteLiteral("</li>\r\n");
 
             
-            #line 45 "..\..\Views\Shared\_Layout.cshtml"
-                           Write(Html.ActionLink("All Open", MVC.Job.AllOpen()));
+            #line 62 "..\..\Views\Shared\_Layout.cshtml"
+                                        }
 
             
             #line default
             #line hidden
-WriteLiteral("</li>\r\n                            <li>");
+WriteLiteral("                                        ");
 
             
-            #line 46 "..\..\Views\Shared\_Layout.cshtml"
-                           Write(Html.ActionLink("Recently Closed", MVC.Job.RecentlyClosed()));
+            #line 63 "..\..\Views\Shared\_Layout.cshtml"
+                                         if (Authorization.Has(Claims.Job.Lists.AwaitingFinanceAgreementBreach))
+                                        {
 
             
             #line default
             #line hidden
-WriteLiteral("</li>\r\n                        </ul>\r\n                    </li>\r\n                " +
-"    <li");
+WriteLiteral("                                            <li>");
+
+            
+            #line 65 "..\..\Views\Shared\_Layout.cshtml"
+                                           Write(Html.ActionLink("Agreement Breach", MVC.Job.AwaitingFinanceAgreementBreach()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</li>\r\n");
+
+            
+            #line 66 "..\..\Views\Shared\_Layout.cshtml"
+                                        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                        ");
+
+            
+            #line 67 "..\..\Views\Shared\_Layout.cshtml"
+                                         if (Authorization.Has(Claims.Job.Lists.AwaitingFinanceInsuranceProcessing))
+                                        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                            <li>");
+
+            
+            #line 69 "..\..\Views\Shared\_Layout.cshtml"
+                                           Write(Html.ActionLink("Insurance Processing", MVC.Job.AwaitingFinanceInsuranceProcessing()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</li>\r\n");
+
+            
+            #line 70 "..\..\Views\Shared\_Layout.cshtml"
+                                        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                    </ul>\r\n                                </li>\r" +
+"\n");
+
+            
+            #line 73 "..\..\Views\Shared\_Layout.cshtml"
+                                }
+                                else
+                                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <li>");
+
+            
+            #line 76 "..\..\Views\Shared\_Layout.cshtml"
+                               Write(Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</li>\r\n");
+
+            
+            #line 77 "..\..\Views\Shared\_Layout.cshtml"
+                                }
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            ");
+
+            
+            #line 79 "..\..\Views\Shared\_Layout.cshtml"
+                             if (Authorization.Has(Claims.Job.Lists.DevicesAwaitingRepair))
+                            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <li>");
+
+            
+            #line 81 "..\..\Views\Shared\_Layout.cshtml"
+                               Write(Html.ActionLink("Awaiting Device Repair", MVC.Job.DevicesAwaitingRepair()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</li>\r\n");
+
+            
+            #line 82 "..\..\Views\Shared\_Layout.cshtml"
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            ");
+
+            
+            #line 83 "..\..\Views\Shared\_Layout.cshtml"
+                             if (Authorization.Has(Claims.Job.Lists.AllOpen))
+                            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <li>");
+
+            
+            #line 85 "..\..\Views\Shared\_Layout.cshtml"
+                               Write(Html.ActionLink("All Open", MVC.Job.AllOpen()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</li>\r\n");
+
+            
+            #line 86 "..\..\Views\Shared\_Layout.cshtml"
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                            ");
+
+            
+            #line 87 "..\..\Views\Shared\_Layout.cshtml"
+                             if (Authorization.Has(Claims.Job.Lists.RecentlyClosed))
+                            {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <li>");
+
+            
+            #line 89 "..\..\Views\Shared\_Layout.cshtml"
+                               Write(Html.ActionLink("Recently Closed", MVC.Job.RecentlyClosed()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</li>\r\n");
+
+            
+            #line 90 "..\..\Views\Shared\_Layout.cshtml"
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </ul>\r\n                    </li>\r\n                    <li" +
+"");
 
 WriteLiteral(" class=\"sep\"");
 
 WriteLiteral("></li>\r\n                    <li>");
 
             
-            #line 50 "..\..\Views\Shared\_Layout.cshtml"
+            #line 94 "..\..\Views\Shared\_Layout.cshtml"
                    Write(Html.ActionLink("Devices", MVC.Device.Index(), accesskey: "2"));
 
             
@@ -338,7 +613,7 @@ WriteLiteral(" class=\"sep\"");
 WriteLiteral("></li>\r\n                    <li>");
 
             
-            #line 52 "..\..\Views\Shared\_Layout.cshtml"
+            #line 96 "..\..\Views\Shared\_Layout.cshtml"
                    Write(Html.ActionLink("Users", MVC.User.Index(), accesskey: "3"));
 
             
@@ -351,34 +626,60 @@ WriteLiteral(" class=\"moveRight\"");
 WriteLiteral(">");
 
             
-            #line 53 "..\..\Views\Shared\_Layout.cshtml"
+            #line 97 "..\..\Views\Shared\_Layout.cshtml"
                                      Write(Html.ActionLink("Public Reports", MVC.Public.Public.Index()));
 
             
             #line default
             #line hidden
-WriteLiteral("</li>\r\n                    <li");
-
-WriteLiteral(" class=\"sep\"");
-
-WriteLiteral("></li>\r\n                    <li>");
+WriteLiteral("</li>\r\n");
 
             
-            #line 55 "..\..\Views\Shared\_Layout.cshtml"
-                   Write(Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0"));
+            #line 98 "..\..\Views\Shared\_Layout.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 98 "..\..\Views\Shared\_Layout.cshtml"
+                     if (Authorization.Has(Claims.Config.Show))
+                    {
 
             
             #line default
             #line hidden
-WriteLiteral("</li>\r\n                </ul>\r\n            </nav>\r\n        </header>\r\n        <div" +
-"");
+WriteLiteral("                        <li");
+
+WriteLiteral(" class=\"sep\"");
+
+WriteLiteral("></li>\r\n");
+
+WriteLiteral("                        <li>");
+
+            
+            #line 101 "..\..\Views\Shared\_Layout.cshtml"
+                       Write(Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0"));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("</li>\r\n");
+
+            
+            #line 102 "..\..\Views\Shared\_Layout.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </ul>\r\n            </nav>\r\n        </header>\r\n        <div");
 
 WriteLiteral(" id=\"layout_PageHeading\"");
 
 WriteLiteral(">");
 
             
-            #line 59 "..\..\Views\Shared\_Layout.cshtml"
+            #line 106 "..\..\Views\Shared\_Layout.cshtml"
                                 Write(CommonHelpers.Breadcrumbs(ViewBag.Title ?? string.Empty));
 
             
@@ -393,7 +694,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("            ");
 
             
-            #line 61 "..\..\Views\Shared\_Layout.cshtml"
+            #line 108 "..\..\Views\Shared\_Layout.cshtml"
        Write(RenderBody());
 
             
@@ -402,7 +703,7 @@ WriteLiteral("            ");
 WriteLiteral("\r\n        </section>\r\n        <footer>\r\n            Disco v");
 
             
-            #line 64 "..\..\Views\Shared\_Layout.cshtml"
+            #line 111 "..\..\Views\Shared\_Layout.cshtml"
                Write(Disco.Web.DiscoApplication.Version);
 
             
@@ -413,7 +714,7 @@ WriteLiteral(" ");
 WriteLiteral("@ ");
 
             
-            #line 64 "..\..\Views\Shared\_Layout.cshtml"
+            #line 111 "..\..\Views\Shared\_Layout.cshtml"
                                                         Write(Disco.Web.DiscoApplication.OrganisationName);
 
             
@@ -423,7 +724,7 @@ WriteLiteral(" | <a\r\n                href=\"http://discoict.com.au/\" target=\
 "m.au</a> | ");
 
             
-            #line 65 "..\..\Views\Shared\_Layout.cshtml"
+            #line 112 "..\..\Views\Shared\_Layout.cshtml"
                                                                                 Write(Html.ActionLink("Credits", MVC.Public.Public.Credits()));
 
             
@@ -432,7 +733,7 @@ WriteLiteral(" | <a\r\n                href=\"http://discoict.com.au/\" target=\
 WriteLiteral(" | ");
 
             
-            #line 65 "..\..\Views\Shared\_Layout.cshtml"
+            #line 112 "..\..\Views\Shared\_Layout.cshtml"
                                                                                                                                            Write(Html.ActionLink("Licence", MVC.Public.Public.Licence()));
 
             
@@ -441,13 +742,13 @@ WriteLiteral(" | ");
 WriteLiteral("\r\n        </footer>\r\n    </div>\r\n");
 
             
-            #line 68 "..\..\Views\Shared\_Layout.cshtml"
+            #line 115 "..\..\Views\Shared\_Layout.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 68 "..\..\Views\Shared\_Layout.cshtml"
+            #line 115 "..\..\Views\Shared\_Layout.cshtml"
        Disco.Services.Plugins.Features.UIExtension.UIExtensions.ExecuteExtensionResult(this); 
             
             #line default
diff --git a/Disco.Web/Views/Shared/_SearchDialog.generated.cs b/Disco.Web/Views/Shared/_SearchDialog.generated.cs
index 2105c3ed..4012074c 100644
--- a/Disco.Web/Views/Shared/_SearchDialog.generated.cs
+++ b/Disco.Web/Views/Shared/_SearchDialog.generated.cs
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Shared
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_SearchDialog.cshtml")]
-    public partial class SearchDialog : System.Web.Mvc.WebViewPage<string>
+    public partial class SearchDialog : Disco.Services.Web.WebViewPage<string>
     {
         public SearchDialog()
         {
diff --git a/Disco.Web/Views/Update/Index.generated.cs b/Disco.Web/Views/Update/Index.generated.cs
index 3675ef26..312575a8 100644
--- a/Disco.Web/Views/Update/Index.generated.cs
+++ b/Disco.Web/Views/Update/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.Update
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Update/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<Disco.Web.Models.Update.IndexModel>
+    public partial class Index : Disco.Services.Web.WebViewPage<Disco.Web.Models.Update.IndexModel>
     {
         public Index()
         {
diff --git a/Disco.Web/Views/User/ARCHIVE_Show.cshtml b/Disco.Web/Views/User/ARCHIVE_Show.cshtml
deleted file mode 100644
index 0d645991..00000000
--- a/Disco.Web/Views/User/ARCHIVE_Show.cshtml
+++ /dev/null
@@ -1,85 +0,0 @@
-@model Disco.Web.Models.User.ShowModel
-@{
-    ViewBag.Title = Html.ToBreadcrumb("Users", MVC.User.Index(), string.Format("{0} ({1})", Model.User.DisplayName, Model.User.Id));
-    Html.BundleDeferred("~/ClientScripts/Modules/Silverlight");
-    Html.BundleDeferred("~/ClientScripts/Modules/Disco-CreateJob");
-}
-<table class="userShow">
-    <tr>
-        <th class="name">Id:
-        </th>
-        <td class="value">
-            @Model.User.Id
-        </td>
-        <th class="name">Given Name:
-        </th>
-        <td class="value">
-            @Model.User.GivenName
-        </td>
-    </tr>
-    <tr>
-        <th class="name">Type:
-        </th>
-        <td class="value">
-            @Model.User.Type
-        </td>
-        <th class="name">Surname:
-        </th>
-        <td class="value">
-            @Model.User.Surname
-        </td>
-    </tr>
-    <tr>
-        <th class="name">Display Name:
-        </th>
-        <td class="value" colspan="3">
-            @Model.User.DisplayName
-        </td>
-    </tr>
-    <tr>
-        <th class="name">Email Address:
-        </th>
-        <td class="value">
-            @Model.User.EmailAddress
-        </td>
-        <th class="name">Phone Number:
-        </th>
-        <td class="value">
-            @Model.User.PhoneNumber
-        </td>
-    </tr>
-    <tr>
-        <th class="name">Assigned Devices:
-        </th>
-        <td class="value" colspan="3">
-            @Html.Partial(MVC.User.Views._UserDeviceAssignmentHistoryTable, Model.User)
-        </td>
-    </tr>
-    <tr>
-        <th class="name">Generate Documents:
-        </th>
-        <td class="value" colspan="3">
-            @Html.DropDownList("DocumentTemplates", Model.DocumentTemplatesSelectListItems)
-            <script type="text/javascript">
-                $(function () {
-                    var generatePdfUrl = '@Url.Action(MVC.API.User.GeneratePdf(Model.User.Id, null))?DocumentTemplateId=';
-                    var $documentTemplates = $('#DocumentTemplates');
-                    $documentTemplates.change(function () {
-                        var v = $documentTemplates.val();
-                        if (v) {
-                            window.location.href = generatePdfUrl + v;
-                            $documentTemplates.val('');
-                        }
-                    });
-                });
-            </script>
-        </td>
-    </tr>
-</table>
-<h2>Jobs</h2>
-@Html.Partial(MVC.Shared.Views._JobTable, Model.Jobs)
-<h2>Attachments</h2>
-@Html.Partial(MVC.User.Views.UserParts.Resources, Model)
-<div class="actionBar">
-    @Html.ActionLinkButton("Create Job", MVC.Job.Create(Model.PrimaryDeviceSerialNumber, Model.User.Id), "buttonCreateJob")
-</div>
diff --git a/Disco.Web/Views/User/ARCHIVE__UserDeviceAssignmentHistoryTable.cshtml b/Disco.Web/Views/User/ARCHIVE__UserDeviceAssignmentHistoryTable.cshtml
deleted file mode 100644
index c2c137bf..00000000
--- a/Disco.Web/Views/User/ARCHIVE__UserDeviceAssignmentHistoryTable.cshtml
+++ /dev/null
@@ -1,80 +0,0 @@
-@model Disco.Models.Repository.User
-@{
-    var userId = Model.Id;
-}
-@if (Model.DeviceUserAssignments.Count > 0)
-{ 
-    <table class="genericData smallTable" id="User_AssignedDevice_History_@(userId)">
-        <tr>
-            <th>
-                Device Serial #
-            </th>
-            <th>
-                Device Asset #
-            </th>
-            <th>
-                Device Model
-            </th>
-            <th>
-                Assigned
-            </th>
-            <th>
-                Unassigned
-            </th>
-        </tr>
-        @foreach (var dua in Model.DeviceUserAssignments.OrderByDescending(m => m.AssignedDate))
-        {
-            <tr class="assignmentActive@((!dua.UnassignedDate.HasValue).ToString())">
-                <td>
-                    @Html.ActionLink(dua.Device.SerialNumber, MVC.Device.Show(dua.DeviceSerialNumber))
-                </td>
-                <td>
-                    @dua.Device.AssetNumber
-                </td>
-                <td>
-                    @dua.Device.DeviceModel.ToString()
-                </td>
-                <td>
-                    @CommonHelpers.FriendlyDate(dua.AssignedDate)
-                </td>
-                <td>
-                    @CommonHelpers.FriendlyDate(dua.UnassignedDate, "Current")
-                </td>
-            </tr>
-        }
-        @if (Model.DeviceUserAssignments.Count(m => !m.UnassignedDate.HasValue) == 0)
-        {
-            <tr class="noActiveAssignments">
-                <td colspan="5">
-                    <span class="smallMessage">No Active Assignments</span>
-                </td>
-            </tr>
-        }
-    </table>
-    <a href="#" id="User_AssignedDevice_History_Trigger_@(userId)" class="smallLink">Show
-        All Assignment History (<span id="User_AssignedDevice_History_RecordCount_@(userId)"></span>)</a>
-    <script type="text/javascript">
-        $(function () {
-            var $table = $('#User_AssignedDevice_History_@(userId)');
-            var $inactiveRecords = $table.find('tr.assignmentActiveFalse').hide();
-            if ($inactiveRecords.length != 0) {
-                var recordCountText = $inactiveRecords.length + ' record';
-                if ($inactiveRecords.length != 1)
-                    recordCountText += 's';
-                $('#User_AssignedDevice_History_RecordCount_@(userId)').text(recordCountText);
-                $('#User_AssignedDevice_History_Trigger_@(userId)').click(function () {
-                    $(this).hide();
-                    $table.find('tr.noActiveAssignments').hide();
-                    $inactiveRecords.show();
-                    return false;
-                });
-            } else {
-                $('#User_AssignedDevice_History_Trigger_@(userId)').hide();
-            }
-        });
-    </script>
-}
-else
-{ 
-    <span class="smallMessage">No Assignment History Available</span>
-}
diff --git a/Disco.Web/Views/User/Index.cshtml b/Disco.Web/Views/User/Index.cshtml
index e17221d4..561b034d 100644
--- a/Disco.Web/Views/User/Index.cshtml
+++ b/Disco.Web/Views/User/Index.cshtml
@@ -1,6 +1,8 @@
 @{
     ViewBag.Title = "Users";
 }
-<h3>
-    Search for a User</h3>
-@Html.Partial(MVC.Shared.Views._SearchDialog, "users")
+@if (Authorization.Has(Claims.User.Search))
+{
+    <h3>Search for a User</h3>
+    @Html.Partial(MVC.Shared.Views._SearchDialog, "users")
+}
\ No newline at end of file
diff --git a/Disco.Web/Views/User/Index.generated.cs b/Disco.Web/Views/User/Index.generated.cs
index 2ed85756..ed0a8404 100644
--- a/Disco.Web/Views/User/Index.generated.cs
+++ b/Disco.Web/Views/User/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.User
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/User/Index.cshtml")]
-    public partial class Index : System.Web.Mvc.WebViewPage<dynamic>
+    public partial class Index : Disco.Services.Web.WebViewPage<dynamic>
     {
         public Index()
         {
@@ -48,17 +50,38 @@ namespace Disco.Web.Views.User
             
             #line default
             #line hidden
-WriteLiteral("\r\n<h3>\r\n    Search for a User</h3>\r\n");
+WriteLiteral("\r\n");
 
             
-            #line 6 "..\..\Views\User\Index.cshtml"
+            #line 4 "..\..\Views\User\Index.cshtml"
+ if (Authorization.Has(Claims.User.Search))
+{
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <h3>Search for a User</h3>\r\n");
+
+            
+            #line 7 "..\..\Views\User\Index.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 7 "..\..\Views\User\Index.cshtml"
 Write(Html.Partial(MVC.Shared.Views._SearchDialog, "users"));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
+            
+            #line 7 "..\..\Views\User\Index.cshtml"
+                                                          
+}
+            
+            #line default
+            #line hidden
         }
     }
 }
diff --git a/Disco.Web/Views/User/Show.cshtml b/Disco.Web/Views/User/Show.cshtml
index c8ba26bf..7b1da0c1 100644
--- a/Disco.Web/Views/User/Show.cshtml
+++ b/Disco.Web/Views/User/Show.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Models.User.ShowModel
 @{
+    Authorization.Require(Claims.User.Show);
+
     ViewBag.Title = Html.ToBreadcrumb("Users", MVC.User.Index(), string.Format("User: {0} ({1})", Model.User.DisplayName, Model.User.Id));
 }
 <div id="User_Show">
@@ -7,36 +9,53 @@
     <script type="text/javascript">
         $(function () {
             var $tabs = $('#UserDetailTabs');
-            $tabs.tabs({
-                activate: function (event, ui) {
-                    window.setTimeout(function () {
-                        var $window = $(window);
-                        var tabHeight = $tabs.height();
-                        var tabOffset = $tabs.offset();
-                        var windowScrollTop = $window.scrollTop();
-                        var windowHeight = $window.height();
+            if ($tabs.children().length > 1) {
+                $tabs.tabs({
+                    activate: function (event, ui) {
+                        window.setTimeout(function () {
+                            var $window = $(window);
+                            var tabHeight = $tabs.height();
+                            var tabOffset = $tabs.offset();
+                            var windowScrollTop = $window.scrollTop();
+                            var windowHeight = $window.height();
 
-                        var tabTopNotShown = windowScrollTop - tabOffset.top;
-                        if (tabTopNotShown > 0) {
-                            $('html').animate({ scrollTop: tabOffset.top }, 125);
-                        } else {
-                            var tabBottomNotShown = ((windowScrollTop + windowHeight) - (tabHeight + tabOffset.top)) * -1;
-                            if (tabBottomNotShown > 0) {
-                                if (tabHeight > windowHeight)
-                                    $('html').animate({ scrollTop: tabOffset.top }, 125);
-                                else
-                                    $('html').animate({ scrollTop: windowScrollTop + tabBottomNotShown }, 125);
+                            var tabTopNotShown = windowScrollTop - tabOffset.top;
+                            if (tabTopNotShown > 0) {
+                                $('html').animate({ scrollTop: tabOffset.top }, 125);
+                            } else {
+                                var tabBottomNotShown = ((windowScrollTop + windowHeight) - (tabHeight + tabOffset.top)) * -1;
+                                if (tabBottomNotShown > 0) {
+                                    if (tabHeight > windowHeight)
+                                        $('html').animate({ scrollTop: tabOffset.top }, 125);
+                                    else
+                                        $('html').animate({ scrollTop: windowScrollTop + tabBottomNotShown }, 125);
+                                }
                             }
-                        }
-                    }, 1);
-                }
-            });
+                        }, 1);
+                    }
+                });
+            } else {
+                $tabs.hide();
+            }
         });
     </script>
     <div id="UserDetailTabs">
         <ul id="UserDetailTabItems"></ul>
-        @Html.Partial(MVC.User.Views.UserParts._Jobs, Model)
-        @Html.Partial(MVC.User.Views.UserParts._AssignmentHistory, Model)
-        @Html.Partial(MVC.User.Views.UserParts._Resources, Model)
+        @if (Authorization.Has(Claims.User.ShowJobs))
+        {
+            @Html.Partial(MVC.User.Views.UserParts._Jobs, Model)
+        }
+        @if (Authorization.Has(Claims.User.ShowAssignmentHistory))
+        {
+            @Html.Partial(MVC.User.Views.UserParts._AssignmentHistory, Model)
+        }
+        @if (Authorization.Has(Claims.User.ShowAttachments))
+        {
+            @Html.Partial(MVC.User.Views.UserParts._Resources, Model)
+        }
+        @if (Authorization.Has(Claims.User.ShowAuthorization))
+        {
+            @Html.Partial(MVC.User.Views.UserParts._Authorization, Model)
+        }
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/Disco.Web/Views/User/Show.generated.cs b/Disco.Web/Views/User/Show.generated.cs
index af69b26c..32c61596 100644
--- a/Disco.Web/Views/User/Show.generated.cs
+++ b/Disco.Web/Views/User/Show.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.User
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/User/Show.cshtml")]
-    public partial class Show : System.Web.Mvc.WebViewPage<Disco.Web.Models.User.ShowModel>
+    public partial class Show : Disco.Services.Web.WebViewPage<Disco.Web.Models.User.ShowModel>
     {
         public Show()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Views.User
             
             #line 2 "..\..\Views\User\Show.cshtml"
   
+    Authorization.Require(Claims.User.Show);
+
     ViewBag.Title = Html.ToBreadcrumb("Users", MVC.User.Index(), string.Format("User: {0} ({1})", Model.User.DisplayName, Model.User.Id));
 
             
@@ -57,7 +61,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("    ");
 
             
-            #line 6 "..\..\Views\User\Show.cshtml"
+            #line 8 "..\..\Views\User\Show.cshtml"
 Write(Html.Partial(MVC.User.Views.UserParts._Subject, Model));
 
             
@@ -67,36 +71,26 @@ WriteLiteral("\r\n    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(@">
-        $(function () {
-            var $tabs = $('#UserDetailTabs');
-            $tabs.tabs({
-                activate: function (event, ui) {
-                    window.setTimeout(function () {
-                        var $window = $(window);
-                        var tabHeight = $tabs.height();
-                        var tabOffset = $tabs.offset();
-                        var windowScrollTop = $window.scrollTop();
-                        var windowHeight = $window.height();
-
-                        var tabTopNotShown = windowScrollTop - tabOffset.top;
-                        if (tabTopNotShown > 0) {
-                            $('html').animate({ scrollTop: tabOffset.top }, 125);
-                        } else {
-                            var tabBottomNotShown = ((windowScrollTop + windowHeight) - (tabHeight + tabOffset.top)) * -1;
-                            if (tabBottomNotShown > 0) {
-                                if (tabHeight > windowHeight)
-                                    $('html').animate({ scrollTop: tabOffset.top }, 125);
-                                else
-                                    $('html').animate({ scrollTop: windowScrollTop + tabBottomNotShown }, 125);
-                            }
-                        }
-                    }, 1);
-                }
-            });
-        });
-    </script>
-    <div");
+WriteLiteral(">\r\n        $(function () {\r\n            var $tabs = $(\'#UserDetailTabs\');\r\n      " +
+"      if ($tabs.children().length > 1) {\r\n                $tabs.tabs({\r\n        " +
+"            activate: function (event, ui) {\r\n                        window.set" +
+"Timeout(function () {\r\n                            var $window = $(window);\r\n   " +
+"                         var tabHeight = $tabs.height();\r\n                      " +
+"      var tabOffset = $tabs.offset();\r\n                            var windowScr" +
+"ollTop = $window.scrollTop();\r\n                            var windowHeight = $w" +
+"indow.height();\r\n\r\n                            var tabTopNotShown = windowScroll" +
+"Top - tabOffset.top;\r\n                            if (tabTopNotShown > 0) {\r\n   " +
+"                             $(\'html\').animate({ scrollTop: tabOffset.top }, 125" +
+");\r\n                            } else {\r\n                                var ta" +
+"bBottomNotShown = ((windowScrollTop + windowHeight) - (tabHeight + tabOffset.top" +
+")) * -1;\r\n                                if (tabBottomNotShown > 0) {\r\n        " +
+"                            if (tabHeight > windowHeight)\r\n                     " +
+"                   $(\'html\').animate({ scrollTop: tabOffset.top }, 125);\r\n      " +
+"                              else\r\n                                        $(\'h" +
+"tml\').animate({ scrollTop: windowScrollTop + tabBottomNotShown }, 125);\r\n       " +
+"                         }\r\n                            }\r\n                     " +
+"   }, 1);\r\n                    }\r\n                });\r\n            } else {\r\n   " +
+"             $tabs.hide();\r\n            }\r\n        });\r\n    </script>\r\n    <div");
 
 WriteLiteral(" id=\"UserDetailTabs\"");
 
@@ -106,38 +100,111 @@ WriteLiteral(" id=\"UserDetailTabItems\"");
 
 WriteLiteral("></ul>\r\n");
 
-WriteLiteral("        ");
-
             
-            #line 38 "..\..\Views\User\Show.cshtml"
-   Write(Html.Partial(MVC.User.Views.UserParts._Jobs, Model));
+            #line 44 "..\..\Views\User\Show.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 44 "..\..\Views\User\Show.cshtml"
+         if (Authorization.Has(Claims.User.ShowJobs))
+        {
+            
+            
+            #line default
+            #line hidden
+            
+            #line 46 "..\..\Views\User\Show.cshtml"
+       Write(Html.Partial(MVC.User.Views.UserParts._Jobs, Model));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("        ");
-
             
-            #line 39 "..\..\Views\User\Show.cshtml"
-   Write(Html.Partial(MVC.User.Views.UserParts._AssignmentHistory, Model));
+            #line 46 "..\..\Views\User\Show.cshtml"
+                                                                
+        }
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n");
-
 WriteLiteral("        ");
 
             
-            #line 40 "..\..\Views\User\Show.cshtml"
-   Write(Html.Partial(MVC.User.Views.UserParts._Resources, Model));
+            #line 48 "..\..\Views\User\Show.cshtml"
+         if (Authorization.Has(Claims.User.ShowAssignmentHistory))
+        {
+            
+            
+            #line default
+            #line hidden
+            
+            #line 50 "..\..\Views\User\Show.cshtml"
+       Write(Html.Partial(MVC.User.Views.UserParts._AssignmentHistory, Model));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n    </div>\r\n</div>");
+            
+            #line 50 "..\..\Views\User\Show.cshtml"
+                                                                             
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 52 "..\..\Views\User\Show.cshtml"
+         if (Authorization.Has(Claims.User.ShowAttachments))
+        {
+            
+            
+            #line default
+            #line hidden
+            
+            #line 54 "..\..\Views\User\Show.cshtml"
+       Write(Html.Partial(MVC.User.Views.UserParts._Resources, Model));
+
+            
+            #line default
+            #line hidden
+            
+            #line 54 "..\..\Views\User\Show.cshtml"
+                                                                     
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        ");
+
+            
+            #line 56 "..\..\Views\User\Show.cshtml"
+         if (Authorization.Has(Claims.User.ShowAuthorization))
+        {
+            
+            
+            #line default
+            #line hidden
+            
+            #line 58 "..\..\Views\User\Show.cshtml"
+       Write(Html.Partial(MVC.User.Views.UserParts._Authorization, Model));
+
+            
+            #line default
+            #line hidden
+            
+            #line 58 "..\..\Views\User\Show.cshtml"
+                                                                         
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    </div>\r\n</div>\r\n");
 
         }
     }
diff --git a/Disco.Web/Views/User/UserParts/_AssignmentHistory.cshtml b/Disco.Web/Views/User/UserParts/_AssignmentHistory.cshtml
index bffd2c34..be2973e2 100644
--- a/Disco.Web/Views/User/UserParts/_AssignmentHistory.cshtml
+++ b/Disco.Web/Views/User/UserParts/_AssignmentHistory.cshtml
@@ -1,4 +1,7 @@
 @model Disco.Web.Models.User.ShowModel
+@{
+    Authorization.Require(Claims.User.ShowAssignmentHistory);
+}
 <div id="UserDetailTab-AssignmentHistory" class="UserPart">
     @if (Model.User.DeviceUserAssignments.Count > 0)
     { 
@@ -19,7 +22,14 @@
             {
                 <tr>
                     <td>
-                        @Html.ActionLink(dua.Device.SerialNumber, MVC.Device.Show(dua.DeviceSerialNumber))
+                        @if (Authorization.Has(Claims.Device.Show))
+                        {
+                            @Html.ActionLink(dua.Device.SerialNumber, MVC.Device.Show(dua.DeviceSerialNumber))
+                        }
+                        else
+                        {
+                            @dua.Device.SerialNumber
+                        }
                     </td>
                     <td>
                         @dua.Device.AssetNumber
diff --git a/Disco.Web/Views/User/UserParts/_AssignmentHistory.generated.cs b/Disco.Web/Views/User/UserParts/_AssignmentHistory.generated.cs
index 5801c5de..a446a097 100644
--- a/Disco.Web/Views/User/UserParts/_AssignmentHistory.generated.cs
+++ b/Disco.Web/Views/User/UserParts/_AssignmentHistory.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,19 +28,29 @@ namespace Disco.Web.Views.User.UserParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/User/UserParts/_AssignmentHistory.cshtml")]
-    public partial class AssignmentHistory : System.Web.Mvc.WebViewPage<Disco.Web.Models.User.ShowModel>
+    public partial class AssignmentHistory : Disco.Services.Web.WebViewPage<Disco.Web.Models.User.ShowModel>
     {
         public AssignmentHistory()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<div");
+            
+            #line 2 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+  
+    Authorization.Require(Claims.User.ShowAssignmentHistory);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<div");
 
 WriteLiteral(" id=\"UserDetailTab-AssignmentHistory\"");
 
@@ -49,13 +59,13 @@ WriteLiteral(" class=\"UserPart\"");
 WriteLiteral(">\r\n");
 
             
-            #line 3 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+            #line 6 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 3 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+            #line 6 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
      if (Model.User.DeviceUserAssignments.Count > 0)
     { 
 
@@ -82,13 +92,13 @@ WriteLiteral(@">
 ");
 
             
-            #line 18 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+            #line 21 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
             
             
             #line default
             #line hidden
             
-            #line 18 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+            #line 21 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
              foreach (var dua in Model.User.DeviceUserAssignments.OrderByDescending(m => m.AssignedDate))
             {
 
@@ -97,21 +107,58 @@ WriteLiteral(@">
             #line hidden
 WriteLiteral("                <tr>\r\n                    <td>\r\n");
 
-WriteLiteral("                        ");
-
             
-            #line 22 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
-                   Write(Html.ActionLink(dua.Device.SerialNumber, MVC.Device.Show(dua.DeviceSerialNumber)));
+            #line 25 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 25 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+                         if (Authorization.Has(Claims.Device.Show))
+                        {
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 27 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+                       Write(Html.ActionLink(dua.Device.SerialNumber, MVC.Device.Show(dua.DeviceSerialNumber)));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                    </td>\r\n                    <td>\r\n");
+            
+            #line 27 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+                                                                                                              
+                        }
+                        else
+                        {
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 31 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+                       Write(dua.Device.SerialNumber);
+
+            
+            #line default
+            #line hidden
+            
+            #line 31 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+                                                    
+                        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    </td>\r\n                    <td>\r\n");
 
 WriteLiteral("                        ");
 
             
-            #line 25 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+            #line 35 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
                    Write(dua.Device.AssetNumber);
 
             
@@ -122,7 +169,7 @@ WriteLiteral("\r\n                    </td>\r\n                    <td>\r\n");
 WriteLiteral("                        ");
 
             
-            #line 28 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+            #line 38 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
                    Write(dua.Device.DeviceModel.ToString());
 
             
@@ -133,7 +180,7 @@ WriteLiteral("\r\n                    </td>\r\n                    <td>\r\n");
 WriteLiteral("                        ");
 
             
-            #line 31 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+            #line 41 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
                    Write(CommonHelpers.FriendlyDate(dua.AssignedDate));
 
             
@@ -144,7 +191,7 @@ WriteLiteral("\r\n                    </td>\r\n                    <td>\r\n");
 WriteLiteral("                        ");
 
             
-            #line 34 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+            #line 44 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
                    Write(CommonHelpers.FriendlyDate(dua.UnassignedDate, "Current"));
 
             
@@ -153,7 +200,7 @@ WriteLiteral("                        ");
 WriteLiteral("\r\n                    </td>\r\n                </tr>\r\n");
 
             
-            #line 37 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+            #line 47 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
             }
 
             
@@ -162,7 +209,7 @@ WriteLiteral("\r\n                    </td>\r\n                </tr>\r\n");
 WriteLiteral("        </table>\r\n");
 
             
-            #line 39 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+            #line 49 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
     }
     else
     { 
@@ -177,7 +224,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Assignment History Available</span>\r\n");
 
             
-            #line 43 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+            #line 53 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
     }
 
             
@@ -187,7 +234,7 @@ WriteLiteral("    <script>\r\n        $(\'#UserDetailTabItems\').append(\'<li><a
 "b-AssignmentHistory\">Assignment History [");
 
             
-            #line 45 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
+            #line 55 "..\..\Views\User\UserParts\_AssignmentHistory.cshtml"
                                                                                                         Write(Model.User.DeviceUserAssignments.Count);
 
             
diff --git a/Disco.Web/Views/User/UserParts/_Authorization.cshtml b/Disco.Web/Views/User/UserParts/_Authorization.cshtml
new file mode 100644
index 00000000..66faf4ea
--- /dev/null
+++ b/Disco.Web/Views/User/UserParts/_Authorization.cshtml
@@ -0,0 +1,39 @@
+@model Disco.Web.Models.User.ShowModel
+@{
+    Authorization.Require(Claims.User.ShowAuthorization);
+
+    Html.BundleDeferred("~/Style/Fancytree");
+    Html.BundleDeferred("~/ClientScripts/Modules/jQuery-Fancytree");
+}
+<div id="UserDetailTab-Authorization" class="UserPart">
+    <div id="UserDetailTab-AuthorizationContainer">
+        
+        @if (Model.ClaimNavigator != null)
+        {
+            <div id="Config_AuthRoles_Claims_Tree">
+                </div>
+                <script>
+                    (function(){
+                        var claimNodes = @(new HtmlString(Newtonsoft.Json.JsonConvert.SerializeObject(Model.ClaimNavigatorFancyTreeNodes)));
+
+                        $(function(){
+                            var tree = $('#Config_AuthRoles_Claims_Tree').fancytree({
+                                source: claimNodes,
+                                checkbox: true,
+                                selectMode: 3
+                            });
+                        });
+                    })();
+                </script>
+        }
+        else
+        {
+            <div>NO ACCESS</div>
+        }
+
+
+    </div>
+    <script>
+        $('#UserDetailTabItems').append('<li><a href="#UserDetailTab-Authorization">Authorization</a></li>');
+    </script>
+</div>
\ No newline at end of file
diff --git a/Disco.Web/Views/User/UserParts/_Authorization.generated.cs b/Disco.Web/Views/User/UserParts/_Authorization.generated.cs
new file mode 100644
index 00000000..4b8aa6dd
--- /dev/null
+++ b/Disco.Web/Views/User/UserParts/_Authorization.generated.cs
@@ -0,0 +1,136 @@
+#pragma warning disable 1591
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.18051
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Disco.Web.Views.User.UserParts
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using System.Net;
+    using System.Text;
+    using System.Web;
+    using System.Web.Helpers;
+    using System.Web.Mvc;
+    using System.Web.Mvc.Ajax;
+    using System.Web.Mvc.Html;
+    using System.Web.Routing;
+    using System.Web.Security;
+    using System.Web.UI;
+    using System.Web.WebPages;
+    using Disco.BI.Extensions;
+    using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
+    using Disco.Web;
+    using Disco.Web.Extensions;
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
+    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/User/UserParts/_Authorization.cshtml")]
+    public partial class Authorization : Disco.Services.Web.WebViewPage<Disco.Web.Models.User.ShowModel>
+    {
+        public Authorization()
+        {
+        }
+        public override void Execute()
+        {
+            
+            #line 2 "..\..\Views\User\UserParts\_Authorization.cshtml"
+  
+    Authorization.Require(Claims.User.ShowAuthorization);
+
+    Html.BundleDeferred("~/Style/Fancytree");
+    Html.BundleDeferred("~/ClientScripts/Modules/jQuery-Fancytree");
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<div");
+
+WriteLiteral(" id=\"UserDetailTab-Authorization\"");
+
+WriteLiteral(" class=\"UserPart\"");
+
+WriteLiteral(">\r\n    <div");
+
+WriteLiteral(" id=\"UserDetailTab-AuthorizationContainer\"");
+
+WriteLiteral(">\r\n        \r\n");
+
+            
+            #line 11 "..\..\Views\User\UserParts\_Authorization.cshtml"
+        
+            
+            #line default
+            #line hidden
+            
+            #line 11 "..\..\Views\User\UserParts\_Authorization.cshtml"
+         if (Model.ClaimNavigator != null)
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <div");
+
+WriteLiteral(" id=\"Config_AuthRoles_Claims_Tree\"");
+
+WriteLiteral(">\r\n                </div>\r\n");
+
+WriteLiteral("                <script>\r\n                    (function(){\r\n                     " +
+"   var claimNodes = ");
+
+            
+            #line 17 "..\..\Views\User\UserParts\_Authorization.cshtml"
+                                     Write(new HtmlString(Newtonsoft.Json.JsonConvert.SerializeObject(Model.ClaimNavigatorFancyTreeNodes)));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@";
+
+                        $(function(){
+                            var tree = $('#Config_AuthRoles_Claims_Tree').fancytree({
+                                source: claimNodes,
+                                checkbox: true,
+                                selectMode: 3
+                            });
+                        });
+                    })();
+                </script>
+");
+
+            
+            #line 28 "..\..\Views\User\UserParts\_Authorization.cshtml"
+        }
+        else
+        {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            <div>NO ACCESS</div>\r\n");
+
+            
+            #line 32 "..\..\Views\User\UserParts\_Authorization.cshtml"
+        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n\r\n    </div>\r\n    <script>\r\n        $(\'#UserDetailTabItems\').append(\'<li><a hre" +
+"f=\"#UserDetailTab-Authorization\">Authorization</a></li>\');\r\n    </script>\r\n</div" +
+">");
+
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/Disco.Web/Views/User/UserParts/_Jobs.cshtml b/Disco.Web/Views/User/UserParts/_Jobs.cshtml
index bd91ebc6..4c73e624 100644
--- a/Disco.Web/Views/User/UserParts/_Jobs.cshtml
+++ b/Disco.Web/Views/User/UserParts/_Jobs.cshtml
@@ -1,4 +1,7 @@
 @model Disco.Web.Models.User.ShowModel
+@{
+    Authorization.Require(Claims.User.ShowJobs);
+}
 <div id="UserDetailTab-Jobs" class="UserPart">
     <div id="UserDetailTab-JobsContainer">
         @Html.Partial(MVC.Shared.Views._JobTable, Model.Jobs)
diff --git a/Disco.Web/Views/User/UserParts/_Jobs.generated.cs b/Disco.Web/Views/User/UserParts/_Jobs.generated.cs
index df936df2..364248ec 100644
--- a/Disco.Web/Views/User/UserParts/_Jobs.generated.cs
+++ b/Disco.Web/Views/User/UserParts/_Jobs.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,19 +28,29 @@ namespace Disco.Web.Views.User.UserParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/User/UserParts/_Jobs.cshtml")]
-    public partial class Jobs : System.Web.Mvc.WebViewPage<Disco.Web.Models.User.ShowModel>
+    public partial class Jobs : Disco.Services.Web.WebViewPage<Disco.Web.Models.User.ShowModel>
     {
         public Jobs()
         {
         }
         public override void Execute()
         {
-WriteLiteral("<div");
+            
+            #line 2 "..\..\Views\User\UserParts\_Jobs.cshtml"
+  
+    Authorization.Require(Claims.User.ShowJobs);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\r\n<div");
 
 WriteLiteral(" id=\"UserDetailTab-Jobs\"");
 
@@ -55,7 +65,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("        ");
 
             
-            #line 4 "..\..\Views\User\UserParts\_Jobs.cshtml"
+            #line 7 "..\..\Views\User\UserParts\_Jobs.cshtml"
    Write(Html.Partial(MVC.Shared.Views._JobTable, Model.Jobs));
 
             
@@ -65,7 +75,7 @@ WriteLiteral("\r\n    </div>\r\n    <script>\r\n        $(\'#UserDetailTabItems\
 "\"#UserDetailTab-Jobs\">Jobs [");
 
             
-            #line 7 "..\..\Views\User\UserParts\_Jobs.cshtml"
+            #line 10 "..\..\Views\User\UserParts\_Jobs.cshtml"
                                                                              Write(Model.User.Jobs == null ? 0 : Model.User.Jobs.Count);
 
             
diff --git a/Disco.Web/Views/User/UserParts/_Resources.cshtml b/Disco.Web/Views/User/UserParts/_Resources.cshtml
index b74aa59a..3c62902c 100644
--- a/Disco.Web/Views/User/UserParts/_Resources.cshtml
+++ b/Disco.Web/Views/User/UserParts/_Resources.cshtml
@@ -1,13 +1,23 @@
 @model Disco.Web.Models.User.ShowModel
 @{
+    Authorization.Require(Claims.User.ShowAttachments);
+
+    var canAddAttachments = Authorization.Has(Claims.User.Actions.AddAttachments);
+    var canRemoveAnyAttachments = Authorization.Has(Claims.User.Actions.RemoveAnyAttachments);
+    var canRemoveOwnAttachments = Authorization.Has(Claims.User.Actions.RemoveOwnAttachments);
+
     Html.BundleDeferred("~/Style/Shadowbox");
     Html.BundleDeferred("~/ClientScripts/Modules/Shadowbox");
-    Html.BundleDeferred("~/ClientScripts/Modules/Silverlight");
+
+    if (Authorization.Has(Claims.User.Actions.AddAttachments))
+    {
+        Html.BundleDeferred("~/ClientScripts/Modules/Silverlight");
+    }
 }
 <div id="UserDetailTab-Resources" class="UserPart">
     <table id="userShowResources">
         <tr>
-            <td id="Attachments">
+            <td id="Attachments" class="@(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments")">
                 <div class="attachmentOutput">
                     @if (Model.User.UserAttachments != null)
                     {
@@ -21,31 +31,35 @@
                                   { @ua.DocumentTemplate.Description}
                                   else
                                   { @ua.Comments }}
-                            </span><span class="author">@ua.TechUser.ToString()</span><span class="remove"></span>
-                            <span class="timestamp" title="@ua.Timestamp.ToFullDateTime()">@ua.Timestamp.ToFuzzy()</span>
+                            </span><span class="author">@ua.TechUser.ToString()</span>@if (canRemoveAnyAttachments || (canRemoveOwnAttachments && ua.TechUserId == CurrentUser.Id))
+                                                                                      {<text><span class="remove"></span></text>}<span class="timestamp" title="@ua.Timestamp.ToFullDateTime()">@ua.Timestamp.ToFuzzy()</span>
                         </a>   
                         }
                     }
                 </div>
-                <div class="attachmentInput clearfix">
-                    <span class="action upload"></span><span class="action photo"></span>
-                </div>
+                @if (canAddAttachments)
+                {
+                    <div class="attachmentInput clearfix">
+                        <span class="action upload"></span><span class="action photo"></span>
+                    </div>
+                }
                 <script type="text/javascript">
                     Shadowbox.init({
                         skipSetup: true,
                         modal: true
                     });
                     $(function () {
+                        $Attachments = $('#Attachments');
+                        $attachmentOutput = $Attachments.find('.attachmentOutput');
+
+                        @if (canAddAttachments)
+                        {<text>
+                        //#region Add Attachments
                         if (!document.DiscoFunctions) {
                             document.DiscoFunctions = {};
                         }
                         document.DiscoFunctions.addAttachment = addAttachment;
 
-                        $Attachments = $('#Attachments');
-                        $attachmentOutput = $Attachments.find('.attachmentOutput');
-
-                        $attachmentOutput.find('span.remove').click(removeAttachment);
-
                         $('#dialogUpload').dialog({
                             autoOpen: false,
                             draggable: false,
@@ -58,13 +72,6 @@
                             }
                         });
 
-                        $('#dialogRemoveAttachment').dialog({
-                            resizable: false,
-                            height: 140,
-                            modal: true,
-                            autoOpen: false
-                        });
-
                         var onLoadNavigation = null;
                         var isLoaded = null;
                         Silverlight.createObject(
@@ -83,119 +90,159 @@
                             'UploadUrl=@(Url.Action(MVC.API.User.AttachmentUpload(Model.User.Id, null)))'
                         );
 
-                    $attachmentInput = $Attachments.find('.attachmentInput');
-                    $attachmentInput.find('.photo').click(function () {
-                        showDialog('/WebCam');
-                    });
-                    $attachmentInput.find('.upload').click(function () {
-                        showDialog('/File');
-                    });
-
-                    silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
-                    function showDialog(navigationPath) {
-                        $('#dialogUpload').dialog('open');
-                        if (isLoaded) {
-                            silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
-                        } else {
-                            onLoadNavigation = navigationPath;
-                        }
-                    };
-                    function addAttachment(id, quick) {
-                        var data = { id: id };
-                        $.ajax({
-                            url: '@Url.Action(MVC.API.User.Attachment())',
-                            dataType: 'json',
-                            data: data,
-                            success: function (d) {
-                                if (d.Result == 'OK') {
-                                    var a = d.Attachment;
-
-                                    var e = $('<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span><span class="remove"></span><span class="timestamp"></span></a>');
-
-                                    e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '@(Url.Action(MVC.API.User.AttachmentDownload()))/' + a.Id);
-                                    e.find('.icon img').attr('src', '@(Url.Action(MVC.API.User.AttachmentThumbnail()))/' + a.Id);
-                                    e.find('.comments').text(a.Comments);
-                                    e.find('.author').text(a.Author);
-                                    e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
-                                    e.find('.remove').click(removeAttachment);
-                                    if (!quick)
-                                        e.hide();
-                                    $attachmentOutput.append(e);
-                                    if (!quick)
-                                        e.show('slow');
-                                    if (a.MimeType.toLowerCase().indexOf('image/') == 0)
-                                        e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments });
-                                } else {
-                                    alert('Unable to add attachment: ' + d.Result);
-                                }
-                            },
-                            error: function (jqXHR, textStatus, errorThrown) {
-                                alert('Unable to add attachment: ' + textStatus);
-                            }
+                        $attachmentInput = $Attachments.find('.attachmentInput');
+                        $attachmentInput.find('.photo').click(function () {
+                            showDialog('/WebCam');
+                        });
+                        $attachmentInput.find('.upload').click(function () {
+                            showDialog('/File');
                         });
-                    }
-                    function removeAttachment() {
-                        $this = $(this).closest('a');
 
-                        var data = { id: $this.attr('data-attachmentid') };
-                        var $dialogRemoveAttachment = $('#dialogRemoveAttachment');
-                        $dialogRemoveAttachment.dialog("enable");
-                        $dialogRemoveAttachment.dialog('option', 'buttons', {
-                            "Remove": function () {
-                                $dialogRemoveAttachment.dialog("disable");
-                                $dialogRemoveAttachment.dialog("option", "buttons", null);
-                                $.ajax({
-                                    url: '@Url.Action(MVC.API.User.AttachmentRemove())',
-                                    dataType: 'json',
-                                    data: data,
-                                    success: function (d) {
-                                        if (d == 'OK') {
-                                            $this.hide(300).delay(300).queue(function () {
-                                                var $this = $(this);
-                                                if ($this.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
-                                                    Shadowbox.removeCache(this);
-                                                $this.remove();
-                                            });
-                                        } else {
-                                            alert('Unable to remove attachment: ' + d);
-                                        }
-                                        $dialogRemoveAttachment.dialog("close");
-                                    },
-                                    error: function (jqXHR, textStatus, errorThrown) {
-                                        alert('Unable to remove attachment: ' + textStatus);
-                                        $dialogRemoveAttachment.dialog("close");
+                        silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
+                        function showDialog(navigationPath) {
+                            $('#dialogUpload').dialog('open');
+                            if (isLoaded) {
+                                silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
+                            } else {
+                                onLoadNavigation = navigationPath;
+                            }
+                        };
+                        function addAttachment(id, quick) {
+                            var data = { id: id };
+                            $.ajax({
+                                url: '@Url.Action(MVC.API.User.Attachment())',
+                                dataType: 'json',
+                                data: data,
+                                success: function (d) {
+                                    if (d.Result == 'OK') {
+                                        var a = d.Attachment;
+                                        @if (canRemoveAnyAttachments)
+                                        {<text>buildAttachment(a, true);</text>}
+                                        else if (canRemoveOwnAttachments)
+                                        {<text>buildAttachment(a, (a.AuthorId === '@(CurrentUser.Id)'));</text>}
+                                        else
+                                        {<text>buildAttachment(a, false);</text>}
+
+                                    } else {
+                                        alert('Unable to add attachment: ' + d.Result);
                                     }
-                                });
-                            },
-                            Cancel: function () {
-                                $dialogRemoveAttachment.dialog("close");
-                            }
+                                },
+                                error: function (jqXHR, textStatus, errorThrown) {
+                                    alert('Unable to add attachment: ' + textStatus);
+                                }
+                            });
+                        }
+                        function buildAttachment(a, canRemove) {
+                            var t = '<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span>';
+                            if (canRemove)
+                                t += '<span class="remove"></span>';
+                            t += '<span class="timestamp"></span></a>';
+
+                            var e = $(t);
+
+                            e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '@(Url.Action(MVC.API.User.AttachmentDownload()))/' + a.Id);
+                            e.find('.icon img').attr('src', '@(Url.Action(MVC.API.User.AttachmentThumbnail()))/' + a.Id);
+                            e.find('.comments').text(a.Comments);
+                            e.find('.author').text(a.Author);
+                            e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
+                            if (canRemove)
+                                e.find('.remove').click(removeAttachment);
+                            if (!quick)
+                                e.hide();
+                            $attachmentOutput.append(e);
+                            if (!quick)
+                                e.show('slow');
+                            if (a.MimeType.toLowerCase().indexOf('image/') == 0)
+                                e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments });
+                        }
+
+                        //#endregion
+                        </text>}
+                        @if (canRemoveAnyAttachments || canRemoveOwnAttachments)
+                        {<text>
+                        //#region Remove Attachments
+
+                        $attachmentOutput.find('span.remove').click(removeAttachment);
+
+                        $('#dialogRemoveAttachment').dialog({
+                            resizable: false,
+                            height: 140,
+                            modal: true,
+                            autoOpen: false
                         });
 
-                        $dialogRemoveAttachment.dialog('open');
+                        function removeAttachment() {
+                            $this = $(this).closest('a');
 
-                        return false;
-                    }
-                    $attachmentOutput.children('a').each(function () {
-                        $this = $(this);
-                        if ($this.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
-                            $this.shadowbox({ gallery: 'attachments', player: 'img', title: $this.find('.comments').text() });
+                            var data = { id: $this.attr('data-attachmentid') };
+                            var $dialogRemoveAttachment = $('#dialogRemoveAttachment');
+                            $dialogRemoveAttachment.dialog("enable");
+                            $dialogRemoveAttachment.dialog('option', 'buttons', {
+                                "Remove": function () {
+                                    $dialogRemoveAttachment.dialog("disable");
+                                    $dialogRemoveAttachment.dialog("option", "buttons", null);
+                                    $.ajax({
+                                        url: '@Url.Action(MVC.API.User.AttachmentRemove())',
+                                        dataType: 'json',
+                                        data: data,
+                                        success: function (d) {
+                                            if (d == 'OK') {
+                                                $this.hide(300).delay(300).queue(function () {
+                                                    var $this = $(this);
+                                                    if ($this.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
+                                                        Shadowbox.removeCache(this);
+                                                    $this.remove();
+                                                });
+                                            } else {
+                                                alert('Unable to remove attachment: ' + d);
+                                            }
+                                            $dialogRemoveAttachment.dialog("close");
+                                        },
+                                        error: function (jqXHR, textStatus, errorThrown) {
+                                            alert('Unable to remove attachment: ' + textStatus);
+                                            $dialogRemoveAttachment.dialog("close");
+                                        }
+                                    });
+                                },
+                                Cancel: function () {
+                                    $dialogRemoveAttachment.dialog("close");
+                                }
+                            });
+
+                            $dialogRemoveAttachment.dialog('open');
+
+                            return false;
+                        }
+
+                        //#endregion
+                        </text>}
+
+                        $attachmentOutput.children('a').each(function () {
+                            $this = $(this);
+                            if ($this.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
+                                $this.shadowbox({ gallery: 'attachments', player: 'img', title: $this.find('.comments').text() });
+                        });
                     });
-                });
                 </script>
             </td>
         </tr>
     </table>
-    <div id="dialogUpload" title="Upload Attachment">
-        <div id="silverlightHostUploadAttachment">
+    @if (canAddAttachments)
+    {
+        <div id="dialogUpload" title="Upload Attachment">
+            <div id="silverlightHostUploadAttachment">
+            </div>
         </div>
-    </div>
-    <div id="dialogRemoveAttachment" title="Remove this Attachment?">
-        <p>
-            <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
-            Are you sure?
-        </p>
-    </div>
+    }
+    @if (canRemoveAnyAttachments || canRemoveOwnAttachments)
+    {
+        <div id="dialogRemoveAttachment" title="Remove this Attachment?">
+            <p>
+                <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
+                Are you sure?
+            </p>
+        </div>
+    }
     <script>
         $('#UserDetailTabItems').append('<li><a href="#UserDetailTab-Resources" id="UserDetailTab-ResourcesLink">Attachments [@(Model.User.UserAttachments == null ? 0 : Model.User.UserAttachments.Count)]</a></li>');
     </script>
diff --git a/Disco.Web/Views/User/UserParts/_Resources.generated.cs b/Disco.Web/Views/User/UserParts/_Resources.generated.cs
index d67670b2..c7952168 100644
--- a/Disco.Web/Views/User/UserParts/_Resources.generated.cs
+++ b/Disco.Web/Views/User/UserParts/_Resources.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.User.UserParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/User/UserParts/_Resources.cshtml")]
-    public partial class Resources : System.Web.Mvc.WebViewPage<Disco.Web.Models.User.ShowModel>
+    public partial class Resources : Disco.Services.Web.WebViewPage<Disco.Web.Models.User.ShowModel>
     {
         public Resources()
         {
@@ -43,9 +45,19 @@ namespace Disco.Web.Views.User.UserParts
             
             #line 2 "..\..\Views\User\UserParts\_Resources.cshtml"
   
+    Authorization.Require(Claims.User.ShowAttachments);
+
+    var canAddAttachments = Authorization.Has(Claims.User.Actions.AddAttachments);
+    var canRemoveAnyAttachments = Authorization.Has(Claims.User.Actions.RemoveAnyAttachments);
+    var canRemoveOwnAttachments = Authorization.Has(Claims.User.Actions.RemoveOwnAttachments);
+
     Html.BundleDeferred("~/Style/Shadowbox");
     Html.BundleDeferred("~/ClientScripts/Modules/Shadowbox");
-    Html.BundleDeferred("~/ClientScripts/Modules/Silverlight");
+
+    if (Authorization.Has(Claims.User.Actions.AddAttachments))
+    {
+        Html.BundleDeferred("~/ClientScripts/Modules/Silverlight");
+    }
 
             
             #line default
@@ -64,6 +76,16 @@ WriteLiteral(">\r\n        <tr>\r\n            <td");
 
 WriteLiteral(" id=\"Attachments\"");
 
+WriteAttribute("class", Tuple.Create(" class=\"", 778), Tuple.Create("\"", 853)
+            
+            #line 20 "..\..\Views\User\UserParts\_Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 786), Tuple.Create<System.Object, System.Int32>(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments"
+            
+            #line default
+            #line hidden
+, 786), false)
+);
+
 WriteLiteral(">\r\n                <div");
 
 WriteLiteral(" class=\"attachmentOutput\"");
@@ -71,13 +93,13 @@ WriteLiteral(" class=\"attachmentOutput\"");
 WriteLiteral(">\r\n");
 
             
-            #line 12 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 22 "..\..\Views\User\UserParts\_Resources.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 12 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 22 "..\..\Views\User\UserParts\_Resources.cshtml"
                      if (Model.User.UserAttachments != null)
                     {
                         foreach (var ua in Model.User.UserAttachments)
@@ -88,20 +110,20 @@ WriteLiteral(">\r\n");
             #line hidden
 WriteLiteral("                        <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 618), Tuple.Create("\"", 676)
+WriteAttribute("href", Tuple.Create(" href=\"", 1115), Tuple.Create("\"", 1173)
             
-            #line 16 "..\..\Views\User\UserParts\_Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 625), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.User.AttachmentDownload(ua.Id))
+            #line 26 "..\..\Views\User\UserParts\_Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 1122), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.User.AttachmentDownload(ua.Id))
             
             #line default
             #line hidden
-, 625), false)
+, 1122), false)
 );
 
 WriteLiteral(" data-attachmentid=\"");
 
             
-            #line 16 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 26 "..\..\Views\User\UserParts\_Resources.cshtml"
                                                                                                     Write(ua.Id);
 
             
@@ -112,7 +134,7 @@ WriteLiteral("\"");
 WriteLiteral(" data-mimetype=\"");
 
             
-            #line 16 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 26 "..\..\Views\User\UserParts\_Resources.cshtml"
                                                                                                                            Write(ua.MimeType);
 
             
@@ -124,68 +146,68 @@ WriteLiteral(">\r\n                            <span");
 
 WriteLiteral(" class=\"icon\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 782), Tuple.Create("\"", 802)
+WriteAttribute("title", Tuple.Create(" title=\"", 1279), Tuple.Create("\"", 1299)
             
-            #line 17 "..\..\Views\User\UserParts\_Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 790), Tuple.Create<System.Object, System.Int32>(ua.Filename
+            #line 27 "..\..\Views\User\UserParts\_Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 1287), Tuple.Create<System.Object, System.Int32>(ua.Filename
             
             #line default
             #line hidden
-, 790), false)
+, 1287), false)
 );
 
 WriteLiteral(">\r\n                                <img");
 
 WriteLiteral(" alt=\"Attachment Thumbnail\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 869), Tuple.Create("\"", 929)
+WriteAttribute("src", Tuple.Create(" src=\"", 1366), Tuple.Create("\"", 1426)
             
-            #line 18 "..\..\Views\User\UserParts\_Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 875), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.User.AttachmentThumbnail(ua.Id))
+            #line 28 "..\..\Views\User\UserParts\_Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 1372), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.User.AttachmentThumbnail(ua.Id))
             
             #line default
             #line hidden
-, 875), false)
+, 1372), false)
 );
 
 WriteLiteral(" /></span>\r\n                            <span");
 
 WriteLiteral(" class=\"comments\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 992), Tuple.Create("\"", 1012)
+WriteAttribute("title", Tuple.Create(" title=\"", 1489), Tuple.Create("\"", 1509)
             
-            #line 19 "..\..\Views\User\UserParts\_Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 1000), Tuple.Create<System.Object, System.Int32>(ua.Comments
+            #line 29 "..\..\Views\User\UserParts\_Resources.cshtml"
+, Tuple.Create(Tuple.Create("", 1497), Tuple.Create<System.Object, System.Int32>(ua.Comments
             
             #line default
             #line hidden
-, 1000), false)
+, 1497), false)
 );
 
 WriteLiteral(">\r\n");
 
             
-            #line 20 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 30 "..\..\Views\User\UserParts\_Resources.cshtml"
                                 
             
             #line default
             #line hidden
             
-            #line 20 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 30 "..\..\Views\User\UserParts\_Resources.cshtml"
                                   if (!string.IsNullOrEmpty(ua.DocumentTemplateId))
                                   { 
             
             #line default
             #line hidden
             
-            #line 21 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 31 "..\..\Views\User\UserParts\_Resources.cshtml"
                                Write(ua.DocumentTemplate.Description);
 
             
             #line default
             #line hidden
             
-            #line 21 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 31 "..\..\Views\User\UserParts\_Resources.cshtml"
                                                                     }
                                   else
                                   { 
@@ -193,14 +215,14 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 23 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 33 "..\..\Views\User\UserParts\_Resources.cshtml"
                                Write(ua.Comments);
 
             
             #line default
             #line hidden
             
-            #line 23 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 33 "..\..\Views\User\UserParts\_Resources.cshtml"
                                                  }
             
             #line default
@@ -212,35 +234,52 @@ WriteLiteral(" class=\"author\"");
 WriteLiteral(">");
 
             
-            #line 24 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 34 "..\..\Views\User\UserParts\_Resources.cshtml"
                                                    Write(ua.TechUser.ToString());
 
             
             #line default
             #line hidden
-WriteLiteral("</span><span");
+WriteLiteral("</span>");
 
-WriteLiteral(" class=\"remove\"");
-
-WriteLiteral("></span>\r\n                            <span");
-
-WriteLiteral(" class=\"timestamp\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 1432), Tuple.Create("\"", 1470)
             
-            #line 25 "..\..\Views\User\UserParts\_Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 1440), Tuple.Create<System.Object, System.Int32>(ua.Timestamp.ToFullDateTime()
+            #line 34 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                                                                       if (canRemoveAnyAttachments || (canRemoveOwnAttachments && ua.TechUserId == CurrentUser.Id))
+                                                                                      {
             
             #line default
             #line hidden
-, 1440), false)
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"remove\"");
+
+WriteLiteral("></span>");
+
+            
+            #line 35 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                                                                                                                }
+            
+            #line default
+            #line hidden
+WriteLiteral("<span");
+
+WriteLiteral(" class=\"timestamp\"");
+
+WriteAttribute("title", Tuple.Create(" title=\"", 2095), Tuple.Create("\"", 2133)
+            
+            #line 35 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                                                                , Tuple.Create(Tuple.Create("", 2103), Tuple.Create<System.Object, System.Int32>(ua.Timestamp.ToFullDateTime()
+            
+            #line default
+            #line hidden
+, 2103), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 25 "..\..\Views\User\UserParts\_Resources.cshtml"
-                                                                                      Write(ua.Timestamp.ToFuzzy());
+            #line 35 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                                                                                                                                                                           Write(ua.Timestamp.ToFuzzy());
 
             
             #line default
@@ -248,18 +287,34 @@ WriteLiteral(">");
 WriteLiteral("</span>\r\n                        </a>   \r\n");
 
             
-            #line 27 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 37 "..\..\Views\User\UserParts\_Resources.cshtml"
                         }
                     }
 
             
             #line default
             #line hidden
-WriteLiteral("                </div>\r\n                <div");
+WriteLiteral("                </div>\r\n");
+
+            
+            #line 40 "..\..\Views\User\UserParts\_Resources.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 40 "..\..\Views\User\UserParts\_Resources.cshtml"
+                 if (canAddAttachments)
+                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <div");
 
 WriteLiteral(" class=\"attachmentInput clearfix\"");
 
-WriteLiteral(">\r\n                    <span");
+WriteLiteral(">\r\n                        <span");
 
 WriteLiteral(" class=\"action upload\"");
 
@@ -267,34 +322,69 @@ WriteLiteral("></span><span");
 
 WriteLiteral(" class=\"action photo\"");
 
-WriteLiteral("></span>\r\n                </div>\r\n                <script");
+WriteLiteral("></span>\r\n                    </div>\r\n");
+
+            
+            #line 45 "..\..\Views\User\UserParts\_Resources.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n                    Shadowbox.init({\r\n                        skipSetup: true," +
-"\r\n                        modal: true\r\n                    });\r\n                " +
-"    $(function () {\r\n                        if (!document.DiscoFunctions) {\r\n  " +
-"                          document.DiscoFunctions = {};\r\n                       " +
-" }\r\n                        document.DiscoFunctions.addAttachment = addAttachmen" +
-"t;\r\n\r\n                        $Attachments = $(\'#Attachments\');\r\n               " +
-"         $attachmentOutput = $Attachments.find(\'.attachmentOutput\');\r\n\r\n        " +
-"                $attachmentOutput.find(\'span.remove\').click(removeAttachment);\r\n" +
-"\r\n                        $(\'#dialogUpload\').dialog({\r\n                         " +
-"   autoOpen: false,\r\n                            draggable: false,\r\n            " +
-"                modal: true,\r\n                            resizable: false,\r\n   " +
-"                         width: 860,\r\n                            height: 550,\r\n" +
-"                            close: function () {\r\n                              " +
-"  silverlightUploadAttachment.content.Navigator.Navigate(\'/Hidden\');\r\n          " +
-"                  }\r\n                        });\r\n\r\n                        $(\'#" +
-"dialogRemoveAttachment\').dialog({\r\n                            resizable: false," +
-"\r\n                            height: 140,\r\n                            modal: t" +
-"rue,\r\n                            autoOpen: false\r\n                        });\r\n" +
-"\r\n                        var onLoadNavigation = null;\r\n                        " +
-"var isLoaded = null;\r\n                        Silverlight.createObject(\r\n       " +
-"                         \'");
+WriteLiteral(@">
+                    Shadowbox.init({
+                        skipSetup: true,
+                        modal: true
+                    });
+                    $(function () {
+                        $Attachments = $('#Attachments');
+                        $attachmentOutput = $Attachments.find('.attachmentOutput');
+
+");
 
             
-            #line 71 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 55 "..\..\Views\User\UserParts\_Resources.cshtml"
+                        
+            
+            #line default
+            #line hidden
+            
+            #line 55 "..\..\Views\User\UserParts\_Resources.cshtml"
+                         if (canAddAttachments)
+                        {
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+                        //#region Add Attachments
+                        if (!document.DiscoFunctions) {
+                            document.DiscoFunctions = {};
+                        }
+                        document.DiscoFunctions.addAttachment = addAttachment;
+
+                        $('#dialogUpload').dialog({
+                            autoOpen: false,
+                            draggable: false,
+                            modal: true,
+                            resizable: false,
+                            width: 860,
+                            height: 550,
+                            close: function () {
+                                silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
+                            }
+                        });
+
+                        var onLoadNavigation = null;
+                        var isLoaded = null;
+                        Silverlight.createObject(
+                                '");
+
+            
+            #line 78 "..\..\Views\User\UserParts\_Resources.cshtml"
                              Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap);
 
             
@@ -315,7 +405,7 @@ WriteLiteral(@"',
                             'UploadUrl=");
 
             
-            #line 83 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 90 "..\..\Views\User\UserParts\_Resources.cshtml"
                                    Write(Url.Action(MVC.API.User.AttachmentUpload(Model.User.Id, null)));
 
             
@@ -324,151 +414,330 @@ WriteLiteral(@"',
 WriteLiteral(@"'
                         );
 
-                    $attachmentInput = $Attachments.find('.attachmentInput');
-                    $attachmentInput.find('.photo').click(function () {
-                        showDialog('/WebCam');
-                    });
-                    $attachmentInput.find('.upload').click(function () {
-                        showDialog('/File');
-                    });
+                        $attachmentInput = $Attachments.find('.attachmentInput');
+                        $attachmentInput.find('.photo').click(function () {
+                            showDialog('/WebCam');
+                        });
+                        $attachmentInput.find('.upload').click(function () {
+                            showDialog('/File');
+                        });
 
-                    silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
-                    function showDialog(navigationPath) {
-                        $('#dialogUpload').dialog('open');
-                        if (isLoaded) {
-                            silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
-                        } else {
-                            onLoadNavigation = navigationPath;
-                        }
-                    };
-                    function addAttachment(id, quick) {
-                        var data = { id: id };
-                        $.ajax({
-                            url: '");
+                        silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
+                        function showDialog(navigationPath) {
+                            $('#dialogUpload').dialog('open');
+                            if (isLoaded) {
+                                silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
+                            } else {
+                                onLoadNavigation = navigationPath;
+                            }
+                        };
+                        function addAttachment(id, quick) {
+                            var data = { id: id };
+                            $.ajax({
+                                url: '");
 
             
-            #line 106 "..\..\Views\User\UserParts\_Resources.cshtml"
-                             Write(Url.Action(MVC.API.User.Attachment()));
+            #line 113 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                 Write(Url.Action(MVC.API.User.Attachment()));
 
             
             #line default
             #line hidden
 WriteLiteral(@"',
-                            dataType: 'json',
-                            data: data,
-                            success: function (d) {
-                                if (d.Result == 'OK') {
-                                    var a = d.Attachment;
-
-                                    var e = $('<a><span class=""icon""><img alt=""Attachment Thumbnail"" /></span><span class=""comments""></span><span class=""author""></span><span class=""remove""></span><span class=""timestamp""></span></a>');
-
-                                    e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '");
+                                dataType: 'json',
+                                data: data,
+                                success: function (d) {
+                                    if (d.Result == 'OK') {
+                                        var a = d.Attachment;
+");
 
             
-            #line 115 "..\..\Views\User\UserParts\_Resources.cshtml"
-                                                                                                                  Write(Url.Action(MVC.API.User.AttachmentDownload()));
+            #line 119 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                        
+            
+            #line default
+            #line hidden
+            
+            #line 119 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                         if (canRemoveAnyAttachments)
+                                        {
+            
+            #line default
+            #line hidden
+WriteLiteral("buildAttachment(a, true);");
+
+            
+            #line 120 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                                                               }
+                                        else if (canRemoveOwnAttachments)
+                                        {
+            
+            #line default
+            #line hidden
+WriteLiteral("buildAttachment(a, (a.AuthorId === \'");
+
+            
+            #line 122 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                                                               Write(CurrentUser.Id);
 
             
             #line default
             #line hidden
-WriteLiteral("/\' + a.Id);\r\n                                    e.find(\'.icon img\').attr(\'src\', " +
-"\'");
+WriteLiteral("\'));");
 
             
-            #line 116 "..\..\Views\User\UserParts\_Resources.cshtml"
-                                                                 Write(Url.Action(MVC.API.User.AttachmentThumbnail()));
+            #line 122 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                                                                                               }
+                                        else
+                                        {
+            
+            #line default
+            #line hidden
+WriteLiteral("buildAttachment(a, false);");
+
+            
+            #line 124 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                                                                }
 
             
             #line default
             #line hidden
-WriteLiteral("/\' + a.Id);\r\n                                    e.find(\'.comments\').text(a.Comme" +
-"nts);\r\n                                    e.find(\'.author\').text(a.Author);\r\n  " +
-"                                  e.find(\'.timestamp\').text(a.TimestampFuzzy).at" +
-"tr(\'title\', a.TimestampFull);\r\n                                    e.find(\'.remo" +
-"ve\').click(removeAttachment);\r\n                                    if (!quick)\r\n" +
-"                                        e.hide();\r\n                             " +
-"       $attachmentOutput.append(e);\r\n                                    if (!qu" +
-"ick)\r\n                                        e.show(\'slow\');\r\n                 " +
-"                   if (a.MimeType.toLowerCase().indexOf(\'image/\') == 0)\r\n       " +
-"                                 e.shadowbox({ gallery: \'attachments\', player: \'" +
-"img\', title: a.Comments });\r\n                                } else {\r\n         " +
-"                           alert(\'Unable to add attachment: \' + d.Result);\r\n    " +
-"                            }\r\n                            },\r\n                 " +
-"           error: function (jqXHR, textStatus, errorThrown) {\r\n                 " +
-"               alert(\'Unable to add attachment: \' + textStatus);\r\n              " +
-"              }\r\n                        });\r\n                    }\r\n           " +
-"         function removeAttachment() {\r\n                        $this = $(this)." +
-"closest(\'a\');\r\n\r\n                        var data = { id: $this.attr(\'data-attac" +
-"hmentid\') };\r\n                        var $dialogRemoveAttachment = $(\'#dialogRe" +
-"moveAttachment\');\r\n                        $dialogRemoveAttachment.dialog(\"enabl" +
-"e\");\r\n                        $dialogRemoveAttachment.dialog(\'option\', \'buttons\'" +
-", {\r\n                            \"Remove\": function () {\r\n                      " +
-"          $dialogRemoveAttachment.dialog(\"disable\");\r\n                          " +
-"      $dialogRemoveAttachment.dialog(\"option\", \"buttons\", null);\r\n              " +
-"                  $.ajax({\r\n                                    url: \'");
+WriteLiteral(@"
+                                    } else {
+                                        alert('Unable to add attachment: ' + d.Result);
+                                    }
+                                },
+                                error: function (jqXHR, textStatus, errorThrown) {
+                                    alert('Unable to add attachment: ' + textStatus);
+                                }
+                            });
+                        }
+                        function buildAttachment(a, canRemove) {
+                            var t = '<a><span");
+
+WriteLiteral(" class=\"icon\"");
+
+WriteLiteral("><img");
+
+WriteLiteral(" alt=\"Attachment Thumbnail\"");
+
+WriteLiteral(" /></span><span");
+
+WriteLiteral(" class=\"comments\"");
+
+WriteLiteral("></span><span");
+
+WriteLiteral(" class=\"author\"");
+
+WriteLiteral("></span>\';\r\n                            if (canRemove)\r\n                         " +
+"       t += \'<span");
+
+WriteLiteral(" class=\"remove\"");
+
+WriteLiteral("></span>\';\r\n                            t += \'<span");
+
+WriteLiteral(" class=\"timestamp\"");
+
+WriteLiteral("></span></a>\';\r\n\r\n                            var e = $(t);\r\n\r\n                  " +
+"          e.attr(\'data-attachmentid\', a.Id).attr(\'data-mimetype\', a.MimeType).at" +
+"tr(\'href\', \'");
 
             
-            #line 148 "..\..\Views\User\UserParts\_Resources.cshtml"
-                                     Write(Url.Action(MVC.API.User.AttachmentRemove()));
+            #line 143 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                                                                                          Write(Url.Action(MVC.API.User.AttachmentDownload()));
 
             
             #line default
             #line hidden
-WriteLiteral("\',\r\n                                    dataType: \'json\',\r\n                      " +
-"              data: data,\r\n                                    success: function" +
-" (d) {\r\n                                        if (d == \'OK\') {\r\n              " +
-"                              $this.hide(300).delay(300).queue(function () {\r\n  " +
-"                                              var $this = $(this);\r\n            " +
-"                                    if ($this.attr(\'data-mimetype\').toLowerCase(" +
-").indexOf(\'image/\') == 0)\r\n                                                    S" +
-"hadowbox.removeCache(this);\r\n                                                $th" +
-"is.remove();\r\n                                            });\r\n                 " +
-"                       } else {\r\n                                            ale" +
-"rt(\'Unable to remove attachment: \' + d);\r\n                                      " +
-"  }\r\n                                        $dialogRemoveAttachment.dialog(\"clo" +
-"se\");\r\n                                    },\r\n                                 " +
-"   error: function (jqXHR, textStatus, errorThrown) {\r\n                         " +
-"               alert(\'Unable to remove attachment: \' + textStatus);\r\n           " +
-"                             $dialogRemoveAttachment.dialog(\"close\");\r\n         " +
-"                           }\r\n                                });\r\n             " +
-"               },\r\n                            Cancel: function () {\r\n          " +
-"                      $dialogRemoveAttachment.dialog(\"close\");\r\n                " +
-"            }\r\n                        });\r\n\r\n                        $dialogRem" +
-"oveAttachment.dialog(\'open\');\r\n\r\n                        return false;\r\n        " +
-"            }\r\n                    $attachmentOutput.children(\'a\').each(function" +
-" () {\r\n                        $this = $(this);\r\n                        if ($th" +
-"is.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n                " +
-"            $this.shadowbox({ gallery: \'attachments\', player: \'img\', title: $thi" +
-"s.find(\'.comments\').text() });\r\n                    });\r\n                });\r\n  " +
-"              </script>\r\n            </td>\r\n        </tr>\r\n    </table>\r\n    <di" +
-"v");
+WriteLiteral("/\' + a.Id);\r\n                            e.find(\'.icon img\').attr(\'src\', \'");
+
+            
+            #line 144 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                                         Write(Url.Action(MVC.API.User.AttachmentThumbnail()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"/' + a.Id);
+                            e.find('.comments').text(a.Comments);
+                            e.find('.author').text(a.Author);
+                            e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
+                            if (canRemove)
+                                e.find('.remove').click(removeAttachment);
+                            if (!quick)
+                                e.hide();
+                            $attachmentOutput.append(e);
+                            if (!quick)
+                                e.show('slow');
+                            if (a.MimeType.toLowerCase().indexOf('image/') == 0)
+                                e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments });
+                        }
+
+                        //#endregion
+                        ");
+
+            
+            #line 160 "..\..\Views\User\UserParts\_Resources.cshtml"
+                               }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        ");
+
+            
+            #line 161 "..\..\Views\User\UserParts\_Resources.cshtml"
+                         if (canRemoveAnyAttachments || canRemoveOwnAttachments)
+                        {
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+                        //#region Remove Attachments
+
+                        $attachmentOutput.find('span.remove').click(removeAttachment);
+
+                        $('#dialogRemoveAttachment').dialog({
+                            resizable: false,
+                            height: 140,
+                            modal: true,
+                            autoOpen: false
+                        });
+
+                        function removeAttachment() {
+                            $this = $(this).closest('a');
+
+                            var data = { id: $this.attr('data-attachmentid') };
+                            var $dialogRemoveAttachment = $('#dialogRemoveAttachment');
+                            $dialogRemoveAttachment.dialog(""enable"");
+                            $dialogRemoveAttachment.dialog('option', 'buttons', {
+                                ""Remove"": function () {
+                                    $dialogRemoveAttachment.dialog(""disable"");
+                                    $dialogRemoveAttachment.dialog(""option"", ""buttons"", null);
+                                    $.ajax({
+                                        url: '");
+
+            
+            #line 185 "..\..\Views\User\UserParts\_Resources.cshtml"
+                                         Write(Url.Action(MVC.API.User.AttachmentRemove()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\',\r\n                                        dataType: \'json\',\r\n                  " +
+"                      data: data,\r\n                                        succe" +
+"ss: function (d) {\r\n                                            if (d == \'OK\') {" +
+"\r\n                                                $this.hide(300).delay(300).que" +
+"ue(function () {\r\n                                                    var $this " +
+"= $(this);\r\n                                                    if ($this.attr(\'" +
+"data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n                         " +
+"                               Shadowbox.removeCache(this);\r\n                   " +
+"                                 $this.remove();\r\n                              " +
+"                  });\r\n                                            } else {\r\n   " +
+"                                             alert(\'Unable to remove attachment:" +
+" \' + d);\r\n                                            }\r\n                       " +
+"                     $dialogRemoveAttachment.dialog(\"close\");\r\n                 " +
+"                       },\r\n                                        error: functi" +
+"on (jqXHR, textStatus, errorThrown) {\r\n                                         " +
+"   alert(\'Unable to remove attachment: \' + textStatus);\r\n                       " +
+"                     $dialogRemoveAttachment.dialog(\"close\");\r\n                 " +
+"                       }\r\n                                    });\r\n             " +
+"                   },\r\n                                Cancel: function () {\r\n  " +
+"                                  $dialogRemoveAttachment.dialog(\"close\");\r\n    " +
+"                            }\r\n                            });\r\n\r\n              " +
+"              $dialogRemoveAttachment.dialog(\'open\');\r\n\r\n                       " +
+"     return false;\r\n                        }\r\n\r\n                        //#endr" +
+"egion\r\n                        ");
+
+            
+            #line 218 "..\..\Views\User\UserParts\_Resources.cshtml"
+                               }
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"
+                        $attachmentOutput.children('a').each(function () {
+                            $this = $(this);
+                            if ($this.attr('data-mimetype').toLowerCase().indexOf('image/') == 0)
+                                $this.shadowbox({ gallery: 'attachments', player: 'img', title: $this.find('.comments').text() });
+                        });
+                    });
+                </script>
+            </td>
+        </tr>
+    </table>
+");
+
+            
+            #line 230 "..\..\Views\User\UserParts\_Resources.cshtml"
+    
+            
+            #line default
+            #line hidden
+            
+            #line 230 "..\..\Views\User\UserParts\_Resources.cshtml"
+     if (canAddAttachments)
+    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        <div");
 
 WriteLiteral(" id=\"dialogUpload\"");
 
 WriteLiteral(" title=\"Upload Attachment\"");
 
-WriteLiteral(">\r\n        <div");
+WriteLiteral(">\r\n            <div");
 
 WriteLiteral(" id=\"silverlightHostUploadAttachment\"");
 
-WriteLiteral(">\r\n        </div>\r\n    </div>\r\n    <div");
+WriteLiteral(">\r\n            </div>\r\n        </div>\r\n");
+
+            
+            #line 236 "..\..\Views\User\UserParts\_Resources.cshtml"
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    ");
+
+            
+            #line 237 "..\..\Views\User\UserParts\_Resources.cshtml"
+     if (canRemoveAnyAttachments || canRemoveOwnAttachments)
+    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        <div");
 
 WriteLiteral(" id=\"dialogRemoveAttachment\"");
 
 WriteLiteral(" title=\"Remove this Attachment?\"");
 
-WriteLiteral(">\r\n        <p>\r\n            <span");
+WriteLiteral(">\r\n            <p>\r\n                <span");
 
 WriteLiteral(" class=\"ui-icon ui-icon-alert\"");
 
 WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\"");
 
-WriteLiteral("></span>\r\n            Are you sure?\r\n        </p>\r\n    </div>\r\n    <script>\r\n    " +
-"    $(\'#UserDetailTabItems\').append(\'<li><a href=\"#UserDetailTab-Resources\" id=\"" +
-"UserDetailTab-ResourcesLink\">Attachments [");
+WriteLiteral("></span>\r\n                Are you sure?\r\n            </p>\r\n        </div>\r\n");
 
             
-            #line 200 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 245 "..\..\Views\User\UserParts\_Resources.cshtml"
+    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("    <script>\r\n        $(\'#UserDetailTabItems\').append(\'<li><a href=\"#UserDetailTa" +
+"b-Resources\" id=\"UserDetailTab-ResourcesLink\">Attachments [");
+
+            
+            #line 247 "..\..\Views\User\UserParts\_Resources.cshtml"
                                                                                                                           Write(Model.User.UserAttachments == null ? 0 : Model.User.UserAttachments.Count);
 
             
diff --git a/Disco.Web/Views/User/UserParts/_Subject.cshtml b/Disco.Web/Views/User/UserParts/_Subject.cshtml
index e8a7eb8c..6397b380 100644
--- a/Disco.Web/Views/User/UserParts/_Subject.cshtml
+++ b/Disco.Web/Views/User/UserParts/_Subject.cshtml
@@ -1,5 +1,7 @@
 @model Disco.Web.Models.User.ShowModel
 @{
+    Authorization.Require(Claims.User.Show);
+
     var currentDeviceAssignments = Model.User.DeviceUserAssignments.Where(dua => !dua.UnassignedDate.HasValue).OrderByDescending(dua => dua.AssignedDate).ToList();
 }
 <table id="User_Show_Subjects">
@@ -30,15 +32,6 @@
                             </tr>
                         </table>
                     </div>
-                    <div id="User_Show_Details_Category" class="status">
-                        <table class="none verticalHeadings">
-                            <tr>
-                                <td>Type:
-                                </td>
-                                <td><span id="User_Show_Details_Category_Type" title="Type">@Model.User.Type</span></td>
-                            </tr>
-                        </table>
-                    </div>
                     <div id="User_Show_Details_Attributes" class="status">
                         <table class="none verticalHeadings">
                             <tr>
@@ -69,29 +62,32 @@
                             </tr>
                         </table>
                     </div>
-                    <div id="User_Show_GenerateDocument_Container" class="status">
-                        @Html.DropDownList("User_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems)
-                        <script type="text/javascript">
-                            $(function () {
-                                var generatePdfUrl = '@Url.Action(MVC.API.User.GeneratePdf(Model.User.Id, null))?DocumentTemplateId=';
-                            var $documentTemplates = $('#User_Show_GenerateDocument');
-                            $documentTemplates.change(function () {
-                                var v = $documentTemplates.val();
-                                if (v) {
-                                    window.location.href = generatePdfUrl + v;
-                                    $documentTemplates.val('').blur();
-                                }
-                            });
-                        });
-                        </script>
-                    </div>
+                    @if (Authorization.Has(Claims.User.Actions.GenerateDocuments))
+                    {
+                        <div id="User_Show_GenerateDocument_Container" class="status">
+                            @Html.DropDownList("User_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems)
+                            <script type="text/javascript">
+                                $(function () {
+                                    var generatePdfUrl = '@Url.Action(MVC.API.User.GeneratePdf(Model.User.Id, null))?DocumentTemplateId=';
+                                    var $documentTemplates = $('#User_Show_GenerateDocument');
+                                    $documentTemplates.change(function () {
+                                        var v = $documentTemplates.val();
+                                        if (v) {
+                                            window.location.href = generatePdfUrl + v;
+                                            $documentTemplates.val('').blur();
+                                        }
+                                    });
+                                });
+                            </script>
+                        </div>
+                    }
                     <div id="User_Show_Details_Actions">
-                        @{
-                            Html.BundleDeferred("~/ClientScripts/Modules/Disco-CreateJob");
-                        }
-                        @Html.ActionLinkSmallButton("Create Job", MVC.Job.Create(Model.PrimaryDeviceSerialNumber, Model.User.Id), "User_Show_Details_Actions_CreateJob_Button")
-                        @if (currentDeviceAssignments.Count > 1)
+                        @if (Authorization.Has(Claims.Job.Actions.Create))
                         {
+                            Html.BundleDeferred("~/ClientScripts/Modules/Disco-CreateJob");
+                            @Html.ActionLinkSmallButton("Create Job", MVC.Job.Create(Model.PrimaryDeviceSerialNumber, Model.User.Id), "User_Show_Details_Actions_CreateJob_Button")
+                            if (currentDeviceAssignments.Count > 1)
+                            {
                             <div id="User_Show_Details_Actions_CreateJob_Dialog" class="dialog" title="Create Job for Which Device?">
                                 <div class="clearfix">
                                     <span class="ui-icon ui-icon-info" style="float: left; margin: 0 7px 20px 0;"></span>
@@ -183,9 +179,9 @@
                                     });
                                 });
                             </script>
-                        }
-                        else
-                        {
+                            }
+                            else
+                            {
                             <script>
                                 $(function () {
                                     $('#User_Show_Details_Actions_CreateJob_Button').click(function () {
@@ -198,6 +194,7 @@
                                     });
                                 });
                             </script>
+                            }
                         }
                     </div>
                 </div>
@@ -211,9 +208,16 @@
                             foreach (var assignment in currentDeviceAssignments)
                             {
                             <div class="User_Show_AssignedDevices_CurrentAssignment clearfix" data-deviceserialnumber="@assignment.DeviceSerialNumber">
-                                <a href="@Url.Action(MVC.Device.Show(assignment.Device.SerialNumber))">
+                                @if (Authorization.Has(Claims.Device.Show))
+                                {
+                                    <a href="@Url.Action(MVC.Device.Show(assignment.Device.SerialNumber))">
+                                        <img class="User_Show_AssignedDevices_CurrentAssignment_Image" alt="Model Image" src="@Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))" />
+                                    </a>
+                                }
+                                else
+                                {
                                     <img class="User_Show_AssignedDevices_CurrentAssignment_Image" alt="Model Image" src="@Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))" />
-                                </a>
+                                }
                                 <div class="User_Show_AssignedDevices_CurrentAssignment_Details">
                                     <table class="none">
                                         <tbody>
@@ -221,7 +225,16 @@
                                                 <td>Serial Number:
                                                 </td>
                                                 <td>
-                                                    <span class="User_Show_AssignedDevices_CurrentAssignment_SerialNumber">@Html.ActionLink(assignment.Device.SerialNumber, MVC.Device.Show(assignment.Device.SerialNumber))</span> (<span>@assignment.Device.ComputerName</span>)
+                                                    <span class="User_Show_AssignedDevices_CurrentAssignment_SerialNumber">
+                                                        @if (Authorization.Has(Claims.Device.Show))
+                                                        {
+                                                            @Html.ActionLink(assignment.Device.SerialNumber, MVC.Device.Show(assignment.Device.SerialNumber))
+                                                        }
+                                                        else
+                                                        {
+                                                            @assignment.Device.SerialNumber
+                                                        }
+                                                    </span>(<span>@assignment.Device.ComputerName</span>)
                                                 </td>
                                             </tr>
                                             <tr>
diff --git a/Disco.Web/Views/User/UserParts/_Subject.generated.cs b/Disco.Web/Views/User/UserParts/_Subject.generated.cs
index 354f42c1..a90c40e1 100644
--- a/Disco.Web/Views/User/UserParts/_Subject.generated.cs
+++ b/Disco.Web/Views/User/UserParts/_Subject.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.User.UserParts
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/User/UserParts/_Subject.cshtml")]
-    public partial class Subject : System.Web.Mvc.WebViewPage<Disco.Web.Models.User.ShowModel>
+    public partial class Subject : Disco.Services.Web.WebViewPage<Disco.Web.Models.User.ShowModel>
     {
         public Subject()
         {
@@ -43,6 +45,8 @@ namespace Disco.Web.Views.User.UserParts
             
             #line 2 "..\..\Views\User\UserParts\_Subject.cshtml"
   
+    Authorization.Require(Claims.User.Show);
+
     var currentDeviceAssignments = Model.User.DeviceUserAssignments.Where(dua => !dua.UnassignedDate.HasValue).OrderByDescending(dua => dua.AssignedDate).ToList();
 
             
@@ -75,7 +79,7 @@ WriteLiteral(" title=\"Username\"");
 WriteLiteral(">");
 
             
-            #line 16 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 18 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                                        Write(Model.User.Id);
 
             
@@ -92,7 +96,7 @@ WriteLiteral(" title=\"Display Name\"");
 WriteLiteral(">");
 
             
-            #line 21 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 23 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                                                       Write(Model.User.DisplayName);
 
             
@@ -109,7 +113,7 @@ WriteLiteral(" title=\"Given Name\"");
 WriteLiteral(">");
 
             
-            #line 25 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 27 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                                                   Write(Model.User.GivenName);
 
             
@@ -126,7 +130,7 @@ WriteLiteral(" title=\"Surname\"");
 WriteLiteral(">");
 
             
-            #line 29 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 31 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                                              Write(Model.User.Surname);
 
             
@@ -135,33 +139,6 @@ WriteLiteral(">");
 WriteLiteral("</span></td>\r\n                            </tr>\r\n                        </table>" +
 "\r\n                    </div>\r\n                    <div");
 
-WriteLiteral(" id=\"User_Show_Details_Category\"");
-
-WriteLiteral(" class=\"status\"");
-
-WriteLiteral(">\r\n                        <table");
-
-WriteLiteral(" class=\"none verticalHeadings\"");
-
-WriteLiteral(">\r\n                            <tr>\r\n                                <td>Type:\r\n " +
-"                               </td>\r\n                                <td><span");
-
-WriteLiteral(" id=\"User_Show_Details_Category_Type\"");
-
-WriteLiteral(" title=\"Type\"");
-
-WriteLiteral(">");
-
-            
-            #line 38 "..\..\Views\User\UserParts\_Subject.cshtml"
-                                                                                       Write(Model.User.Type);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span></td>\r\n                            </tr>\r\n                        </table>" +
-"\r\n                    </div>\r\n                    <div");
-
 WriteLiteral(" id=\"User_Show_Details_Attributes\"");
 
 WriteLiteral(" class=\"status\"");
@@ -174,13 +151,13 @@ WriteLiteral(">\r\n                            <tr>\r\n
 "td>\r\n                                <td>\r\n");
 
             
-            #line 47 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 40 "..\..\Views\User\UserParts\_Subject.cshtml"
                                     
             
             #line default
             #line hidden
             
-            #line 47 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 40 "..\..\Views\User\UserParts\_Subject.cshtml"
                                      if (!string.IsNullOrEmpty(Model.User.EmailAddress))
                                     {
 
@@ -196,7 +173,7 @@ WriteLiteral(" title=\"Email Address [Update in Active Directory]\"");
 WriteLiteral(">");
 
             
-            #line 49 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 42 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                                                                                     Write(Model.User.EmailAddress);
 
             
@@ -205,7 +182,7 @@ WriteLiteral(">");
 WriteLiteral("</span>\r\n");
 
             
-            #line 50 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 43 "..\..\Views\User\UserParts\_Subject.cshtml"
                                     }
                                     else
                                     {
@@ -220,7 +197,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">Unknown</span>\r\n");
 
             
-            #line 54 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 47 "..\..\Views\User\UserParts\_Subject.cshtml"
                                     }
 
             
@@ -231,13 +208,13 @@ WriteLiteral("                                </td>\r\n
 "                            <td>\r\n");
 
             
-            #line 60 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 53 "..\..\Views\User\UserParts\_Subject.cshtml"
                                     
             
             #line default
             #line hidden
             
-            #line 60 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 53 "..\..\Views\User\UserParts\_Subject.cshtml"
                                      if (!string.IsNullOrEmpty(Model.User.PhoneNumber))
                                     {
 
@@ -253,7 +230,7 @@ WriteLiteral(" title=\"Phone Number [Update in Active Directory]\"");
 WriteLiteral(">");
 
             
-            #line 62 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 55 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                                                                                    Write(Model.User.PhoneNumber);
 
             
@@ -262,7 +239,7 @@ WriteLiteral(">");
 WriteLiteral("</span>\r\n");
 
             
-            #line 63 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 56 "..\..\Views\User\UserParts\_Subject.cshtml"
                                     }
                                     else
                                     {
@@ -277,14 +254,30 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">Unknown</span>\r\n");
 
             
-            #line 67 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 60 "..\..\Views\User\UserParts\_Subject.cshtml"
                                     }
 
             
             #line default
             #line hidden
 WriteLiteral("                                </td>\r\n                            </tr>\r\n       " +
-"                 </table>\r\n                    </div>\r\n                    <div");
+"                 </table>\r\n                    </div>\r\n");
+
+            
+            #line 65 "..\..\Views\User\UserParts\_Subject.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 65 "..\..\Views\User\UserParts\_Subject.cshtml"
+                     if (Authorization.Has(Claims.User.Actions.GenerateDocuments))
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <div");
 
 WriteLiteral(" id=\"User_Show_GenerateDocument_Container\"");
 
@@ -292,84 +285,83 @@ WriteLiteral(" class=\"status\"");
 
 WriteLiteral(">\r\n");
 
-WriteLiteral("                        ");
+WriteLiteral("                            ");
 
             
-            #line 73 "..\..\Views\User\UserParts\_Subject.cshtml"
-                   Write(Html.DropDownList("User_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems));
+            #line 68 "..\..\Views\User\UserParts\_Subject.cshtml"
+                       Write(Html.DropDownList("User_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                        <script");
+WriteLiteral("\r\n                            <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n                            $(function () {\r\n                                v" +
-"ar generatePdfUrl = \'");
+WriteLiteral(">\r\n                                $(function () {\r\n                             " +
+"       var generatePdfUrl = \'");
 
             
-            #line 76 "..\..\Views\User\UserParts\_Subject.cshtml"
-                                                 Write(Url.Action(MVC.API.User.GeneratePdf(Model.User.Id, null)));
+            #line 71 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                                     Write(Url.Action(MVC.API.User.GeneratePdf(Model.User.Id, null)));
 
             
             #line default
             #line hidden
 WriteLiteral(@"?DocumentTemplateId=';
-                            var $documentTemplates = $('#User_Show_GenerateDocument');
-                            $documentTemplates.change(function () {
-                                var v = $documentTemplates.val();
-                                if (v) {
-                                    window.location.href = generatePdfUrl + v;
-                                    $documentTemplates.val('').blur();
-                                }
-                            });
-                        });
-                        </script>
-                    </div>
-                    <div");
+                                    var $documentTemplates = $('#User_Show_GenerateDocument');
+                                    $documentTemplates.change(function () {
+                                        var v = $documentTemplates.val();
+                                        if (v) {
+                                            window.location.href = generatePdfUrl + v;
+                                            $documentTemplates.val('').blur();
+                                        }
+                                    });
+                                });
+                            </script>
+                        </div>
+");
+
+            
+            #line 83 "..\..\Views\User\UserParts\_Subject.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <div");
 
 WriteLiteral(" id=\"User_Show_Details_Actions\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 89 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 85 "..\..\Views\User\UserParts\_Subject.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 89 "..\..\Views\User\UserParts\_Subject.cshtml"
-                          
-                            Html.BundleDeferred("~/ClientScripts/Modules/Disco-CreateJob");
-                        
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 92 "..\..\Views\User\UserParts\_Subject.cshtml"
-                   Write(Html.ActionLinkSmallButton("Create Job", MVC.Job.Create(Model.PrimaryDeviceSerialNumber, Model.User.Id), "User_Show_Details_Actions_CreateJob_Button"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 93 "..\..\Views\User\UserParts\_Subject.cshtml"
-                        
-            
-            #line default
-            #line hidden
-            
-            #line 93 "..\..\Views\User\UserParts\_Subject.cshtml"
-                         if (currentDeviceAssignments.Count > 1)
+            #line 85 "..\..\Views\User\UserParts\_Subject.cshtml"
+                         if (Authorization.Has(Claims.Job.Actions.Create))
                         {
+                            Html.BundleDeferred("~/ClientScripts/Modules/Disco-CreateJob");
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 88 "..\..\Views\User\UserParts\_Subject.cshtml"
+                       Write(Html.ActionLinkSmallButton("Create Job", MVC.Job.Create(Model.PrimaryDeviceSerialNumber, Model.User.Id), "User_Show_Details_Actions_CreateJob_Button"));
+
+            
+            #line default
+            #line hidden
+            
+            #line 88 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                                                                                                                                                                   
+                            if (currentDeviceAssignments.Count > 1)
+                            {
 
             
             #line default
@@ -405,13 +397,13 @@ WriteLiteral(" class=\"none\"");
 WriteLiteral(">\r\n");
 
             
-            #line 102 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 98 "..\..\Views\User\UserParts\_Subject.cshtml"
                                         
             
             #line default
             #line hidden
             
-            #line 102 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 98 "..\..\Views\User\UserParts\_Subject.cshtml"
                                          foreach (var assignment in currentDeviceAssignments)
                                         {
 
@@ -425,7 +417,7 @@ WriteLiteral(" class=\"CreateJob_Assignment clearfix\"");
 WriteLiteral(" data-createjoburl=\"");
 
             
-            #line 104 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 100 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                                                     Write(Url.Action(MVC.Job.Create(assignment.DeviceSerialNumber, Model.User.Id)));
 
             
@@ -439,14 +431,14 @@ WriteLiteral(" class=\"CreateJob_Assignment_Image\"");
 
 WriteLiteral(" alt=\"Model Image\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 6326), Tuple.Create("\"", 6447)
+WriteAttribute("src", Tuple.Create(" src=\"", 6191), Tuple.Create("\"", 6312)
             
-            #line 105 "..\..\Views\User\UserParts\_Subject.cshtml"
-                               , Tuple.Create(Tuple.Create("", 6332), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))
+            #line 101 "..\..\Views\User\UserParts\_Subject.cshtml"
+                               , Tuple.Create(Tuple.Create("", 6197), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))
             
             #line default
             #line hidden
-, 6332), false)
+, 6197), false)
 );
 
 WriteLiteral(" />\r\n                                                <div");
@@ -466,7 +458,7 @@ WriteLiteral(@">
                                                                     <span>");
 
             
-            #line 113 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 109 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                      Write(assignment.Device.SerialNumber);
 
             
@@ -475,7 +467,7 @@ WriteLiteral(@">
 WriteLiteral("</span> (<span>");
 
             
-            #line 113 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 109 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                                                                    Write(assignment.Device.ComputerName);
 
             
@@ -491,7 +483,7 @@ WriteLiteral(@"</span>)
                                                                     <span>");
 
             
-            #line 120 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 116 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                      Write(assignment.Device.DeviceModel.ToString());
 
             
@@ -506,13 +498,13 @@ WriteLiteral(@"</span>
 ");
 
             
-            #line 126 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 122 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                     
             
             #line default
             #line hidden
             
-            #line 126 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 122 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                      if (!string.IsNullOrEmpty(assignment.Device.AssetNumber))
                                                                     {
 
@@ -522,7 +514,7 @@ WriteLiteral(@"</span>
 WriteLiteral("                                                                        <span>");
 
             
-            #line 128 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 124 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                          Write(assignment.Device.AssetNumber);
 
             
@@ -531,7 +523,7 @@ WriteLiteral("
 WriteLiteral("</span>\r\n");
 
             
-            #line 129 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 125 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                     }
                                                                     else
                                                                     {
@@ -546,7 +538,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">Unknown</span>\r\n");
 
             
-            #line 133 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 129 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                     }
 
             
@@ -560,7 +552,7 @@ WriteLiteral(@"                                                                <
                                                                     <span>");
 
             
-            #line 139 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 135 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                      Write(CommonHelpers.FriendlyDate(assignment.AssignedDate));
 
             
@@ -576,7 +568,7 @@ WriteLiteral(@"</span>
 ");
 
             
-            #line 146 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 142 "..\..\Views\User\UserParts\_Subject.cshtml"
                                         }
 
             
@@ -613,10 +605,10 @@ WriteLiteral("                            <script>\r\n
 "ipt>\r\n");
 
             
-            #line 186 "..\..\Views\User\UserParts\_Subject.cshtml"
-                        }
-                        else
-                        {
+            #line 182 "..\..\Views\User\UserParts\_Subject.cshtml"
+                            }
+                            else
+                            {
 
             
             #line default
@@ -636,7 +628,8 @@ WriteLiteral(@"                            <script>
 ");
 
             
-            #line 201 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 197 "..\..\Views\User\UserParts\_Subject.cshtml"
+                            }
                         }
 
             
@@ -654,13 +647,13 @@ WriteLiteral(" id=\"User_Show_AssignedDevices_Active\"");
 WriteLiteral(">\r\n                        <h3>Current Device Assignments</h3>\r\n");
 
             
-            #line 209 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 206 "..\..\Views\User\UserParts\_Subject.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 209 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 206 "..\..\Views\User\UserParts\_Subject.cshtml"
                          if (currentDeviceAssignments.Count > 0)
                         {
                             foreach (var assignment in currentDeviceAssignments)
@@ -676,7 +669,7 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment clearfix\"");
 WriteLiteral(" data-deviceserialnumber=\"");
 
             
-            #line 213 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 210 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                                                                   Write(assignment.DeviceSerialNumber);
 
             
@@ -684,35 +677,87 @@ WriteLiteral(" data-deviceserialnumber=\"");
             #line hidden
 WriteLiteral("\"");
 
-WriteLiteral(">\r\n                                <a");
+WriteLiteral(">\r\n");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 13160), Tuple.Create("\"", 13227)
             
-            #line 214 "..\..\Views\User\UserParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 13167), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Device.Show(assignment.Device.SerialNumber))
+            #line 211 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                
             
             #line default
             #line hidden
-, 13167), false)
+            
+            #line 211 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                 if (Authorization.Has(Claims.Device.Show))
+                                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                    <a");
+
+WriteAttribute("href", Tuple.Create(" href=\"", 13184), Tuple.Create("\"", 13251)
+            
+            #line 213 "..\..\Views\User\UserParts\_Subject.cshtml"
+, Tuple.Create(Tuple.Create("", 13191), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Device.Show(assignment.Device.SerialNumber))
+            
+            #line default
+            #line hidden
+, 13191), false)
 );
 
-WriteLiteral(">\r\n                                    <img");
+WriteLiteral(">\r\n                                        <img");
 
 WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Image\"");
 
 WriteLiteral(" alt=\"Model Image\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 13347), Tuple.Create("\"", 13468)
+WriteAttribute("src", Tuple.Create(" src=\"", 13375), Tuple.Create("\"", 13496)
             
-            #line 215 "..\..\Views\User\UserParts\_Subject.cshtml"
-                                         , Tuple.Create(Tuple.Create("", 13353), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))
+            #line 214 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                             , Tuple.Create(Tuple.Create("", 13381), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))
             
             #line default
             #line hidden
-, 13353), false)
+, 13381), false)
 );
 
-WriteLiteral(" />\r\n                                </a>\r\n                                <div");
+WriteLiteral(" />\r\n                                    </a>\r\n");
+
+            
+            #line 216 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                }
+                                else
+                                {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                    <img");
+
+WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Image\"");
+
+WriteLiteral(" alt=\"Model Image\"");
+
+WriteAttribute("src", Tuple.Create(" src=\"", 13768), Tuple.Create("\"", 13889)
+            
+            #line 219 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                         , Tuple.Create(Tuple.Create("", 13774), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))
+            
+            #line default
+            #line hidden
+, 13774), false)
+);
+
+WriteLiteral(" />\r\n");
+
+            
+            #line 220 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                <div");
 
 WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Details\"");
 
@@ -730,20 +775,59 @@ WriteLiteral(@">
 
 WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_SerialNumber\"");
 
-WriteLiteral(">");
+WriteLiteral(">\r\n");
 
             
-            #line 224 "..\..\Views\User\UserParts\_Subject.cshtml"
-                                                                                                                      Write(Html.ActionLink(assignment.Device.SerialNumber, MVC.Device.Show(assignment.Device.SerialNumber)));
+            #line 229 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                                        
+            
+            #line default
+            #line hidden
+            
+            #line 229 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                                         if (Authorization.Has(Claims.Device.Show))
+                                                        {
+                                                            
+            
+            #line default
+            #line hidden
+            
+            #line 231 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                                       Write(Html.ActionLink(assignment.Device.SerialNumber, MVC.Device.Show(assignment.Device.SerialNumber)));
 
             
             #line default
             #line hidden
-WriteLiteral("</span> (<span>");
+            
+            #line 231 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                                                                                                                                             
+                                                        }
+                                                        else
+                                                        {
+                                                            
+            
+            #line default
+            #line hidden
+            
+            #line 235 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                                       Write(assignment.Device.SerialNumber);
 
             
-            #line 224 "..\..\Views\User\UserParts\_Subject.cshtml"
-                                                                                                                                                                                                                                      Write(assignment.Device.ComputerName);
+            #line default
+            #line hidden
+            
+            #line 235 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                                                                           
+                                                        }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                                                    </span>(<span>");
+
+            
+            #line 237 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                                             Write(assignment.Device.ComputerName);
 
             
             #line default
@@ -762,7 +846,7 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Model\"");
 WriteLiteral(">");
 
             
-            #line 231 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 244 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                                                                Write(assignment.Device.DeviceModel.ToString());
 
             
@@ -777,13 +861,13 @@ WriteLiteral(@"</span>
 ");
 
             
-            #line 237 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 250 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                     
             
             #line default
             #line hidden
             
-            #line 237 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 250 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                      if (!string.IsNullOrEmpty(assignment.Device.AssetNumber))
                                                     {
 
@@ -797,7 +881,7 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Asset\"");
 WriteLiteral(">");
 
             
-            #line 239 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 252 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                                                                    Write(assignment.Device.AssetNumber);
 
             
@@ -806,7 +890,7 @@ WriteLiteral(">");
 WriteLiteral("</span>\r\n");
 
             
-            #line 240 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 253 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                     }
                                                     else
                                                     {
@@ -821,7 +905,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">Unknown</span>\r\n");
 
             
-            #line 244 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 257 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                     }
 
             
@@ -839,7 +923,7 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Assigned\"");
 WriteLiteral(">");
 
             
-            #line 250 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 263 "..\..\Views\User\UserParts\_Subject.cshtml"
                                                                                                                   Write(CommonHelpers.FriendlyDate(assignment.AssignedDate));
 
             
@@ -855,7 +939,7 @@ WriteLiteral(@"</span>
 ");
 
             
-            #line 257 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 270 "..\..\Views\User\UserParts\_Subject.cshtml"
                             }
                         }
                         else
@@ -871,7 +955,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Current Device Assignments</span>\r\n");
 
             
-            #line 262 "..\..\Views\User\UserParts\_Subject.cshtml"
+            #line 275 "..\..\Views\User\UserParts\_Subject.cshtml"
                         }
 
             
diff --git a/Disco.Web/Views/User/_UserTable.cshtml b/Disco.Web/Views/User/_UserTable.cshtml
index 06d4965a..aaeb8f37 100644
--- a/Disco.Web/Views/User/_UserTable.cshtml
+++ b/Disco.Web/Views/User/_UserTable.cshtml
@@ -5,23 +5,17 @@
         <table class="genericData userTable">
             <thead>
                 <tr>
-                    <th>
-                        Id
+                    <th>Id
                     </th>
-                    <th>
-                        Surname
+                    <th>Surname
                     </th>
-                    <th>
-                        Given Name
+                    <th>Given Name
                     </th>
-                    <th>
-                        Display Name
+                    <th>Display Name
                     </th>
-                    <th>
-                        Assigned Devices
+                    <th>Assigned Devices
                     </th>
-                    <th>
-                        Jobs
+                    <th>Jobs
                     </th>
                 </tr>
             </thead>
@@ -30,7 +24,14 @@
                 {
                     <tr>
                         <td>
-                            @Html.ActionLink(item.Id, MVC.User.Show(item.Id))
+                            @if (Authorization.Has(Claims.User.Show))
+                            {
+                                @Html.ActionLink(item.Id, MVC.User.Show(item.Id))
+                            }
+                            else
+                            {
+                                @item.Id
+                            }
                         </td>
                         <td>
                             @item.Surname
diff --git a/Disco.Web/Views/User/_UserTable.generated.cs b/Disco.Web/Views/User/_UserTable.generated.cs
index c1e72cca..44f178e3 100644
--- a/Disco.Web/Views/User/_UserTable.generated.cs
+++ b/Disco.Web/Views/User/_UserTable.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,12 +28,14 @@ namespace Disco.Web.Views.User
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/User/_UserTable.cshtml")]
-    public partial class UserTable : System.Web.Mvc.WebViewPage<IEnumerable<Disco.Models.BI.Search.UserSearchResultItem>>
+    public partial class UserTable : Disco.Services.Web.WebViewPage<IEnumerable<Disco.Models.BI.Search.UserSearchResultItem>>
     {
         public UserTable()
         {
@@ -67,23 +69,17 @@ WriteLiteral(" class=\"genericData userTable\"");
 WriteLiteral(@">
             <thead>
                 <tr>
-                    <th>
-                        Id
+                    <th>Id
                     </th>
-                    <th>
-                        Surname
+                    <th>Surname
                     </th>
-                    <th>
-                        Given Name
+                    <th>Given Name
                     </th>
-                    <th>
-                        Display Name
+                    <th>Display Name
                     </th>
-                    <th>
-                        Assigned Devices
+                    <th>Assigned Devices
                     </th>
-                    <th>
-                        Jobs
+                    <th>Jobs
                     </th>
                 </tr>
             </thead>
@@ -91,13 +87,13 @@ WriteLiteral(@">
 ");
 
             
-            #line 29 "..\..\Views\User\_UserTable.cshtml"
+            #line 23 "..\..\Views\User\_UserTable.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 29 "..\..\Views\User\_UserTable.cshtml"
+            #line 23 "..\..\Views\User\_UserTable.cshtml"
                  foreach (var item in Model)
                 {
 
@@ -106,21 +102,58 @@ WriteLiteral(@">
             #line hidden
 WriteLiteral("                    <tr>\r\n                        <td>\r\n");
 
-WriteLiteral("                            ");
-
             
-            #line 33 "..\..\Views\User\_UserTable.cshtml"
-                       Write(Html.ActionLink(item.Id, MVC.User.Show(item.Id)));
+            #line 27 "..\..\Views\User\_UserTable.cshtml"
+                            
+            
+            #line default
+            #line hidden
+            
+            #line 27 "..\..\Views\User\_UserTable.cshtml"
+                             if (Authorization.Has(Claims.User.Show))
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 29 "..\..\Views\User\_UserTable.cshtml"
+                           Write(Html.ActionLink(item.Id, MVC.User.Show(item.Id)));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                        </td>\r\n                        <td>\r\n");
+            
+            #line 29 "..\..\Views\User\_UserTable.cshtml"
+                                                                                 
+                            }
+                            else
+                            {
+                                
+            
+            #line default
+            #line hidden
+            
+            #line 33 "..\..\Views\User\_UserTable.cshtml"
+                           Write(item.Id);
+
+            
+            #line default
+            #line hidden
+            
+            #line 33 "..\..\Views\User\_UserTable.cshtml"
+                                        
+                            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        </td>\r\n                        <td>\r\n");
 
 WriteLiteral("                            ");
 
             
-            #line 36 "..\..\Views\User\_UserTable.cshtml"
+            #line 37 "..\..\Views\User\_UserTable.cshtml"
                        Write(item.Surname);
 
             
@@ -131,7 +164,7 @@ WriteLiteral("\r\n                        </td>\r\n                        <td>\
 WriteLiteral("                            ");
 
             
-            #line 39 "..\..\Views\User\_UserTable.cshtml"
+            #line 40 "..\..\Views\User\_UserTable.cshtml"
                        Write(item.GivenName);
 
             
@@ -142,7 +175,7 @@ WriteLiteral("\r\n                        </td>\r\n                        <td>\
 WriteLiteral("                            ");
 
             
-            #line 42 "..\..\Views\User\_UserTable.cshtml"
+            #line 43 "..\..\Views\User\_UserTable.cshtml"
                        Write(item.DisplayName);
 
             
@@ -153,7 +186,7 @@ WriteLiteral("\r\n                        </td>\r\n                        <td>\
 WriteLiteral("                            ");
 
             
-            #line 45 "..\..\Views\User\_UserTable.cshtml"
+            #line 46 "..\..\Views\User\_UserTable.cshtml"
                        Write(item.AssignedDevicesCount);
 
             
@@ -164,7 +197,7 @@ WriteLiteral("\r\n                        </td>\r\n                        <td>\
 WriteLiteral("                            ");
 
             
-            #line 48 "..\..\Views\User\_UserTable.cshtml"
+            #line 49 "..\..\Views\User\_UserTable.cshtml"
                        Write(item.JobCount);
 
             
@@ -173,7 +206,7 @@ WriteLiteral("                            ");
 WriteLiteral("\r\n                        </td>\r\n                    </tr>\r\n");
 
             
-            #line 51 "..\..\Views\User\_UserTable.cshtml"
+            #line 52 "..\..\Views\User\_UserTable.cshtml"
                 }
 
             
@@ -182,7 +215,7 @@ WriteLiteral("\r\n                        </td>\r\n                    </tr>\r\n
 WriteLiteral("            </tbody>\r\n        </table>\r\n");
 
             
-            #line 54 "..\..\Views\User\_UserTable.cshtml"
+            #line 55 "..\..\Views\User\_UserTable.cshtml"
     }
     else
     { 
@@ -197,7 +230,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Users Found</span>\r\n");
 
             
-            #line 58 "..\..\Views\User\_UserTable.cshtml"
+            #line 59 "..\..\Views\User\_UserTable.cshtml"
     }
 
             
diff --git a/Disco.Web/Views/User/_ViewStart.generated.cs b/Disco.Web/Views/User/_ViewStart.generated.cs
index de875711..c987ad66 100644
--- a/Disco.Web/Views/User/_ViewStart.generated.cs
+++ b/Disco.Web/Views/User/_ViewStart.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,6 +28,8 @@ namespace Disco.Web.Views.User
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
diff --git a/Disco.Web/Views/Web.config b/Disco.Web/Views/Web.config
index 7d1356c6..4d7bc926 100644
--- a/Disco.Web/Views/Web.config
+++ b/Disco.Web/Views/Web.config
@@ -10,12 +10,14 @@
 
   <system.web.webPages.razor>
     <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
+    <pages pageBaseType="Disco.Services.Web.WebViewPage">
       <namespaces>
-        <add namespace="Disco.Models.Repository" />
         <add namespace="Disco.BI.Extensions" />
-        <add namespace="Disco.Web.Extensions" />
+        <add namespace="Disco.Models.Repository" />
+        <add namespace="Disco.Services.Authorization" />
+        <add namespace="Disco.Services.Web" />
         <add namespace="Disco.Web" />
+        <add namespace="Disco.Web.Extensions" />
         <add namespace="System.Web.Mvc" />
         <add namespace="System.Web.Mvc.Ajax" />
         <add namespace="System.Web.Mvc.Html" />
diff --git a/Disco.Web/Views/_ViewStart.generated.cs b/Disco.Web/Views/_ViewStart.generated.cs
index 4347b349..3098fcf0 100644
--- a/Disco.Web/Views/_ViewStart.generated.cs
+++ b/Disco.Web/Views/_ViewStart.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -28,6 +28,8 @@ namespace Disco.Web.Views
     using System.Web.WebPages;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
+    using Disco.Services.Authorization;
+    using Disco.Services.Web;
     using Disco.Web;
     using Disco.Web.Extensions;
     
diff --git a/Disco.Web/Web.config b/Disco.Web/Web.config
index 234922a9..dd9ae82f 100644
--- a/Disco.Web/Web.config
+++ b/Disco.Web/Web.config
@@ -33,8 +33,6 @@
         <add namespace="System.Web.Mvc.Html" />
         <add namespace="System.Web.Routing" />
         <add namespace="System.Web.WebPages" />
-        <add namespace="Disco.BI.Extensions" />
-        <add namespace="Disco.Web.Extensions" />
       </namespaces>
     </pages>
   </system.web>