diff --git a/checkout.summary.html b/checkout.summary.html
index d2d590c..212fdb9 100644
--- a/checkout.summary.html
+++ b/checkout.summary.html
@@ -445,7 +445,7 @@
 						<td>&nbsp;</td>
 					</tr>
 
-					<!--{{vtIf: {vtGet:Mehrwertsteuer} .gt. 0 }}-->
+					<!--{{vtIf: {vtGet:Mehrwertsteuer} .gt. 0 .and. {vtGlobal:pxtcVatHandling} .eq. excluded }}-->
 						<tr>
 							<td>{{vtGet:s_fld_netvalue}}:</td>
 							<td class="text-monospace">
@@ -501,6 +501,62 @@
 							<td><strong>{{vtGet:s_fld_total}}:</strong></td>
 							<td class="text-monospace"><strong>{{vtGet:Gesamtpreis|num-en:2}} {{vtSession:Currency}}</strong></td>
 						</tr>
+					<!--{{vtElseIf: {vtGet:Mehrwertsteuer} .gt. 0 .and. {vtGlobal:pxtcVatHandling} .neq. excluded }}-->
+						<tr>
+							<td>{{vtGet:s_fld_netvalue}}:</td>
+							<td class="text-monospace">
+								{{vtGet:Warenwert_brutto|num-en:2}} {{vtSession:Currency}}
+								<small class="text-muted">{{vtGet:Warenwert_netto|num-en:2}} {{vtSession:Currency}}</small>
+							</td>
+						</tr>
+						<!--{{vtIf: {vtGet:Rabatt_netto} .gt. 0 }}-->
+							<tr>
+								<td>{{vtGet:s_fld_discount}}:</td>
+								<td class="text-monospace">
+									-{{vtGet:Rabatt_brutto|num-en:2}} {{vtSession:Currency}}
+									<small class="text-muted">-{{vtGet:Rabatt_netto|num-en:2}} {{vtSession:Currency}}</small>
+								</td>
+							</tr>
+						<!--{{vtEndIf}}-->
+						<!--{{vtIf: {vtGet:CD_Versand_netto} .gt. 0 }}-->
+							<tr>
+								<td>
+									<!--{{vtIf: {vtGet:Language} .eq. en .and. {vtGlobal:pxtcDeliveryDownloadablesText2en} .neq. }}-->
+										{{vtGlobal:pxtcDeliveryDownloadablesText2en}}:
+									<!--{{vtElse}}-->
+										{{vtGlobal:pxtcDeliveryDownloadablesText2de}}:
+									<!--{{vtEndIf}}-->
+								</td>
+								<td class="text-monospace">
+									{{vtGet:CD_Versand_brutto|num-en:2}} {{vtSession:Currency}}
+									<small class="text-muted">{{vtGet:CD_Versand_netto|num-en:2}} {{vtSession:Currency}}</small>
+								</td>
+							</tr>
+						<!--{{vtEndIf}}-->
+						<!--{{vtIf: {vtGet:Auftragspauschale_netto} .gt. 0 }}-->
+							<tr>
+								<td>{{vtGet:s_fld_lumpsum}}</td>
+								<td class="text-monospace">
+									{{vtGet:Auftragspauschale_brutto|num-en:2}} {{vtSession:Currency}}
+									<small class="text-muted">{{vtGet:Auftragspauschale_netto|num-en:2}} {{vtSession:Currency}}</small>
+								</td>
+							</tr>
+						<!--{{vtEndIf}}-->
+						<tr>
+							<td>{{vtGet:s_fld_shipping_costs}}:</td>
+							<td class="text-monospace">
+								{{vtGet:Versandkosten_brutto|num-en:2}} {{vtSession:Currency}}
+								<small class="text-muted">{{vtGet:Versandkosten_netto|num-en:2}} {{vtSession:Currency}}</small>
+							</td>
+						</tr>
+						<tr>
+							<td>{{vtGet:s_txt_0038}}:</td>
+							<td class="text-monospace">{{vtGet:Mehrwertsteuer|num-en:2}} {{vtSession:Currency}}</td>
+						</tr>
+						<tr>
+							<td><strong>{{vtGet:s_fld_total}}:</strong></td>
+							<td class="text-monospace"><strong>{{vtGet:Gesamtpreis|num-en:2}} {{vtSession:Currency}}</strong></td>
+						</tr>
 					<!--{{vtElse}}-->
 						<tr>
 							<td>{{vtGet:s_fld_netvalue}}:</td>
diff --git a/image.html b/image.html
index f3e3855..d6597c2 100644
--- a/image.html
+++ b/image.html
@@ -412,6 +412,12 @@
 
 <!--{{vtEndIf}}-->
 
+<!--{{vtCapture:PageFooter}}-->
+	<!--{{vtRepeat: {vtGlobal:activePlugins} }}-->
+		{{vtInclude: /plugins/{vtItem}/inc/image_footer.html }}
+	<!--{{vtEndRepeat}}-->
+<!--{{vtEndCapture}}-->
+
 <!--{{vtSet: PageBodyClass = "{vtGet:PageBodyClass} view_{vtGet:Template}" }}-->
 
 {{vtTemplate: /config/views/{vtGet:Template}.html, views/{vtGet:Template}.html }}
diff --git a/includes/header_r.html b/includes/header_r.html
index 0e5cbe3..2d609da 100644
--- a/includes/header_r.html
+++ b/includes/header_r.html
@@ -345,7 +345,7 @@
 								{{vtEndIf}}
 							-->
 							<li id="LgSwitchButton" class="nav-item d-lg-none {{vtIf: {vtGlobal:pxtcAllowLanguageSwitch} .neq. 2 }}d-xl-inline{{vtEndIf}}">
-								<a href="{{vtLink:-met='{vtGetValue:-met}', lg='{vtGet:LinkLanguage}'}}&amp;o={{vtGetValue:o}}&amp;t={{vtGetValue:t}}" class="nav-link">
+								<a href="{{vtLink:-met='{vtCurrentMethod}', lg='{vtGet:LinkLanguage}'}}&amp;o={{vtGetValue:o}}&amp;t={{vtGetValue:t}}" class="nav-link">
 									<i class="fas fa-globe {{vtIf: {vtGlobal:pxtcAllowLanguageSwitch} .eq. 1 }}d-none d-lg-inline d-xl-none{{vtElseIf: {vtGlobal:pxtcAllowLanguageSwitch} .eq. 2}}d-xl-none{{vtEndIf}}"></i>
 									<span class="d-lg-none d-xl-inline">{{vtGet:LabelLanguage}}</span>
 								</a>
@@ -357,7 +357,7 @@
 								</a>
 								<div class="dropdown-menu">
 									<a class="dropdown-item disabled" href="#">{{vtGet:FirstLanguage}}</a>
-									<a class="dropdown-item" href="{{vtLink:-met='{vtGetValue:-met}', lg='{vtGet:LanguageSwitch}'}}{{vtGet:UrlAddition}}">{{vtGet:SecondLanguage}}</a>
+									<a class="dropdown-item" href="{{vtLink:-met='{vtCurrentMethod}', lg='{vtGet:LanguageSwitch}'}}{{vtGet:UrlAddition}}">{{vtGet:SecondLanguage}}</a>
 								</div>
 							</li>
 						<!--{{vtEndIf}}-->
diff --git a/product.vtedit.html b/product.vtedit.html
index 341e514..2f1c696 100644
--- a/product.vtedit.html
+++ b/product.vtedit.html
@@ -54,6 +54,7 @@
 					$( '#Rabattstaffel' ).hide();
 				}
 			});
+			$( 'input[name="Rabatt_anwenden"]' ).change();
 
 			$( 'input[name="-hires_path"]' ).change( function(){
 				handleChange_path();
diff --git a/setup_details.html b/setup_details.html
index d364a14..248045a 100644
--- a/setup_details.html
+++ b/setup_details.html
@@ -69,6 +69,17 @@
 				</td>
 			</tr>
 			<tr><td colspan="2">&nbsp;</td></tr>
+			<tr>
+				<td align="right" class="normal">Bestelldialog</td>
+				<td class="normal">
+					<!--{{vtIf: {pxtcDetailInlineOrderDialog} .eq. 1 }}-->
+						stets einblenden
+					<!--{{vtElse}}-->
+						in eigenem Fenster öffnen
+					<!--{{vtEndIf}}-->
+				</td>
+			</tr>
+			<tr><td colspan="2">&nbsp;</td></tr>
 			<tr>
 				<td align="right" class="normal">Zusatzinfos</td>
 				<td class="normal">
diff --git a/setup_details.vtedit.html b/setup_details.vtedit.html
index 76b9ca1..811f7a4 100644
--- a/setup_details.vtedit.html
+++ b/setup_details.vtedit.html
@@ -123,6 +123,16 @@
 				</td>
 			</tr>
 			<tr><td colspan="2">&nbsp;</td></tr>
+			<tr>
+				<td align="right" class="normal">Bestelldialog</td>
+				<td class="normal">
+					<select name="pxtcDetailInlineOrderDialog" size="1">
+						<option value="">in eigenem Fenster öffnen</option>
+						<option value="1" {{vtIf: {pxtcDetailInlineOrderDialog} .eq.1}}selected{{vtEndIf}}>stets einblenden</option>
+					</select>
+				</td>
+			</tr>
+			<tr><td colspan="2">&nbsp;</td></tr>
 			<tr>
 				<td align="right" class="normal">Zusatzinfos</td>
 				<td class="normal">
diff --git a/views/image_r.html b/views/image_r.html
index 9351775..99fd8a6 100644
--- a/views/image_r.html
+++ b/views/image_r.html
@@ -57,6 +57,7 @@
 
 		#action-panel { z-index:1010; position:fixed; bottom:20px; right:20px; }
 		#load-page { z-index:9251; }
+		#add-to-cart .modal-body table { width: 99%; }
 
 	</style>
 	<!--{{vtRepeat: {vtGet:ProductList} }}-->
@@ -153,7 +154,7 @@
 						<div class="btn-group mb-2">
 							<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 								<i class="fas fa-download"></i>
-								Herunterladen
+								{{vtGet:s_btn_download_short}}
 							</button>
 							<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
 								<!--{{vtRepeat: {vtGet:Downloads} }}-->
