diff --git a/EpsonTest.Templates/Templates/FinalReceipt.xml b/EpsonTest.Templates/Templates/FinalReceipt.xml
index fc19b2f..2f1b84c 100644
--- a/EpsonTest.Templates/Templates/FinalReceipt.xml
+++ b/EpsonTest.Templates/Templates/FinalReceipt.xml
@@ -10,15 +10,22 @@
 		<line>Debitorenrechnung</line>
 	</if>
 
-	<columns left="{{ReceiptLabel}}" right="{{DateTime:HH:mm dd.MM.yyyy}}" bold="true" />
+	<row bold="true">
+		<col align="left">{{ReceiptLabel}}</col>
+		<col align="right">{{DateTime:HH:mm dd.MM.yyyy}}</col>
+	</row>
 	<line>Guests: {{Guests}}</line>
 	<line />
-	
+
 
 	<foreach items="Items" var="item">
-		<columns left="{{item.Quantity}}x {{item.Description}}" right="{{item.PriceDisplay}}" wrap="true" />
+		<row>
+			<col align="right" width="4">{{item.Quantity}}x </col>
+			<col align="left" wrap="true">{{item.Description}}</col>
+			<col align="right">{{item.PriceDisplay}}</col>
+		</row>
 		<foreach items="item.SubItems" var="sub">
-			<line>  - {{sub}}</line>
+			<line>    - {{sub}}</line>
 		</foreach>
 	</foreach>
 
@@ -35,7 +42,10 @@
 	</if>
 
 	<if test="DiscountInfo">
-		<columns left="{{DiscountInfo.Description}}" right="{{DiscountInfo.Amount:F2}} {{DiscountInfo.Currency}}" wrap="true" />
+		<row>
+			<col align="left" wrap="true">{{DiscountInfo.Description}}</col>
+			<col align="right">{{DiscountInfo.Amount:F2}} {{DiscountInfo.Currency}}</col>
+		</row>
 		<line />
 	</if>
 
@@ -46,14 +56,17 @@
 		<line />
 	</if>
 
-	<columns left="{{PaymentMethod}}" right="{{PaymentAmount:F2}} {{Currency}}" bold="true" />
+	<row bold="true">
+		<col align="left">{{PaymentMethod}}</col>
+		<col align="right">{{PaymentAmount:F2}} {{Currency}}</col>
+	</row>
 	<line />
 
 	<foreach items="TaxBreakdown" var="tax">
 		<if test="$first">
 			<row>
 				<col width="25%" align="left">MwSt  %</col>
-				<col width="25%" align="right" wrap="true" >Brutto</col>
+				<col width="25%" align="right" wrap="true">Brutto</col>
 				<col width="25%" align="right" wrap="true">Netto</col>
 				<col width="25%" align="right">MwSt</col>
 			</row>
@@ -72,11 +85,20 @@
 
 	<line />
 
-	<columns left="Bedient von:" right="{{WaiterName}}" />
+	<row>
+		<col align="left">Bedient von:</col>
+		<col align="right">{{WaiterName}}</col>
+	</row>
 	<if test="Terminal">
-		<columns left="Terminal:" right="{{Terminal}}" />
+		<row>
+			<col align="left">Terminal:</col>
+			<col align="right">{{Terminal}}</col>
+		</row>
 	</if>
-	<columns left="Tisch:" right="{{TableNumber}}" />
+	<row>
+		<col align="left">Tisch:</col>
+		<col align="right">{{TableNumber}}</col>
+	</row>
 	<line />
 	<line />
 
@@ -88,16 +110,46 @@
 		<line align="center">{{tr.BookingType}}</line>
 		<line align="center">{{tr.PaymentSystem}}</line>
 		<line>{{tr.TransactionNumber}}</line>
-		<columns left="{{tr.TransactionDateTime:dd.MM.yyyy}}" right="{{tr.TransactionDateTime:HH:mm:ss}}" />
-		<columns left="Trm-Id:" right="{{tr.TerminalId}}" />
-		<columns left="AID:" right="{{tr.AID}}" />
-		<columns left="Trx. Seq-Cnt:" right="{{tr.TransactionSeqCount}}" />
-		<columns left="Trx. Ref-No:" right="{{tr.TransactionRefNo}}" />
-		<columns left="Auth. Code:" right="{{tr.AuthCode}}" />
-		<columns left="Acq-Id:" right="{{tr.AcquirerId}}" />
-		<columns left="EFT {{tr.Currency}}:" right="{{tr.EftAmount:F2}}" />
-		<columns left="Trinkgeld {{tr.Currency}}:" right="{{tr.TipAmount:F2}}" />
-		<columns left="Total-EFT {{tr.Currency}}:" right="{{tr.TotalEftAmount:F2}}" />
+		<row>
+			<col align="left">{{tr.TransactionDateTime:dd.MM.yyyy}}</col>
+			<col align="right">{{tr.TransactionDateTime:HH:mm:ss}}</col>
+		</row>
+		<row>
+			<col align="left">Trm-Id:</col>
+			<col align="right">{{tr.TerminalId}}</col>
+		</row>
+		<row>
+			<col align="left">AID:</col>
+			<col align="right">{{tr.AID}}</col>
+		</row>
+		<row>
+			<col align="left">Trx. Seq-Cnt:</col>
+			<col align="right">{{tr.TransactionSeqCount}}</col>
+		</row>
+		<row>
+			<col align="left">Trx. Ref-No:</col>
+			<col align="right">{{tr.TransactionRefNo}}</col>
+		</row>
+		<row>
+			<col align="left">Auth. Code:</col>
+			<col align="right">{{tr.AuthCode}}</col>
+		</row>
+		<row>
+			<col align="left">Acq-Id:</col>
+			<col align="right">{{tr.AcquirerId}}</col>
+		</row>
+		<row>
+			<col align="left">EFT {{tr.Currency}}:</col>
+			<col align="right">{{tr.EftAmount:F2}}</col>
+		</row>
+		<row>
+			<col align="left">Trinkgeld {{tr.Currency}}:</col>
+			<col align="right">{{tr.TipAmount:F2}}</col>
+		</row>
+		<row>
+			<col align="left">Total-EFT {{tr.Currency}}:</col>
+			<col align="right">{{tr.TotalEftAmount:F2}}</col>
+		</row>
 		<separator />
 		<line />
 	</foreach>