diff --git a/Elwig/Documents/BusinessDocument.cs b/Elwig/Documents/BusinessDocument.cs
index c7ecdf4..295fb31 100644
--- a/Elwig/Documents/BusinessDocument.cs
+++ b/Elwig/Documents/BusinessDocument.cs
@@ -34,19 +34,23 @@ namespace Elwig.Documents {
             }
         }
 
-        protected Cell NewAsideCell(Paragraph text, int colspan = 1, bool isName = false) {
-            var cell = NewCell(text, colspan: colspan).SetPaddingsMM(0.25f, 0.5f, 0.25f, isName ? 1 : 0);
+        protected Cell NewAsideCell(Paragraph text, int colspan = 1, bool isName = false, bool right = false, bool center = false) {
+            var cell = NewCell(text, colspan: colspan).SetPaddingsMM(0.25f, center ? 0 : right ? 1 : 0.5f, 0.25f, isName ? 1 : 0);
             if (colspan == 26) {
                 cell.SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
                     .SetBackgroundColor(new DeviceRgb(0xe0, 0xe0, 0xe0))
                     .SetBorderTop(new SolidBorder(new DeviceRgb(0x80, 0x80, 0x80), BorderThickness))
                     .SetPaddingsMM(0.5f, 1, 0.5f, 1);
+            } else if (isName) {
+                cell.SetBorderLeft(new SolidBorder(new DeviceRgb(0x80, 0x80, 0x80), BorderThickness));
             }
+            if (right) cell.SetTextAlignment(TextAlignment.RIGHT);
+            if (center) cell.SetTextAlignment(TextAlignment.CENTER);
             return cell;
         }
 
-        protected Cell NewAsideCell(string text, int colspan = 1, bool isName = false) {
-            return NewAsideCell(new KernedParagraph(text, 10), colspan, isName);
+        protected Cell NewAsideCell(string text, int colspan = 1, bool isName = false, bool right = false, bool center = false) {
+            return NewAsideCell(new KernedParagraph(text, 10), colspan, isName, right, center);
         }
 
         public BusinessDocument(string title, Member m, DateOnly? dateFrom, bool includeSender = false) :
@@ -60,17 +64,27 @@ namespace Elwig.Documents {
 
         protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
             base.BeforeRenderBody(doc, pdf);
-            var uid = new KernedParagraph(Member.UstIdNr ?? "-", 10);
-            if (!Member.IsBuchführend) uid.Add(Normal(" ")).Add(Italic("(pauschaliert)"));
             Aside = new Table(ColsMM(2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5))
                 .SetWidth(UnitValue.CreatePointValue(65 * PtInMM)).SetFixedLayout()
                 .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
                 .SetFont(NF).SetFontSize(10)
                 .SetBorder(new SolidBorder(new DeviceRgb(0x80, 0x80, 0x80), BorderThickness))
-                .AddCell(NewAsideCell("Mitglied", 26))
-                .AddCell(NewAsideCell("Mitglieds-Nr.:", 9, isName: true)).AddCell(NewAsideCell($"{Member.MgNr}", 17))
-                .AddCell(NewAsideCell("Betriebs-Nr.:", 9, isName: true)).AddCell(NewAsideCell((Member.LfbisNr ?? "-") + (Member.OrganicAuthorityCode != null ? $" ({Member.OrganicAuthorityCode})" : ""), 17))
-                .AddCell(NewAsideCell("UID:", 9, isName: true)).AddCell(NewAsideCell(uid, 17));
+                .AddCell(NewAsideCell("Mitglied", 26));
+            if (Member.IsOrganic) {
+                Aside
+                    .AddCell(NewAsideCell("Mitgl.-Nr.:", 8, isName: true)).AddCell(NewAsideCell($"{Member.MgNr}", 4, right: true))
+                    .AddCell(NewAsideCell("Bio-KSt.:", 6, isName: true)).AddCell(NewAsideCell(Member.OrganicAuthorityCode ?? "-", 8, right: true, center: Member.OrganicAuthorityCode == null))
+                    .AddCell(NewAsideCell("Betr.-Nr.:", 6, isName: true)).AddCell(NewAsideCell(Member.LfbisNr ?? "-", 6, right: true, center: Member.LfbisNr == null))
+                    .AddCell(NewAsideCell("OOC-ID:", 6, isName: true)).AddCell(NewAsideCell(Member.OrganicOperatorId ?? "-", 8, right: true, center: Member.OrganicOperatorId == null))
+                    .AddCell(NewAsideCell("UID:", 6, isName: true)).AddCell(NewAsideCell(Member.UstIdNr ?? "-", 10, right: true, center: Member.UstIdNr == null))
+                    .AddCell(NewAsideCell(new KernedParagraph("", 10).Add(Italic(Member.IsBuchführend ? "(buchführend)" : "(pauschaliert)")), 10, center: true));
+            } else {
+                Aside
+                    .AddCell(NewAsideCell("Mitglieds-Nr.:", 12, isName: true)).AddCell(NewAsideCell($"{Member.MgNr}", 4, right: true)).AddCell(NewAsideCell("", 10))
+                    .AddCell(NewAsideCell("Betriebs-Nr.:", 10, isName: true)).AddCell(NewAsideCell(Member.LfbisNr ?? "-", 6, right: true, center: Member.LfbisNr == null)).AddCell(NewAsideCell("", 10))
+                    .AddCell(NewAsideCell("UID:", 6, isName: true)).AddCell(NewAsideCell(Member.UstIdNr ?? "-", 10, right: true, center: Member.UstIdNr == null))
+                    .AddCell(NewAsideCell(new KernedParagraph("", 10).Add(Italic(Member.IsBuchführend ? "(buchführend)" : "(pauschaliert)")), 10, center: true));
+            }
         }
 
         protected void RenderAddress(Canvas canvas, Rectangle pageSize) {
diff --git a/Elwig/Documents/DeliveryConfirmation.cs b/Elwig/Documents/DeliveryConfirmation.cs
index 89d4cb1..95e4f9e 100644
--- a/Elwig/Documents/DeliveryConfirmation.cs
+++ b/Elwig/Documents/DeliveryConfirmation.cs
@@ -56,9 +56,9 @@ namespace Elwig.Documents {
             var firstDay = Data.Rows.MinBy(r => r.Date)?.Date;
             var lastDay = Data.Rows.MaxBy(r => r.Date)?.Date;
             Aside?.AddCell(NewAsideCell("Saison", 26))
-                .AddCell(NewAsideCell("Lieferungen:", 9, isName: true)).AddCell(NewAsideCell($"{Data.Rows.DistinctBy(r => r.LsNr).Count():N0} (Teil-Lfrg.: {Data.RowNum:N0})", 17))
-                .AddCell(NewAsideCell("Zeitraum:", 9, isName: true)).AddCell(NewAsideCell(firstDay == null || lastDay == null ? "-" : firstDay == lastDay ? $"{firstDay:dd.MM.} (1 Tag)" : $"{firstDay:dd.MM.}\u2013{lastDay:dd.MM.} ({lastDay?.DayNumber - firstDay?.DayNumber + 1:N0} Tage)", 17))
-                .AddCell(NewAsideCell("Menge:", 9, isName: true)).AddCell(NewAsideCell($"{MemberStats.Sum(s => s.Weight):N0} kg", 17));
+                .AddCell(NewAsideCell("Lieferungen:", 12, isName: true)).AddCell(NewAsideCell($"{Data.Rows.DistinctBy(r => r.LsNr).Count():N0} (Teil-Lfrg.: {Data.RowNum:N0})", 14))
+                .AddCell(NewAsideCell("Zeitraum:", 8, isName: true)).AddCell(NewAsideCell(firstDay == null || lastDay == null ? "-" : firstDay == lastDay ? $"{firstDay:dd.MM.} (1 Tag)" : $"{firstDay:dd.MM.}\u2013{lastDay:dd.MM.} ({lastDay?.DayNumber - firstDay?.DayNumber + 1:N0} Tage)", 18, center: true))
+                .AddCell(NewAsideCell("Menge:", 12, isName: true)).AddCell(NewAsideCell($"{MemberStats.Sum(s => s.Weight):N0} kg", 14));
         }
 
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {