diff --git a/app/src/main/java/ch/pizzalink/android/model/OrderHistoryModel.java b/app/src/main/java/ch/pizzalink/android/model/OrderHistoryModel.java
index 7055e74..03de560 100644
--- a/app/src/main/java/ch/pizzalink/android/model/OrderHistoryModel.java
+++ b/app/src/main/java/ch/pizzalink/android/model/OrderHistoryModel.java
@@ -223,14 +223,26 @@ import ch.pizzalink.android.helper.DateTimeHelper;
         if(id == null)
             id = "";
 
-        if(createDate == null)
-            createDate = "";
+        if(invoiceNo == null)
+            invoiceNo = "";
 
-        if(currencyCode == null)
-            currencyCode = "";
+        if(invoicePrefix == null)
+            invoicePrefix = "";
 
-        if(currencyValue == null)
-            currencyValue = "";
+        if(storeId == null)
+            storeId = "";
+
+        if(storeName == null)
+            storeName = "";
+
+        if(storeUrl == null)
+            storeUrl = "";
+
+        if(customerId == null)
+            customerId = "";
+
+        if(customerGroupId == null)
+            customerGroupId = "";
 
         if(firstname == null)
             firstname = "";
@@ -238,11 +250,165 @@ import ch.pizzalink.android.helper.DateTimeHelper;
         if(lastname == null)
             lastname = "";
 
+        if(email == null)
+            email = "";
+
+        if(telephone == null)
+            telephone = "";
+
+        if(fax == null)
+            fax = "";
+
+        if(customField == null)
+            customField = "";
+
+        if(paymentFirstname == null)
+            paymentFirstname = "";
+
+        if(paymentLastname == null)
+            paymentLastname = "";
+
+        if(paymentCompany == null)
+            paymentCompany = "";
+
+        if(paymentAddress1 == null)
+            paymentAddress1 = "";
+
+        if(paymentAddress2 == null)
+            paymentAddress2 = "";
+
+        if(paymentCity == null)
+            paymentCity = "";
+
+        if(paymentPostcode == null)
+            paymentPostcode = "";
+
+        if(paymentCountry == null)
+            paymentCountry = "";
+
+        if(paymentCountryId == null)
+            paymentCountryId = "";
+
+        if(paymentZone == null)
+            paymentZone = "";
+
+        if(paymentZoneId == null)
+            paymentZoneId = "";
+
+        if(paymentAddressFormat == null)
+            paymentAddressFormat = "";
+
+        if(paymentCustomField == null)
+            paymentCustomField = "";
+
+        if(paymentMethod == null)
+            paymentMethod = "";
+
+        if(paymentCode == null)
+            paymentCode = "";
+
+        if(shippingFirstname == null)
+            shippingFirstname = "";
+
+        if(shippingLastname == null)
+            shippingLastname = "";
+
+        if(shippingCompany == null)
+            shippingCompany = "";
+
+        if(shippingAddress1 == null)
+            shippingAddress1 = "";
+
+        if(shippingAddress2 == null)
+            shippingAddress2 = "";
+
+        if(shippingCity == null)
+            shippingCity = "";
+
+        if(shippingPostcode == null)
+            shippingPostcode = "";
+
+        if(shippingCountry == null)
+            shippingCountry = "";
+
+        if(shippingCountryId == null)
+            shippingCountryId = "";
+
+        if(shippingZone == null)
+            shippingZone = "";
+
+        if(shippingZoneId == null)
+            shippingZoneId = "";
+
+        if(shippingAddressFormat == null)
+            shippingAddressFormat = "";
+
+        if(shippingCustomField == null)
+            shippingCustomField = "";
+
+        if(shippingMethod == null)
+            shippingMethod = "";
+
+        if(shippingCode == null)
+            shippingCode = "";
+
+        if(comment == null)
+            comment = "";
+
+        if(total == null)
+            total = "0.0";
+
+        if(orderStatusId == null)
+            orderStatusId = "";
+
+        if(affiliateId == null)
+            affiliateId = "";
+
+        if(commission == null)
+            commission = "";
+
+        if(marketingId == null)
+            marketingId = "";
+
+        if(tracking == null)
+            tracking = "";
+
+        if(languageId == null)
+            languageId = "";
+
+        if(currencyId == null)
+            currencyId = "";
+
+        if(currencyCode == null)
+            currencyCode = "";
+
+        if(currencyValue == null)
+            currencyValue = "";
+
+        if(ip == null)
+            ip = "";
+
+        if(forwardedIp == null)
+            forwardedIp = "";
+
+        if(userAgent == null)
+            userAgent = "";
+
+        if(acceptLanguage == null)
+            acceptLanguage = "";
+
+        if(createDate == null)
+            createDate = "";
+
+        if(dateModified == null)
+            dateModified = "";
+
+        if(shippingTime == null)
+            shippingTime = "";
+
         if(status == null)
             status = "";
 
-        if(total == null)
-            total = "";
     }
 
     public static void checkNull(ArrayList<OrderHistoryModel> orderHistoryList){
diff --git a/app/src/main/res/layout/activity_order_history_details.xml b/app/src/main/res/layout/activity_order_history_details.xml
index 27162cd..58da918 100644
--- a/app/src/main/res/layout/activity_order_history_details.xml
+++ b/app/src/main/res/layout/activity_order_history_details.xml
@@ -105,6 +105,10 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:description="@string/order_history_order_note" />
+                    
+                    <android.support.v4.widget.Space
+                        android:layout_width="match_parent"
+                        android:layout_height="96dp" />
 
                 </LinearLayout>