diff --git a/upload/admin/view/template/extension/module/recurring_info.twig b/upload/admin/view/template/extension/module/recurring_info.twig
index b66e211d8..2cc99f347 100644
--- a/upload/admin/view/template/extension/module/recurring_info.twig
+++ b/upload/admin/view/template/extension/module/recurring_info.twig
@@ -19,32 +19,34 @@
             <h3 class="panel-title"><i class="fa fa-list"></i> {{ text_recurring_detail }}</h3>
           </div>
           <div class="panel-body">
-            <table class="table table-bordered">
-              <tr>
-                <td>{{ text_order_recurring_id }}</td>
-                <td>{{ order_recurring_id }}</td>
-              </tr>
-              <tr>
-                <td>{{ text_reference }}</td>
-                <td>{{ reference }}</td>
-              </tr>
-              <tr>
-                <td>{{ text_recurring_name }}</td>
-                <td>{{ recurring_name }}</td>
-              </tr>
-              <tr>
-                <td>{{ text_recurring_description }}</td>
-                <td>{{ recurring_description }}</td>
-              </tr>
-              <tr>
-                <td>{{ text_recurring_status }}</td>
-                <td>{{ recurring_status }}</td>
-              </tr>
-              <tr>
-                <td>{{ text_payment_method }}</td>
-                <td>{{ payment_method }}</td>
-              </tr>
-            </table>
+            <div class="table-responsive">
+              <table class="table table-bordered">
+                <tr>
+                  <td>{{ text_order_recurring_id }}</td>
+                  <td>{{ order_recurring_id }}</td>
+                </tr>
+                <tr>
+                  <td>{{ text_reference }}</td>
+                  <td>{{ reference }}</td>
+                </tr>
+                <tr>
+                  <td>{{ text_recurring_name }}</td>
+                  <td>{{ recurring_name }}</td>
+                </tr>
+                <tr>
+                  <td>{{ text_recurring_description }}</td>
+                  <td>{{ recurring_description }}</td>
+                </tr>
+                <tr>
+                  <td>{{ text_recurring_status }}</td>
+                  <td>{{ recurring_status }}</td>
+                </tr>
+                <tr>
+                  <td>{{ text_payment_method }}</td>
+                  <td>{{ payment_method }}</td>
+                </tr>
+              </table>
+            </div>
           </div>
         </div>
       </div>
@@ -54,33 +56,35 @@
             <h3 class="panel-title"><i class="fa fa-list"></i> {{ text_order_detail }}</h3>
           </div>
           <div class="panel-body">
-            <table class="table table-bordered">
-              <tr>
-                <td>{{ text_order_id }}</td>
-                <td><a href="{{ order }}">{{ order_id }}</a></td>
-              </tr>
-              <tr>
-                <td>{{ text_customer }}</td>
-                <td>
-                  {% if customer %}
-                    <a href="{{ customer }}">{{ firstname }} {{ lastname }}</a>
-                  {% else %}
-                    {{ firstname }} {{ lastname }}
-                  {% endif %}</td>
-              </tr>
-              <tr>
-                <td>{{ text_email }}</td>
-                <td>{{ email }}</td>
-              </tr>
-              <tr>
-                <td>{{ text_order_status }}</td>
-                <td>{{ order_status }}</td>
-              </tr>
-              <tr>
-                <td>{{ text_date_added }}</td>
-                <td>{{ date_added }}</td>
-              </tr>
-            </table>
+            <div class="table-responsive">
+              <table class="table table-bordered">
+                <tr>
+                  <td>{{ text_order_id }}</td>
+                  <td><a href="{{ order }}">{{ order_id }}</a></td>
+                </tr>
+                <tr>
+                  <td>{{ text_customer }}</td>
+                  <td>
+                    {% if customer %}
+                      <a href="{{ customer }}">{{ firstname }} {{ lastname }}</a>
+                    {% else %}
+                      {{ firstname }} {{ lastname }}
+                    {% endif %}</td>
+                </tr>
+                <tr>
+                  <td>{{ text_email }}</td>
+                  <td>{{ email }}</td>
+                </tr>
+                <tr>
+                  <td>{{ text_order_status }}</td>
+                  <td>{{ order_status }}</td>
+                </tr>
+                <tr>
+                  <td>{{ text_date_added }}</td>
+                  <td>{{ date_added }}</td>
+                </tr>
+              </table>
+            </div>
           </div>
         </div>
       </div>
@@ -90,20 +94,22 @@
         <h3 class="panel-title"><i class="fa fa-list"></i> {{ text_product_detail }}</h3>
       </div>
       <div class="panel-body">
-        <table class="table table-bordered">
-          <thead>
-          <tr>
-            <td>{{ text_product }}</td>
-            <td>{{ text_quantity }}</td>
-          </tr>
-          </thead>
-          <tbody>
-          <tr>
-            <td>{{ product }}</td>
-            <td>{{ quantity }}</td>
-          </tr>
-          </tbody>
-        </table>
+        <div class="table-responsive">
+          <table class="table table-bordered">
+            <thead>
+              <tr>
+                <td>{{ text_product }}</td>
+                <td>{{ text_quantity }}</td>
+              </tr>
+            </thead>
+            <tbody>
+            <tr>
+              <td>{{ product }}</td>
+              <td>{{ quantity }}</td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
       </div>
     </div>
     <div class="panel panel-default">
@@ -111,30 +117,32 @@
         <h3 class="panel-title"><i class="fa fa-list"></i> {{ text_transaction }}</h3>
       </div>
       <div class="panel-body"> {{ buttons }}
-        <table class="table table-bordered">
-          <thead>
-          <tr>
-            <td class="text-left">{{ column_date_added }}</td>
-            <td class="text-right">{{ column_amount }}</td>
-            <td class="text-left">{{ column_type }}</td>
-          </tr>
-          </thead>
-          <tbody>
-          {% if transactions %}
-            {% for transaction in transactions %}
+        <div class="table-responsive">
+          <table class="table table-bordered">
+            <thead>
               <tr>
-                <td class="text-left">{{ transaction.date_added }}</td>
-                <td class="text-right">{{ transaction.amount }}</td>
-                <td class="text-left">{{ transaction.type }}</td>
+                <td class="text-left">{{ column_date_added }}</td>
+                <td class="text-right">{{ column_amount }}</td>
+                <td class="text-left">{{ column_type }}</td>
               </tr>
-            {% endfor %}
-          {% else %}
-            <tr>
-              <td class="text-center" colspan="7">{{ text_no_results }}</td>
-            </tr>
-          {% endif %}
-          </tbody>
-        </table>
+            </thead>
+            <tbody>
+              {% if transactions %}
+                {% for transaction in transactions %}
+                  <tr>
+                    <td class="text-left">{{ transaction.date_added }}</td>
+                    <td class="text-right">{{ transaction.amount }}</td>
+                    <td class="text-left">{{ transaction.type }}</td>
+                  </tr>
+                {% endfor %}
+              {% else %}
+                <tr>
+                  <td class="text-center" colspan="7">{{ text_no_results }}</td>
+                </tr>
+              {% endif %}
+            </tbody>
+          </table>
+        </div>
       </div>
     </div>
   </div>
diff --git a/upload/admin/view/template/extension/other/recurring_info.twig b/upload/admin/view/template/extension/other/recurring_info.twig
index a31371dd4..5d2c98bd9 100644
--- a/upload/admin/view/template/extension/other/recurring_info.twig
+++ b/upload/admin/view/template/extension/other/recurring_info.twig
@@ -31,7 +31,7 @@
                 <div class="tab-pane active" id="tab-general">
                   <fieldset>
                     <legend>{{ text_product }}</legend>
-                    <div class="responsive">
+                    <div class="table-responsive">
                       <table class="table table-bordered">
                         <tr>
                           <td>{{ text_order_recurring_id }}</td>
@@ -116,35 +116,33 @@
             <h3 class="panel-title"><i class="fa fa-list"></i> {{ text_order_detail }}</h3>
           </div>
           <div class="panel-body">
-            <div class="responsive">
-              <table class="table table-bordered">
-                <tr>
-                  <td>{{ text_order_id }}</td>
-                  <td><a href="{{ order }}">{{ order_id }}</a></td>
-                </tr>
-                <tr>
-                  <td>{{ text_customer }}</td>
-                  <td>
-                    {% if customer %}
-                      <a href="{{ customer }}">{{ firstname }} {{ lastname }}</a>
-                    {% else %}
-                      {{ firstname }} {{ lastname }}
-                    {% endif %}</td>
-                </tr>
-                <tr>
-                  <td>{{ text_email }}</td>
-                  <td>{{ email }}</td>
-                </tr>
-                <tr>
-                  <td>{{ text_order_status }}</td>
-                  <td>{{ order_status }}</td>
-                </tr>
-                <tr>
-                  <td>{{ text_date_added }}</td>
-                  <td>{{ date_added }}</td>
-                </tr>
-              </table>
-            </div>
+            <table class="table table-bordered">
+              <tr>
+                <td>{{ text_order_id }}</td>
+                <td><a href="{{ order }}">{{ order_id }}</a></td>
+              </tr>
+              <tr>
+                <td>{{ text_customer }}</td>
+                <td>
+                  {% if customer %}
+                    <a href="{{ customer }}">{{ firstname }} {{ lastname }}</a>
+                  {% else %}
+                    {{ firstname }} {{ lastname }}
+                  {% endif %}</td>
+              </tr>
+              <tr>
+                <td>{{ text_email }}</td>
+                <td>{{ email }}</td>
+              </tr>
+              <tr>
+                <td>{{ text_order_status }}</td>
+                <td>{{ order_status }}</td>
+              </tr>
+              <tr>
+                <td>{{ text_date_added }}</td>
+                <td>{{ date_added }}</td>
+              </tr>
+            </table>
           </div>
         </div>
       </div>
@@ -175,7 +173,7 @@
         <h3 class="panel-title"><i class="fa fa-list"></i> {{ text_transaction }}</h3>
       </div>
       <div class="panel-body"> {{ buttons }}
-        <div class="responsive">
+        <div class="table-responsive">
           <table class="table table-bordered">
             <thead>
             <tr>
diff --git a/upload/admin/view/template/extension/payment/paypal/order.twig b/upload/admin/view/template/extension/payment/paypal/order.twig
index 08601b0df..f33a18b67 100644
--- a/upload/admin/view/template/extension/payment/paypal/order.twig
+++ b/upload/admin/view/template/extension/payment/paypal/order.twig
@@ -1,140 +1,133 @@
 <div class="row">
-	<div class="col-lg-6">
-		<table class="table table-bordered">
-			<thead>
-				<tr>
-					<td colspan="2">{{ text_payment_information }}</td>
-				</tr>
-			</thead>
-			<tbody>
-				<tr>
-					<td>{{ text_transaction_id }}</td>
-					<td>
-						<a href="{{ transaction_url }}" target="_blank">{{ transaction_id }}</a>
-						<input type="hidden" name="order_id" value="{{ order_id }}" id="input_order_id" />
-						<input type="hidden" name="country_code" value="{{ country_code }}" id="input_country_code" />
-					</td>
-				</tr>
-				<tr>
-					<td>{{ text_transaction_description }}</td>
-					<td>{{ attribute(_context, 'text_transaction_' ~ transaction_status) }}</td>
-				</tr>
-				{% if ((transaction_status == 'created') or (transaction_status == 'completed') or (transaction_status == 'partially_captured') or (transaction_status == 'partially_refunded')) %}
-				<tr>
-					<td>{{ text_transaction_comment }}</td>
-					<td>
-						<textarea name="transaction_comment" id="input_transaction_comment" class="form-control"></textarea>
-						<div class="checkbox">
-							<label><input type="checkbox" name="transaction_notify" value="1" id="input_transaction_notify">&nbsp;{{ text_transaction_notify }}</label>
-						</div>
-					</td>
-				</tr>
-				<tr>
-					<td>{{ text_transaction_action }}</td>
-					<td>
-						{% if ((transaction_status == 'created') or (transaction_status == 'partially_captured')) %}
-						<div class="row" style="margin: 0px -4px">
-							<div class="col-lg-4" style="padding: 4px 4px;">
-								<button type="button" class="btn btn-primary btn-block button-capture-payment">{{ button_capture_payment }}</button>
-							</div>
-							<div class="col-lg-4" style="padding: 4px 4px;">
-								<input type="text" name="capture_amount" value="{{ capture_amount }}" id="input_capture_amount" class="form-control" />
-							</div>
-							<div class="col-lg-4" style="padding: 4px 4px;">
-								<div class="checkbox">
-									<label><input type="checkbox" name="final_capture" value="1" checked="checked" id="input_final_capture">&nbsp;{{ text_final_capture }}</label>
-								</div>
-							</div>
-						</div>
-						<div class="row" style="margin: 0px -4px">
-							<div class="col-lg-4" style="padding: 4px 4px;">
-								<button type="button" class="btn btn-primary btn-block button-reauthorize-payment">{{ button_reauthorize_payment }}</button>
-							</div>
-							<div class="col-lg-4" style="padding: 4px 4px;">
-								<input type="text" name="reauthorize_amount" value="{{ reauthorize_amount }}" id="input_reauthorize_amount" class="form-control" />
-							</div>
-						</div>
-						<div class="row" style="margin: 0px -4px">
-							<div class="col-lg-4" style="padding: 4px 4px;">
-								<button type="button" class="btn btn-primary btn-block button-void-payment">{{ button_void_payment }}</button>
-							</div>
-						</div>
-						{% endif %}
-						{% if ((transaction_status == 'completed') or (transaction_status == 'partially_refunded')) %}
-						<div class="row" style="margin: 0px -4px">
-							<div class="col-lg-4" style="padding: 4px 4px;">
-								<button type="button" class="btn btn-primary btn-block button-refund-payment">{{ button_refund_payment }}</button>
-							</div>
-							<div class="col-lg-4" style="padding: 4px 4px;">
-								<input type="text" name="refund_amount" value="{{ refund_amount }}" id="input_refund_amount" class="form-control" />
-							</div>
-						</div>
-						{% endif %}
-					</td>
-				</tr>
-				{% endif %}
-			</tbody>
-		</table>
-	</div>
-	{% if (transaction_status == 'completed') %}
-	<div class="col-lg-6">
-		<table class="table table-bordered">
-			<thead>
-				<tr>
-					<td colspan="2">{{ text_tracker_information }}</td>
-				</tr>
-			</thead>
-			<tbody>
-				<tr>
-					<td>{{ text_tracking_number }}</td>
-					<td>
-						{% if tracking_number %}
-						{{ tracking_number }}
-						<input type="hidden" name="tracking_number" value="{{ tracking_number }}" id="input_tracking_number" />
-						{% else %}
-						<input type="text" name="tracking_number" value="{{ tracking_number }}" id="input_tracking_number" class="form-control" />
-						{% endif %}
-					</td>
-				</tr>
-				<tr>
-					<td>{{ text_carrier_name }}</td>
-					<td>
-						{% if carrier_name %}
-						{{ carrier_name }}
-						<input type="hidden" name="carrier_name" value="{{ carrier_name }}" id="input_carrier_name" />
-						{% else %}
-						<input type="text" name="carrier_name" value="{{ carrier_name }}" id="input_carrier_name" class="form-control" />
-						{% endif %}
-					</td>
-				</tr>
-				{% if not tracking_number %}
-				<tr>
-					<td>{{ text_tracker_comment }}</td>
-					<td>
-						<textarea name="tracker_comment" id="input_tracker_comment" class="form-control"></textarea>
-						<div class="checkbox">
-							<label><input type="checkbox" name="tracker_notify" value="1" id="input_tracker_notify">&nbsp;{{ text_tracker_notify }}</label>
-						</div>
-					</td>
-				</tr>
-				{% endif %}
-				<tr>
-					<td>{{ text_tracker_action }}</td>
-					<td>
-						{% if tracking_number %}
-						<button class="btn btn-danger button-cancel-tracker"><i class="fa fa-minus-circle"></i> {{ button_cancel_tracker }}</button>
-						{% else %}
-						<button class="btn btn-primary button-create-tracker"><i class="fa fa-plus-circle"></i> {{ button_create_tracker }}</button>
-						{% endif %}
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-	{% endif %}
+  <div class="col-lg-6">
+    <table class="table table-bordered">
+      <thead>
+        <tr>
+          <td colspan="2">{{ text_payment_information }}</td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>{{ text_transaction_id }}</td>
+          <td>
+            <a href="{{ transaction_url }}" target="_blank">{{ transaction_id }}</a>
+            <input type="hidden" name="order_id" value="{{ order_id }}" id="input_order_id" />
+            <input type="hidden" name="country_code" value="{{ country_code }}" id="input_country_code" />
+          </td>
+        </tr>
+        <tr>
+          <td>{{ text_transaction_description }}</td>
+          <td>{{ attribute(_context, 'text_transaction_' ~ transaction_status) }}</td>
+        </tr>
+        {% if ((transaction_status == 'created') or (transaction_status == 'completed') or (transaction_status == 'partially_captured') or (transaction_status == 'partially_refunded')) %}
+          <tr>
+            <td>{{ text_transaction_comment }}</td>
+            <td>
+              <textarea name="transaction_comment" id="input_transaction_comment" class="form-control"></textarea>
+              <div class="checkbox">
+                <label><input type="checkbox" name="transaction_notify" value="1" id="input_transaction_notify">&nbsp;{{ text_transaction_notify }}</label>
+              </div></td>
+          </tr>
+          <tr>
+            <td>{{ text_transaction_action }}</td>
+            <td>
+              {% if ((transaction_status == 'created') or (transaction_status == 'partially_captured')) %}
+                <div class="row" style="margin: 0px -4px">
+                  <div class="col-lg-4" style="padding: 4px 4px;">
+                    <button type="button" class="btn btn-primary btn-block button-capture-payment">{{ button_capture_payment }}</button>
+                  </div>
+                  <div class="col-lg-4" style="padding: 4px 4px;">
+                    <input type="text" name="capture_amount" value="{{ capture_amount }}" id="input_capture_amount" class="form-control" />
+                  </div>
+                  <div class="col-lg-4" style="padding: 4px 4px;">
+                    <div class="checkbox">
+                      <label><input type="checkbox" name="final_capture" value="1" checked="checked" id="input_final_capture">&nbsp;{{ text_final_capture }}</label>
+                    </div>
+                  </div>
+                </div>
+                <div class="row" style="margin: 0px -4px">
+                  <div class="col-lg-4" style="padding: 4px 4px;">
+                    <button type="button" class="btn btn-primary btn-block button-reauthorize-payment">{{ button_reauthorize_payment }}</button>
+                  </div>
+                  <div class="col-lg-4" style="padding: 4px 4px;">
+                    <input type="text" name="reauthorize_amount" value="{{ reauthorize_amount }}" id="input_reauthorize_amount" class="form-control" />
+                  </div>
+                </div>
+                <div class="row" style="margin: 0px -4px">
+                  <div class="col-lg-4" style="padding: 4px 4px;">
+                    <button type="button" class="btn btn-primary btn-block button-void-payment">{{ button_void_payment }}</button>
+                  </div>
+                </div>
+              {% endif %}
+              {% if ((transaction_status == 'completed') or (transaction_status == 'partially_refunded')) %}
+                <div class="row" style="margin: 0px -4px">
+                  <div class="col-lg-4" style="padding: 4px 4px;">
+                    <button type="button" class="btn btn-primary btn-block button-refund-payment">{{ button_refund_payment }}</button>
+                  </div>
+                  <div class="col-lg-4" style="padding: 4px 4px;">
+                    <input type="text" name="refund_amount" value="{{ refund_amount }}" id="input_refund_amount" class="form-control" />
+                  </div>
+                </div>
+              {% endif %}</td>
+          </tr>
+    	{% endif %}
+      </tbody>
+    </table>
+  </div>
+  {% if (transaction_status == 'completed') %}
+    <div class="col-lg-6">
+      <table class="table table-bordered">
+        <thead>
+          <tr>
+            <td colspan="2">{{ text_tracker_information }}</td>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>{{ text_tracking_number }}</td>
+            <td>
+              {% if tracking_number %}
+                {{ tracking_number }}
+                <input type="hidden" name="tracking_number" value="{{ tracking_number }}" id="input_tracking_number" />
+              {% else %}
+                <input type="text" name="tracking_number" value="{{ tracking_number }}" id="input_tracking_number" class="form-control" />
+              {% endif %}</td>
+          </tr>
+          <tr>
+            <td>{{ text_carrier_name }}</td>
+            <td>
+              {% if carrier_name %}
+                {{ carrier_name }}
+                <input type="hidden" name="carrier_name" value="{{ carrier_name }}" id="input_carrier_name" />
+              {% else %}
+                <input type="text" name="carrier_name" value="{{ carrier_name }}" id="input_carrier_name" class="form-control" />
+              {% endif %}</td>
+          </tr>
+          {% if not tracking_number %}
+            <tr>
+              <td>{{ text_tracker_comment }}</td>
+              <td>
+                <textarea name="tracker_comment" id="input_tracker_comment" class="form-control"></textarea>
+                <div class="checkbox">
+                  <label><input type="checkbox" name="tracker_notify" value="1" id="input_tracker_notify">&nbsp;{{ text_tracker_notify }}</label>
+                </div></td>
+            </tr>
+          {% endif %}
+          <tr>
+            <td>{{ text_tracker_action }}</td>
+            <td>
+              {% if tracking_number %}
+                <button class="btn btn-danger button-cancel-tracker"><i class="fa fa-minus-circle"></i> {{ button_cancel_tracker }}</button>
+              {% else %}
+                <button class="btn btn-primary button-create-tracker"><i class="fa fa-plus-circle"></i> {{ button_create_tracker }}</button>
+              {% endif %}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  {% endif %}
 </div>
 <script type="text/javascript">
-
 window.addEventListener('load', function () {
 	$('#tab-paypal').on('click', '.button-capture-payment', function() {
 		$.ajax({
diff --git a/upload/admin/view/template/sale/order_info.twig b/upload/admin/view/template/sale/order_info.twig
index f07c90ddc..ce89778b0 100644
--- a/upload/admin/view/template/sale/order_info.twig
+++ b/upload/admin/view/template/sale/order_info.twig
@@ -152,57 +152,59 @@
             </tr>
           </tbody>
         </table>
-        <table class="table table-bordered">
-          <thead>
-            <tr>
-              <td class="text-left">{{ column_product }}</td>
-              <td class="text-left">{{ column_model }}</td>
-              <td class="text-right">{{ column_quantity }}</td>
-              <td class="text-right">{{ column_price }}</td>
-              <td class="text-right">{{ column_total }}</td>
-            </tr>
-          </thead>
-          <tbody>
-            {% for product in products %}
-              <tr>
-                <td class="text-left"><a href="{{ product.href }}">{{ product.name }}</a>
-                  {% for option in product.option %}
-                    <br/>
-                    {% if option.type != 'file' %}
-                      &nbsp;
-                      <small> - {{ option.name }}: {{ option.value }}</small>
-                    {% else %}
-                      &nbsp;
-                      <small> - {{ option.name }}: <a href="{{ option.href }}">{{ option.value }}</a></small>
-                    {% endif %}
-                  {% endfor %}
-                  {% if product.subscription %}
-                    <br/>
-                    <small> - {{ text_subscription }}: <a href="{{ product.subscription }}" target="_blank">{{ product.subscription_description }}</a></small>
-                  {% endif %}</td>
-                <td class="text-left">{{ product.model }}</td>
-                <td class="text-right">{{ product.quantity }}</td>
-                <td class="text-right">{{ product.price }}</td>
-                <td class="text-right">{{ product.total }}</td>
-              </tr>
-            {% endfor %}
-            {% for voucher in vouchers %}
-              <tr>
-                <td class="text-left"><a href="{{ voucher.href }}">{{ voucher.description }}</a></td>
-                <td class="text-left"></td>
-                <td class="text-right">1</td>
-                <td class="text-right">{{ voucher.amount }}</td>
-                <td class="text-right">{{ voucher.amount }}</td>
-              </tr>
-            {% endfor %}
-            {% for total in totals %}
+        <div class="table-responsive">
+          <table class="table table-bordered">
+            <thead>
               <tr>
-                <td colspan="4" class="text-right">{{ total.title }}</td>
-                <td class="text-right">{{ total.text }}</td>
+                <td class="text-left">{{ column_product }}</td>
+                <td class="text-left">{{ column_model }}</td>
+                <td class="text-right">{{ column_quantity }}</td>
+                <td class="text-right">{{ column_price }}</td>
+                <td class="text-right">{{ column_total }}</td>
               </tr>
-            {% endfor %}
-          </tbody>
-        </table>
+            </thead>
+            <tbody>
+              {% for product in products %}
+                <tr>
+                  <td class="text-left"><a href="{{ product.href }}">{{ product.name }}</a>
+                    {% for option in product.option %}
+                      <br/>
+                      {% if option.type != 'file' %}
+                        &nbsp;
+                        <small> - {{ option.name }}: {{ option.value }}</small>
+                      {% else %}
+                        &nbsp;
+                        <small> - {{ option.name }}: <a href="{{ option.href }}">{{ option.value }}</a></small>
+                      {% endif %}
+                    {% endfor %}
+                    {% if product.subscription %}
+                      <br/>
+                      <small> - {{ text_subscription }}: <a href="{{ product.subscription }}" target="_blank">{{ product.subscription_description }}</a></small>
+                    {% endif %}</td>
+                  <td class="text-left">{{ product.model }}</td>
+                  <td class="text-right">{{ product.quantity }}</td>
+                  <td class="text-right">{{ product.price }}</td>
+                  <td class="text-right">{{ product.total }}</td>
+                </tr>
+              {% endfor %}
+              {% for voucher in vouchers %}
+                <tr>
+                  <td class="text-left"><a href="{{ voucher.href }}">{{ voucher.description }}</a></td>
+                  <td class="text-left"></td>
+                  <td class="text-right">1</td>
+                  <td class="text-right">{{ voucher.amount }}</td>
+                  <td class="text-right">{{ voucher.amount }}</td>
+                </tr>
+              {% endfor %}
+              {% for total in totals %}
+                <tr>
+                  <td colspan="4" class="text-right">{{ total.title }}</td>
+                  <td class="text-right">{{ total.text }}</td>
+                </tr>
+              {% endfor %}
+            </tbody>
+          </table>
+        </div>
         {% if comment %}
           <table class="table table-bordered">
             <thead>
diff --git a/upload/admin/view/template/sale/returns_history.twig b/upload/admin/view/template/sale/returns_history.twig
index 391762913..e11bf5275 100644
--- a/upload/admin/view/template/sale/returns_history.twig
+++ b/upload/admin/view/template/sale/returns_history.twig
@@ -6,33 +6,35 @@
     <button type="button" class="close" data-dismiss="alert">&times;</button>
   </div>
 {% endif %}
-<table class="table table-bordered">
-  <thead>
-    <tr>
-      <td class="text-left">{{ column_date_added }}</td>
-      <td class="text-left">{{ column_comment }}</td>
-      <td class="text-left">{{ column_status }}</td>
-      <td class="text-left">{{ column_notify }}</td>
-    </tr>
-  </thead>
-  <tbody>
-    {% if histories %}
-      {% for history in histories %}
-        <tr>
-          <td class="text-left">{{ history.date_added }}</td>
-          <td class="text-left">{{ history.comment }}</td>
-          <td class="text-left">{{ history.status }}</td>
-          <td class="text-left">{{ history.notify }}</td>
-        </tr>
-      {% endfor %}
-    {% else %}
+<div class="table-responsive">
+  <table class="table table-bordered">
+    <thead>
       <tr>
-        <td class="text-center" colspan="4">{{ text_no_results }}</td>
+        <td class="text-left">{{ column_date_added }}</td>
+        <td class="text-left">{{ column_comment }}</td>
+        <td class="text-left">{{ column_status }}</td>
+        <td class="text-left">{{ column_notify }}</td>
       </tr>
-    {% endif %}
-  </tbody>
-</table>
-<div class="row">
-  <div class="col-sm-6 text-left">{{ pagination }}</div>
-  <div class="col-sm-6 text-right">{{ results }}</div>
+    </thead>
+    <tbody>
+      {% if histories %}
+        {% for history in histories %}
+          <tr>
+            <td class="text-left">{{ history.date_added }}</td>
+            <td class="text-left">{{ history.comment }}</td>
+            <td class="text-left">{{ history.status }}</td>
+            <td class="text-left">{{ history.notify }}</td>
+          </tr>
+        {% endfor %}
+      {% else %}
+        <tr>
+          <td class="text-center" colspan="4">{{ text_no_results }}</td>
+        </tr>
+      {% endif %}
+    </tbody>
+  </table>
+  <div class="row">
+    <div class="col-sm-6 text-left">{{ pagination }}</div>
+    <div class="col-sm-6 text-right">{{ results }}</div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/upload/catalog/view/theme/default/template/product/compare.twig b/upload/catalog/view/theme/default/template/product/compare.twig
index 5b89b5558..892dce3e7 100644
--- a/upload/catalog/view/theme/default/template/product/compare.twig
+++ b/upload/catalog/view/theme/default/template/product/compare.twig
@@ -21,122 +21,126 @@
     <div class="{{ class }}" id="content">{{ content_top }}
       <h1>{{ heading_title }}</h1>
       {% if products %}
-        <table class="table table-bordered">
-          <thead>
-            <tr>
-              <td colspan="{{ products|length + 1 }}"><strong>{{ text_product }}</strong></td>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>{{ text_name }}</td>
-              {% for product in products %}
-                <td><a href="{{ product.href }}"><strong>{{ product.name }}</strong></a></td>
-              {% endfor %}
-            </tr>
-            <tr>
-              <td>{{ text_image }}</td>
-              {% for product in products %}
-                <td class="text-center">{% if product.thumb %} <img src="{{ product.thumb }}" alt="{{ product.name }}" title="{{ product.name }}" class="img-thumbnail"/> {% endif %}</td>
-              {% endfor %}
-            </tr>
-            <tr>
-              <td>{{ text_price }}</td>
-              {% for product in products %}
-                <td>
-                  {% if product.price %}
-                    {% if not product.special %}
-                      {{ product.price }}
-                    {% else %}
-                      <span style="text-decoration: line-through;">{{ product.price }}</span>
-                      {{ product.special }}
-                    {% endif %}
-                  {% endif %}</td>
-              {% endfor %}
-            </tr>
-            <tr>
-              <td>{{ text_model }}</td>
-              {% for product in products %}
-                <td>{{ product.model }}</td>
-              {% endfor %}
-            </tr>
-            <tr>
-              <td>{{ text_manufacturer }}</td>
-              {% for product in products %}
-                <td>{{ product.manufacturer }}</td>
-              {% endfor %}
-            </tr>
-            <tr>
-              <td>{{ text_availability }}</td>
-              {% for product in products %}
-                <td>{{ product.availability }}</td>
-              {% endfor %}
-            </tr>
-            {% if review_status %}
+        <div class="table-responsive">
+          <table class="table table-bordered">
+            <thead>
               <tr>
-                <td>{{ text_rating }}</td>
+                <td colspan="{{ products|length + 1 }}"><strong>{{ text_product }}</strong></td>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>{{ text_name }}</td>
                 {% for product in products %}
-                  <td class="rating">
-                    {% for i in 1..5 %}
-                      {% if product.rating < i %}
-                        <span class="fa fa-stack"><i class="fa fa-star-o fa-stack-2x"></i></span>
+                  <td><a href="{{ product.href }}"><strong>{{ product.name }}</strong></a></td>
+                {% endfor %}
+              </tr>
+              <tr>
+                <td>{{ text_image }}</td>
+                {% for product in products %}
+                  <td class="text-center">{% if product.thumb %} <img src="{{ product.thumb }}" alt="{{ product.name }}" title="{{ product.name }}" class="img-thumbnail"/> {% endif %}</td>
+                {% endfor %}
+              </tr>
+              <tr>
+                <td>{{ text_price }}</td>
+                {% for product in products %}
+                  <td>
+                    {% if product.price %}
+                      {% if not product.special %}
+                        {{ product.price }}
                       {% else %}
-                        <span class="fa fa-stack"><i class="fa fa-star fa-stack-2x"></i><i class="fa fa-star-o fa-stack-2x"></i></span>
+                        <span style="text-decoration: line-through;">{{ product.price }}</span>
+                        {{ product.special }}
                       {% endif %}
-                    {% endfor %}<br/>
-                    {{ product.reviews }}</td>
+                    {% endif %}</td>
                 {% endfor %}
               </tr>
-            {% endif %}
-            <tr>
-              <td>{{ text_summary }}</td>
-              {% for product in products %}
-                <td class="description">{{ product.description }}</td>
-              {% endfor %}
-            </tr>
-            <tr>
-              <td>{{ text_weight }}</td>
-              {% for product in products %}
-                <td>{{ product.weight }}</td>
-              {% endfor %}
-            </tr>
-            <tr>
-              <td>{{ text_dimension }}</td>
-              {% for product in products %}
-                <td>{{ product.length }} x {{ product.width }} x {{ product.height }}</td>
-              {% endfor %}
-            </tr>
-          </tbody>
-        </table>
-        <table class="table table-bordered">
-          {% for attribute_group in attribute_groups %}
-            <thead>
               <tr>
-                <td colspan="{{ products|length + 1 }}"><strong>{{ attribute_group.name }}</strong></td>
+                <td>{{ text_model }}</td>
+                {% for product in products %}
+                  <td>{{ product.model }}</td>
+                {% endfor %}
               </tr>
-            </thead>
-            {% for key, attribute in attribute_group.attribute %}
-              <tbody>
+              <tr>
+                <td>{{ text_manufacturer }}</td>
+                {% for product in products %}
+                  <td>{{ product.manufacturer }}</td>
+                {% endfor %}
+              </tr>
+              <tr>
+                <td>{{ text_availability }}</td>
+                {% for product in products %}
+                  <td>{{ product.availability }}</td>
+                {% endfor %}
+              </tr>
+              {% if review_status %}
                 <tr>
-                  <td>{{ attribute.name }}</td>
+                  <td>{{ text_rating }}</td>
                   {% for product in products %}
-                    {% if product.attribute[key] %}
-                      <td>{{ product.attribute[key] }}</td>
-                    {% else %}
-                      <td></td>
-                    {% endif %}
+                    <td class="rating">
+                      {% for i in 1..5 %}
+                        {% if product.rating < i %}
+                          <span class="fa fa-stack"><i class="fa fa-star-o fa-stack-2x"></i></span>
+                        {% else %}
+                          <span class="fa fa-stack"><i class="fa fa-star fa-stack-2x"></i><i class="fa fa-star-o fa-stack-2x"></i></span>
+                        {% endif %}
+                      {% endfor %}<br/>
+                      {{ product.reviews }}</td>
                   {% endfor %}
                 </tr>
-              </tbody>
-            {% endfor %}
-          {% endfor %}
-          <tr>
-            <td></td>
-            {% for product in products %}
-              <td><input type="button" value="{{ button_cart }}" class="btn btn-primary btn-block" onclick="cart.add('{{ product.product_id }}', '{{ product.minimum }}');"/><a href="{{ product.remove }}" class="btn btn-danger btn-block">{{ button_remove }}</a></td>
+              {% endif %}
+              <tr>
+                <td>{{ text_summary }}</td>
+                {% for product in products %}
+                  <td class="description">{{ product.description }}</td>
+                {% endfor %}
+              </tr>
+              <tr>
+                <td>{{ text_weight }}</td>
+                {% for product in products %}
+                  <td>{{ product.weight }}</td>
+                {% endfor %}
+              </tr>
+              <tr>
+                <td>{{ text_dimension }}</td>
+                {% for product in products %}
+                  <td>{{ product.length }} x {{ product.width }} x {{ product.height }}</td>
+                {% endfor %}
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div class="table-responsive">
+          <table class="table table-bordered">
+            {% for attribute_group in attribute_groups %}
+              <thead>
+                <tr>
+                  <td colspan="{{ products|length + 1 }}"><strong>{{ attribute_group.name }}</strong></td>
+                </tr>
+              </thead>
+              {% for key, attribute in attribute_group.attribute %}
+                <tbody>
+                  <tr>
+                    <td>{{ attribute.name }}</td>
+                    {% for product in products %}
+                      {% if product.attribute[key] %}
+                        <td>{{ product.attribute[key] }}</td>
+                      {% else %}
+                        <td></td>
+                      {% endif %}
+                    {% endfor %}
+                  </tr>
+                </tbody>
+              {% endfor %}
             {% endfor %}
-          </tr>
-        </table>
+            <tr>
+              <td></td>
+              {% for product in products %}
+                <td><input type="button" value="{{ button_cart }}" class="btn btn-primary btn-block" onclick="cart.add('{{ product.product_id }}', '{{ product.minimum }}');"/><a href="{{ product.remove }}" class="btn btn-danger btn-block">{{ button_remove }}</a></td>
+              {% endfor %}
+            </tr>
+          </table>
+        </div>
       {% else %}
         <p>{{ text_no_results }}</p>
         <div class="buttons">