diff --git a/shop/components/order-wizard.tsx b/shop/components/order-wizard.tsx
index 4909089..8953906 100644
--- a/shop/components/order-wizard.tsx
+++ b/shop/components/order-wizard.tsx
@@ -1113,7 +1113,7 @@ export function OrderWizard({
             initial={{ opacity: 0, scale: 0.98 }}
             animate={{ opacity: 1, scale: 1 }}
             exit={{ opacity: 0, scale: 0.98 }}
-            className="w-full"
+            className="h-[calc(100vh-140px)] overflow-hidden w-full"
           >
             <StepSummary
               finalItemsToShow={finalItemsToShow}
diff --git a/shop/components/wizard/step-summary.tsx b/shop/components/wizard/step-summary.tsx
index b7e5f9c..d8669cd 100644
--- a/shop/components/wizard/step-summary.tsx
+++ b/shop/components/wizard/step-summary.tsx
@@ -4,6 +4,7 @@ import React from 'react'
 import { Card, CardHeader, CardTitle, CardDescription, CardContent, CardFooter } from '@/components/ui/card'
 import { Separator } from '@/components/ui/separator'
 import { Button } from '@/components/ui/button'
+import { Badge } from '@/components/ui/badge'
 import { ShieldCheck, Building2, Calendar, Loader2, CheckCircle2 } from 'lucide-react'
 import * as Icons from 'lucide-react'
 import { Category, Product, EndCustomer, Profile } from '@/lib/types'
@@ -64,104 +65,140 @@ export function StepSummary({
   setOrderNotes,
 }: StepSummaryProps) {
   return (
-    <div className="grid grid-cols-1 lg:grid-cols-12 gap-8 items-start max-w-6xl mx-auto text-left">
-      {/* LINKER BEREICH: Linksbündige Überschrift & Notizfeld */}
-      <div className="lg:col-span-5 space-y-6">
-        <div className="space-y-3">
-          <div className="flex items-center gap-3">
-            <div className="w-12 h-12 bg-primary/20 rounded-xl flex items-center justify-center border border-primary/50 shrink-0">
-              <ShieldCheck className="w-6 h-6 text-primary" />
+    <div className="grid grid-cols-1 lg:grid-cols-12 gap-6 h-full items-stretch text-left">
+      {/* LINKER BEREICH: Scrollbares Bedienfeld */}
+      <div className="lg:col-span-5 flex flex-col h-full overflow-hidden pr-4 space-y-6">
+        <div className="flex-1 overflow-y-auto pr-1 space-y-6 pb-4 subpixel-antialiased scrollbar-thin scrollbar-thumb-white/10 scrollbar-track-transparent">
+          
+          {/* Header & Status Stepper */}
+          <div className="space-y-4">
+            <div className="flex items-center gap-3">
+              <div className="w-12 h-12 bg-primary/20 rounded-xl flex items-center justify-center border border-primary/50 shrink-0">
+                <ShieldCheck className="w-6 h-6 text-primary" />
+              </div>
+              <div>
+                <h2 className="text-2xl font-extrabold text-white tracking-tight">
+                  Anfrage prüfen
+                </h2>
+                <p className="text-slate-400 text-xs mt-0.5">
+                  Fast fertig! Bitte überprüfen Sie Ihre ausgewählte Konfiguration.
+                </p>
+              </div>
+            </div>
+
+            {/* Vertikaler Status-Stepper */}
+            <div className="space-y-4 py-4 border-t border-b border-white/5">
+              <p className="text-[10px] font-bold uppercase tracking-wider text-slate-500">
+                Schritt 4 von 4 — Zusammenfassung & Abschluss
+              </p>
+              <div className="flex flex-col gap-3 pl-1">
+                <div className="flex items-center gap-3">
+                  <div className="w-6 h-6 rounded-full bg-green-500/20 border border-green-500/35 flex items-center justify-center text-green-400 text-xs">
+                    <Icons.Check className="w-3.5 h-3.5" />
+                  </div>
+                  <span className="text-sm text-slate-400 font-medium">Kunde</span>
+                </div>
+                <div className="flex items-center gap-3">
+                  <div className="w-6 h-6 rounded-full bg-green-500/20 border border-green-500/35 flex items-center justify-center text-green-400 text-xs">
+                    <Icons.Check className="w-3.5 h-3.5" />
+                  </div>
+                  <span className="text-sm text-slate-400 font-medium">Modell</span>
+                </div>
+                <div className="flex items-center gap-3">
+                  <div className="w-6 h-6 rounded-full bg-green-500/20 border border-green-500/35 flex items-center justify-center text-green-400 text-xs">
+                    <Icons.Check className="w-3.5 h-3.5" />
+                  </div>
+                  <span className="text-sm text-slate-400 font-medium">Software</span>
+                </div>
+                <div className="flex items-center gap-3">
+                  <div className="w-6 h-6 rounded-full bg-primary/20 border border-primary text-primary flex items-center justify-center text-xs font-bold shadow-[0_0_10px_rgba(59,130,246,0.2)]">
+                    4
+                  </div>
+                  <span className="text-sm text-white font-bold">Abschluss</span>
+                </div>
+              </div>
             </div>
-            <span className="text-xs font-bold uppercase tracking-widest text-sky-400 bg-sky-500/10 px-3 py-1 rounded-full border border-sky-500/20">
-              Schritt 4 von 4 — Abschluss
-            </span>
           </div>
-          <h2 className="text-3xl sm:text-4xl font-extrabold text-white tracking-tight">
-            Anfrage prüfen
-          </h2>
-          <p className="text-slate-300 text-base leading-relaxed">
-            Fast fertig! Bitte überprüfen Sie Ihre ausgewählte Konfiguration vor dem Absenden.
+
+          {/* Kunden-Info Card */}
+          {selectedEndCustomer && (
+            <div className="p-4 rounded-xl bg-white/5 border border-white/10 space-y-2">
+              <div className="flex items-center gap-2 text-primary font-bold text-xs uppercase tracking-wider">
+                <Building2 className="w-4 h-4" />
+                <span>Ausgewählter Endkunde</span>
+              </div>
+              <p className="text-white font-bold text-sm">{selectedEndCustomer.company_name}</p>
+              <p className="text-slate-400 text-xs">Ansprechpartner: {[selectedEndCustomer.first_name, selectedEndCustomer.last_name].filter(Boolean).join(' ')}</p>
+              <p className="text-slate-400 text-xs">Adresse: {[selectedEndCustomer.street, [selectedEndCustomer.zip, selectedEndCustomer.city].filter(Boolean).join(' ')].filter(Boolean).join(', ')}</p>
+            </div>
+          )}
+
+          {/* Anmerkungen / Notizfeld */}
+          <div className="space-y-2 pt-2">
+            <label htmlFor="order-notes" className="block text-xs font-bold text-white uppercase tracking-wider">
+              Anmerkungen / Hinweise (optional)
+            </label>
+            <textarea
+              id="order-notes"
+              rows={4}
+              value={orderNotes}
+              onChange={e => setOrderNotes(e.target.value)}
+              placeholder="Besondere Hinweise, Ansprechpartner oder Terminwünsche hier eintragen..."
+              className="w-full p-3 rounded-xl bg-white/5 border border-white/10 text-xs text-white placeholder-slate-500 focus:border-primary focus:outline-none transition-colors duration-200 resize-none shadow-inner"
+            />
+          </div>
+
+          <p className="text-[10px] text-slate-500 leading-relaxed">
+            Mit dem Klick auf „{initialOrder ? 'Anfrage aktualisieren' : 'Kostenpflichtig bestellen'}“ akzeptieren Sie unsere AGB und die{' '}
+            <a href="/datenschutz" target="_blank" rel="noopener noreferrer" className="underline hover:text-slate-400">
+              Datenschutzerklärung
+            </a>.
           </p>
-        </div>
 
-        {/* Kunden-Info Card */}
-        {selectedEndCustomer && (
-          <div className="p-5 rounded-2xl bg-slate-900/80 border border-slate-800 space-y-2">
-            <div className="flex items-center gap-2 text-sky-400 font-bold text-sm">
-              <Building2 className="w-4 h-4" />
-              <span>Ausgewählter Endkunde</span>
-            </div>
-            <p className="text-white font-bold text-base">{selectedEndCustomer.company_name}</p>
-            <p className="text-slate-400 text-xs">{selectedEndCustomer.first_name} {selectedEndCustomer.last_name}</p>
-            <p className="text-slate-400 text-xs">{selectedEndCustomer.zip} {selectedEndCustomer.city}</p>
-          </div>
-        )}
-
-        {/* Anmerkungen / Notizfeld (Links) */}
-        <div className="space-y-2 pt-2">
-          <label htmlFor="order-notes" className="block text-sm font-bold text-white">
-            Anmerkungen / Hinweise (optional)
-          </label>
-          <textarea
-            id="order-notes"
-            rows={4}
-            value={orderNotes}
-            onChange={e => setOrderNotes(e.target.value)}
-            placeholder="Besondere Hinweise, Ansprechpartner oder Terminwünsche hier eintragen..."
-            className="w-full p-4 rounded-xl bg-slate-900/90 border border-slate-800 text-sm text-white placeholder-slate-500 focus:border-sky-400 focus:outline-none transition-colors duration-200 resize-none shadow-inner"
-          />
-        </div>
-
-        <p className="text-xs text-slate-500 italic">
-          Mit dem Klick auf „{initialOrder ? 'Anfrage aktualisieren' : 'Kostenpflichtig bestellen'}“ akzeptieren Sie unsere AGB und die{' '}
-          <a href="/datenschutz" target="_blank" rel="noopener noreferrer" className="underline hover:text-slate-400">
-            Datenschutzerklärung
-          </a>.
-        </p>
-
-        {/* Aktions-Buttons Links */}
-        <div className="space-y-3 pt-2">
-          <Button
-            className="w-full h-14 text-lg font-bold bg-primary hover:bg-primary/90 shadow-[0_0_20px_rgba(59,130,246,0.3)] rounded-xl"
-            onClick={handleSubmit}
-            disabled={isSubmitting}
-          >
-            {isSubmitting ? (
-              initialOrder ? (
-                <><Loader2 className="mr-2 h-5 w-5 animate-spin" /> Anfrage wird aktualisiert...</>
+          {/* Aktions-Buttons */}
+          <div className="space-y-3 pt-2">
+            <Button
+              className="w-full h-12 text-sm font-bold bg-primary hover:bg-primary/90 shadow-[0_0_15px_rgba(59,130,246,0.2)] rounded-xl"
+              onClick={handleSubmit}
+              disabled={isSubmitting}
+            >
+              {isSubmitting ? (
+                initialOrder ? (
+                  <><Loader2 className="mr-2 h-4 w-4 animate-spin" /> Anfrage wird aktualisiert...</>
+                ) : (
+                  <><Loader2 className="mr-2 h-4 w-4 animate-spin" /> Anfrage wird versendet...</>
+                )
               ) : (
-                <><Loader2 className="mr-2 h-5 w-5 animate-spin" /> Anfrage wird versendet...</>
-              )
-            ) : (
-              initialOrder ? 'Anfrage aktualisieren' : 'Kostenpflichtig bestellen'
-            )}
-          </Button>
-          <Button variant="ghost" className="w-full text-slate-400 hover:text-white" onClick={prevStep}>
-            Noch etwas ändern
-          </Button>
+                initialOrder ? 'Anfrage aktualisieren' : 'Kostenpflichtig bestellen'
+              )}
+            </Button>
+            <Button variant="ghost" className="w-full text-slate-400 hover:text-white text-xs h-10" onClick={prevStep}>
+              Noch etwas ändern
+            </Button>
+          </div>
         </div>
       </div>
 
       {/* RECHTER BEREICH: Eigenständig scrollbare Zusammenfassung der Anfrage */}
-      <div className="lg:col-span-7">
-        <Card className="glass-dark border-primary/30 shadow-primary/10 shadow-2xl overflow-hidden rounded-2xl flex flex-col max-h-[calc(100vh-6rem)]">
-          <CardHeader className="shrink-0 border-b border-white/10 pb-4">
-            <CardTitle className="text-xl text-white flex items-center justify-between">
+      <div className="lg:col-span-7 flex flex-col h-full overflow-hidden pl-4">
+        <Card className="glass-dark border-white/10 shadow-2xl overflow-hidden rounded-2xl flex flex-col h-full">
+          <CardHeader className="shrink-0 border-b border-white/5 pb-4">
+            <CardTitle className="text-lg text-white flex items-center justify-between font-bold">
               <span>Zusammenfassung der Positionen</span>
-              <span className="text-xs font-normal text-sky-400 bg-sky-500/10 px-3 py-1 rounded-full border border-sky-500/20">
+              <Badge className="bg-primary/20 text-primary border border-primary/30 text-xs rounded-full">
                 {finalItemsToShow.length} {finalItemsToShow.length === 1 ? 'Kasse' : 'Kassen'}
-              </span>
+              </Badge>
             </CardTitle>
           </CardHeader>
 
           {/* Scrollbarer Content der Aufschlüsselung */}
           <CardContent className="space-y-6 text-left flex-1 overflow-y-auto pt-6 subpixel-antialiased scrollbar-thin scrollbar-thumb-white/10 scrollbar-track-transparent pr-2">
-            <div className="p-4 rounded-xl bg-white/5 space-y-6">
+            <div className="space-y-6">
               {finalItemsToShow.map((item, itemIdx) => (
-                <div key={itemIdx} className="space-y-3 border-b border-white/10 pb-4 last:border-0 last:pb-0">
-                  <div className="flex justify-between items-center bg-white/5 p-2.5 rounded-lg border border-white/5">
+                <div key={itemIdx} className="space-y-3 border-b border-white/5 pb-5 last:border-0 last:pb-0">
+                  <div className="flex justify-between items-center bg-white/5 p-3 rounded-xl border border-white/10">
                     <span className="text-white font-bold text-sm">Kasse: {item.deviceName}</span>
-                    <span className="text-xs text-sky-400 font-semibold uppercase px-2 py-0.5 rounded bg-sky-500/10 border border-sky-500/20">
+                    <span className={`text-[10px] px-2 py-0.5 rounded border ${item.billingInterval === 'one_time' ? 'border-amber-500/30 text-amber-400 bg-amber-500/10' : 'border-emerald-500/30 text-emerald-400 bg-emerald-500/10'} font-semibold uppercase`}>
                       {item.billingInterval === 'one_time' ? 'Kauf' : 'Abo'}
                     </span>
                   </div>
@@ -185,8 +222,8 @@ export function StepSummary({
                     const freeLimit = cat.allow_multiselect ? cat.free_items_limit : 0
 
                     return (
-                      <div key={cat.id} className="text-sm space-y-1.5 pl-2">
-                        <span className="text-slate-400 text-xs font-semibold uppercase tracking-wider block">{cat.name}:</span>
+                      <div key={cat.id} className="text-sm space-y-2 pl-2">
+                        <span className="text-slate-500 text-[10px] font-bold uppercase tracking-wider block">{cat.name}:</span>
                         {sortedProds.map((prod, idx) => {
                           const isFree = idx < freeLimit
                           const isAbo = item.billingInterval === 'monthly'
@@ -196,9 +233,9 @@ export function StepSummary({
                               <span className="flex items-center gap-1.5">
                                 <CategoryIcon icon={cat.icon} className="w-3.5 h-3.5 text-primary shrink-0" />
                                 {prod.name}
-                                {isFree && <span className="text-[10px] bg-green-500/20 text-green-400 px-1.5 py-0.5 rounded border border-green-500/30">Inklusive</span>}
+                                {isFree && <span className="text-[9px] bg-green-500/20 text-green-400 px-1.5 py-0.5 rounded border border-green-500/30 font-bold uppercase">Inklusive</span>}
                               </span>
-                              <span className="font-mono text-xs">
+                              <span className="font-bold text-xs text-white">
                                 {isFree ? '0,00 €' : new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(displayPrice)}
                               </span>
                             </div>
@@ -207,7 +244,7 @@ export function StepSummary({
 
                         {/* Selected Modules */}
                         {sel?.moduleIds && sel.moduleIds.length > 0 && (
-                          <div className="pl-4 space-y-1 pt-1">
+                          <div className="pl-4 space-y-1.5 pt-1">
                             {sel.moduleIds.map((mId: string) => {
                               let modObj: any = null
                               products.forEach(p => {
@@ -224,7 +261,7 @@ export function StepSummary({
                               return (
                                 <div key={mId} className="flex justify-between text-slate-400 text-xs">
                                   <span>+ {modObj.name} {qty > 1 ? `(${qty}x)` : ''}</span>
-                                  <span className="font-mono">
+                                  <span className="font-semibold text-slate-300">
                                     {new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(totalPrice)}
                                   </span>
                                 </div>
@@ -240,12 +277,12 @@ export function StepSummary({
 
               {/* Gebühren & Zusatz-Positionen */}
               {linkedFeeProducts.length > 0 && (
-                <div className="border-t border-white/10 pt-3 space-y-2">
-                  <span className="text-slate-400 text-xs font-semibold uppercase tracking-wider block">Service & Gebühren:</span>
+                <div className="border-t border-white/5 pt-4 space-y-2">
+                  <span className="text-slate-500 text-[10px] font-bold uppercase tracking-wider block">Service & Gebühren:</span>
                   {linkedFeeProducts.map(fp => (
                     <div key={fp.id} className="flex justify-between text-xs text-slate-300">
                       <span>{fp.name}</span>
-                      <span className="font-mono">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(fp.base_price)}</span>
+                      <span className="font-bold text-white">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(fp.base_price)}</span>
                     </div>
                   ))}
                 </div>
@@ -254,38 +291,38 @@ export function StepSummary({
 
             {/* Summen-Berechnung */}
             {oneTimeTotal > 0 ? (
-              <div className="space-y-1.5 border-t border-white/10 pt-4">
-                <div className="flex justify-between text-sm text-slate-400">
+              <div className="space-y-2 border-t border-white/10 pt-5">
+                <div className="flex justify-between text-xs text-slate-400">
                   <span>Netto-Gesamtbetrag:</span>
-                  <span className="font-mono">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(oneTimeNet)}</span>
+                  <span className="font-semibold text-white">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(oneTimeNet)}</span>
                 </div>
-                <div className="flex justify-between text-sm text-slate-400">
+                <div className="flex justify-between text-xs text-slate-400">
                   <span>zzgl. 19% MwSt.:</span>
-                  <span className="font-mono">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(oneTimeTax)}</span>
+                  <span className="font-semibold text-white">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(oneTimeTax)}</span>
                 </div>
                 {updatePriceModifier.label && (
-                  <div className="text-sm text-green-400 font-semibold bg-green-500/10 p-2 rounded border border-green-500/20 my-1">
+                  <div className="text-xs text-green-400 font-semibold bg-green-500/10 p-2.5 rounded-xl border border-green-500/20 my-1">
                     {updatePriceModifier.label}
                   </div>
                 )}
-                <div className="flex justify-between text-lg font-bold text-sky-400 pt-2 border-t border-white/5">
+                <div className="flex justify-between text-base font-bold text-primary pt-3 border-t border-white/5">
                   <span>Gesamtbetrag (brutto):</span>
-                  <span className="font-mono">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(oneTimeGross)}</span>
+                  <span className="font-bold text-white">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(oneTimeGross)}</span>
                 </div>
               </div>
             ) : (
-              <div className="space-y-1.5 border-t border-white/10 pt-4">
-                <div className="flex justify-between text-sm text-slate-400">
+              <div className="space-y-2 border-t border-white/10 pt-5">
+                <div className="flex justify-between text-xs text-slate-400">
                   <span>Netto-Gesamtbetrag:</span>
-                  <span className="font-mono">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(monthlyNet)} / mtl.</span>
+                  <span className="font-semibold text-white">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(monthlyNet)} / mtl.</span>
                 </div>
-                <div className="flex justify-between text-sm text-slate-400">
+                <div className="flex justify-between text-xs text-slate-400">
                   <span>zzgl. 19% MwSt.:</span>
-                  <span className="font-mono">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(monthlyTax)} / mtl.</span>
+                  <span className="font-semibold text-white">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(monthlyTax)} / mtl.</span>
                 </div>
-                <div className="flex justify-between text-lg font-bold text-sky-400 pt-2 border-t border-white/5">
+                <div className="flex justify-between text-base font-bold text-primary pt-3 border-t border-white/5">
                   <span>Gesamtbetrag (brutto):</span>
-                  <span className="font-mono">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(monthlyGross)} / mtl.</span>
+                  <span className="font-bold text-white">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(monthlyGross)} / mtl.</span>
                 </div>
               </div>
             )}