diff --git a/LaaProductionWeb/LaaProductionWeb.Services/ShipmentsService.cs b/LaaProductionWeb/LaaProductionWeb.Services/ShipmentsService.cs
index a94e305f..f7cffa2c 100644
--- a/LaaProductionWeb/LaaProductionWeb.Services/ShipmentsService.cs
+++ b/LaaProductionWeb/LaaProductionWeb.Services/ShipmentsService.cs
@@ -83,7 +83,7 @@
                          , REPLACE(RTRIM(LTRIM([AuftragPositionSerienNr].[KundeneigeneSerienNr])), ' ', '')	-- 2
 	                     , [PalettenScan].[PalettenNr]														-- 3
                     	 , CAST(CASE WHEN [PalettenScan].[ID] IS NULL THEN 0 ELSE 1 END AS BIT)				-- 4
-	                     , [PalettenScan].[PositionNr]											            -- 5
+	                     , ISNULL([PalettenScan].[PositionNr], [AuftragPositionSerienNr].[PositionNr])      -- 5
                       FROM [AuftragPositionSerienNr]
                       LEFT JOIN [PalettenScan]	
                         ON [PalettenScan].[AuftragNr]				= [AuftragPositionSerienNr].[AuftragNr]
@@ -105,6 +105,7 @@
                     PositionNr = reader.GetValue<int>(5),
                 })
                 .OrderByDescending(x => x.IsScaned)
+                .ThenBy(x => x.PositionNr)
                 .ThenBy(x => x.ClientNr);
 
         public PalletsBatchModel LoadBatchModel(OrderScanModel model)
@@ -122,7 +123,7 @@
 	                     , [Kunde].[Name]						-- 3 
                     	 , [Auftrag].[ZusatzText]				-- 4
                       FROM [AlleAuftragPositionen]				AS [Auftrag]
-                      JOIN [Kunde]		ON [Kunde].[KundenNr]	 = [Auftrag].[KundenNr]
+                      JOIN [Kunde] ON [Kunde].[KundenNr]	     = [Auftrag].[KundenNr]
                      WHERE [Auftrag].[AuftragNr]				 = @{orderNr}
                        AND [Auftrag].[PositionNr]				 = @{posNr}
                   ORDER BY [Auftrag].[FertigungsauftragNr]	 DESC",
diff --git a/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj b/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj
index 3a9a5922..2e3c0a8a 100644
--- a/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj
+++ b/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj
@@ -162,6 +162,7 @@
     <Content Include="App_Content\js\scripts.js" />
     <Content Include="App_Content\svg\sensus_xylem_logo.svg" />
     <Content Include="favicon.ico" />
+    <Content Include="favicon.svg" />
     <Content Include="Global.asax" />
     <Content Include="Web.config">
       <SubType>Designer</SubType>
@@ -181,11 +182,11 @@
     <Content Include="Views\Report\Filter.cshtml" />
     <Content Include="Views\Report\Results.cshtml" />
     <Content Include="Views\Report\DateFilter.cshtml" />
+    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="App_Content\font\fonts\bootstrap-icons.woff" />
     <Content Include="App_Content\font\fonts\bootstrap-icons.woff2" />
-    <Content Include="libman.json" />
     <Content Include="App_Content\css\bootstrap.min.css.map" />
     <Content Include="App_Data\client_map.json" />
     <Content Include="Views\Protocol\Body.cshtml" />
diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Body.cshtml b/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Body.cshtml
index 5723d0ff..58c26bc0 100644
--- a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Body.cshtml
+++ b/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Body.cshtml
@@ -23,9 +23,6 @@
 }
 
 <tbody>
-    @{ 
-
-    }
     <tr>
         <td colspan="2" class="p-0">
             <table class="table table-bordered">
@@ -58,7 +55,7 @@
         </td>
     </tr>
     <tr>
-        <td colspan="2" class="pt-5 px-0 small">
+        <td colspan="2" class="pt-5 pb-0 px-0 small">
             <table class="table table-sm table-bordered border-top text-secondary">
                 <tr>
                     <th>Legend:</th>
diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Index.cshtml b/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Index.cshtml
index 6e13b602..b12a1caf 100644
--- a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Index.cshtml
+++ b/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Index.cshtml
@@ -3,7 +3,7 @@
 @using LaaProductionWeb.Controllers
 @using LaaProductionWeb.Services.Models
 
-<table class="table table-bordered">
+<table class="table table-bordered mb-5">
     <thead>
         <tr>
             <th class="align-top p-0 w-100">
diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Shared/_Layout.cshtml b/LaaProductionWeb/LaaProductionWeb/Views/Shared/_Layout.cshtml
index e1d811ea..a4474bc5 100644
--- a/LaaProductionWeb/LaaProductionWeb/Views/Shared/_Layout.cshtml
+++ b/LaaProductionWeb/LaaProductionWeb/Views/Shared/_Layout.cshtml
@@ -13,6 +13,8 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+    <link rel="icon" type="image/svg" href="~/favicon.svg">
+
     @Styles.Render("~/bootstrap_css")
     @Styles.Render("~/bootstrap_icons")
     @Styles.Render("~/styles_css")
diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Batch.cshtml b/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Batch.cshtml
index 346da810..1e8ef70c 100644
--- a/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Batch.cshtml
+++ b/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Batch.cshtml
@@ -6,16 +6,16 @@
 <div class="d-flex justify-content-center">
     <div id="batch" class="print-page border rounded shadow-sm mt-5 p-5">
         <div class="table-responsive">
-            <table class="table table-borderless table-striped">
+            <table class="table table-borderless">
                 <tr>
                     <th colspan="2" class="fs-5">Paletten Begleitschein</th>
                     <th colspan="2" class="fs-5">@this.Model.ClientName</th>
                 </tr>
                 <tr>
-                    <th class="py-0 white-space-nowrap">Kunden-Auftrag</th>
-                    <td class="py-0">@this.Model.OrderNr</td>
-                    <th class="py-0 white-space-nowrap">Fertigungsauftrags-Nr.</th>
-                    <td class="py-0">@this.Model.ProductionOrderNr</td>
+                    <th class="py-1 white-space-nowrap">Kunden-Auftrag</th>
+                    <td class="py-1">@this.Model.OrderNr</td>
+                    <th class="py-1 white-space-nowrap">Fertigungsauftrags-Nr.</th>
+                    <td class="py-1">@this.Model.ProductionOrderNr</td>
                 </tr>
                 @{ 
                     var isFirst = true;
@@ -23,27 +23,27 @@
                     foreach (var position in this.Model.Positions)
                     {
                         <tr>
-                            <th class="py-0">@(isFirst ? "Position Nr" : string.Empty)</th>
-                            <td class="py-0">@position.PositionNr</td>
-                            <th class="py-0">@(isFirst ? "Bezeichnung" : string.Empty)</th>
-                            <td class="py-0">@position.Description</td>
+                            <th class="py-1">@(isFirst ? "Position Nr" : string.Empty)</th>
+                            <td class="py-1">@position.PositionNr</td>
+                            <th class="py-1">@(isFirst ? "Bezeichnung" : string.Empty)</th>
+                            <td class="py-1">@position.Description</td>
                         </tr>
 
                         isFirst = false;
                     }
                 }
                 <tr>
-                    <th class="py-0 white-space-nowrap">Palettemenge</th>
-                    <td class="py-0">@this.Model.ItemsCount</td>
-                    <th class="py-0 white-space-nowrap">Auftragsmenge</th>
-                    <td class="py-0">@this.Model.TotlalItemsCount</td>
+                    <th class="py-1 white-space-nowrap">Palettemenge</th>
+                    <td class="py-1">@this.Model.ItemsCount</td>
+                    <th class="py-1 white-space-nowrap">Auftragsmenge</th>
+                    <td class="py-1">@this.Model.TotlalItemsCount</td>
                 </tr>
             </table>
             <table class="table table-borderless table-striped">
                 <thead>
                     <tr>
                         <th>Nr.</th>
-                        <th class="w-100">Serial Nr.</th>
+                        <th class="w-100">(Pos) Serial Nr.</th>
                         <th class="w-100">Barcode</th>
                         <th class="white-space-nowrap">Paletten Nr.</th>
                         <th class="w-100"></th>
diff --git a/LaaProductionWeb/LaaProductionWeb/favicon.svg b/LaaProductionWeb/LaaProductionWeb/favicon.svg
new file mode 100644
index 00000000..4f681355
--- /dev/null
+++ b/LaaProductionWeb/LaaProductionWeb/favicon.svg
@@ -0,0 +1,26 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 275.27 123.65">
+	<defs>
+		<style>.cls-1{fill:#71d54c;}.cls-2{fill:#003895;}.cls-3{fill:#078ab1;}</style>
+	</defs>
+	<title>sensus_xylem_logo</title>
+	<g id="Layer_2" data-name="Layer 2">
+		<g id="Layer_1-2" data-name="Layer 1">
+      <rect class="cls-1" x="47.04" width="37.99" height="7.14"/>
+      <rect class="cls-1" x="47.04" y="11.65" width="37.99" height="7.14"/>
+      <rect class="cls-1" x="47.04" y="23.29" width="37.99" height="7.14"/>
+			<path class="cls-2" d="M124.94,35h-22.3c-7.14,0-9.31,2.08-9.31,8.9v27.5h9.14V42.71h22.64V71.36h9.14V43.86c0-6.82-2.18-8.9-9.31-8.9"/>
+			<path class="cls-2" d="M219.87,35V63.61H197.23V35h-9.14v27.5c0,6.82,2.18,8.9,9.31,8.9h22.3c7.14,0,9.31-2.08,9.31-8.9V35Z"/>
+			<path class="cls-2" d="M55.38,35c-6.82,0-8.91,2.18-8.91,9.31V62.05c0,7.14,2.08,9.31,8.91,9.31H85V63.61H55v-7H85V49.2H55v-7H85V35Z"/>
+			<path class="cls-2" d="M38.4,42.23V35H9.31C2.18,35,0,37,0,43.86v3.89c0,6.82,2.18,8.9,9.31,8.9H30.78v7H0v7.75H29.76c7.1,0,9.38-2.16,9.38-8.9V57.61c0-6.74-2.28-8.9-9.38-8.9H8.3V42.23Z"/>
+			<path class="cls-2" d="M179.92,42.23V35H150.83c-7.14,0-9.32,2.08-9.32,8.9v3.89c0,6.82,2.18,8.9,9.32,8.9h21.46v7H141.52v7.75h29.76c7.1,0,9.38-2.16,9.38-8.9V57.61c0-6.74-2.28-8.9-9.38-8.9H149.82V42.23Z"/>
+			<path class="cls-2" d="M274.53,42.23V35H245.44c-7.14,0-9.31,2.08-9.31,8.9v3.89c0,6.82,2.17,8.9,9.31,8.9H266.9v7H236.13v7.75h29.75c7.1,0,9.39-2.16,9.39-8.9V57.61c0-6.74-2.28-8.9-9.39-8.9H244.43V42.23Z"/>
+			<path class="cls-3" d="M68.21,103.11c0-3-1.66-4.54-4.69-4.54a7.49,7.49,0,0,0-5.23,2.07l-1.42-1.7a9.79,9.79,0,0,1,6.9-2.51c3.8,0,6.84,2.1,6.84,6.38v7.7a23.25,23.25,0,0,0,.3,4h-2.3a19,19,0,0,1-.26-2.86h-.06a7,7,0,0,1-6.38,3.31c-2.67,0-6.1-1.43-6.1-5.33,0-5.42,6-5.9,12.4-5.9Zm-.75,2.55c-4.16,0-9,.46-9,3.8,0,2.51,2.13,3.33,4.13,3.33A5.48,5.48,0,0,0,68.21,107v-1.31Z"/>
+			<path class="cls-3" d="M190.39,111.47v3h-2.55V86.07h2.55V99.92h.07a8,8,0,0,1,6.65-3.49c5.49,0,9.09,4.05,9.09,9.23s-3.6,9.24-9.09,9.24a8.08,8.08,0,0,1-6.65-3.43Zm6.47-12.91a7.09,7.09,0,0,0,0,14.16c4.22,0,6.64-3.15,6.64-7.06s-2.41-7.09-6.64-7.09"/>
+			<path class="cls-3" d="M209.09,96.87h2.46c.06.95.15,2.25.15,3h.07a6.25,6.25,0,0,1,5.64-3.45,6.58,6.58,0,0,1,1.68.18l-.34,2.4a6.89,6.89,0,0,0-1.8-.22c-2.7,0-5.15,2-5.15,6.65v9h-2.55V100.74c0-.94,0-2.66-.16-3.87"/>
+			<path class="cls-3" d="M232.09,103.11c0-3-1.66-4.54-4.69-4.54a7.46,7.46,0,0,0-5.23,2.07l-1.41-1.7a9.74,9.74,0,0,1,6.89-2.51c3.8,0,6.84,2.1,6.84,6.38v7.7a24.22,24.22,0,0,0,.31,4h-2.3a18.26,18.26,0,0,1-.26-2.86h-.07a7.05,7.05,0,0,1-6.39,3.31c-2.66,0-6.07-1.43-6.07-5.33,0-5.42,6-5.9,12.39-5.9Zm-.75,2.55c-4.18,0-9,.46-9,3.8,0,2.51,2.14,3.33,4.13,3.33a5.48,5.48,0,0,0,5.64-5.82v-1.31Z"/>
+			<path class="cls-3" d="M241.1,96.87c.06.95.16,2.25.16,3h.07a6.85,6.85,0,0,1,6-3.45c4.47,0,6.68,2.89,6.68,7.25v10.78h-2.55v-9.73c0-3.67-1.08-6.16-4.77-6.16-2.69,0-5.33,2.18-5.33,6.87v9h-2.55V100.74c0-.94,0-2.66-.14-3.87Z"/>
+			<path class="cls-3" d="M266,114.9c-5.49,0-9.09-4.06-9.09-9.24s3.59-9.23,9.09-9.23a8,8,0,0,1,6.65,3.49h.07V86.07h2.55v28.39h-2.55v-3h-.07A8.1,8.1,0,0,1,266,114.9m.27-2.18a6.71,6.71,0,0,0,6.75-7.06c0-4-2.81-7.09-6.75-7.09-4.24,0-6.64,3.19-6.64,7.09s2.4,7.06,6.64,7.06"/>
+			<path class="cls-3" d="M176.07,111.18v3.28h-1.85c-3.13,0-4.65-1.63-4.65-5.28v-5.72c0-1.79-.56-3.63-2.82-3.63s-3,1.84-3,3.63v11h-4v-11c0-1.79-.78-3.63-3.09-3.63s-3.06,1.84-3.06,3.63v11h-3.92V103.32c0-4.35,2.8-7,7-7a6.78,6.78,0,0,1,5.09,2.06,6.77,6.77,0,0,1,5.08-2.06c3.85,0,6.59,2.48,6.59,7v5.91c0,1.35.62,1.95,1.76,1.95Zm-30.61.47a11.42,11.42,0,0,1-7.74,3.07c-5.88,0-9.35-3.82-9.35-9.22s3.73-9.23,9-9.23c5.48,0,8.82,4.25,8.82,9.53,0,.66-.05,1.33-.05,1.33h-13.7c.51,2.59,2.1,4.22,5.28,4.22a7.37,7.37,0,0,0,5.21-2.17Zm-13-7.63h9.73c-.45-2.66-2.2-4.39-4.78-4.39s-4.39,1.79-5,4.39M120,109c0,3.83,1.58,5.42,4.83,5.42h1.78v-3.37h-.84c-1.2,0-1.87-.59-1.87-2.05V86.95H120Zm-10.95,2H109c-1,0-1.55-1.49-2.54-4.18l-1.64-4.52c-1.54-4.21-3.1-6.11-6.66-6.11-3,0-4.52,1.81-6.38,4.32L90.4,102.4,86,96.56H81.39l6.69,8.77-2.61,3.51c-1.34,1.8-2.16,2.34-3.31,2.34h-.78v3.28h1.67a4.91,4.91,0,0,0,4.41-2.27l2.86-4,4.6,6.29h4.69l-7-9.21,1.74-2.3c1.58-2.11,2.33-3.12,3.67-3.12s2.12,1.31,3.32,4.36l2,5.09c1.15,3,2.26,5.17,4.29,5.17h.26l-1,2.58c-.8,2-1.56,3.28-3.67,3.28h-.92v3.33h1.34c3.13,0,5.36-1.54,6.81-5.59l7.73-21.51H114Z"/>
+    </g>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/LaaProductionWeb/LaaProductionWeb/libman.json b/LaaProductionWeb/LaaProductionWeb/libman.json
deleted file mode 100644
index cf92d6be..00000000
--- a/LaaProductionWeb/LaaProductionWeb/libman.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "version": "1.0",
-  "defaultProvider": "cdnjs",
-  "libraries": [
-    {
-      "library": "bootstrap@5.2.3",
-      "destination": "App_Content/",
-      "files": [
-        "css/bootstrap.min.css.map"
-      ]
-    }
-  ]
-}
\ No newline at end of file