diff --git a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/100.phtml b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/100.phtml
index 48d5928db..05637bfb0 100755
--- a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/100.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/100.phtml
@@ -13,7 +13,7 @@ $this->headScript()->prependFile('/'. $this->designPath . '/js/saxoprint.js');
     }
 
 </script>
-<div class="md:flex mt-10 md:w-2/4 m-auto gap-10">
+<div class="md:flex mt-10 md:w-2/4 md:m-auto gap-10  ml-2 mr-2  md:mt-10">
     <div class="md:w-1/2">
         <?php if ($this->article->file != "" && $this->layouterPreviewId == "") : ?>
             <?php echo $this->image()->thumbnailImage($this->article->title, 'productdetail', $this->article->file); ?>
@@ -24,7 +24,7 @@ $this->headScript()->prependFile('/'. $this->designPath . '/js/saxoprint.js');
         <p><?php echo $this->article->einleitung ?></p>
     </div>
 </div>
-<div class="border border-slate-200 mt-10 md:w-2/4 m-auto">
+<div class="border border-slate-200 mt-10 md:w-2/4 md:m-auto ml-2 mr-2 md:mt-10">
     <div class="bg-gray-200 divide-x flex w-full" id="default-tab" data-tabs-active-classes="border-b-2 border-gray-400 bg-gray-300" data-tabs-toggle="#product-content" role="tablist">
         <div class="w-1/2 p-1 cursor-pointer" data-tabs-target="#div-calc" type="button" role="tab" aria-controls="div-calc" aria-selected="false">Kalkulation</div>
         <div class="w-1/2 p-1 cursor-pointer" data-tabs-target="#div-details" type="button" role="tab" aria-controls="div-details" aria-selected="false">Beschreibung</div>
@@ -56,8 +56,12 @@ $this->headScript()->prependFile('/'. $this->designPath . '/js/saxoprint.js');
                         </tbody>
                     </table>
                     <?php if (!$this->article->not_buy) : ?>
-                        <input type="hidden" id="upload_mode" name="upload_mode" value="<?php echo $this->upload_mode ?>" />
-                        <button type="button" id="in_basket" class="w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full disabled bg-highlight "><?= $this->translate('Buy') ?></button>
+                                        <form action="/article/buy/?id=<?= $this->article->id ?>" target="_self" class="buy" role="form" id="buyform" method="POST">
+                                            <input type="hidden" value="1" name="count">
+                                            <input type="hidden" id="upload_mode" name="upload_mode" value="<?php echo $this->upload_mode ?>" />
+                                            <input type="hidden" value="" name="collecting_orders_data" id="collecting_orders_data"/>
+                        <button type="submit" id="in_basket" class="w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full disabled bg-highlight "><?= $this->translate('Buy') ?></button>
+                        </form>
                     <?php endif; ?>
                     <?php if ($this->article->as_offer) : ?><button type="button" class="w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-slate-200 border bg-highlight text-black p-2 pl-5 pr-5 rounded-full disabled bg-slate-50 mt-5 "><?php echo $this->translate('Angebot drucken') ?></button><?php endif; ?>
                 </div>
@@ -68,3 +72,4 @@ $this->headScript()->prependFile('/'. $this->designPath . '/js/saxoprint.js');
         </div>
     </div>
 </div>
+
diff --git a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/100_basket_index.phtml b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/100_basket_index.phtml
index ce52a1cde..1968ce341 100755
--- a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/100_basket_index.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/100_basket_index.phtml
@@ -4,7 +4,7 @@
 $articleObj = new market_article();
     $filesOptions =$this->article['basketarticle']->getFiles();
 ?>
-    <div class="col-sm-3">
+    <div class="basis-4/12">
     	<?php if(($basketArticle['a6_org_article'] == 0 || $basketArticle['a6_org_article'] == "") && ($this->article['basketarticle']->getLayouterId() == "" || $this->article['basketarticle']->getLayouterId() == false)): ?>
     		<?php echo $this->image()->thumbnailImage($basketArticle['title'], 'articlelist', $basketArticle['file']); ?>
     	<?php elseif(($basketArticle['a6_org_article'] != 0 && $basketArticle['file'] != "") && ($this->article['basketarticle']->getLayouterId() == "" || $this->article['basketarticle']->getLayouterId() == false)): ?>
@@ -13,7 +13,7 @@ $articleObj = new market_article();
             <?= $articleObj->generatePreview($basketArticle['id'],$this->article['basketarticle']->getLayouterId()); ?>
         <?php endif; ?>
     </div>
-    <div class="col-sm-5"><span class="mobilelabel"><strong>Anzahl:</strong> </span>
+    <div class="basis-5/12"><span class="mobilelabel"><strong>Anzahl:</strong> </span>
         <?php if(isset($count)): ?>
             <strong><?php echo $count ?></strong>
     	<?php else: ?>
@@ -65,7 +65,7 @@ $articleObj = new market_article();
         <?php endif; ?>
         Gewicht: <?php echo $this->article['basketarticle']->getWeight() ?>
     </div>
-    <div class="col-sm-4" style="text-align: right;">
+    <div class="basis-4/12" style="text-align: right;">
     <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php echo $this->currency->toCurrency($this->article['basketarticle']->getNetto()*$this->article['basketarticle']->getCount()) ?> <label style="font-size:14px; font-weight:100;width: 45px;">(Netto)</label><br /><strong><?php echo $this->currency->toCurrency($this->article['basketarticle']->getBrutto()*$this->article['basketarticle']->getCount()) ?></strong> <label style="font-size:14px; font-weight:100;"><?php echo $this->translate('(Brutto inkl. '.$basketArticle["mwert"].'% MwSt.)')?></label></label><?php } ?>
         <br/><a href="<?php echo $this->url(array('del' => $this->article['uuid']), 'basketdel') ?>"><?php echo $this->translate('Löschen'); ?></a>
         <br/><a href="<?php echo $this->url(array('key' => $this->article['uuid']), 'articleload') ?>"><?php echo $this->translate('Bearbeiten') ?></a>
diff --git a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/101_basket_index.phtml b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/101_basket_index.phtml
index 863fa80da..c0a893267 100755
--- a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/101_basket_index.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/101_basket_index.phtml
@@ -5,7 +5,7 @@ $articleObj = new market_article();
     $filesOptions =$this->article['basketarticle']->getFiles();
 
 ?>
-    <div class="col-sm-3">
+    <div class="basis-3/12">
     	<?php if(($basketArticle['a6_org_article'] == 0 || $basketArticle['a6_org_article'] == "") && ($this->article['basketarticle']->getLayouterId() == "" || $this->article['basketarticle']->getLayouterId() == false)): ?>
     		<?php echo $this->image()->thumbnailImage($basketArticle['title'], 'articlelist', $basketArticle['file']); ?>
     	<?php elseif(($basketArticle['a6_org_article'] != 0 && $basketArticle['file'] != "") && ($this->article['basketarticle']->getLayouterId() == "" || $this->article['basketarticle']->getLayouterId() == false)): ?>
@@ -14,7 +14,7 @@ $articleObj = new market_article();
             <?= $articleObj->generatePreview($basketArticle['id'],$this->article['basketarticle']->getLayouterId()); ?>
         <?php endif; ?>
     </div>
-    <div class="col-sm-5"><span class="mobilelabel"><strong>Anzahl:</strong> </span>
+    <div class="basis-5/12"><span class="mobilelabel"><strong>Anzahl:</strong> </span>
         <?php if(isset($count)): ?>
             <strong><?php echo $count ?></strong>
     	<?php else: ?>
@@ -66,7 +66,7 @@ $articleObj = new market_article();
         <?php endif; ?>
         Gewicht: <?php echo $this->article['basketarticle']->getWeight() ?>
     </div>
-    <div class="col-sm-4" style="text-align: right;">
+    <div class="basis-4/12" style="text-align: right;">
     <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php echo $this->currency->toCurrency($this->article['basketarticle']->getNetto()*$this->article['basketarticle']->getCount()) ?> <label style="font-size:14px; font-weight:100;width: 45px;">(Netto)</label><br /><strong><?php echo $this->currency->toCurrency($this->article['basketarticle']->getBrutto()*$this->article['basketarticle']->getCount()) ?></strong> <label style="font-size:14px; font-weight:100;"><?php echo $this->translate('(Brutto inkl. '.$basketArticle["mwert"].'% MwSt.)')?></label></label><?php } ?>
         <br/><a href="<?php echo $this->url(array('del' => $this->article['uuid']), 'basketdel') ?>"><?php echo $this->translate('Löschen'); ?></a>
         <br/><a href="<?php echo $this->url(array('key' => $this->article['uuid']), 'articleload') ?>"><?php echo $this->translate('Bearbeiten') ?></a>
diff --git a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/6.phtml b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/6.phtml
index a6c52f7f7..d8d8293f8 100755
--- a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/6.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/6.phtml
@@ -36,7 +36,7 @@
     }
 
 </script>
-<div class="md:flex mt-10 md:w-2/4 m-auto gap-10">
+<div class="md:flex mt-10 md:w-2/4 md:m-auto gap-10 ml-2 mr-2">
     <div class="md:w-1/2">
         <?php if ($this->article->file != "" && $this->layouterPreviewId == "") : ?>
             <?php echo $this->image()->thumbnailImage($this->article->title, 'productdetail', $this->article->file); ?>
@@ -47,7 +47,7 @@
         <p><?php echo $this->article->einleitung ?></p>
     </div>
 </div>
-<div class="border border-slate-200 mt-10 md:w-2/4 m-auto">
+<div class="border border-slate-200 mt-10 md:w-2/4 md:m-auto  ml-2 mr-2 md:mt-10">
     <div class="bg-gray-200 divide-x flex w-full" id="default-tab" data-tabs-active-classes="border-b-2 border-gray-400 bg-gray-300" data-tabs-toggle="#product-content" role="tablist">
         <div class="w-1/2 p-1 cursor-pointer" data-tabs-target="#div-calc" type="button" role="tab" aria-controls="div-calc" aria-selected="false">Kalkulation</div>
         <div class="w-1/2 p-1 cursor-pointer" data-tabs-target="#div-details" type="button" role="tab" aria-controls="div-details" aria-selected="false">Beschreibung</div>
@@ -87,3 +87,4 @@
         </div>
     </div>
 </div>
+
diff --git a/src/old/application/design/vorlagen/tailwindcss/layout/default.phtml b/src/old/application/design/vorlagen/tailwindcss/layout/default.phtml
index 533f46ca0..14a26c8d4 100755
--- a/src/old/application/design/vorlagen/tailwindcss/layout/default.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/layout/default.phtml
@@ -145,8 +145,8 @@
     <?= $this->layout()->CONTENT; ?>
     </div>
     <div class="bg-highlight mt-10 pt-10 pb-10">
-      <div class="flex flex-row m-auto w-2/3">
-        <div class="basis-1/3 text-white">
+      <div class="md:flex flex-row m-auto w-2/3">
+        <div class="md:basis-1/3 text-white mb-4 md:mb-0">
           <h2 class="text-2xl">Adresse</h2>
           <p class="mb-5">
             <a href="https://www.google.ch/maps/place/Lenzdruck+AG+I+Print-+und+Medienangebote+in+Zofingen/@47.301347,7.9782434,17z/data=!3m1!4b1!4m6!3m5!1s0x479015e5502b82ff:0xcf407054803cbfe7!8m2!3d47.301347!4d7.9808183!16s%2Fg%2F1tcv0bmf?hl=de&amp;entry=ttu" target="_blank" rel="noopener">Miescherweg 2</a><br/>
@@ -157,7 +157,7 @@
 				    <a href="mailto:info@lenzdruck.ch">info@lenzdruck.ch</a>
           </p>
         </div>
-        <div class="basis-1/3 text-white">
+        <div class="md:basis-1/3 text-white mb-4 md:mb-0">
           <h2 class="text-2xl">Sitemap</h2>
           <ul class="ml-4 list-disc">
             <li><a title="Druckerei" href="https://lenzdruck.ch/">Home</a></li>
@@ -170,7 +170,7 @@
             <li><a title="Druckereien" href="https://lenzdruck.ch/kontakt-kontaktformular-fragen/">Kontakt</a></li>
           </ul>
         </div>
-        <div class="basis-1/3 text-white">
+        <div class="md:basis-1/3 text-white">
           <h2 class="text-2xl">Rechtliches</h2>
           <ul class="ml-4 list-disc">
             <li><a href="https://lenzdruck.ch/agb/">AGB</a></li>
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/index/sliderproductsnosidenav.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/index/sliderproductsnosidenav.phtml
index 895243bf2..2e62e2ee4 100755
--- a/src/old/application/design/vorlagen/tailwindcss/templates/index/sliderproductsnosidenav.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/index/sliderproductsnosidenav.phtml
@@ -1,23 +1,23 @@
 <div class="mb-10">
   <h2 class="text-center mb-2 font-lenzFont text-4xl tracking-widest text-highlight font-medium m-auto">Printmedien Shop</h2>
-  <p class="m-auto text-lg text-center w-1/3">Erwerben Sie in unserem Printmedien Onlineshop günstige Druckprodukte zu erstklassiger Qualität kostenlos direkt zu Ihnen vor Ihre Haustüre geliefert.</p>
+  <p class="m-auto text-lg text-center md:w-1/3">Erwerben Sie in unserem Printmedien Onlineshop günstige Druckprodukte zu erstklassiger Qualität kostenlos direkt zu Ihnen vor Ihre Haustüre geliefert.</p>
 </div>
 
 <?php $articlegroups = $this->articlegroup()->getByArray($this->designsettings()->get('mc_start_productgroups')); ?>
 <?php $first = array_shift($articlegroups); ?>
-<div class="p-10 flex bg-dark w-2/4 m-auto text-white flex-row">
-  <div class="w-1/2">
+<div class="p-10 md:flex bg-dark w-3/4 md:w-2/4 m-auto text-white flex-row">
+  <div class="md:w-1/2">
     <a href="<?= $this->url(array('id' => $first->url), 'overview') ?>" class="">
       <?= $this->image()->thumbnailImage($first->title, 'productgrouplist', $first->image); ?>
     </a>
   </div>
-  <div class="w-1/2 p-5">
+  <div class="md:w-1/2 p-5">
     <h4 class="text-2xl font-lenzFont"><?php echo $first->title ?></h4>
     <p class="mt-4 mb-8 font-lenzFont"><?php echo $first->getEinleitung() ?></p>
     <a href="<?= $this->url(array('id' => $first->url), 'overview') ?>" class="uppercase bg-white p-4 text-black rounded-full text-sm font-bold transition ease-in-out duration-300 delay-150 hover:bg-black hover:text-white">Zu den Produkten</a>
   </div>
 </div>
-<div class="w-2/4 m-auto text-white gap-5 columns-2 pt-5">
+<div class="w-3/4 md:w-2/4 m-auto text-white gap-5 md:columns-2 pt-5">
 	<?php foreach ($articlegroups as $key => $articlegroup): ?>
   <div class="break-inside-avoid-column mb-5">
     <div class="bg-highlight p-10">
@@ -31,3 +31,4 @@
     </div>
 	<?php endforeach; ?>
 </div>
+
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/user/login.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/user/login.phtml
index 68ab6dccb..e7da82eee 100755
--- a/src/old/application/design/vorlagen/tailwindcss/templates/user/login.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/user/login.phtml
@@ -1,4 +1,4 @@
-<div class="columns-2 w-2/4 m-auto mt-5">
+<div class="md:columns-2 md:w-2/4 w-3/4 m-auto mt-5">
 	<div class="break-inside-avoid-column mb-5">
 		<h4 class="text-2xl text-highlight mb-4"><?php if(!$this->shop->private): ?><?php echo $this->translate('Wenn Sie bereits Kunde sind') ?><?php endif; ?></h4>
 		<div class="border border-slate-200 p-5">
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/user/resetpassword.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/user/resetpassword.phtml
index 90de39565..0f8c2958a 100755
--- a/src/old/application/design/vorlagen/tailwindcss/templates/user/resetpassword.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/user/resetpassword.phtml
@@ -1,36 +1,11 @@
-<div class="row">
+<div class="md:w-2/4 w-3/4 m-auto mt-5">
     
-	<div class="col-xs-12">
-	 
+	<h1 class="text-lg mb-2"><?php echo $this->translate('Passwort vergessen?') ?></h1>
 
-	    <h1><?php echo $this->translate('Passwort vergessen?') ?></h1>
+	<p class="mb-2"><strong><?php echo $this->translate('Dann sind Sie hier richtig!')?></strong></p>
 
+	<p class="mb-2"><?php echo $this->translate('Geben Sie bitte die Email-Adresse Ihres registrierten Accounts an und fahren Sie mit "Passwort zurücksetzen" fort. <br><br>Anschließend erhalten Sie eine Bestätigungs-Email.')?></p>
 
-	    <p><strong><?php echo $this->translate('Dann sind Sie hier richtig!')?></strong></p>
-
-	    <br>
-	</div>
-
-	<div class="col-sm-6 col-xs-12">
-	   
-	    <p>
-		<?php echo $this->translate('Geben Sie bitte die Email-Adresse Ihres registrierten Accounts an und fahren Sie mit "Passwort zurücksetzen" fort. <br><br>Anschließend erhalten Sie eine Bestätigungs-Email.')?>
-	    </p>
-	</div>
-
-	<div class="col-sm-6 col-xs-12">
-	    <div class="well" style="padding: 3em">
-		    <?php 
-			EasyBib_Form_Decorator::setFormDecorator($this->form, \EasyBib_Form_Decorator::BOOTSTRAP, 'submit');
-		       //echo $this->form->render();
-					$owd_FORM =  $this->form->setAttrib('class', 'niceform form-horizontal')->render();
-
-					 echo str_replace(	array('control-group','control-label','class="controls"', '<input type="text"', '<input type="password"', '<select', 'Passwort zurücksetzen'),
-								array('form-group','form-label','class="form-controls"', '<input type="text" class="form-control"', '<input type="password" class="form-control"', '<select class="form-control"', 'Passwort zurücksetzen'), 
-								$owd_FORM ); 
-		    ?>
+			<?= $this->partial('completeform.phtml', array('buttonName' => 'Zurücksetzen', 'buttonClass' => '', 'form' => $this->form)) ?>
 		 
-	    </div>
-	</div>
-	
-</div>
\ No newline at end of file
+</div>