From 55bc0ac317aaa8b54f1e34710533c3db840da005 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Thu, 3 Dec 2020 03:47:07 +0000
Subject: [PATCH] Code refactor and styling.

---
 Aaru.Server.Task/Program.cs                   |  13 +-
 .../Areas/Admin/Controllers/AtasController.cs |   4 +-
 .../Controllers/BlockDescriptorsController.cs |   6 +-
 .../Areas/Admin/Controllers/ChsController.cs  |   6 +-
 .../CompactDiscOffsetsController.cs           |   6 +-
 .../Controllers/DeviceStatsController.cs      |   6 +-
 .../Admin/Controllers/DevicesController.cs    |  39 ++--
 .../Admin/Controllers/ReportsController.cs    |  39 ++--
 .../Admin/Controllers/ScsisController.cs      |  15 +-
 .../Areas/Admin/Controllers/SscsController.cs |   7 +-
 .../SupportedDensitiesController.cs           |  18 +-
 .../Controllers/TestedMediasController.cs     |  13 +-
 .../TestedSequentialMediasController.cs       |   7 +-
 .../Controllers/UsbProductsController.cs      |  20 +-
 .../Areas/Admin/Controllers/UsbsController.cs |   6 +-
 .../Areas/Admin/Views/Atas/Consolidate.cshtml |   2 +-
 .../Areas/Admin/Views/Atas/Delete.cshtml      |   2 +-
 .../Areas/Admin/Views/Atas/Details.cshtml     |   2 +-
 .../Areas/Admin/Views/Chs/Consolidate.cshtml  |   2 +-
 .../Views/CompactDiscOffsets/Delete.cshtml    |   2 +-
 .../Views/CompactDiscOffsets/Edit.cshtml      |   2 +-
 .../Admin/Views/DeviceStats/Delete.cshtml     |   2 +-
 .../Areas/Admin/Views/DeviceStats/Edit.cshtml |   2 +-
 .../Admin/Views/DeviceStats/Index.cshtml      |   6 +-
 .../Areas/Admin/Views/Devices/Delete.cshtml   |   2 +-
 .../Areas/Admin/Views/Devices/Details.cshtml  |  39 ++--
 .../Areas/Admin/Views/Devices/Edit.cshtml     |   6 +-
 .../Areas/Admin/Views/Devices/Find.cshtml     |   2 +-
 .../Admin/Views/FireWires/Consolidate.cshtml  |   2 +-
 .../Areas/Admin/Views/FireWires/Delete.cshtml |   2 +-
 .../Areas/Admin/Views/FireWires/Edit.cshtml   |   4 +-
 .../GdRomSwapDiscCapabilities/Delete.cshtml   | 120 ++++------
 .../GdRomSwapDiscCapabilities/Details.cshtml  | 118 ++++------
 .../Admin/Views/MediaFormats/Delete.cshtml    |   2 +-
 .../Areas/Admin/Views/Medias/Delete.cshtml    |   2 +-
 .../Areas/Admin/Views/Mmc/Delete.cshtml       |   2 +-
 .../Areas/Admin/Views/Mmc/Index.cshtml        |   3 +-
 .../Areas/Admin/Views/MmcSds/Delete.cshtml    |   2 +-
 .../Areas/Admin/Views/Pcmcias/Delete.cshtml   |   2 +-
 .../Areas/Admin/Views/Reports/Delete.cshtml   |   2 +-
 .../Areas/Admin/Views/Reports/Details.cshtml  |  32 +--
 .../Areas/Admin/Views/Reports/Edit.cshtml     |   6 +-
 .../Areas/Admin/Views/ScsiModes/Delete.cshtml |   2 +-
 .../Areas/Admin/Views/ScsiPages/Delete.cshtml |   2 +-
 .../Admin/Views/Scsis/Consolidate.cshtml      |   2 +-
 .../Areas/Admin/Views/Scsis/Delete.cshtml     |   2 +-
 .../Areas/Admin/Views/Scsis/Details.cshtml    |   2 +-
 .../Areas/Admin/Views/Shared/_Layout.cshtml   |   2 +-
 .../Admin/Views/Shared/_LoginPartial.cshtml   |   2 +-
 .../Areas/Admin/Views/Sscs/Consolidate.cshtml |   2 +-
 .../Areas/Admin/Views/Sscs/Delete.cshtml      |   2 +-
 .../Views/SupportedDensities/Delete.cshtml    |   2 +-
 .../Admin/Views/TestedMedias/Delete.cshtml    | 212 ++++++------------
 .../Admin/Views/TestedMedias/Details.cshtml   | 210 ++++++-----------
 .../Admin/Views/TestedMedias/Edit.cshtml      |   2 +-
 .../TestedSequentialMedias/Delete.cshtml      |   2 +-
 .../Views/TestedSequentialMedias/Edit.cshtml  |   2 +-
 .../Admin/Views/UsbProducts/Index.cshtml      |   2 +-
 .../Areas/Admin/Views/Usbs/Consolidate.cshtml |   2 +-
 .../Areas/Admin/Views/Usbs/Delete.cshtml      |   2 +-
 Aaru.Server/Controllers/ReportController.cs   |  10 +-
 Aaru.Server/Controllers/StatsController.cs    |  12 +-
 Aaru.Server/Controllers/UpdateController.cs   |  15 +-
 .../Controllers/UploadReportController.cs     |  30 ++-
 .../Controllers/UploadStatsController.cs      |  10 +-
 Aaru.Server/Core/Ata.cs                       |  48 ++--
 Aaru.Server/Core/StatsConverter.cs            |  14 +-
 Aaru.Server/Core/TestedMedia.cs               |  34 +--
 Aaru.Server/Program.cs                        |  10 +-
 .../Views/Shared/_CookieConsentPartial.cshtml |   2 +-
 Aaru.Server/Views/Stats/Index.cshtml          |   8 +-
 71 files changed, 500 insertions(+), 722 deletions(-)

diff --git a/Aaru.Server.Task/Program.cs b/Aaru.Server.Task/Program.cs
index 89ea67da..79cf5381 100644
--- a/Aaru.Server.Task/Program.cs
+++ b/Aaru.Server.Task/Program.cs
@@ -450,13 +450,12 @@ namespace Aaru.Server.Task
                             modifiedOffsets++;
                     }
 
-                    foreach(Device device in ctx.
-                                             Devices.
-                                             Where(d => d.Manufacturer == null && d.Model != null &&
-                                                        d.Model.Trim() == model).
-                                             Union(ctx.Devices.Where(d => d.Manufacturer != null &&
-                                                                          d.Manufacturer.Trim() == manufacturer &&
-                                                                          d.Model != null && d.Model == model)))
+                    foreach(Device device in ctx.Devices.
+                                                 Where(d => d.Manufacturer == null && d.Model != null &&
+                                                            d.Model.Trim() == model).
+                                                 Union(ctx.Devices.Where(d => d.Manufacturer != null &&
+                                                                              d.Manufacturer.Trim() == manufacturer &&
+                                                                              d.Model != null && d.Model == model)))
                     {
                         if(device.CdOffset     == cdOffset &&
                            device.ModifiedWhen == cdOffset.ModifiedWhen)
diff --git a/Aaru.Server/Areas/Admin/Controllers/AtasController.cs b/Aaru.Server/Areas/Admin/Controllers/AtasController.cs
index b8e0cca5..9cb66dd7 100644
--- a/Aaru.Server/Areas/Admin/Controllers/AtasController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/AtasController.cs
@@ -75,8 +75,8 @@ namespace Aaru.Server.Areas.Admin.Controllers
 
         public IActionResult Consolidate()
         {
-            List<IdHashModel> hashes =
-                _context.Ata.Select(m => new IdHashModel(m.Id, Hash.Sha512(m.Identify))).ToList();
+            List<IdHashModel> hashes = _context.Ata.Select(m => new IdHashModel(m.Id, Hash.Sha512(m.Identify))).
+                                                ToList();
 
             List<IdHashModel> dups = hashes.GroupBy(x => x.Hash).Where(g => g.Count() > 1).
                                             Select(x => hashes.FirstOrDefault(y => y.Hash == x.Key)).ToList();
diff --git a/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs b/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs
index 2a081a10..ce2dd012 100644
--- a/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs
@@ -15,8 +15,8 @@ namespace Aaru.Server.Areas.Admin.Controllers
         public BlockDescriptorsController(AaruServerContext context) => _context = context;
 
         // GET: Admin/BlockDescriptors
-        public async Task<IActionResult> Index() =>
-            View(await _context.BlockDescriptor.OrderBy(b => b.BlockLength).ThenBy(b => b.Blocks).
-                                ThenBy(b => b.Density).ToListAsync());
+        public async Task<IActionResult> Index() => View(await _context.BlockDescriptor.OrderBy(b => b.BlockLength).
+                                                                        ThenBy(b => b.Blocks).ThenBy(b => b.Density).
+                                                                        ToListAsync());
     }
 }
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Controllers/ChsController.cs b/Aaru.Server/Areas/Admin/Controllers/ChsController.cs
index 3140b3f1..5a44f953 100644
--- a/Aaru.Server/Areas/Admin/Controllers/ChsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/ChsController.cs
@@ -18,9 +18,9 @@ namespace Aaru.Server.Areas.Admin.Controllers
         public ChsController(AaruServerContext context) => _context = context;
 
         // GET: Admin/Chs
-        public async Task<IActionResult> Index() =>
-            View(await _context.Chs.OrderBy(c => c.Cylinders).ThenBy(c => c.Heads).ThenBy(c => c.Sectors).
-                                ToListAsync());
+        public async Task<IActionResult> Index() => View(await _context.Chs.OrderBy(c => c.Cylinders).
+                                                                        ThenBy(c => c.Heads).ThenBy(c => c.Sectors).
+                                                                        ToListAsync());
 
         public IActionResult Consolidate()
         {
diff --git a/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs b/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs
index 5e26201b..ef4db390 100644
--- a/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs
@@ -16,9 +16,9 @@ namespace Aaru.Server.Areas.Admin.Controllers
         public CompactDiscOffsetsController(AaruServerContext context) => _context = context;
 
         // GET: Admin/CompactDiscOffsets
-        public async Task<IActionResult> Index() =>
-            View(await _context.CdOffsets.OrderBy(o => o.Manufacturer).ThenBy(o => o.Model).ThenBy(o => o.Offset).
-                                ToListAsync());
+        public async Task<IActionResult> Index() => View(await _context.CdOffsets.OrderBy(o => o.Manufacturer).
+                                                                        ThenBy(o => o.Model).ThenBy(o => o.Offset).
+                                                                        ToListAsync());
 
         // GET: Admin/CompactDiscOffsets/Edit/5
         public async Task<IActionResult> Edit(int? id)
diff --git a/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs b/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs
index 37935256..5c75a16b 100644
--- a/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs
@@ -15,9 +15,9 @@ namespace Aaru.Server.Areas.Admin.Controllers
         public DeviceStatsController(AaruServerContext context) => _context = context;
 
         // GET: Admin/DeviceStats
-        public async Task<IActionResult> Index() =>
-            View(await _context.DeviceStats.OrderBy(d => d.Manufacturer).ThenBy(d => d.Model).ThenBy(d => d.Bus).
-                                ToListAsync());
+        public async Task<IActionResult> Index() => View(await _context.DeviceStats.OrderBy(d => d.Manufacturer).
+                                                                        ThenBy(d => d.Model).ThenBy(d => d.Bus).
+                                                                        ToListAsync());
 
         // GET: Admin/DeviceStats/Edit/5
         public async Task<IActionResult> Edit(int? id)
diff --git a/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs b/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs
index 107e05fb..cd33cd05 100644
--- a/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs
@@ -17,9 +17,10 @@ namespace Aaru.Server.Areas.Admin.Controllers
         public DevicesController(AaruServerContext context) => _context = context;
 
         // GET: Admin/Devices
-        public async Task<IActionResult> Index() =>
-            View(await _context.Devices.OrderBy(d => d.Manufacturer).ThenBy(d => d.Model).ThenBy(d => d.Revision).
-                                ThenBy(d => d.CompactFlash).ThenBy(d => d.Type).ToListAsync());
+        public async Task<IActionResult> Index() => View(await _context.Devices.OrderBy(d => d.Manufacturer).
+                                                                        ThenBy(d => d.Model).ThenBy(d => d.Revision).
+                                                                        ThenBy(d => d.CompactFlash).ThenBy(d => d.Type).
+                                                                        ToListAsync());
 
         // GET: Admin/Devices/Details/5
         public async Task<IActionResult> Details(int? id)
@@ -39,25 +40,25 @@ namespace Aaru.Server.Areas.Admin.Controllers
                 return NotFound();
             }
 
-            model.ReportAll = _context.
-                              Reports.Where(d => d.Manufacturer == model.Report.Manufacturer &&
-                                                 d.Model == model.Report.Model && d.Revision == model.Report.Revision).
-                              Select(d => d.Id).ToList();
+            model.ReportAll = _context.Reports.
+                                       Where(d => d.Manufacturer == model.Report.Manufacturer &&
+                                                  d.Model == model.Report.Model && d.Revision == model.Report.Revision).
+                                       Select(d => d.Id).ToList();
 
-            model.ReportButManufacturer = _context.
-                                          Reports.Where(d => d.Model    == model.Report.Model &&
-                                                             d.Revision == model.Report.Revision).Select(d => d.Id).
-                                          Where(d => model.ReportAll.All(r => r != d)).ToList();
+            model.ReportButManufacturer = _context.Reports.
+                                                   Where(d => d.Model    == model.Report.Model &&
+                                                              d.Revision == model.Report.Revision).Select(d => d.Id).
+                                                   Where(d => model.ReportAll.All(r => r != d)).ToList();
 
-            model.SameAll = _context.
-                            Devices.Where(d => d.Manufacturer == model.Report.Manufacturer &&
-                                               d.Model == model.Report.Model && d.Revision == model.Report.Revision &&
-                                               d.Id != id).Select(d => d.Id).ToList();
+            model.SameAll = _context.Devices.
+                                     Where(d => d.Manufacturer == model.Report.Manufacturer &&
+                                                d.Model == model.Report.Model && d.Revision == model.Report.Revision &&
+                                                d.Id != id).Select(d => d.Id).ToList();
 
-            model.SameButManufacturer = _context.
-                                        Devices.Where(d => d.Model    == model.Report.Model    &&
-                                                           d.Revision == model.Report.Revision && d.Id != id).
-                                        Select(d => d.Id).Where(d => model.SameAll.All(r => r != d)).ToList();
+            model.SameButManufacturer = _context.Devices.
+                                                 Where(d => d.Model    == model.Report.Model    &&
+                                                            d.Revision == model.Report.Revision && d.Id != id).
+                                                 Select(d => d.Id).Where(d => model.SameAll.All(r => r != d)).ToList();
 
             model.StatsAll = _context.DeviceStats.
                                       Where(d => d.Manufacturer == model.Report.Manufacturer &&
diff --git a/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs b/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs
index 69b4d317..38353af2 100644
--- a/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs
@@ -17,9 +17,10 @@ namespace Aaru.Server.Areas.Admin.Controllers
         public ReportsController(AaruServerContext context) => _context = context;
 
         // GET: Admin/Reports
-        public async Task<IActionResult> Index() =>
-            View(await _context.Reports.OrderBy(r => r.Manufacturer).ThenBy(r => r.Model).ThenBy(r => r.Revision).
-                                ThenBy(r => r.CompactFlash).ThenBy(r => r.Type).ToListAsync());
+        public async Task<IActionResult> Index() => View(await _context.Reports.OrderBy(r => r.Manufacturer).
+                                                                        ThenBy(r => r.Model).ThenBy(r => r.Revision).
+                                                                        ThenBy(r => r.CompactFlash).ThenBy(r => r.Type).
+                                                                        ToListAsync());
 
         // GET: Admin/Reports/Details/5
         public async Task<IActionResult> Details(int? id)
@@ -39,25 +40,25 @@ namespace Aaru.Server.Areas.Admin.Controllers
                 return NotFound();
             }
 
-            model.ReportAll = _context.
-                              Devices.Where(d => d.Manufacturer == model.Report.Manufacturer &&
-                                                 d.Model == model.Report.Model && d.Revision == model.Report.Revision).
-                              Select(d => d.Id).ToList();
+            model.ReportAll = _context.Devices.
+                                       Where(d => d.Manufacturer == model.Report.Manufacturer &&
+                                                  d.Model == model.Report.Model && d.Revision == model.Report.Revision).
+                                       Select(d => d.Id).ToList();
 
-            model.ReportButManufacturer = _context.
-                                          Devices.Where(d => d.Model    == model.Report.Model &&
-                                                             d.Revision == model.Report.Revision).Select(d => d.Id).
-                                          Where(d => model.ReportAll.All(r => r != d)).ToList();
+            model.ReportButManufacturer = _context.Devices.
+                                                   Where(d => d.Model    == model.Report.Model &&
+                                                              d.Revision == model.Report.Revision).Select(d => d.Id).
+                                                   Where(d => model.ReportAll.All(r => r != d)).ToList();
 
-            model.SameAll = _context.
-                            Reports.Where(d => d.Manufacturer == model.Report.Manufacturer &&
-                                               d.Model == model.Report.Model && d.Revision == model.Report.Revision &&
-                                               d.Id != id).Select(d => d.Id).ToList();
+            model.SameAll = _context.Reports.
+                                     Where(d => d.Manufacturer == model.Report.Manufacturer &&
+                                                d.Model == model.Report.Model && d.Revision == model.Report.Revision &&
+                                                d.Id != id).Select(d => d.Id).ToList();
 
-            model.SameButManufacturer = _context.
-                                        Reports.Where(d => d.Model    == model.Report.Model    &&
-                                                           d.Revision == model.Report.Revision && d.Id != id).
-                                        Select(d => d.Id).Where(d => model.SameAll.All(r => r != d)).ToList();
+            model.SameButManufacturer = _context.Reports.
+                                                 Where(d => d.Model    == model.Report.Model    &&
+                                                            d.Revision == model.Report.Revision && d.Id != id).
+                                                 Select(d => d.Id).Where(d => model.SameAll.All(r => r != d)).ToList();
 
             model.ReadCapabilitiesId =
                 model.Report.ATA?.ReadCapabilities?.Id ?? model.Report.SCSI?.ReadCapabilities?.Id ?? 0;
diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs
index 9af63403..f63b8162 100644
--- a/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs
@@ -25,15 +25,12 @@ namespace Aaru.Server.Areas.Admin.Controllers
 
         // GET: Admin/Scsis
         public IActionResult Index() => View(_context.Scsi.AsEnumerable().
-                                                      OrderBy(m =>
-                                                                  StringHandlers.CToString(m.Inquiry?.
-                                                                                             VendorIdentification)).
-                                                      ThenBy(m =>
-                                                                 StringHandlers.CToString(m.Inquiry?.
-                                                                                            ProductIdentification)).
-                                                      ThenBy(m =>
-                                                                 StringHandlers.CToString(m.Inquiry?.
-                                                                                            ProductRevisionLevel)));
+                                                      OrderBy(m => StringHandlers.CToString(m.Inquiry?.
+                                                                  VendorIdentification)).
+                                                      ThenBy(m => StringHandlers.CToString(m.Inquiry?.
+                                                                 ProductIdentification)).
+                                                      ThenBy(m => StringHandlers.CToString(m.Inquiry?.
+                                                                 ProductRevisionLevel)));
 
         // GET: Admin/Scsis/Details/5
         public async Task<IActionResult> Details(int? id)
diff --git a/Aaru.Server/Areas/Admin/Controllers/SscsController.cs b/Aaru.Server/Areas/Admin/Controllers/SscsController.cs
index 8603dcbf..9ef147a9 100644
--- a/Aaru.Server/Areas/Admin/Controllers/SscsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/SscsController.cs
@@ -18,9 +18,10 @@ namespace Aaru.Server.Areas.Admin.Controllers
         public SscsController(AaruServerContext context) => _context = context;
 
         // GET: Admin/Sscs
-        public async Task<IActionResult> Index() =>
-            View(await _context.Ssc.OrderBy(s => s.MinBlockLength).ThenBy(s => s.MaxBlockLength).
-                                ThenBy(s => s.BlockSizeGranularity).ToListAsync());
+        public async Task<IActionResult> Index() => View(await _context.Ssc.OrderBy(s => s.MinBlockLength).
+                                                                        ThenBy(s => s.MaxBlockLength).
+                                                                        ThenBy(s => s.BlockSizeGranularity).
+                                                                        ToListAsync());
 
         // GET: Admin/Sscs/Delete/5
         public async Task<IActionResult> Delete(int? id)
diff --git a/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs b/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs
index 20b1653c..e726b832 100644
--- a/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs
@@ -16,14 +16,16 @@ namespace Aaru.Server.Areas.Admin.Controllers
         public SupportedDensitiesController(AaruServerContext context) => _context = context;
 
         // GET: Admin/SupportedDensities
-        public async Task<IActionResult> Index() => View(await _context.
-                                                               SupportedDensity.OrderBy(d => d.Organization).
-                                                               ThenBy(d => d.Name).ThenBy(d => d.Description).
-                                                               ThenBy(d => d.Capacity).ThenBy(d => d.PrimaryCode).
-                                                               ThenBy(d => d.SecondaryCode).ThenBy(d => d.BitsPerMm).
-                                                               ThenBy(d => d.Width).ThenBy(d => d.Tracks).
-                                                               ThenBy(d => d.DefaultDensity).ThenBy(d => d.Writable).
-                                                               ThenBy(d => d.Duplicate).ToListAsync());
+        public async Task<IActionResult> Index() => View(await _context.SupportedDensity.OrderBy(d => d.Organization).
+                                                                        ThenBy(d => d.Name).ThenBy(d => d.Description).
+                                                                        ThenBy(d => d.Capacity).
+                                                                        ThenBy(d => d.PrimaryCode).
+                                                                        ThenBy(d => d.SecondaryCode).
+                                                                        ThenBy(d => d.BitsPerMm).ThenBy(d => d.Width).
+                                                                        ThenBy(d => d.Tracks).
+                                                                        ThenBy(d => d.DefaultDensity).
+                                                                        ThenBy(d => d.Writable).
+                                                                        ThenBy(d => d.Duplicate).ToListAsync());
 
         // GET: Admin/SupportedDensities/Delete/5
         public async Task<IActionResult> Delete(int? id)
diff --git a/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs b/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs
index a60979da..e157d337 100644
--- a/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs
@@ -29,12 +29,13 @@ namespace Aaru.Server.Areas.Admin.Controllers
         public TestedMediasController(AaruServerContext context) => _context = context;
 
         // GET: Admin/TestedMedias
-        public async Task<IActionResult> Index() => View(await _context.
-                                                               TestedMedia.OrderBy(m => m.Manufacturer).
-                                                               ThenBy(m => m.Model).ThenBy(m => m.MediumTypeName).
-                                                               ThenBy(m => m.MediaIsRecognized).
-                                                               ThenBy(m => m.LongBlockSize).ThenBy(m => m.BlockSize).
-                                                               ThenBy(m => m.Blocks).ToListAsync());
+        public async Task<IActionResult> Index() => View(await _context.TestedMedia.OrderBy(m => m.Manufacturer).
+                                                                        ThenBy(m => m.Model).
+                                                                        ThenBy(m => m.MediumTypeName).
+                                                                        ThenBy(m => m.MediaIsRecognized).
+                                                                        ThenBy(m => m.LongBlockSize).
+                                                                        ThenBy(m => m.BlockSize).ThenBy(m => m.Blocks).
+                                                                        ToListAsync());
 
         // GET: Admin/TestedMedias/Details/5
         public async Task<IActionResult> Details(int? id)
diff --git a/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs b/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs
index e4646fb0..54c4da3d 100644
--- a/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs
@@ -16,9 +16,10 @@ namespace Aaru.Server.Areas.Admin.Controllers
         public TestedSequentialMediasController(AaruServerContext context) => _context = context;
 
         // GET: Admin/TestedSequentialMedias
-        public async Task<IActionResult> Index() =>
-            View(await _context.TestedSequentialMedia.OrderBy(m => m.Manufacturer).ThenBy(m => m.Model).
-                                ThenBy(m => m.MediumTypeName).ToListAsync());
+        public async Task<IActionResult> Index() => View(await _context.TestedSequentialMedia.
+                                                                        OrderBy(m => m.Manufacturer).
+                                                                        ThenBy(m => m.Model).
+                                                                        ThenBy(m => m.MediumTypeName).ToListAsync());
 
         // GET: Admin/TestedSequentialMedias/Edit/5
         public async Task<IActionResult> Edit(int? id)
diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs
index 2e8d43b2..a8405ee5 100644
--- a/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs
@@ -15,15 +15,15 @@ namespace Aaru.Server.Areas.Admin.Controllers
         public UsbProductsController(AaruServerContext context) => _context = context;
 
         // GET: Admin/UsbProducts
-        public async Task<IActionResult> Index() => View(await _context.
-                                                               UsbProducts.Include(u => u.Vendor).
-                                                               OrderBy(p => p.Vendor.Vendor).ThenBy(p => p.Product).
-                                                               ThenBy(p => p.ProductId).Select(p => new UsbProductModel
-                                                               {
-                                                                   ProductId   = p.ProductId,
-                                                                   ProductName = p.Product,
-                                                                   VendorId    = p.Vendor.Id,
-                                                                   VendorName  = p.Vendor.Vendor
-                                                               }).ToListAsync());
+        public async Task<IActionResult> Index() => View(await _context.UsbProducts.Include(u => u.Vendor).
+                                                                        OrderBy(p => p.Vendor.Vendor).
+                                                                        ThenBy(p => p.Product).ThenBy(p => p.ProductId).
+                                                                        Select(p => new UsbProductModel
+                                                                        {
+                                                                            ProductId   = p.ProductId,
+                                                                            ProductName = p.Product,
+                                                                            VendorId    = p.Vendor.Id,
+                                                                            VendorName  = p.Vendor.Vendor
+                                                                        }).ToListAsync());
     }
 }
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs
index 5504a533..20895893 100644
--- a/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs
@@ -18,9 +18,9 @@ namespace Aaru.Server.Areas.Admin.Controllers
         public UsbsController(AaruServerContext context) => _context = context;
 
         // GET: Admin/Usbs
-        public async Task<IActionResult> Index() =>
-            View(await _context.Usb.OrderBy(u => u.Manufacturer).ThenBy(u => u.Product).ThenBy(u => u.VendorID).
-                                ThenBy(u => u.ProductID).ToListAsync());
+        public async Task<IActionResult> Index() => View(await _context.Usb.OrderBy(u => u.Manufacturer).
+                                                                        ThenBy(u => u.Product).ThenBy(u => u.VendorID).
+                                                                        ThenBy(u => u.ProductID).ToListAsync());
 
         // GET: Admin/Usbs/Details/5
         public async Task<IActionResult> Details(int? id)
diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml
index 64b6faea..67ee956b 100644
--- a/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml
@@ -24,7 +24,7 @@
 <div>
     Do you want to remove the duplicates?
     <form asp-action="Consolidate" enctype="multipart/form-data">
-        <input type="hidden" asp-for="Json" name="models" />
+        <input asp-for="Json" name="models" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Consolidate" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Delete.cshtml
index c2e78da9..4cceb7e4 100644
--- a/Aaru.Server/Areas/Admin/Views/Atas/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Atas/Delete.cshtml
@@ -43,7 +43,7 @@
 </div>
 <div>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Details.cshtml
index 66435cf6..79b78346 100644
--- a/Aaru.Server/Areas/Admin/Views/Atas/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Atas/Details.cshtml
@@ -42,7 +42,7 @@
 </div>
 <div>
     <form asp-action="Compare">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         Compare to:
         <input name="RightId" type="number" />
         <a asp-action="Index" class="btn btn-secondary">Back to List</a>
diff --git a/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml
index cdf1ed25..f101bd91 100644
--- a/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml
@@ -24,7 +24,7 @@
 <div>
     Do you want to remove the duplicates?
     <form asp-action="Consolidate" enctype="multipart/form-data">
-        <input type="hidden" asp-for="Json" name="models" />
+        <input asp-for="Json" name="models" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Consolidate" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml
index 30317973..ce0600d0 100644
--- a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml
@@ -82,7 +82,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml
index fa627eff..b4bc0b1e 100644
--- a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml
@@ -39,7 +39,7 @@
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <input asp-for="Id" type="hidden" />
             <div class="form-group">
                 <label asp-for="Manufacturer" class="control-label"></label>
                 <input asp-for="Manufacturer" class="form-control" />
diff --git a/Aaru.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml
index e1cbac86..b179ded8 100644
--- a/Aaru.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml
@@ -64,7 +64,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml
index b1a758c1..af5777c2 100644
--- a/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml
@@ -39,7 +39,7 @@
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <input asp-for="Id" type="hidden" />
             <div class="form-group">
                 <label asp-for="Manufacturer" class="control-label"></label>
                 <input asp-for="Manufacturer" class="form-control" />
diff --git a/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml b/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml
index 62ae636d..9d456d79 100644
--- a/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml
@@ -75,12 +75,10 @@
                 @if(item.Report is null)
                 {
                     @("No")
-                    <a asp-action="Find" asp-controller="Devices" asp-route-id="@item.Id" asp-route-manufacturer="@item.Manufacturer" asp-route-model="@item.Model" asp-route-revision="@item.Revision" asp-route-bus="@item.Bus" target="_blank">(Find)</a>
-                }
+                    <a asp-action="Find" asp-controller="Devices" asp-route-bus="@item.Bus" asp-route-id="@item.Id" asp-route-manufacturer="@item.Manufacturer" asp-route-model="@item.Model" asp-route-revision="@item.Revision" target="_blank">(Find)</a>                }
                 else
                 {
-                    <a asp-action="Details" asp-controller="Devices" asp-route-id="@item.Report.Id" target="_blank">Yes</a>
-                }
+                    <a asp-action="Details" asp-controller="Devices" asp-route-id="@item.Report.Id" target="_blank">Yes</a>                }
             </td>
             <td>
                 <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Delete.cshtml
index 9b9683ce..590dda9f 100644
--- a/Aaru.Server/Areas/Admin/Views/Devices/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Devices/Delete.cshtml
@@ -94,7 +94,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml
index 6ff13323..dd22a747 100644
--- a/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml
@@ -100,49 +100,49 @@
 @if(Model.ReadCapabilitiesId != 0)
 {
     <div>
-        <a asp-controller="TestedMedias" asp-action="Details" asp-route-id="@Model.ReadCapabilitiesId" target="_blank">Read capabilities</a>
+        <a asp-action="Details" asp-controller="TestedMedias" asp-route-id="@Model.ReadCapabilitiesId" target="_blank">Read capabilities</a>
     </div>
 }
 @if(Model.Report.ATA != null)
 {
     <div>
-        <a asp-controller="Atas" asp-action="Details" asp-route-id="@Model.Report.ATA.Id" target="_blank">ATA report</a>
+        <a asp-action="Details" asp-controller="Atas" asp-route-id="@Model.Report.ATA.Id" target="_blank">ATA report</a>
     </div>
 }
 @if(Model.Report.ATAPI != null)
 {
     <div>
-        <a asp-controller="Atas" asp-action="Details" asp-route-id="@Model.Report.ATAPI.Id" target="_blank">ATAPI report</a>
+        <a asp-action="Details" asp-controller="Atas" asp-route-id="@Model.Report.ATAPI.Id" target="_blank">ATAPI report</a>
     </div>
 }
 @if(Model.Report.SCSI != null)
 {
     <div>
-        <a asp-controller="Scsis" asp-action="Details" asp-route-id="@Model.Report.SCSI.Id" target="_blank">SCSI report</a>
+        <a asp-action="Details" asp-controller="Scsis" asp-route-id="@Model.Report.SCSI.Id" target="_blank">SCSI report</a>
     </div>
 }
 @if(Model.Report.MultiMediaCard != null)
 {
     <div>
-        <a asp-controller="MmcSds" asp-action="Details" asp-route-id="@Model.Report.MultiMediaCard.Id" target="_blank">MultiMediaCard report</a>
+        <a asp-action="Details" asp-controller="MmcSds" asp-route-id="@Model.Report.MultiMediaCard.Id" target="_blank">MultiMediaCard report</a>
     </div>
 }
 @if(Model.Report.SecureDigital != null)
 {
     <div>
-        <a asp-controller="MmcSds" asp-action="Details" asp-route-id="@Model.Report.SecureDigital.Id" target="_blank">SecureDigital report</a>
+        <a asp-action="Details" asp-controller="MmcSds" asp-route-id="@Model.Report.SecureDigital.Id" target="_blank">SecureDigital report</a>
     </div>
 }
 @if(Model.Report.USB != null)
 {
     <div>
-        <a asp-controller="Usbs" asp-action="Details" asp-route-id="@Model.Report.USB.Id" target="_blank">USB report</a>
+        <a asp-action="Details" asp-controller="Usbs" asp-route-id="@Model.Report.USB.Id" target="_blank">USB report</a>
     </div>
 }
 @if(Model.Report.GdRomSwapDiscCapabilitiesId != null)
 {
     <div>
-        <a asp-controller="GdRomSwapDiscCapabilities" asp-action="Details" asp-route-id="@Model.Report.GdRomSwapDiscCapabilitiesId" target="_blank">GD-ROM swap-trick capabilities report</a>
+        <a asp-action="Details" asp-controller="GdRomSwapDiscCapabilities" asp-route-id="@Model.Report.GdRomSwapDiscCapabilitiesId" target="_blank">GD-ROM swap-trick capabilities report</a>
     </div>
 }
 @if(Model.Report.FireWire != null)
@@ -179,7 +179,7 @@
                     </td>
                     <td>
                         <a asp-action="Details" asp-route-id="@item" class="btn btn-primary" target="_blank">Details</a>
-                        <a asp-action="Merge" asp-route-slave="@item" asp-route-master="@Model.Report.Id" class="btn btn-secondary">Merge</a>
+                        <a asp-action="Merge" asp-route-master="@Model.Report.Id" asp-route-slave="@item" class="btn btn-secondary">Merge</a>
                     </td>
                 </tr>
             }
@@ -209,7 +209,7 @@
                     </td>
                     <td>
                         <a asp-action="Details" asp-route-id="@item" class="btn btn-primary" target="_blank">Details</a>
-                        <a asp-action="Merge" asp-route-slave="@item" asp-route-master="@Model.Report.Id" class="btn btn-secondary">Merge</a>
+                        <a asp-action="Merge" asp-route-master="@Model.Report.Id" asp-route-slave="@item" class="btn btn-secondary">Merge</a>
                     </td>
                 </tr>
             }
@@ -238,8 +238,8 @@
                         @item
                     </td>
                     <td>
-                        <a asp-controller="Reports" asp-action="Details" asp-route-id="@item" class="btn btn-primary" target="_blank">Details</a>
-                        <a asp-action="MergeReports" asp-route-reportId="@item" asp-route-deviceId="@Model.Report.Id" class="btn btn-secondary">Merge</a>
+                        <a asp-action="Details" asp-controller="Reports" asp-route-id="@item" class="btn btn-primary" target="_blank">Details</a>
+                        <a asp-action="MergeReports" asp-route-deviceId="@Model.Report.Id" asp-route-reportId="@item" class="btn btn-secondary">Merge</a>
                     </td>
                 </tr>
             }
@@ -268,8 +268,8 @@
                         @item
                     </td>
                     <td>
-                        <a asp-controller="Reports" asp-action="Details" asp-route-id="@item" class="btn btn-primary" target="_blank">Details</a>
-                        <a asp-action="MergeReports" asp-route-reportId="@item" asp-route-deviceId="@Model.Report.Id" class="btn btn-secondary">Merge</a>
+                        <a asp-action="Details" asp-controller="Reports" asp-route-id="@item" class="btn btn-primary" target="_blank">Details</a>
+                        <a asp-action="MergeReports" asp-route-deviceId="@Model.Report.Id" asp-route-reportId="@item" class="btn btn-secondary">Merge</a>
                     </td>
                 </tr>
             }
@@ -336,7 +336,7 @@
                         }
                     </td>
                     <td>
-                        <a asp-action="LinkReports" asp-route-statsId="@item.Id" asp-route-deviceId="@Model.Report.Id" class="btn btn-secondary">Link</a>
+                        <a asp-action="LinkReports" asp-route-deviceId="@Model.Report.Id" asp-route-statsId="@item.Id" class="btn btn-secondary">Link</a>
                     </td>
                 </tr>
             }
@@ -392,11 +392,10 @@
                         }
                         else
                         {
-                            <a asp-action="Details" asp-route-id="@item.Report.Id" target="_blank">Yes</a>
-                        }
+                            <a asp-action="Details" asp-route-id="@item.Report.Id" target="_blank">Yes</a>                        }
                     </td>
                     <td>
-                        <a asp-action="LinkReports" asp-route-statsId="@item.Id" asp-route-deviceId="@Model.Report.Id" class="btn btn-secondary">Link</a>
+                        <a asp-action="LinkReports" asp-route-deviceId="@Model.Report.Id" asp-route-statsId="@item.Id" class="btn btn-secondary">Link</a>
                     </td>
                 </tr>
             }
@@ -437,7 +436,7 @@
                         @Html.DisplayFor(modelItem => item.MediumTypeName)
                     </td>
                     <td>
-                        <a asp-controller="TestedMedias" asp-action="Details" asp-route-id="@item.Id" class="btn btn-secondary" target="_blank">Details</a>
+                        <a asp-action="Details" asp-controller="TestedMedias" asp-route-id="@item.Id" class="btn btn-secondary" target="_blank">Details</a>
                     </td>
                 </tr>
             }
@@ -478,7 +477,7 @@
                         @Html.DisplayFor(modelItem => item.MediumTypeName)
                     </td>
                     <td>
-                        <a asp-controller="TestedSequentialMedias" asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger" target="_blank">Delete</a>
+                        <a asp-action="Delete" asp-controller="TestedSequentialMedias" asp-route-id="@item.Id" class="btn btn-danger" target="_blank">Delete</a>
                     </td>
                 </tr>
             }
diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml
index 3e3108bc..5e7b3e97 100644
--- a/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml
@@ -40,7 +40,7 @@
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <input asp-for="Id" type="hidden" />
             <div class="form-group">
                 <label asp-for="Manufacturer" class="control-label"></label>
                 <input asp-for="Manufacturer" class="form-control" />
@@ -58,7 +58,7 @@
             </div>
             <div class="form-check form-group">
                 <label class="form-check-label">
-                    <input class="form-check-input" asp-for="CompactFlash" /> @Html.DisplayNameFor(model => model.CompactFlash)
+                    <input asp-for="CompactFlash" class="form-check-input" /> @Html.DisplayNameFor(model => model.CompactFlash)
                 </label>
             </div>
             <div class="form-group">
@@ -73,7 +73,7 @@
             </div>
             <div class="form-group">
                 <label asp-for="Type" class="control-label"></label>
-                <select asp-for="Type" class="form-control" asp-items="Html.GetEnumSelectList<DeviceType>()"></select>
+                <select asp-for="Type" asp-items="Html.GetEnumSelectList<DeviceType>()" class="form-control"></select>
                 <span asp-validation-for="Type" class="text-danger"></span>
             </div>
             <div class="form-group">
diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml
index eba2d212..9d9813a9 100644
--- a/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml
@@ -110,7 +110,7 @@ else
                     @Html.DisplayFor(modelItem => item.Type)
                 </td>
                 <td>
-                    <a asp-action="LinkReports" asp-route-statsId="@Model.Id" asp-route-deviceId="@item.Id" class="btn btn-secondary">Link</a>
+                    <a asp-action="LinkReports" asp-route-deviceId="@item.Id" asp-route-statsId="@Model.Id" class="btn btn-secondary">Link</a>
                 </td>
             </tr>
         }
diff --git a/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml
index ebc8125a..7f3822fe 100644
--- a/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml
@@ -54,7 +54,7 @@
 <div>
     Do you want to remove the duplicates?
     <form asp-action="Consolidate" enctype="multipart/form-data">
-        <input type="hidden" asp-for="Json" name="models" />
+        <input asp-for="Json" name="models" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Consolidate" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/FireWires/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/FireWires/Delete.cshtml
index 9ddd933f..8035c923 100644
--- a/Aaru.Server/Areas/Admin/Views/FireWires/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/FireWires/Delete.cshtml
@@ -70,7 +70,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/FireWires/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/FireWires/Edit.cshtml
index 248be530..5dc63bca 100644
--- a/Aaru.Server/Areas/Admin/Views/FireWires/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/FireWires/Edit.cshtml
@@ -39,7 +39,7 @@
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <input asp-for="Id" type="hidden" />
             <div class="form-group">
                 <label asp-for="VendorID" class="control-label"></label>
                 <input asp-for="VendorID" class="form-control" />
@@ -62,7 +62,7 @@
             </div>
             <div class="form-check form-group">
                 <label class="form-check-label">
-                    <input class="form-check-input" asp-for="RemovableMedia" /> @Html.DisplayNameFor(model => model.RemovableMedia)
+                    <input asp-for="RemovableMedia" class="form-check-input" /> @Html.DisplayNameFor(model => model.RemovableMedia)
                 </label>
             </div>
             <div class="form-group">
diff --git a/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Delete.cshtml
index 31262c0f..9a730afe 100644
--- a/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Delete.cshtml
@@ -55,14 +55,14 @@ else if(Model.RecognizedSwapDisc)
         {
             <dt class="col-sm-4">Contents of last readable sector in HD area (with PQ):</dt>
             <dd class="col-sm-8">
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.MaximumReadablePqInHdArea)">@Model.MaximumReadablePqInHdArea.Length bytes</a>
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.MaximumReadablePqInHdArea)" asp-route-id="@Model.Id" target="_blank">@Model.MaximumReadablePqInHdArea.Length bytes</a>
             </dd>
         }
         @if(Model.MaximumReadableRwInHdArea != null)
         {
             <dt class="col-sm-4">Contents of last readable sector in HD area (with RW):</dt>
             <dd class="col-sm-8">
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.MaximumReadableRwInHdArea)">@Model.MaximumReadableRwInHdArea.Length bytes</a>
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.MaximumReadableRwInHdArea)" asp-route-id="@Model.Id" target="_blank">@Model.MaximumReadableRwInHdArea.Length bytes</a>
             </dd>
         }
     </dl>
@@ -92,8 +92,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba0Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba0Data)">@Model.Lba0Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba0Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba0Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba0DecodedSense != null)
@@ -120,8 +119,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba0ScrambledData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba0ScrambledData)">@Model.Lba0ScrambledData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba0ScrambledData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba0ScrambledData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba0ScrambledDecodedSense != null)
@@ -148,8 +146,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba44990Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba44990Data)">@Model.Lba44990Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba44990Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba44990Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba44990DecodedSense != null)
@@ -176,8 +173,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba44990PqData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba44990PqData)">@Model.Lba44990PqData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba44990PqData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba44990PqData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba44990PqDecodedSense != null)
@@ -204,8 +200,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba44990RwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba44990RwData)">@Model.Lba44990RwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba44990RwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba44990RwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba44990RwDecodedSense != null)
@@ -232,8 +227,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba44990AudioData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba44990AudioData)">@Model.Lba44990AudioData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba44990AudioData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba44990AudioData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba44990AudioDecodedSense != null)
@@ -260,8 +254,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba44990AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba44990AudioRwData)">@Model.Lba44990AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba44990AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba44990AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba44990AudioPqDecodedSense != null)
@@ -288,8 +281,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba44990AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba44990AudioRwData)">@Model.Lba44990AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba44990AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba44990AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba44990AudioRwDecodedSense != null)
@@ -316,8 +308,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba45000Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba45000Data)">@Model.Lba45000Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba45000Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba45000Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba45000DecodedSense != null)
@@ -344,8 +335,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba45000PqData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba45000PqData)">@Model.Lba45000PqData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba45000PqData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba45000PqData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba45000PqDecodedSense != null)
@@ -372,8 +362,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba45000RwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba45000RwData)">@Model.Lba45000RwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba45000RwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba45000RwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba45000RwDecodedSense != null)
@@ -400,8 +389,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba45000AudioData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba45000AudioData)">@Model.Lba45000AudioData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba45000AudioData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba45000AudioData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba45000AudioDecodedSense != null)
@@ -428,8 +416,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba45000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba45000AudioRwData)">@Model.Lba45000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba45000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba45000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba45000AudioPqDecodedSense != null)
@@ -456,8 +443,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba45000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba45000AudioRwData)">@Model.Lba45000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba45000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba45000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba45000AudioRwDecodedSense != null)
@@ -484,8 +470,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba50000Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba50000Data)">@Model.Lba50000Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba50000Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba50000Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba50000DecodedSense != null)
@@ -512,8 +497,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba50000PqData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba50000PqData)">@Model.Lba50000PqData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba50000PqData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba50000PqData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba50000PqDecodedSense != null)
@@ -540,8 +524,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba50000RwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba50000RwData)">@Model.Lba50000RwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba50000RwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba50000RwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba50000RwDecodedSense != null)
@@ -568,8 +551,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba50000AudioData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba50000AudioData)">@Model.Lba50000AudioData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba50000AudioData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba50000AudioData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba50000AudioDecodedSense != null)
@@ -596,8 +578,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba50000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba50000AudioRwData)">@Model.Lba50000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba50000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba50000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba50000AudioPqDecodedSense != null)
@@ -624,8 +605,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba50000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba50000AudioRwData)">@Model.Lba50000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba50000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba50000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba50000AudioRwDecodedSense != null)
@@ -652,8 +632,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba100000Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba100000Data)">@Model.Lba100000Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba100000Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba100000Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba100000DecodedSense != null)
@@ -680,8 +659,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba100000PqData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba100000PqData)">@Model.Lba100000PqData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba100000PqData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba100000PqData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba100000PqDecodedSense != null)
@@ -708,8 +686,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba100000RwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba100000RwData)">@Model.Lba100000RwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba100000RwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba100000RwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba100000RwDecodedSense != null)
@@ -736,8 +713,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba100000AudioData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba100000AudioData)">@Model.Lba100000AudioData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba100000AudioData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba100000AudioData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba100000AudioDecodedSense != null)
@@ -764,8 +740,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba100000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba100000AudioRwData)">@Model.Lba100000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba100000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba100000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba100000AudioPqDecodedSense != null)
@@ -792,8 +767,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba100000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba100000AudioRwData)">@Model.Lba100000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba100000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba100000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba100000AudioRwDecodedSense != null)
@@ -820,8 +794,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba400000Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba400000Data)">@Model.Lba400000Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba400000Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba400000Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba400000DecodedSense != null)
@@ -848,8 +821,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba400000PqData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba400000PqData)">@Model.Lba400000PqData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba400000PqData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba400000PqData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba400000PqDecodedSense != null)
@@ -876,8 +848,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba400000RwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba400000RwData)">@Model.Lba400000RwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba400000RwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba400000RwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba400000RwDecodedSense != null)
@@ -904,8 +875,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba400000AudioData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba400000AudioData)">@Model.Lba400000AudioData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba400000AudioData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba400000AudioData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba400000AudioDecodedSense != null)
@@ -932,8 +902,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba400000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba400000AudioRwData)">@Model.Lba400000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba400000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba400000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba400000AudioPqDecodedSense != null)
@@ -960,8 +929,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba400000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba400000AudioRwData)">@Model.Lba400000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba400000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba400000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba400000AudioRwDecodedSense != null)
@@ -988,8 +956,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba450000Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba450000Data)">@Model.Lba450000Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba450000Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba450000Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba450000DecodedSense != null)
@@ -1016,8 +983,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba450000PqData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba450000PqData)">@Model.Lba450000PqData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba450000PqData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba450000PqData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba450000PqDecodedSense != null)
@@ -1044,8 +1010,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba450000RwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba450000RwData)">@Model.Lba450000RwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba450000RwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba450000RwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba450000RwDecodedSense != null)
@@ -1072,8 +1037,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba450000AudioData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba450000AudioData)">@Model.Lba450000AudioData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba450000AudioData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba450000AudioData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba450000AudioDecodedSense != null)
@@ -1100,8 +1064,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba450000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba450000AudioRwData)">@Model.Lba450000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba450000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba450000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba450000AudioPqDecodedSense != null)
@@ -1128,8 +1091,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba450000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba450000AudioRwData)">@Model.Lba450000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba450000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba450000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba450000AudioRwDecodedSense != null)
@@ -1145,7 +1107,7 @@ else
     <h4>Swap disc not recognized, or firmware reset after tray opened.</h4>
 }
 <form asp-action="Delete">
-    <input type="hidden" asp-for="Id" />
+    <input asp-for="Id" type="hidden" />
     <input class="btn btn-danger" type="submit" value="Delete" />
 </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Details.cshtml b/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Details.cshtml
index 867ee5b4..aa6ce771 100644
--- a/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Details.cshtml
@@ -54,14 +54,14 @@ else if(Model.RecognizedSwapDisc)
         {
             <dt class="col-sm-4">Contents of last readable sector in HD area (with PQ):</dt>
             <dd class="col-sm-8">
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.MaximumReadablePqInHdArea)">@Model.MaximumReadablePqInHdArea.Length bytes</a>
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.MaximumReadablePqInHdArea)" asp-route-id="@Model.Id" target="_blank">@Model.MaximumReadablePqInHdArea.Length bytes</a>
             </dd>
         }
         @if(Model.MaximumReadableRwInHdArea != null)
         {
             <dt class="col-sm-4">Contents of last readable sector in HD area (with RW):</dt>
             <dd class="col-sm-8">
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.MaximumReadableRwInHdArea)">@Model.MaximumReadableRwInHdArea.Length bytes</a>
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.MaximumReadableRwInHdArea)" asp-route-id="@Model.Id" target="_blank">@Model.MaximumReadableRwInHdArea.Length bytes</a>
             </dd>
         }
     </dl>
@@ -91,8 +91,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba0Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba0Data)">@Model.Lba0Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba0Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba0Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba0DecodedSense != null)
@@ -119,8 +118,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba0ScrambledData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba0ScrambledData)">@Model.Lba0ScrambledData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba0ScrambledData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba0ScrambledData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba0ScrambledDecodedSense != null)
@@ -147,8 +145,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba44990Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba44990Data)">@Model.Lba44990Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba44990Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba44990Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba44990DecodedSense != null)
@@ -175,8 +172,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba44990PqData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba44990PqData)">@Model.Lba44990PqData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba44990PqData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba44990PqData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba44990PqDecodedSense != null)
@@ -203,8 +199,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba44990RwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba44990RwData)">@Model.Lba44990RwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba44990RwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba44990RwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba44990RwDecodedSense != null)
@@ -231,8 +226,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba44990AudioData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba44990AudioData)">@Model.Lba44990AudioData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba44990AudioData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba44990AudioData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba44990AudioDecodedSense != null)
@@ -259,8 +253,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba44990AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba44990AudioRwData)">@Model.Lba44990AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba44990AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba44990AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba44990AudioPqDecodedSense != null)
@@ -287,8 +280,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba44990AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba44990AudioRwData)">@Model.Lba44990AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba44990AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba44990AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba44990AudioRwDecodedSense != null)
@@ -315,8 +307,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba45000Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba45000Data)">@Model.Lba45000Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba45000Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba45000Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba45000DecodedSense != null)
@@ -343,8 +334,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba45000PqData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba45000PqData)">@Model.Lba45000PqData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba45000PqData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba45000PqData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba45000PqDecodedSense != null)
@@ -371,8 +361,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba45000RwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba45000RwData)">@Model.Lba45000RwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba45000RwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba45000RwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba45000RwDecodedSense != null)
@@ -399,8 +388,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba45000AudioData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba45000AudioData)">@Model.Lba45000AudioData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba45000AudioData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba45000AudioData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba45000AudioDecodedSense != null)
@@ -427,8 +415,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba45000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba45000AudioRwData)">@Model.Lba45000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba45000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba45000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba45000AudioPqDecodedSense != null)
@@ -455,8 +442,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba45000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba45000AudioRwData)">@Model.Lba45000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba45000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba45000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba45000AudioRwDecodedSense != null)
@@ -483,8 +469,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba50000Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba50000Data)">@Model.Lba50000Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba50000Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba50000Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba50000DecodedSense != null)
@@ -511,8 +496,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba50000PqData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba50000PqData)">@Model.Lba50000PqData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba50000PqData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba50000PqData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba50000PqDecodedSense != null)
@@ -539,8 +523,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba50000RwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba50000RwData)">@Model.Lba50000RwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba50000RwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba50000RwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba50000RwDecodedSense != null)
@@ -567,8 +550,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba50000AudioData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba50000AudioData)">@Model.Lba50000AudioData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba50000AudioData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba50000AudioData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba50000AudioDecodedSense != null)
@@ -595,8 +577,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba50000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba50000AudioRwData)">@Model.Lba50000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba50000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba50000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba50000AudioPqDecodedSense != null)
@@ -623,8 +604,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba50000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba50000AudioRwData)">@Model.Lba50000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba50000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba50000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba50000AudioRwDecodedSense != null)
@@ -651,8 +631,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba100000Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba100000Data)">@Model.Lba100000Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba100000Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba100000Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba100000DecodedSense != null)
@@ -679,8 +658,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba100000PqData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba100000PqData)">@Model.Lba100000PqData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba100000PqData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba100000PqData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba100000PqDecodedSense != null)
@@ -707,8 +685,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba100000RwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba100000RwData)">@Model.Lba100000RwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba100000RwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba100000RwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba100000RwDecodedSense != null)
@@ -735,8 +712,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba100000AudioData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba100000AudioData)">@Model.Lba100000AudioData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba100000AudioData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba100000AudioData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba100000AudioDecodedSense != null)
@@ -763,8 +739,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba100000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba100000AudioRwData)">@Model.Lba100000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba100000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba100000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba100000AudioPqDecodedSense != null)
@@ -791,8 +766,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba100000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba100000AudioRwData)">@Model.Lba100000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba100000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba100000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba100000AudioRwDecodedSense != null)
@@ -819,8 +793,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba400000Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba400000Data)">@Model.Lba400000Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba400000Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba400000Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba400000DecodedSense != null)
@@ -847,8 +820,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba400000PqData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba400000PqData)">@Model.Lba400000PqData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba400000PqData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba400000PqData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba400000PqDecodedSense != null)
@@ -875,8 +847,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba400000RwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba400000RwData)">@Model.Lba400000RwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba400000RwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba400000RwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba400000RwDecodedSense != null)
@@ -903,8 +874,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba400000AudioData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba400000AudioData)">@Model.Lba400000AudioData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba400000AudioData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba400000AudioData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba400000AudioDecodedSense != null)
@@ -931,8 +901,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba400000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba400000AudioRwData)">@Model.Lba400000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba400000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba400000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba400000AudioPqDecodedSense != null)
@@ -959,8 +928,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba400000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba400000AudioRwData)">@Model.Lba400000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba400000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba400000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba400000AudioRwDecodedSense != null)
@@ -987,8 +955,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba450000Data != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba450000Data)">@Model.Lba450000Data.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba450000Data)" asp-route-id="@Model.Id" target="_blank">@Model.Lba450000Data.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba450000DecodedSense != null)
@@ -1015,8 +982,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba450000PqData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba450000PqData)">@Model.Lba450000PqData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba450000PqData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba450000PqData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba450000PqDecodedSense != null)
@@ -1043,8 +1009,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba450000RwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba450000RwData)">@Model.Lba450000RwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba450000RwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba450000RwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba450000RwDecodedSense != null)
@@ -1071,8 +1036,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba450000AudioData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba450000AudioData)">@Model.Lba450000AudioData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba450000AudioData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba450000AudioData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba450000AudioDecodedSense != null)
@@ -1099,8 +1063,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba450000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba450000AudioRwData)">@Model.Lba450000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba450000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba450000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba450000AudioPqDecodedSense != null)
@@ -1127,8 +1090,7 @@ else if(Model.RecognizedSwapDisc)
         <td>
             @if(Model.Lba450000AudioRwData != null)
             {
-                <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Lba450000AudioRwData)">@Model.Lba450000AudioRwData.Length bytes</a>
-            }
+                <a asp-action="ViewData" asp-route-data="@nameof(Model.Lba450000AudioRwData)" asp-route-id="@Model.Id" target="_blank">@Model.Lba450000AudioRwData.Length bytes</a>            }
         </td>
         <td>
             @if(Model.Lba450000AudioRwDecodedSense != null)
diff --git a/Aaru.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml
index 778ce5d2..4089372b 100644
--- a/Aaru.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml
@@ -52,7 +52,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Medias/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Medias/Delete.cshtml
index ce197123..f79d6516 100644
--- a/Aaru.Server/Areas/Admin/Views/Medias/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Medias/Delete.cshtml
@@ -58,7 +58,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Mmc/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Mmc/Delete.cshtml
index faf56192..df087c1d 100644
--- a/Aaru.Server/Areas/Admin/Views/Mmc/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Mmc/Delete.cshtml
@@ -41,7 +41,7 @@
     <hr />
     @Html.Raw(Html.EncodedMultiLineText(Modes.PrettifyModePage_2A(Model.ModeSense2AData)))
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml
index 056c2ed1..918cfaf9 100644
--- a/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml
@@ -60,8 +60,7 @@
             <td>
                 @if(item.FeaturesId != null)
                 {
-                    <a asp-action="details" asp-controller="MmcFeatures" asp-route-id="@item.FeaturesId" target="_blank">@Html.DisplayFor(modelItem => item.FeaturesId)</a>
-                }
+                    <a asp-action="details" asp-controller="MmcFeatures" asp-route-id="@item.FeaturesId" target="_blank">@Html.DisplayFor(modelItem => item.FeaturesId)</a>                }
                 else
                 {
                     @Html.DisplayFor(modelItem => item.FeaturesId)
diff --git a/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml
index f6b8ed54..1f10a2d8 100644
--- a/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml
@@ -119,7 +119,7 @@
         }
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Pcmcias/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Pcmcias/Delete.cshtml
index fb99730e..ad8e6765 100644
--- a/Aaru.Server/Areas/Admin/Views/Pcmcias/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Pcmcias/Delete.cshtml
@@ -76,7 +76,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Reports/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Reports/Delete.cshtml
index 003180d7..17510fbd 100644
--- a/Aaru.Server/Areas/Admin/Views/Reports/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Reports/Delete.cshtml
@@ -46,7 +46,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml
index 1319e480..899f4f15 100644
--- a/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml
@@ -53,49 +53,49 @@
 @if(Model.ReadCapabilitiesId != 0)
 {
     <div>
-        <a asp-controller="TestedMedias" asp-action="Details" asp-route-id="@Model.ReadCapabilitiesId" target="_blank">Read capabilities</a>
+        <a asp-action="Details" asp-controller="TestedMedias" asp-route-id="@Model.ReadCapabilitiesId" target="_blank">Read capabilities</a>
     </div>
 }
 @if(Model.Report.ATA != null)
 {
     <div>
-        <a asp-controller="Atas" asp-action="Details" asp-route-id="@Model.Report.ATA.Id" target="_blank">ATA report</a>
+        <a asp-action="Details" asp-controller="Atas" asp-route-id="@Model.Report.ATA.Id" target="_blank">ATA report</a>
     </div>
 }
 @if(Model.Report.ATAPI != null)
 {
     <div>
-        <a asp-controller="Atas" asp-action="Details" asp-route-id="@Model.Report.ATAPI.Id" target="_blank">ATAPI report</a>
+        <a asp-action="Details" asp-controller="Atas" asp-route-id="@Model.Report.ATAPI.Id" target="_blank">ATAPI report</a>
     </div>
 }
 @if(Model.Report.SCSI != null)
 {
     <div>
-        <a asp-controller="Scsis" asp-action="Details" asp-route-id="@Model.Report.SCSI.Id" target="_blank">SCSI report</a>
+        <a asp-action="Details" asp-controller="Scsis" asp-route-id="@Model.Report.SCSI.Id" target="_blank">SCSI report</a>
     </div>
 }
 @if(Model.Report.MultiMediaCard != null)
 {
     <div>
-        <a asp-controller="MmcSds" asp-action="Details" asp-route-id="@Model.Report.MultiMediaCard.Id" target="_blank">MultiMediaCard report</a>
+        <a asp-action="Details" asp-controller="MmcSds" asp-route-id="@Model.Report.MultiMediaCard.Id" target="_blank">MultiMediaCard report</a>
     </div>
 }
 @if(Model.Report.SecureDigital != null)
 {
     <div>
-        <a asp-controller="MmcSds" asp-action="Details" asp-route-id="@Model.Report.SecureDigital.Id" target="_blank">SecureDigital report</a>
+        <a asp-action="Details" asp-controller="MmcSds" asp-route-id="@Model.Report.SecureDigital.Id" target="_blank">SecureDigital report</a>
     </div>
 }
 @if(Model.Report.USB != null)
 {
     <div>
-        <a asp-controller="Usbs" asp-action="Details" asp-route-id="@Model.Report.USB.Id" target="_blank">USB report</a>
+        <a asp-action="Details" asp-controller="Usbs" asp-route-id="@Model.Report.USB.Id" target="_blank">USB report</a>
     </div>
 }
 @if(Model.Report.GdRomSwapDiscCapabilitiesId != null)
 {
     <div>
-        <a asp-controller="GdRomSwapDiscCapabilities" asp-action="Details" asp-route-id="@Model.Report.GdRomSwapDiscCapabilitiesId" target="_blank">GD-ROM swap-trick capabilities report</a>
+        <a asp-action="Details" asp-controller="GdRomSwapDiscCapabilities" asp-route-id="@Model.Report.GdRomSwapDiscCapabilitiesId" target="_blank">GD-ROM swap-trick capabilities report</a>
     </div>
 }
 @if(Model.Report.FireWire != null)
@@ -132,7 +132,7 @@
                     </td>
                     <td>
                         <a asp-action="Details" asp-route-id="@item" class="btn btn-primary" target="_blank">Details</a>
-                        <a asp-action="Merge" asp-route-slave="@item" asp-route-master="@Model.Report.Id" class="btn btn-secondary">Merge</a>
+                        <a asp-action="Merge" asp-route-master="@Model.Report.Id" asp-route-slave="@item" class="btn btn-secondary">Merge</a>
                     </td>
                 </tr>
             }
@@ -162,7 +162,7 @@
                     </td>
                     <td>
                         <a asp-action="Details" asp-route-id="@item" class="btn btn-primary" target="_blank">Details</a>
-                        <a asp-action="Merge" asp-route-slave="@item" asp-route-master="@Model.Report.Id" class="btn btn-secondary">Merge</a>
+                        <a asp-action="Merge" asp-route-master="@Model.Report.Id" asp-route-slave="@item" class="btn btn-secondary">Merge</a>
                     </td>
                 </tr>
             }
@@ -191,8 +191,8 @@
                         @item
                     </td>
                     <td>
-                        <a asp-controller="Devices" asp-action="Details" asp-route-id="@item" class="btn btn-primary" target="_blank">Details</a>
-                        <a asp-controller="Devices" asp-action="MergeReports" asp-route-deviceId="@item" asp-route-reportId="@Model.Report.Id" class="btn btn-secondary">Merge</a>
+                        <a asp-action="Details" asp-controller="Devices" asp-route-id="@item" class="btn btn-primary" target="_blank">Details</a>
+                        <a asp-action="MergeReports" asp-controller="Devices" asp-route-deviceId="@item" asp-route-reportId="@Model.Report.Id" class="btn btn-secondary">Merge</a>
                     </td>
                 </tr>
             }
@@ -221,8 +221,8 @@
                         @item
                     </td>
                     <td>
-                        <a asp-controller="Devices" asp-action="Details" asp-route-id="@item" class="btn btn-primary" target="_blank">Details</a>
-                        <a asp-controller="Devices" asp-action="MergeReports" asp-route-deviceId="@item" asp-route-reportId="@Model.Report.Id" class="btn btn-secondary">Merge</a>
+                        <a asp-action="Details" asp-controller="Devices" asp-route-id="@item" class="btn btn-primary" target="_blank">Details</a>
+                        <a asp-action="MergeReports" asp-controller="Devices" asp-route-deviceId="@item" asp-route-reportId="@Model.Report.Id" class="btn btn-secondary">Merge</a>
                     </td>
                 </tr>
             }
@@ -263,7 +263,7 @@
                         @Html.DisplayFor(modelItem => item.MediumTypeName)
                     </td>
                     <td>
-                        <a asp-controller="TestedMedias" asp-action="Details" asp-route-id="@item.Id" class="btn btn-secondary" target="_blank">Details</a>
+                        <a asp-action="Details" asp-controller="TestedMedias" asp-route-id="@item.Id" class="btn btn-secondary" target="_blank">Details</a>
                     </td>
                 </tr>
             }
@@ -304,7 +304,7 @@
                         @Html.DisplayFor(modelItem => item.MediumTypeName)
                     </td>
                     <td>
-                        <a asp-controller="TestedSequentialMedias" asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger" target="_blank">Delete</a>
+                        <a asp-action="Delete" asp-controller="TestedSequentialMedias" asp-route-id="@item.Id" class="btn btn-danger" target="_blank">Delete</a>
                     </td>
                 </tr>
             }
diff --git a/Aaru.Server/Areas/Admin/Views/Reports/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/Reports/Edit.cshtml
index 255ef889..320aa9df 100644
--- a/Aaru.Server/Areas/Admin/Views/Reports/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Reports/Edit.cshtml
@@ -10,7 +10,7 @@
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <input asp-for="Id" type="hidden" />
             <div class="form-group">
                 <label asp-for="Manufacturer" class="control-label"></label>
                 <input asp-for="Manufacturer" class="form-control" />
@@ -28,12 +28,12 @@
             </div>
             <div class="form-check form-group">
                 <label class="form-check-label">
-                    <input class="form-check-input" asp-for="CompactFlash" /> @Html.DisplayNameFor(model => model.CompactFlash)
+                    <input asp-for="CompactFlash" class="form-check-input" /> @Html.DisplayNameFor(model => model.CompactFlash)
                 </label>
             </div>
             <div class="form-group">
                 <label asp-for="Type" class="control-label"></label>
-                <select asp-for="Type" class="form-control" asp-items="Html.GetEnumSelectList<DeviceType>()"></select>
+                <select asp-for="Type" asp-items="Html.GetEnumSelectList<DeviceType>()" class="form-control"></select>
                 <span asp-validation-for="Type" class="text-danger"></span>
             </div>
             <div class="form-group">
diff --git a/Aaru.Server/Areas/Admin/Views/ScsiModes/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/ScsiModes/Delete.cshtml
index c606bc9e..ecef1071 100644
--- a/Aaru.Server/Areas/Admin/Views/ScsiModes/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/ScsiModes/Delete.cshtml
@@ -76,7 +76,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/ScsiPages/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/ScsiPages/Delete.cshtml
index bb6be3c9..cb800267 100644
--- a/Aaru.Server/Areas/Admin/Views/ScsiPages/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/ScsiPages/Delete.cshtml
@@ -58,7 +58,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml
index d424719f..2241e030 100644
--- a/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml
@@ -24,7 +24,7 @@
 <div>
     Do you want to remove the duplicates?
     <form asp-action="Consolidate" enctype="multipart/form-data">
-        <input type="hidden" asp-for="Json" name="models" />
+        <input asp-for="Json" name="models" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Consolidate" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Delete.cshtml
index 6706eff9..52b9437d 100644
--- a/Aaru.Server/Areas/Admin/Views/Scsis/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Scsis/Delete.cshtml
@@ -41,7 +41,7 @@
     <hr />
     @Html.Raw(Html.EncodedMultiLineText(Inquiry.Prettify(Model.InquiryData)))
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Details.cshtml
index 66def873..73f18c5b 100644
--- a/Aaru.Server/Areas/Admin/Views/Scsis/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Scsis/Details.cshtml
@@ -42,7 +42,7 @@
 </div>
 <div>
     <form asp-action="Compare">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         Compare to:
         <input name="RightId" type="number" />
         <a asp-action="Index" class="btn btn-secondary">Back to List</a>
diff --git a/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml b/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml
index 993142a8..9f4b8e5a 100644
--- a/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml
@@ -82,7 +82,7 @@
     {
         <div>
             <a asp-area="Identity" asp-page="/Account/Manage/Index" class="text-dark" id="manage" title="Manage">Hello @UserManager.GetUserName(User)!</a>
-            <form id="logoutForm" class="form-inline" asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Action("Index", "Home", new { area = "" })">
+            <form asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Action("Index", "Home", new { area = "" })" class="form-inline" id="logoutForm">
                 <button class="btn btn-link text-dark" id="logout" type="submit">Logout</button>
             </form>
         </div>
diff --git a/Aaru.Server/Areas/Admin/Views/Shared/_LoginPartial.cshtml b/Aaru.Server/Areas/Admin/Views/Shared/_LoginPartial.cshtml
index d6cb78b8..f234f783 100644
--- a/Aaru.Server/Areas/Admin/Views/Shared/_LoginPartial.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Shared/_LoginPartial.cshtml
@@ -8,7 +8,7 @@
             <a asp-area="Identity" asp-page="/Account/Manage/Index" class="nav-link text-dark" id="manage" title="Manage">Hello @UserManager.GetUserName(User)!</a>
         </li>
         <li class="nav-item">
-            <form id="logoutForm" class="form-inline" asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Action("Index", "Home", new { area = "" })">
+            <form asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Action("Index", "Home", new { area = "" })" class="form-inline" id="logoutForm">
                 <button class="btn btn-link nav-link text-dark" id="logout" type="submit">Logout</button>
             </form>
         </li>
diff --git a/Aaru.Server/Areas/Admin/Views/Sscs/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Sscs/Consolidate.cshtml
index 061e9240..f1808731 100644
--- a/Aaru.Server/Areas/Admin/Views/Sscs/Consolidate.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Sscs/Consolidate.cshtml
@@ -42,7 +42,7 @@
 <div>
     Do you want to remove the duplicates?
     <form asp-action="Consolidate" enctype="multipart/form-data">
-        <input type="hidden" asp-for="Json" name="models" />
+        <input asp-for="Json" name="models" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Consolidate" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Sscs/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Sscs/Delete.cshtml
index f2ac7bd8..e329e7bf 100644
--- a/Aaru.Server/Areas/Admin/Views/Sscs/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Sscs/Delete.cshtml
@@ -58,7 +58,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/SupportedDensities/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/SupportedDensities/Delete.cshtml
index 00e246a5..017bb890 100644
--- a/Aaru.Server/Areas/Admin/Views/SupportedDensities/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/SupportedDensities/Delete.cshtml
@@ -112,7 +112,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml
index 3b828eb1..4f8d6537 100644
--- a/Aaru.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml
@@ -44,8 +44,7 @@
 <dd class="col-sm-10">
     @if(Model.IdentifyData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.IdentifyData)">@Model.IdentifyData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.IdentifyData)" asp-route-id="@Model.Id" target="_blank">@Model.IdentifyData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -419,8 +418,7 @@
 <dd class="col-sm-10">
     @if(Model.ModeSense6Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ModeSense6Data)">@Model.ModeSense6Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ModeSense6Data)" asp-route-id="@Model.Id" target="_blank">@Model.ModeSense6Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -432,8 +430,7 @@
 <dd class="col-sm-10">
     @if(Model.ModeSense10Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ModeSense10Data)">@Model.ModeSense10Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ModeSense10Data)" asp-route-id="@Model.Id" target="_blank">@Model.ModeSense10Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -609,8 +606,7 @@
 <dd class="col-sm-10">
     @if(Model.IntersessionLeadInData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.IntersessionLeadInData)">@Model.IntersessionLeadInData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.IntersessionLeadInData)" asp-route-id="@Model.Id" target="_blank">@Model.IntersessionLeadInData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -622,8 +618,7 @@
 <dd class="col-sm-10">
     @if(Model.IntersessionLeadOutData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.IntersessionLeadOutData)">@Model.IntersessionLeadOutData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.IntersessionLeadOutData)" asp-route-id="@Model.Id" target="_blank">@Model.IntersessionLeadOutData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -635,8 +630,7 @@
 <dd class="col-sm-10">
     @if(Model.Read6Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Read6Data)">@Model.Read6Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.Read6Data)" asp-route-id="@Model.Id" target="_blank">@Model.Read6Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -648,8 +642,7 @@
 <dd class="col-sm-10">
     @if(Model.Read10Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Read10Data)">@Model.Read10Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.Read10Data)" asp-route-id="@Model.Id" target="_blank">@Model.Read10Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -661,8 +654,7 @@
 <dd class="col-sm-10">
     @if(Model.Read12Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Read12Data)">@Model.Read12Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.Read12Data)" asp-route-id="@Model.Id" target="_blank">@Model.Read12Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -674,8 +666,7 @@
 <dd class="col-sm-10">
     @if(Model.Read16Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Read16Data)">@Model.Read16Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.Read16Data)" asp-route-id="@Model.Id" target="_blank">@Model.Read16Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -687,8 +678,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLong10Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLong10Data)">@Model.ReadLong10Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLong10Data)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLong10Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -700,8 +690,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLong16Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLong16Data)">@Model.ReadLong16Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLong16Data)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLong16Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -713,8 +702,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadSectorsData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadSectorsData)">@Model.ReadSectorsData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadSectorsData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadSectorsData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -726,8 +714,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadSectorsRetryData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadSectorsRetryData)">@Model.ReadSectorsRetryData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadSectorsRetryData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadSectorsRetryData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -739,8 +726,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadDmaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadDmaData)">@Model.ReadDmaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadDmaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadDmaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -752,8 +738,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadDmaRetryData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadDmaRetryData)">@Model.ReadDmaRetryData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadDmaRetryData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadDmaRetryData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -765,8 +750,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLbaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLbaData)">@Model.ReadLbaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLbaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLbaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -778,8 +762,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadRetryLbaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadRetryLbaData)">@Model.ReadRetryLbaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadRetryLbaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadRetryLbaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -791,8 +774,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadDmaLbaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadDmaLbaData)">@Model.ReadDmaLbaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadDmaLbaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadDmaLbaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -804,8 +786,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadDmaRetryLbaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadDmaRetryLbaData)">@Model.ReadDmaRetryLbaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadDmaRetryLbaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadDmaRetryLbaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -817,8 +798,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLba48Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLba48Data)">@Model.ReadLba48Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLba48Data)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLba48Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -830,8 +810,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadDmaLba48Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadDmaLba48Data)">@Model.ReadDmaLba48Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadDmaLba48Data)" asp-route-id="@Model.Id" target="_blank">@Model.ReadDmaLba48Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -843,8 +822,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLongData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLongData)">@Model.ReadLongData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLongData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLongData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -856,8 +834,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLongRetryData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLongRetryData)">@Model.ReadLongRetryData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLongRetryData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLongRetryData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -869,8 +846,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLongLbaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLongLbaData)">@Model.ReadLongLbaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLongLbaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLongLbaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -882,8 +858,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLongRetryLbaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLongRetryLbaData)">@Model.ReadLongRetryLbaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLongRetryLbaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLongRetryLbaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -895,8 +870,7 @@
 <dd class="col-sm-10">
     @if(Model.TocData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.TocData)">@Model.TocData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.TocData)" asp-route-id="@Model.Id" target="_blank">@Model.TocData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -908,8 +882,7 @@
 <dd class="col-sm-10">
     @if(Model.FullTocData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.FullTocData)">@Model.FullTocData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.FullTocData)" asp-route-id="@Model.Id" target="_blank">@Model.FullTocData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -921,8 +894,7 @@
 <dd class="col-sm-10">
     @if(Model.AtipData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.AtipData)">@Model.AtipData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.AtipData)" asp-route-id="@Model.Id" target="_blank">@Model.AtipData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -934,8 +906,7 @@
 <dd class="col-sm-10">
     @if(Model.PmaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PmaData)">@Model.PmaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PmaData)" asp-route-id="@Model.Id" target="_blank">@Model.PmaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -947,8 +918,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadCdData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadCdData)">@Model.ReadCdData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadCdData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadCdData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -960,8 +930,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadCdMsfData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadCdMsfData)">@Model.ReadCdMsfData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadCdMsfData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadCdMsfData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -973,8 +942,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadCdFullData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadCdFullData)">@Model.ReadCdFullData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadCdFullData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadCdFullData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -986,8 +954,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadCdMsfFullData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadCdMsfFullData)">@Model.ReadCdMsfFullData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadCdMsfFullData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadCdMsfFullData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -999,8 +966,7 @@
 <dd class="col-sm-10">
     @if(Model.Track1PregapData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Track1PregapData)">@Model.Track1PregapData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.Track1PregapData)" asp-route-id="@Model.Id" target="_blank">@Model.Track1PregapData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1012,8 +978,7 @@
 <dd class="col-sm-10">
     @if(Model.LeadInData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.LeadInData)">@Model.LeadInData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.LeadInData)" asp-route-id="@Model.Id" target="_blank">@Model.LeadInData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1025,8 +990,7 @@
 <dd class="col-sm-10">
     @if(Model.LeadOutData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.LeadOutData)">@Model.LeadOutData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.LeadOutData)" asp-route-id="@Model.Id" target="_blank">@Model.LeadOutData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1038,8 +1002,7 @@
 <dd class="col-sm-10">
     @if(Model.C2PointersData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.C2PointersData)">@Model.C2PointersData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.C2PointersData)" asp-route-id="@Model.Id" target="_blank">@Model.C2PointersData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1051,8 +1014,7 @@
 <dd class="col-sm-10">
     @if(Model.PQSubchannelData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PQSubchannelData)">@Model.PQSubchannelData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PQSubchannelData)" asp-route-id="@Model.Id" target="_blank">@Model.PQSubchannelData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1064,8 +1026,7 @@
 <dd class="col-sm-10">
     @if(Model.RWSubchannelData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.RWSubchannelData)">@Model.RWSubchannelData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.RWSubchannelData)" asp-route-id="@Model.Id" target="_blank">@Model.RWSubchannelData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1077,8 +1038,7 @@
 <dd class="col-sm-10">
     @if(Model.CorrectedSubchannelData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.CorrectedSubchannelData)">@Model.CorrectedSubchannelData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.CorrectedSubchannelData)" asp-route-id="@Model.Id" target="_blank">@Model.CorrectedSubchannelData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1090,8 +1050,7 @@
 <dd class="col-sm-10">
     @if(Model.PQSubchannelWithC2Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PQSubchannelWithC2Data)">@Model.PQSubchannelWithC2Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PQSubchannelWithC2Data)" asp-route-id="@Model.Id" target="_blank">@Model.PQSubchannelWithC2Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1103,8 +1062,7 @@
 <dd class="col-sm-10">
     @if(Model.RWSubchannelWithC2Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.RWSubchannelWithC2Data)">@Model.RWSubchannelWithC2Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.RWSubchannelWithC2Data)" asp-route-id="@Model.Id" target="_blank">@Model.RWSubchannelWithC2Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1116,8 +1074,7 @@
 <dd class="col-sm-10">
     @if(Model.CorrectedSubchannelWithC2Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.CorrectedSubchannelWithC2Data)">@Model.CorrectedSubchannelWithC2Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.CorrectedSubchannelWithC2Data)" asp-route-id="@Model.Id" target="_blank">@Model.CorrectedSubchannelWithC2Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1129,8 +1086,7 @@
 <dd class="col-sm-10">
     @if(Model.PfiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PfiData)">@Model.PfiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PfiData)" asp-route-id="@Model.Id" target="_blank">@Model.PfiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1142,8 +1098,7 @@
 <dd class="col-sm-10">
     @if(Model.DmiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DmiData)">@Model.DmiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DmiData)" asp-route-id="@Model.Id" target="_blank">@Model.DmiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1155,8 +1110,7 @@
 <dd class="col-sm-10">
     @if(Model.CmiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.CmiData)">@Model.CmiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.CmiData)" asp-route-id="@Model.Id" target="_blank">@Model.CmiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1168,8 +1122,7 @@
 <dd class="col-sm-10">
     @if(Model.DvdBcaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DvdBcaData)">@Model.DvdBcaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DvdBcaData)" asp-route-id="@Model.Id" target="_blank">@Model.DvdBcaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1181,8 +1134,7 @@
 <dd class="col-sm-10">
     @if(Model.DvdAacsData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DvdAacsData)">@Model.DvdAacsData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DvdAacsData)" asp-route-id="@Model.Id" target="_blank">@Model.DvdAacsData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1194,8 +1146,7 @@
 <dd class="col-sm-10">
     @if(Model.DvdDdsData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DvdDdsData)">@Model.DvdDdsData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DvdDdsData)" asp-route-id="@Model.Id" target="_blank">@Model.DvdDdsData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1207,8 +1158,7 @@
 <dd class="col-sm-10">
     @if(Model.DvdSaiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DvdSaiData)">@Model.DvdSaiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DvdSaiData)" asp-route-id="@Model.Id" target="_blank">@Model.DvdSaiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1220,8 +1170,7 @@
 <dd class="col-sm-10">
     @if(Model.PriData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PriData)">@Model.PriData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PriData)" asp-route-id="@Model.Id" target="_blank">@Model.PriData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1233,8 +1182,7 @@
 <dd class="col-sm-10">
     @if(Model.EmbossedPfiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.EmbossedPfiData)">@Model.EmbossedPfiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.EmbossedPfiData)" asp-route-id="@Model.Id" target="_blank">@Model.EmbossedPfiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1246,8 +1194,7 @@
 <dd class="col-sm-10">
     @if(Model.AdipData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.AdipData)">@Model.AdipData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.AdipData)" asp-route-id="@Model.Id" target="_blank">@Model.AdipData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1259,8 +1206,7 @@
 <dd class="col-sm-10">
     @if(Model.DcbData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DcbData)">@Model.DcbData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DcbData)" asp-route-id="@Model.Id" target="_blank">@Model.DcbData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1272,8 +1218,7 @@
 <dd class="col-sm-10">
     @if(Model.HdCmiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.HdCmiData)">@Model.HdCmiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.HdCmiData)" asp-route-id="@Model.Id" target="_blank">@Model.HdCmiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1285,8 +1230,7 @@
 <dd class="col-sm-10">
     @if(Model.DvdLayerData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DvdLayerData)">@Model.DvdLayerData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DvdLayerData)" asp-route-id="@Model.Id" target="_blank">@Model.DvdLayerData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1298,8 +1242,7 @@
 <dd class="col-sm-10">
     @if(Model.BluBcaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.BluBcaData)">@Model.BluBcaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.BluBcaData)" asp-route-id="@Model.Id" target="_blank">@Model.BluBcaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1311,8 +1254,7 @@
 <dd class="col-sm-10">
     @if(Model.BluDdsData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.BluDdsData)">@Model.BluDdsData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.BluDdsData)" asp-route-id="@Model.Id" target="_blank">@Model.BluDdsData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1324,8 +1266,7 @@
 <dd class="col-sm-10">
     @if(Model.BluSaiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.BluSaiData)">@Model.BluSaiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.BluSaiData)" asp-route-id="@Model.Id" target="_blank">@Model.BluSaiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1337,8 +1278,7 @@
 <dd class="col-sm-10">
     @if(Model.BluDiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.BluDiData)">@Model.BluDiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.BluDiData)" asp-route-id="@Model.Id" target="_blank">@Model.BluDiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1350,8 +1290,7 @@
 <dd class="col-sm-10">
     @if(Model.PlextorReadCddaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PlextorReadCddaData)">@Model.PlextorReadCddaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PlextorReadCddaData)" asp-route-id="@Model.Id" target="_blank">@Model.PlextorReadCddaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1363,8 +1302,7 @@
 <dd class="col-sm-10">
     @if(Model.PlextorReadCddaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PlextorReadCddaData)">@Model.PlextorReadCddaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PlextorReadCddaData)" asp-route-id="@Model.Id" target="_blank">@Model.PlextorReadCddaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1376,8 +1314,7 @@
 <dd class="col-sm-10">
     @if(Model.PioneerReadCddaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PioneerReadCddaData)">@Model.PioneerReadCddaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PioneerReadCddaData)" asp-route-id="@Model.Id" target="_blank">@Model.PioneerReadCddaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1389,8 +1326,7 @@
 <dd class="col-sm-10">
     @if(Model.PioneerReadCddaMsfData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PioneerReadCddaMsfData)">@Model.PioneerReadCddaMsfData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PioneerReadCddaMsfData)" asp-route-id="@Model.Id" target="_blank">@Model.PioneerReadCddaMsfData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1402,8 +1338,7 @@
 <dd class="col-sm-10">
     @if(Model.NecReadCddaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.NecReadCddaData)">@Model.NecReadCddaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.NecReadCddaData)" asp-route-id="@Model.Id" target="_blank">@Model.NecReadCddaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1415,8 +1350,7 @@
 <dd class="col-sm-10">
     @if(Model.PlextorReadRawDVDData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PlextorReadRawDVDData)">@Model.PlextorReadRawDVDData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PlextorReadRawDVDData)" asp-route-id="@Model.Id" target="_blank">@Model.PlextorReadRawDVDData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1428,8 +1362,7 @@
 <dd class="col-sm-10">
     @if(Model.HLDTSTReadRawDVDData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.HLDTSTReadRawDVDData)">@Model.HLDTSTReadRawDVDData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.HLDTSTReadRawDVDData)" asp-route-id="@Model.Id" target="_blank">@Model.HLDTSTReadRawDVDData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1447,8 +1380,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadCdScrambledData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadCdScrambledData)">@Model.ReadCdScrambledData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadCdScrambledData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadCdScrambledData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1466,8 +1398,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadF1_06Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadF1_06Data)">@Model.ReadF1_06Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadF1_06Data)" asp-route-id="@Model.Id" target="_blank">@Model.ReadF1_06Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1485,8 +1416,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadF1_06LeadOutData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadF1_06LeadOutData)">@Model.ReadF1_06Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadF1_06LeadOutData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadF1_06Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1494,7 +1424,7 @@
 </dd>
 </dl>
 <form asp-action="Delete">
-    <input type="hidden" asp-for="Id" />
+    <input asp-for="Id" type="hidden" />
     <a asp-action="Index" class="btn btn-primary">Back to List</a>
     <input class="btn btn-danger" type="submit" value="Delete" />
 </form>
diff --git a/Aaru.Server/Areas/Admin/Views/TestedMedias/Details.cshtml b/Aaru.Server/Areas/Admin/Views/TestedMedias/Details.cshtml
index 13b61522..99e8b4be 100644
--- a/Aaru.Server/Areas/Admin/Views/TestedMedias/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/TestedMedias/Details.cshtml
@@ -43,8 +43,7 @@
 <dd class="col-sm-10">
     @if(Model.IdentifyData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.IdentifyData)">@Model.IdentifyData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.IdentifyData)" asp-route-id="@Model.Id" target="_blank">@Model.IdentifyData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -418,8 +417,7 @@
 <dd class="col-sm-10">
     @if(Model.ModeSense6Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ModeSense6Data)">@Model.ModeSense6Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ModeSense6Data)" asp-route-id="@Model.Id" target="_blank">@Model.ModeSense6Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -431,8 +429,7 @@
 <dd class="col-sm-10">
     @if(Model.ModeSense10Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ModeSense10Data)">@Model.ModeSense10Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ModeSense10Data)" asp-route-id="@Model.Id" target="_blank">@Model.ModeSense10Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -608,8 +605,7 @@
 <dd class="col-sm-10">
     @if(Model.IntersessionLeadInData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.IntersessionLeadInData)">@Model.IntersessionLeadInData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.IntersessionLeadInData)" asp-route-id="@Model.Id" target="_blank">@Model.IntersessionLeadInData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -621,8 +617,7 @@
 <dd class="col-sm-10">
     @if(Model.IntersessionLeadOutData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.IntersessionLeadOutData)">@Model.IntersessionLeadOutData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.IntersessionLeadOutData)" asp-route-id="@Model.Id" target="_blank">@Model.IntersessionLeadOutData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -634,8 +629,7 @@
 <dd class="col-sm-10">
     @if(Model.Read6Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Read6Data)">@Model.Read6Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.Read6Data)" asp-route-id="@Model.Id" target="_blank">@Model.Read6Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -647,8 +641,7 @@
 <dd class="col-sm-10">
     @if(Model.Read10Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Read10Data)">@Model.Read10Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.Read10Data)" asp-route-id="@Model.Id" target="_blank">@Model.Read10Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -660,8 +653,7 @@
 <dd class="col-sm-10">
     @if(Model.Read12Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Read12Data)">@Model.Read12Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.Read12Data)" asp-route-id="@Model.Id" target="_blank">@Model.Read12Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -673,8 +665,7 @@
 <dd class="col-sm-10">
     @if(Model.Read16Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Read16Data)">@Model.Read16Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.Read16Data)" asp-route-id="@Model.Id" target="_blank">@Model.Read16Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -686,8 +677,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLong10Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLong10Data)">@Model.ReadLong10Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLong10Data)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLong10Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -699,8 +689,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLong16Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLong16Data)">@Model.ReadLong16Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLong16Data)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLong16Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -712,8 +701,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadSectorsData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadSectorsData)">@Model.ReadSectorsData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadSectorsData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadSectorsData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -725,8 +713,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadSectorsRetryData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadSectorsRetryData)">@Model.ReadSectorsRetryData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadSectorsRetryData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadSectorsRetryData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -738,8 +725,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadDmaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadDmaData)">@Model.ReadDmaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadDmaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadDmaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -751,8 +737,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadDmaRetryData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadDmaRetryData)">@Model.ReadDmaRetryData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadDmaRetryData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadDmaRetryData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -764,8 +749,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLbaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLbaData)">@Model.ReadLbaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLbaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLbaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -777,8 +761,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadRetryLbaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadRetryLbaData)">@Model.ReadRetryLbaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadRetryLbaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadRetryLbaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -790,8 +773,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadDmaLbaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadDmaLbaData)">@Model.ReadDmaLbaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadDmaLbaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadDmaLbaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -803,8 +785,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadDmaRetryLbaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadDmaRetryLbaData)">@Model.ReadDmaRetryLbaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadDmaRetryLbaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadDmaRetryLbaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -816,8 +797,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLba48Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLba48Data)">@Model.ReadLba48Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLba48Data)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLba48Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -829,8 +809,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadDmaLba48Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadDmaLba48Data)">@Model.ReadDmaLba48Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadDmaLba48Data)" asp-route-id="@Model.Id" target="_blank">@Model.ReadDmaLba48Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -842,8 +821,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLongData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLongData)">@Model.ReadLongData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLongData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLongData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -855,8 +833,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLongRetryData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLongRetryData)">@Model.ReadLongRetryData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLongRetryData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLongRetryData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -868,8 +845,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLongLbaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLongLbaData)">@Model.ReadLongLbaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLongLbaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLongLbaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -881,8 +857,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadLongRetryLbaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadLongRetryLbaData)">@Model.ReadLongRetryLbaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadLongRetryLbaData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadLongRetryLbaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -894,8 +869,7 @@
 <dd class="col-sm-10">
     @if(Model.TocData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.TocData)">@Model.TocData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.TocData)" asp-route-id="@Model.Id" target="_blank">@Model.TocData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -907,8 +881,7 @@
 <dd class="col-sm-10">
     @if(Model.FullTocData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.FullTocData)">@Model.FullTocData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.FullTocData)" asp-route-id="@Model.Id" target="_blank">@Model.FullTocData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -920,8 +893,7 @@
 <dd class="col-sm-10">
     @if(Model.AtipData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.AtipData)">@Model.AtipData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.AtipData)" asp-route-id="@Model.Id" target="_blank">@Model.AtipData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -933,8 +905,7 @@
 <dd class="col-sm-10">
     @if(Model.PmaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PmaData)">@Model.PmaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PmaData)" asp-route-id="@Model.Id" target="_blank">@Model.PmaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -946,8 +917,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadCdData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadCdData)">@Model.ReadCdData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadCdData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadCdData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -959,8 +929,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadCdMsfData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadCdMsfData)">@Model.ReadCdMsfData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadCdMsfData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadCdMsfData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -972,8 +941,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadCdFullData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadCdFullData)">@Model.ReadCdFullData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadCdFullData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadCdFullData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -985,8 +953,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadCdMsfFullData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadCdMsfFullData)">@Model.ReadCdMsfFullData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadCdMsfFullData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadCdMsfFullData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -998,8 +965,7 @@
 <dd class="col-sm-10">
     @if(Model.Track1PregapData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.Track1PregapData)">@Model.Track1PregapData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.Track1PregapData)" asp-route-id="@Model.Id" target="_blank">@Model.Track1PregapData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1011,8 +977,7 @@
 <dd class="col-sm-10">
     @if(Model.LeadInData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.LeadInData)">@Model.LeadInData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.LeadInData)" asp-route-id="@Model.Id" target="_blank">@Model.LeadInData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1024,8 +989,7 @@
 <dd class="col-sm-10">
     @if(Model.LeadOutData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.LeadOutData)">@Model.LeadOutData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.LeadOutData)" asp-route-id="@Model.Id" target="_blank">@Model.LeadOutData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1037,8 +1001,7 @@
 <dd class="col-sm-10">
     @if(Model.C2PointersData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.C2PointersData)">@Model.C2PointersData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.C2PointersData)" asp-route-id="@Model.Id" target="_blank">@Model.C2PointersData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1050,8 +1013,7 @@
 <dd class="col-sm-10">
     @if(Model.PQSubchannelData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PQSubchannelData)">@Model.PQSubchannelData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PQSubchannelData)" asp-route-id="@Model.Id" target="_blank">@Model.PQSubchannelData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1063,8 +1025,7 @@
 <dd class="col-sm-10">
     @if(Model.RWSubchannelData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.RWSubchannelData)">@Model.RWSubchannelData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.RWSubchannelData)" asp-route-id="@Model.Id" target="_blank">@Model.RWSubchannelData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1076,8 +1037,7 @@
 <dd class="col-sm-10">
     @if(Model.CorrectedSubchannelData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.CorrectedSubchannelData)">@Model.CorrectedSubchannelData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.CorrectedSubchannelData)" asp-route-id="@Model.Id" target="_blank">@Model.CorrectedSubchannelData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1089,8 +1049,7 @@
 <dd class="col-sm-10">
     @if(Model.PQSubchannelWithC2Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PQSubchannelWithC2Data)">@Model.PQSubchannelWithC2Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PQSubchannelWithC2Data)" asp-route-id="@Model.Id" target="_blank">@Model.PQSubchannelWithC2Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1102,8 +1061,7 @@
 <dd class="col-sm-10">
     @if(Model.RWSubchannelWithC2Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.RWSubchannelWithC2Data)">@Model.RWSubchannelWithC2Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.RWSubchannelWithC2Data)" asp-route-id="@Model.Id" target="_blank">@Model.RWSubchannelWithC2Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1115,8 +1073,7 @@
 <dd class="col-sm-10">
     @if(Model.CorrectedSubchannelWithC2Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.CorrectedSubchannelWithC2Data)">@Model.CorrectedSubchannelWithC2Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.CorrectedSubchannelWithC2Data)" asp-route-id="@Model.Id" target="_blank">@Model.CorrectedSubchannelWithC2Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1128,8 +1085,7 @@
 <dd class="col-sm-10">
     @if(Model.PfiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PfiData)">@Model.PfiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PfiData)" asp-route-id="@Model.Id" target="_blank">@Model.PfiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1141,8 +1097,7 @@
 <dd class="col-sm-10">
     @if(Model.DmiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DmiData)">@Model.DmiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DmiData)" asp-route-id="@Model.Id" target="_blank">@Model.DmiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1154,8 +1109,7 @@
 <dd class="col-sm-10">
     @if(Model.CmiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.CmiData)">@Model.CmiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.CmiData)" asp-route-id="@Model.Id" target="_blank">@Model.CmiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1167,8 +1121,7 @@
 <dd class="col-sm-10">
     @if(Model.DvdBcaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DvdBcaData)">@Model.DvdBcaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DvdBcaData)" asp-route-id="@Model.Id" target="_blank">@Model.DvdBcaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1180,8 +1133,7 @@
 <dd class="col-sm-10">
     @if(Model.DvdAacsData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DvdAacsData)">@Model.DvdAacsData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DvdAacsData)" asp-route-id="@Model.Id" target="_blank">@Model.DvdAacsData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1193,8 +1145,7 @@
 <dd class="col-sm-10">
     @if(Model.DvdDdsData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DvdDdsData)">@Model.DvdDdsData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DvdDdsData)" asp-route-id="@Model.Id" target="_blank">@Model.DvdDdsData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1206,8 +1157,7 @@
 <dd class="col-sm-10">
     @if(Model.DvdSaiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DvdSaiData)">@Model.DvdSaiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DvdSaiData)" asp-route-id="@Model.Id" target="_blank">@Model.DvdSaiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1219,8 +1169,7 @@
 <dd class="col-sm-10">
     @if(Model.PriData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PriData)">@Model.PriData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PriData)" asp-route-id="@Model.Id" target="_blank">@Model.PriData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1232,8 +1181,7 @@
 <dd class="col-sm-10">
     @if(Model.EmbossedPfiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.EmbossedPfiData)">@Model.EmbossedPfiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.EmbossedPfiData)" asp-route-id="@Model.Id" target="_blank">@Model.EmbossedPfiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1245,8 +1193,7 @@
 <dd class="col-sm-10">
     @if(Model.AdipData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.AdipData)">@Model.AdipData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.AdipData)" asp-route-id="@Model.Id" target="_blank">@Model.AdipData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1258,8 +1205,7 @@
 <dd class="col-sm-10">
     @if(Model.DcbData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DcbData)">@Model.DcbData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DcbData)" asp-route-id="@Model.Id" target="_blank">@Model.DcbData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1271,8 +1217,7 @@
 <dd class="col-sm-10">
     @if(Model.HdCmiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.HdCmiData)">@Model.HdCmiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.HdCmiData)" asp-route-id="@Model.Id" target="_blank">@Model.HdCmiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1284,8 +1229,7 @@
 <dd class="col-sm-10">
     @if(Model.DvdLayerData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.DvdLayerData)">@Model.DvdLayerData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.DvdLayerData)" asp-route-id="@Model.Id" target="_blank">@Model.DvdLayerData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1297,8 +1241,7 @@
 <dd class="col-sm-10">
     @if(Model.BluBcaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.BluBcaData)">@Model.BluBcaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.BluBcaData)" asp-route-id="@Model.Id" target="_blank">@Model.BluBcaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1310,8 +1253,7 @@
 <dd class="col-sm-10">
     @if(Model.BluDdsData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.BluDdsData)">@Model.BluDdsData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.BluDdsData)" asp-route-id="@Model.Id" target="_blank">@Model.BluDdsData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1323,8 +1265,7 @@
 <dd class="col-sm-10">
     @if(Model.BluSaiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.BluSaiData)">@Model.BluSaiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.BluSaiData)" asp-route-id="@Model.Id" target="_blank">@Model.BluSaiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1336,8 +1277,7 @@
 <dd class="col-sm-10">
     @if(Model.BluDiData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.BluDiData)">@Model.BluDiData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.BluDiData)" asp-route-id="@Model.Id" target="_blank">@Model.BluDiData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1349,8 +1289,7 @@
 <dd class="col-sm-10">
     @if(Model.PlextorReadCddaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PlextorReadCddaData)">@Model.PlextorReadCddaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PlextorReadCddaData)" asp-route-id="@Model.Id" target="_blank">@Model.PlextorReadCddaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1362,8 +1301,7 @@
 <dd class="col-sm-10">
     @if(Model.PlextorReadCddaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PlextorReadCddaData)">@Model.PlextorReadCddaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PlextorReadCddaData)" asp-route-id="@Model.Id" target="_blank">@Model.PlextorReadCddaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1375,8 +1313,7 @@
 <dd class="col-sm-10">
     @if(Model.PioneerReadCddaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PioneerReadCddaData)">@Model.PioneerReadCddaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PioneerReadCddaData)" asp-route-id="@Model.Id" target="_blank">@Model.PioneerReadCddaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1388,8 +1325,7 @@
 <dd class="col-sm-10">
     @if(Model.PioneerReadCddaMsfData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PioneerReadCddaMsfData)">@Model.PioneerReadCddaMsfData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PioneerReadCddaMsfData)" asp-route-id="@Model.Id" target="_blank">@Model.PioneerReadCddaMsfData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1401,8 +1337,7 @@
 <dd class="col-sm-10">
     @if(Model.NecReadCddaData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.NecReadCddaData)">@Model.NecReadCddaData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.NecReadCddaData)" asp-route-id="@Model.Id" target="_blank">@Model.NecReadCddaData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1414,8 +1349,7 @@
 <dd class="col-sm-10">
     @if(Model.PlextorReadRawDVDData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.PlextorReadRawDVDData)">@Model.PlextorReadRawDVDData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.PlextorReadRawDVDData)" asp-route-id="@Model.Id" target="_blank">@Model.PlextorReadRawDVDData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1427,8 +1361,7 @@
 <dd class="col-sm-10">
     @if(Model.HLDTSTReadRawDVDData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.HLDTSTReadRawDVDData)">@Model.HLDTSTReadRawDVDData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.HLDTSTReadRawDVDData)" asp-route-id="@Model.Id" target="_blank">@Model.HLDTSTReadRawDVDData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1446,8 +1379,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadCdScrambledData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadCdScrambledData)">@Model.ReadCdScrambledData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadCdScrambledData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadCdScrambledData.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1465,8 +1397,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadF1_06Data != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadF1_06Data)">@Model.ReadF1_06Data.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadF1_06Data)" asp-route-id="@Model.Id" target="_blank">@Model.ReadF1_06Data.Length bytes</a>    }
     else
     {
         @("<null>")
@@ -1484,8 +1415,7 @@
 <dd class="col-sm-10">
     @if(Model.ReadF1_06LeadOutData != null)
     {
-        <a asp-action="ViewData" target="_blank" asp-route-id="@Model.Id" asp-route-data="@nameof(Model.ReadF1_06LeadOutData)">@Model.ReadF1_06LeadOutData.Length bytes</a>
-    }
+        <a asp-action="ViewData" asp-route-data="@nameof(Model.ReadF1_06LeadOutData)" asp-route-id="@Model.Id" target="_blank">@Model.ReadF1_06LeadOutData.Length bytes</a>    }
     else
     {
         @("<null>")
diff --git a/Aaru.Server/Areas/Admin/Views/TestedMedias/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/TestedMedias/Edit.cshtml
index 228d3f77..ec518f99 100644
--- a/Aaru.Server/Areas/Admin/Views/TestedMedias/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/TestedMedias/Edit.cshtml
@@ -39,7 +39,7 @@
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <input asp-for="Id" type="hidden" />
             <div class="form-group">
                 <label asp-for="Blocks" class="control-label"></label>
                 <input asp-for="Blocks" class="form-control" />
diff --git a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml
index 86e9fe85..3e1682ff 100644
--- a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml
@@ -82,7 +82,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml
index c861f2bf..663c7967 100644
--- a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml
@@ -39,7 +39,7 @@
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <input asp-for="Id" type="hidden" />
             <div class="form-group">
                 <label asp-for="Manufacturer" class="control-label"></label>
                 <input asp-for="Manufacturer" class="form-control" />
diff --git a/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml b/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml
index 7f2e23a7..aa08059d 100644
--- a/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml
@@ -53,7 +53,7 @@
     {
         <tr>
             <td>
-                <a asp-controller="UsbVendors" asp-action="Details" asp-route-id="@item.VendorId" target="_blank">@Html.DisplayFor(modelItem => item.VendorName)</a>
+                <a asp-action="Details" asp-controller="UsbVendors" asp-route-id="@item.VendorId" target="_blank">@Html.DisplayFor(modelItem => item.VendorName)</a>
             </td>
             <td>
                 @Html.DisplayFor(modelItem => item.ProductName)
diff --git a/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml
index 40152d67..6a4f84e2 100644
--- a/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml
@@ -48,7 +48,7 @@
 <div>
     Do you want to remove the duplicates?
     <form asp-action="Consolidate" enctype="multipart/form-data">
-        <input type="hidden" asp-for="Json" name="models" />
+        <input asp-for="Json" name="models" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Consolidate" />
     </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Usbs/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Usbs/Delete.cshtml
index 49609116..2e8634cd 100644
--- a/Aaru.Server/Areas/Admin/Views/Usbs/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Usbs/Delete.cshtml
@@ -76,7 +76,7 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
+        <input asp-for="Id" type="hidden" />
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
         <input class="btn btn-danger" type="submit" value="Delete" />
     </form>
diff --git a/Aaru.Server/Controllers/ReportController.cs b/Aaru.Server/Controllers/ReportController.cs
index 40453454..b8609d5f 100644
--- a/Aaru.Server/Controllers/ReportController.cs
+++ b/Aaru.Server/Controllers/ReportController.cs
@@ -371,17 +371,17 @@ namespace Aaru.Server.Controllers
                             scsiOneValue.
                                 Add($"Device has {report.SCSI.ReadCapabilities.Blocks} blocks of {report.SCSI.ReadCapabilities.BlockSize} bytes each");
 
-                            if((report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 /
+                            if(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1024 /
                                1024 > 1000000)
                                 scsiOneValue.
-                                    Add($"Device size: {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize} bytes, {(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1000 / 1000 / 1000 / 1000} Tb, {(double)(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
-                            else if((report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) /
+                                    Add($"Device size: {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize} bytes, {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                            else if(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize /
                                     1024 / 1024 > 1000)
                                 scsiOneValue.
-                                    Add($"Device size: {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize} bytes, {(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1000 / 1000 / 1000} Gb, {(double)(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
+                                    Add($"Device size: {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize} bytes, {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1000 / 1000 / 1000} Gb, {(double)(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
                             else
                                 scsiOneValue.
-                                    Add($"Device size: {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize} bytes, {(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1000 / 1000} Mb, {(double)(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 / 1024:F2} MiB");
+                                    Add($"Device size: {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize} bytes, {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1000 / 1000} Mb, {(double)(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 / 1024:F2} MiB");
                         }
 
                         if(report.SCSI.ReadCapabilities.MediumType.HasValue)
diff --git a/Aaru.Server/Controllers/StatsController.cs b/Aaru.Server/Controllers/StatsController.cs
index 08bbf315..692a7a00 100644
--- a/Aaru.Server/Controllers/StatsController.cs
+++ b/Aaru.Server/Controllers/StatsController.cs
@@ -184,12 +184,12 @@ namespace Aaru.Server.Controllers
                         }
 
                     if(realMedia.Count > 0)
-                        ViewBag.repRealMedia =
-                            realMedia.OrderBy(media => media.Type).ThenBy(media => media.SubType).ToList();
+                        ViewBag.repRealMedia = realMedia.OrderBy(media => media.Type).ThenBy(media => media.SubType).
+                                                         ToList();
 
                     if(virtualMedia.Count > 0)
-                        ViewBag.repVirtualMedia =
-                            virtualMedia.OrderBy(media => media.Type).ThenBy(media => media.SubType).ToList();
+                        ViewBag.repVirtualMedia = virtualMedia.OrderBy(media => media.Type).
+                                                               ThenBy(media => media.SubType).ToList();
                 }
 
                 if(_ctx.DeviceStats.Any())
@@ -499,7 +499,7 @@ namespace Aaru.Server.Controllers
                 {
                     (string type, string subType) mediaType =
                         MediaType.MediaTypeToString((CommonTypes.MediaType)Enum.Parse(typeof(CommonTypes.MediaType),
-                                                                                      media.Type));
+                                                        media.Type));
 
                     media.Type = $"{mediaType.type} ({mediaType.subType})";
                 }
@@ -535,7 +535,7 @@ namespace Aaru.Server.Controllers
                 {
                     (string type, string subType) mediaType =
                         MediaType.MediaTypeToString((CommonTypes.MediaType)Enum.Parse(typeof(CommonTypes.MediaType),
-                                                                                      media.Type));
+                                                        media.Type));
 
                     media.Type = $"{mediaType.type} ({mediaType.subType})";
                 }
diff --git a/Aaru.Server/Controllers/UpdateController.cs b/Aaru.Server/Controllers/UpdateController.cs
index 4a439a38..e5b2d435 100644
--- a/Aaru.Server/Controllers/UpdateController.cs
+++ b/Aaru.Server/Controllers/UpdateController.cs
@@ -89,16 +89,11 @@ namespace Aaru.Server.Controllers
             foreach(Device device in _ctx.Devices.Where(d => d.ModifiedWhen > lastSync).ToList())
                 sync.Devices.Add(new DeviceDto(JsonConvert.
                                                    DeserializeObject<DeviceReportV2>(JsonConvert.SerializeObject(device,
-                                                                                                                 Formatting.
-                                                                                                                     None,
-                                                                                                                 new
-                                                                                                                     JsonSerializerSettings
-                                                                                                                     {
-                                                                                                                         ReferenceLoopHandling
-                                                                                                                             = ReferenceLoopHandling.
-                                                                                                                                 Ignore
-                                                                                                                     })),
-                                               device.Id, device.OptimalMultipleSectorsRead,
+                                                       Formatting.None, new JsonSerializerSettings
+                                                       {
+                                                           ReferenceLoopHandling =
+                                                               ReferenceLoopHandling.Ignore
+                                                       })), device.Id, device.OptimalMultipleSectorsRead,
                                                device.CanReadGdRomUsingSwapDisc));
 
             var js = JsonSerializer.Create();
diff --git a/Aaru.Server/Controllers/UploadReportController.cs b/Aaru.Server/Controllers/UploadReportController.cs
index e27434fa..9ab6e24b 100644
--- a/Aaru.Server/Controllers/UploadReportController.cs
+++ b/Aaru.Server/Controllers/UploadReportController.cs
@@ -124,8 +124,8 @@ namespace Aaru.Server.Controllers
                 {
                     Chs existingChs =
                         _ctx.Chs.FirstOrDefault(c =>
-                                                    c.Cylinders == newUploadedReport.
-                                                                   ATA.ReadCapabilities.CHS.Cylinders             &&
+                                                    c.Cylinders == newUploadedReport.ATA.ReadCapabilities.CHS.
+                                                        Cylinders                                                 &&
                                                     c.Heads   == newUploadedReport.ATA.ReadCapabilities.CHS.Heads &&
                                                     c.Sectors == newUploadedReport.ATA.ReadCapabilities.CHS.Sectors);
 
@@ -137,12 +137,11 @@ namespace Aaru.Server.Controllers
                 {
                     Chs existingChs =
                         _ctx.Chs.FirstOrDefault(c =>
-                                                    c.Cylinders == newUploadedReport.
-                                                                   ATA.ReadCapabilities.CurrentCHS.Cylinders &&
-                                                    c.Heads == newUploadedReport.
-                                                               ATA.ReadCapabilities.CurrentCHS.Heads &&
-                                                    c.Sectors == newUploadedReport.
-                                                                 ATA.ReadCapabilities.CurrentCHS.Sectors);
+                                                    c.Cylinders == newUploadedReport.ATA.ReadCapabilities.CurrentCHS.
+                                                        Cylinders &&
+                                                    c.Heads == newUploadedReport.ATA.ReadCapabilities.CurrentCHS.
+                                                        Heads && c.Sectors == newUploadedReport.ATA.ReadCapabilities.
+                                                        CurrentCHS.Sectors);
 
                     if(existingChs != null)
                         newUploadedReport.ATA.ReadCapabilities.CurrentCHS = existingChs;
@@ -286,8 +285,8 @@ namespace Aaru.Server.Controllers
                 {
                     Chs existingChs =
                         _ctx.Chs.FirstOrDefault(c =>
-                                                    c.Cylinders == newUploadedReport.
-                                                                   ATA.ReadCapabilities.CHS.Cylinders             &&
+                                                    c.Cylinders == newUploadedReport.ATA.ReadCapabilities.CHS.
+                                                        Cylinders                                                 &&
                                                     c.Heads   == newUploadedReport.ATA.ReadCapabilities.CHS.Heads &&
                                                     c.Sectors == newUploadedReport.ATA.ReadCapabilities.CHS.Sectors);
 
@@ -299,12 +298,11 @@ namespace Aaru.Server.Controllers
                 {
                     Chs existingChs =
                         _ctx.Chs.FirstOrDefault(c =>
-                                                    c.Cylinders == newUploadedReport.
-                                                                   ATA.ReadCapabilities.CurrentCHS.Cylinders &&
-                                                    c.Heads == newUploadedReport.
-                                                               ATA.ReadCapabilities.CurrentCHS.Heads &&
-                                                    c.Sectors == newUploadedReport.
-                                                                 ATA.ReadCapabilities.CurrentCHS.Sectors);
+                                                    c.Cylinders == newUploadedReport.ATA.ReadCapabilities.CurrentCHS.
+                                                        Cylinders &&
+                                                    c.Heads == newUploadedReport.ATA.ReadCapabilities.CurrentCHS.
+                                                        Heads && c.Sectors == newUploadedReport.ATA.ReadCapabilities.
+                                                        CurrentCHS.Sectors);
 
                     if(existingChs != null)
                         newUploadedReport.ATA.ReadCapabilities.CurrentCHS = existingChs;
diff --git a/Aaru.Server/Controllers/UploadStatsController.cs b/Aaru.Server/Controllers/UploadStatsController.cs
index b12bcbbc..cb358f9c 100644
--- a/Aaru.Server/Controllers/UploadStatsController.cs
+++ b/Aaru.Server/Controllers/UploadStatsController.cs
@@ -253,12 +253,10 @@ namespace Aaru.Server.Controllers
                 if(newstats.Devices != null)
                     foreach(DeviceStats device in from device in newstats.Devices let existing =
                                                       _ctx.DeviceStats.FirstOrDefault(c => c.Bus == device.Bus &&
-                                                                                           c.Manufacturer ==
-                                                                                           device.Manufacturer     &&
-                                                                                           c.Model == device.Model &&
-                                                                                           c.Revision ==
-                                                                                           device.Revision)
-                                                  where existing == null select device)
+                                                          c.Manufacturer == device.Manufacturer &&
+                                                          c.Model == device.Model &&
+                                                          c.Revision == device.Revision) where existing == null
+                                                  select device)
                     {
                         await _ctx.DeviceStats.AddAsync(new DeviceStat
                         {
diff --git a/Aaru.Server/Core/Ata.cs b/Aaru.Server/Core/Ata.cs
index 56e9fe07..603557f5 100644
--- a/Aaru.Server/Core/Ata.cs
+++ b/Aaru.Server/Core/Ata.cs
@@ -705,22 +705,22 @@ namespace Aaru.Server.Core
                 {
                     case 1:
                         ataOneValue.
-                            Add($"{(ataIdentify.BufferSize * logicalSectorSize) / 1024} KiB of single ported single sector buffer");
+                            Add($"{ataIdentify.BufferSize * logicalSectorSize / 1024} KiB of single ported single sector buffer");
 
                         break;
                     case 2:
                         ataOneValue.
-                            Add($"{(ataIdentify.BufferSize * logicalSectorSize) / 1024} KiB of dual ported multi sector buffer");
+                            Add($"{ataIdentify.BufferSize * logicalSectorSize / 1024} KiB of dual ported multi sector buffer");
 
                         break;
                     case 3:
                         ataOneValue.
-                            Add($"{(ataIdentify.BufferSize * logicalSectorSize) / 1024} KiB of dual ported multi sector buffer with read caching");
+                            Add($"{ataIdentify.BufferSize * logicalSectorSize / 1024} KiB of dual ported multi sector buffer with read caching");
 
                         break;
                     default:
                         ataOneValue.
-                            Add($"{(ataIdentify.BufferSize * logicalSectorSize) / 1024} KiB of unknown type {ataIdentify.BufferType} buffer");
+                            Add($"{ataIdentify.BufferSize * logicalSectorSize / 1024} KiB of unknown type {ataIdentify.BufferType} buffer");
 
                         break;
                 }
@@ -1257,7 +1257,7 @@ namespace Aaru.Server.Core
 
                 if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.AddressOffsetReservedAreaBoot))
                     ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.
-                                                                                    AddressOffsetReservedAreaBoot)
+                                                                               AddressOffsetReservedAreaBoot)
                                         ? "Address Offset Reserved Area Boot is supported and enabled"
                                         : "Address Offset Reserved Area Boot is supported");
 
@@ -1271,7 +1271,7 @@ namespace Aaru.Server.Core
 
                 if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.RemovableNotification))
                     ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.
-                                                                                    RemovableNotification)
+                                                                               RemovableNotification)
                                         ? "Removable Media Status Notification is supported and enabled"
                                         : "Removable Media Status Notification is supported");
 
@@ -1389,7 +1389,7 @@ namespace Aaru.Server.Core
 
                 if(ataIdentify.CommandSet4.HasFlag(Identify.CommandSetBit4.SegmentedDownloadMicrocode))
                     ataOneValue.Add(ataIdentify.EnabledCommandSet4.HasFlag(Identify.CommandSetBit4.
-                                                                                    SegmentedDownloadMicrocode)
+                                                                               SegmentedDownloadMicrocode)
                                         ? "Segmented feature in DOWNLOAD MICROCODE is supported and enabled"
                                         : "Segmented feature in DOWNLOAD MICROCODE is supported");
 
@@ -1519,7 +1519,7 @@ namespace Aaru.Server.Core
                     {
                         if(ataIdentify.SATAFeatures.HasFlag(Identify.SATAFeaturesBit.NonZeroBufferOffset))
                             ataOneValue.Add(ataIdentify.EnabledSATAFeatures.HasFlag(Identify.SATAFeaturesBit.
-                                                                                             NonZeroBufferOffset)
+                                                NonZeroBufferOffset)
                                                 ? "Non-zero buffer offsets are supported and enabled"
                                                 : "Non-zero buffer offsets are supported");
 
@@ -1530,20 +1530,20 @@ namespace Aaru.Server.Core
 
                         if(ataIdentify.SATAFeatures.HasFlag(Identify.SATAFeaturesBit.InitPowerMgmt))
                             ataOneValue.Add(ataIdentify.EnabledSATAFeatures.HasFlag(Identify.SATAFeaturesBit.
-                                                                                             InitPowerMgmt)
+                                                InitPowerMgmt)
                                                 ? "Device-initiated power management is supported and enabled"
                                                 : "Device-initiated power management is supported");
 
                         if(ataIdentify.SATAFeatures.HasFlag(Identify.SATAFeaturesBit.InOrderData))
-                            ataOneValue.Add(ataIdentify.
-                                            EnabledSATAFeatures.HasFlag(Identify.SATAFeaturesBit.InOrderData)
+                            ataOneValue.Add(ataIdentify.EnabledSATAFeatures.HasFlag(Identify.SATAFeaturesBit.
+                                                InOrderData)
                                                 ? "In-order data delivery is supported and enabled"
                                                 : "In-order data delivery is supported");
 
                         if(!atapi)
                             if(ataIdentify.SATAFeatures.HasFlag(Identify.SATAFeaturesBit.HardwareFeatureControl))
                                 ataOneValue.Add(ataIdentify.EnabledSATAFeatures.HasFlag(Identify.SATAFeaturesBit.
-                                                                                                 HardwareFeatureControl)
+                                                    HardwareFeatureControl)
                                                     ? "Hardware Feature Control is supported and enabled"
                                                     : "Hardware Feature Control is supported");
 
@@ -1723,7 +1723,7 @@ namespace Aaru.Server.Core
                                         $"{ataReport.ReadCapabilities.CHS.Cylinders * ataReport.ReadCapabilities.CHS.Heads * ataReport.ReadCapabilities.CHS.Sectors} max., {currentSectors} current");
 
                         ataTwoValue.Add("Device size in CHS mode",
-                                        $"{(ulong)currentSectors * logicalSectorSize} bytes, {((ulong)currentSectors * logicalSectorSize) / 1000 / 1000} Mb, {(double)((ulong)currentSectors * logicalSectorSize) / 1024 / 1024:F2} MiB");
+                                        $"{(ulong)currentSectors * logicalSectorSize} bytes, {(ulong)currentSectors * logicalSectorSize / 1000 / 1000} Mb, {(double)((ulong)currentSectors * logicalSectorSize) / 1024 / 1024:F2} MiB");
                     }
                     else if(ataReport.ReadCapabilities.CHS != null)
                     {
@@ -1737,7 +1737,7 @@ namespace Aaru.Server.Core
                         ataTwoValue.Add("Sectors addressable in CHS mode", $"{currentSectors}");
 
                         ataTwoValue.Add("Device size in CHS mode",
-                                        $"{(ulong)currentSectors * logicalSectorSize} bytes, {((ulong)currentSectors * logicalSectorSize) / 1000 / 1000} Mb, {(double)((ulong)currentSectors * logicalSectorSize) / 1024 / 1024:F2} MiB");
+                                        $"{(ulong)currentSectors * logicalSectorSize} bytes, {(ulong)currentSectors * logicalSectorSize / 1000 / 1000} Mb, {(double)((ulong)currentSectors * logicalSectorSize) / 1024 / 1024:F2} MiB");
                     }
 
                     if(ataReport.ReadCapabilities.LBASectors != null)
@@ -1745,15 +1745,15 @@ namespace Aaru.Server.Core
                         ataTwoValue.Add("Sectors addressable in sectors in 28-bit LBA mode",
                                         $"{ataReport.ReadCapabilities.LBASectors}");
 
-                        if(((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1024 / 1024 > 1000000)
+                        if((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize / 1024 / 1024 > 1000000)
                             ataTwoValue.Add("Device size in 28-bit LBA mode",
-                                            $"{(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize} bytes, {((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1000 / 1000 / 1000 / 1000} Tb, {(double)((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
-                        else if(((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1024 / 1024 > 1000)
+                                            $"{(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize} bytes, {(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                        else if((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize / 1024 / 1024 > 1000)
                             ataTwoValue.Add("Device size in 28-bit LBA mode",
-                                            $"{(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize} bytes, {((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1000 / 1000 / 1000} Gb, {(double)((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1024 / 1024 / 1024:F2} GiB");
+                                            $"{(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize} bytes, {(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize / 1000 / 1000 / 1000} Gb, {(double)((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1024 / 1024 / 1024:F2} GiB");
                         else
                             ataTwoValue.Add("Device size in 28-bit LBA mode",
-                                            $"{(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize} bytes, {((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1000 / 1000} Mb, {(double)((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1024 / 1024:F2} MiB");
+                                            $"{(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize} bytes, {(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize / 1000 / 1000} Mb, {(double)((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1024 / 1024:F2} MiB");
                     }
 
                     if(ataReport.ReadCapabilities.LBA48Sectors != null)
@@ -1761,15 +1761,15 @@ namespace Aaru.Server.Core
                         ataTwoValue.Add("Sectors addressable in sectors in 48-bit LBA mode",
                                         $"{ataReport.ReadCapabilities.LBA48Sectors}");
 
-                        if((ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1024 / 1024 > 1000000)
+                        if(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize / 1024 / 1024 > 1000000)
                             ataTwoValue.Add("Device size in 48-bit LBA mode",
-                                            $"{ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize} bytes, {(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1000 / 1000 / 1000 / 1000} Tb, {(double)(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
-                        else if((ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1024 / 1024 > 1000)
+                                            $"{ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize} bytes, {ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                        else if(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize / 1024 / 1024 > 1000)
                             ataTwoValue.Add("Device size in 48-bit LBA mode",
-                                            $"{ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize} bytes, {(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1000 / 1000 / 1000} Gb, {(double)(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1024 / 1024 / 1024:F2} GiB");
+                                            $"{ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize} bytes, {ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize / 1000 / 1000 / 1000} Gb, {(double)(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1024 / 1024 / 1024:F2} GiB");
                         else
                             ataTwoValue.Add("Device size in 48-bit LBA mode",
-                                            $"{ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize} bytes, {(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1000 / 1000} Mb, {(double)(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1024 / 1024:F2} MiB");
+                                            $"{ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize} bytes, {ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize / 1000 / 1000} Mb, {(double)(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1024 / 1024:F2} MiB");
                     }
 
                     if(ata1 || cfa)
diff --git a/Aaru.Server/Core/StatsConverter.cs b/Aaru.Server/Core/StatsConverter.cs
index 6616017f..2631118e 100644
--- a/Aaru.Server/Core/StatsConverter.cs
+++ b/Aaru.Server/Core/StatsConverter.cs
@@ -481,13 +481,13 @@ namespace Aaru.Server.Core
                 }
 
             if(newStats.Devices != null)
-                foreach(DeviceStats device in newStats.
-                                              Devices.Where(device => !string.IsNullOrWhiteSpace(device.Model)).
-                                              Where(device => !ctx.DeviceStats.Any(c => c.Bus == device.Bus &&
-                                                                                        c.Manufacturer ==
-                                                                                        device.Manufacturer        &&
-                                                                                        c.Model    == device.Model &&
-                                                                                        c.Revision == device.Revision)))
+                foreach(DeviceStats device in newStats.Devices.
+                                                       Where(device => !string.IsNullOrWhiteSpace(device.Model)).
+                                                       Where(device => !ctx.DeviceStats.Any(c => c.Bus == device.Bus &&
+                                                                           c.Manufacturer ==
+                                                                           device.Manufacturer        &&
+                                                                           c.Model    == device.Model &&
+                                                                           c.Revision == device.Revision)))
                 {
                     ctx.DeviceStats.Add(new DeviceStat
                     {
diff --git a/Aaru.Server/Core/TestedMedia.cs b/Aaru.Server/Core/TestedMedia.cs
index f12e24d8..cc2b4f62 100644
--- a/Aaru.Server/Core/TestedMedia.cs
+++ b/Aaru.Server/Core/TestedMedia.cs
@@ -85,15 +85,15 @@ namespace Aaru.Server.Core
                 {
                     mediaOneValue.Add($"Medium has {testedMedia.Blocks} blocks of {testedMedia.BlockSize} bytes each");
 
-                    if((testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 > 1000000)
+                    if(testedMedia.Blocks * testedMedia.BlockSize / 1024 / 1024 > 1000000)
                         mediaOneValue.
-                            Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {(testedMedia.Blocks * testedMedia.BlockSize) / 1000 / 1000 / 1000 / 1000} Tb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
-                    else if((testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 > 1000)
+                            Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                    else if(testedMedia.Blocks * testedMedia.BlockSize / 1024 / 1024 > 1000)
                         mediaOneValue.
-                            Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {(testedMedia.Blocks * testedMedia.BlockSize) / 1000 / 1000 / 1000} Gb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
+                            Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000 / 1000} Gb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
                     else
                         mediaOneValue.
-                            Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {(testedMedia.Blocks * testedMedia.BlockSize) / 1000 / 1000} Mb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
+                            Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
                 }
 
                 if(testedMedia.CHS        != null &&
@@ -114,7 +114,7 @@ namespace Aaru.Server.Core
                         Add($"Sectors addressable in CHS mode: {testedMedia.CHS.Cylinders * testedMedia.CHS.Heads * testedMedia.CHS.Sectors} max., {currentSectors} current");
 
                     mediaOneValue.
-                        Add($"Medium size in CHS mode: {(ulong)currentSectors * testedMedia.BlockSize} bytes, {((ulong)currentSectors * testedMedia.BlockSize) / 1000 / 1000} Mb, {(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
+                        Add($"Medium size in CHS mode: {(ulong)currentSectors * testedMedia.BlockSize} bytes, {(ulong)currentSectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
                 }
                 else if(testedMedia.CHS != null)
                 {
@@ -125,37 +125,37 @@ namespace Aaru.Server.Core
                     mediaOneValue.Add($"Sectors addressable in CHS mode: {currentSectors}");
 
                     mediaOneValue.
-                        Add($"Medium size in CHS mode: {(ulong)currentSectors * testedMedia.BlockSize} bytes, {((ulong)currentSectors * testedMedia.BlockSize) / 1000 / 1000} Mb, {(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
+                        Add($"Medium size in CHS mode: {(ulong)currentSectors * testedMedia.BlockSize} bytes, {(ulong)currentSectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
                 }
 
                 if(testedMedia.LBASectors != null)
                 {
                     mediaOneValue.Add($"Sectors addressable in sectors in 28-bit LBA mode: {testedMedia.LBASectors}");
 
-                    if(((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 > 1000000)
+                    if((ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1024 / 1024 > 1000000)
                         mediaOneValue.
-                            Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1000 / 1000 / 1000 / 1000} Tb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
-                    else if(((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 > 1000)
+                            Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                    else if((ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1024 / 1024 > 1000)
                         mediaOneValue.
-                            Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1000 / 1000 / 1000} Gb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
+                            Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 / 1000 / 1000} Gb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
                     else
                         mediaOneValue.
-                            Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1000 / 1000} Mb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
+                            Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
                 }
 
                 if(testedMedia.LBA48Sectors != null)
                 {
                     mediaOneValue.Add($"Sectors addressable in sectors in 48-bit LBA mode: {testedMedia.LBA48Sectors}");
 
-                    if((testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 > 1000000)
+                    if(testedMedia.LBA48Sectors * testedMedia.BlockSize / 1024 / 1024 > 1000000)
                         mediaOneValue.
-                            Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1000 / 1000 / 1000 / 1000} Tb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
-                    else if((testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 > 1000)
+                            Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                    else if(testedMedia.LBA48Sectors * testedMedia.BlockSize / 1024 / 1024 > 1000)
                         mediaOneValue.
-                            Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1000 / 1000 / 1000} Gb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
+                            Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 / 1000 / 1000} Gb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
                     else
                         mediaOneValue.
-                            Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1000 / 1000} Mb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
+                            Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
                 }
 
                 if(testedMedia.NominalRotationRate != null   &&
diff --git a/Aaru.Server/Program.cs b/Aaru.Server/Program.cs
index e56b32f1..009d8130 100644
--- a/Aaru.Server/Program.cs
+++ b/Aaru.Server/Program.cs
@@ -110,11 +110,9 @@ namespace Aaru.Server
             host.Run();
         }
 
-        public static IHostBuilder CreateHostBuilder(string[] args) => Host.
-                                                                       CreateDefaultBuilder(args).
-                                                                       ConfigureWebHostDefaults(webBuilder =>
-                                                                                                    webBuilder.
-                                                                                                        UseStartup<
-                                                                                                            Startup>());
+        public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args).
+                                                                            ConfigureWebHostDefaults(webBuilder =>
+                                                                                webBuilder.
+                                                                                    UseStartup<Startup>());
     }
 }
\ No newline at end of file
diff --git a/Aaru.Server/Views/Shared/_CookieConsentPartial.cshtml b/Aaru.Server/Views/Shared/_CookieConsentPartial.cshtml
index d997b974..f8e74dc1 100644
--- a/Aaru.Server/Views/Shared/_CookieConsentPartial.cshtml
+++ b/Aaru.Server/Views/Shared/_CookieConsentPartial.cshtml
@@ -10,7 +10,7 @@
     <div class="alert alert-dismissible alert-info fade show" id="cookieConsent" role="alert">
         Use this space to summarize your privacy and cookie use policy.
         <a asp-page="/Privacy">Learn More</a>.
-        <button type="button" class="accept-policy close" data-dismiss="alert" aria-label="Close" data-cookie-string="@cookieString">
+        <button aria-label="Close" class="accept-policy close" data-cookie-string="@cookieString" data-dismiss="alert" type="button">
             <span aria-hidden="true">Accept</span>
         </button>
     </div>
diff --git a/Aaru.Server/Views/Stats/Index.cshtml b/Aaru.Server/Views/Stats/Index.cshtml
index 7785ebba..b0615703 100644
--- a/Aaru.Server/Views/Stats/Index.cshtml
+++ b/Aaru.Server/Views/Stats/Index.cshtml
@@ -496,7 +496,13 @@
                             <td>
                                 @if(device.ReportId != 0)
                                 {
-                                    <text>@Html.ActionLink("Yes", "View", "Report", new { id = device.ReportId }, new { target = "_blank" })</text>
+                                    <text>@Html.ActionLink("Yes", "View", "Report", new
+                                          {
+                                              id = device.ReportId
+                                          }, new
+                                          {
+                                              target = "_blank"
+                                          })</text>
                                 }
                                 else
                                 {