diff --git a/modules/receipt/templates/commerce-pos-receipt.html.twig b/modules/receipt/templates/commerce-pos-receipt.html.twig
index d684daa..d94f96a 100644
--- a/modules/receipt/templates/commerce-pos-receipt.html.twig
+++ b/modules/receipt/templates/commerce-pos-receipt.html.twig
@@ -18,7 +18,7 @@
         {{ receipt.print }}
         {% if receipt.is_gift == true %}
             <br>{{ order.getCreatedTime|format_date('medium') }}<br>
-            <strong>{% trans %}Order# {{ order.id|placeholder }}{% endtrans %}</strong>
+            <strong>{% trans %}Order #{{ order.id|placeholder }}{% endtrans %}</strong>
             <br><strong>{{ 'GIFT ORDER'|t }}</strong><br>
         {% endif %}
     </div>
diff --git a/src/Form/POSForm.php b/src/Form/POSForm.php
index 4ad952a..25c3ed1 100644
--- a/src/Form/POSForm.php
+++ b/src/Form/POSForm.php
@@ -69,16 +69,19 @@ class POSForm extends ContentEntityForm {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $form['#tree'] = TRUE;
     $form['#attached']['library'][] = 'commerce_pos/form';
+    $form['totals'] = [
+      '#type' => 'container',
+    ];
 
     $step = $form_state->get('step');
     $step = $step ?: 'order';
     $form_state->set('step', $step);
 
     if ($step == 'order') {
-      $form = $this->buildOrderForm($form, $form_state);
+      $this->buildOrderForm($form, $form_state);
     }
     elseif ($step == 'payment') {
-      $form = $this->buildPaymentForm($form, $form_state);
+      $this->buildPaymentForm($form, $form_state);
     }
 
     $this->addTotalsDisplay($form, $form_state);
@@ -89,7 +92,7 @@ class POSForm extends ContentEntityForm {
   /**
    * Build the POS Order Form.
    */
-  protected function buildOrderForm(array $form, FormStateInterface $form_state) {
+  protected function buildOrderForm(array &$form, FormStateInterface $form_state) {
     /* @var \Drupal\commerce_order\Entity\Order $order */
     $order = $this->entity;
     $form_state->set('commerce_pos_order_id', $order->id());
@@ -110,7 +113,7 @@ class POSForm extends ContentEntityForm {
       '#type' => 'container',
     ];
     // Checkbox if this is gift order.
-    $form['gift_order'] = [
+    $form['totals']['gift_order'] = [
       '#type' => 'checkbox',
       '#title' => $this->t("Gift order"),
       '#default_value' => $gift_value,
@@ -124,14 +127,12 @@ class POSForm extends ContentEntityForm {
         ],
       ]);
     }
-
-    return $form;
   }
 
   /**
    * Build the payment form, this is the second and final step of a POS order.
    */
-  public function buildPaymentForm(array $form, FormStateinterface $form_state) {
+  public function buildPaymentForm(array &$form, FormStateinterface $form_state) {
     /* @var \Drupal\commerce_order\Entity\Order $order */
     $order = $this->entity;
     $wrapper_id = 'commerce-pos-pay-form-wrapper';
@@ -273,8 +274,6 @@ class POSForm extends ContentEntityForm {
       '#submit' => ['::submitForm'],
       '#element_key' => 'back-to-order',
     ];
-
-    return $form;
   }
 
   /**
@@ -325,7 +324,7 @@ class POSForm extends ContentEntityForm {
     $step = $form_state->get('step');
     if ($step == 'order') {
       parent::submitForm($form, $form_state);
-      $this->entity->setData('gift_order', $form_state->getValue('gift_order'));
+      $this->entity->setData('gift_order', $form_state->getValue('totals')['gift_order']);
       $this->entity->save();
       $form_state->set('step', 'payment');
       $form_state->setRebuild(TRUE);
@@ -409,10 +408,6 @@ class POSForm extends ContentEntityForm {
     $store = $order->getStore();
     $default_currency = $store->getDefaultCurrency();
     $totals = [];
-    // Collecting the Subtotal.
-    $form['totals'] = [
-      '#type' => 'container',
-    ];
 
     if (isset($form_state->getUserInput()['keypad'])) {
       $keypad_amount = $form_state->getUserInput()['keypad']['amount'];