diff --git a/stitch-order-form.html b/stitch-order-form.html
index 19be263..36b18d6 100644
--- a/stitch-order-form.html
+++ b/stitch-order-form.html
@@ -39,15 +39,18 @@
 				@apply(--layout-center-center);
 			}
 
-			#error p, #error iron-icon {
-				display: inline-block;
+			#error {
+				@apply(--layout-horizontal);
+				@apply(--layout-center-center);
+				color: var(--primary-error-color, --paper-red-a200);
 			}
 
-			#error p {
-				color: var(--primary-error-color, --paper-red-a200);
+			#error[hidden] {
+				display: none;
 			}
 
 			#error iron-icon {
+				display: inline-block;
 				color: var(--primary-error-color, --paper-red-a700);
 			}
 
@@ -153,11 +156,11 @@ <h1>Order Product</h1>
 
 		<div class="spinner">
 			<paper-spinner id="formSpinner" alt="Loading product details"></paper-spinner>
+		</div>
 
-			<div id="error" hidden$="[[!fail]]">
-				<iron-icon icon="stitch-order:error"></iron-icon>
-				<p>[[failMessage]]</p>
-			</div>
+		<div id="error" hidden$="[[!fail]]">
+			<iron-icon icon="stitch-order:error"></iron-icon>
+			[[failMessage]]
 		</div>
 
 		<form is="iron-form" id="form" method="get" content-type="application/json">
@@ -333,6 +336,7 @@ <h3>Total Cost</h3>
 			this._setFailMessage('');
 		  },
 		  error: function(details){
+			this.loading = false;
 			this._errorDetails = details;
 			this._setFail(true);
 			this._setFailMessage(details.Message[0]);
diff --git a/stitch-order-request.html b/stitch-order-request.html
index bd9b92a..016d805 100644
--- a/stitch-order-request.html
+++ b/stitch-order-request.html
@@ -161,9 +161,7 @@
 			  var options = [];
 
 			  dimensions.forEach(function(dimension){
-				if (product[dimension]) {
-				  options.push({name: dimension, values: [], selected: product[dimension][0]});
-				}
+				options.push({name: dimension, values: [], selected: product[dimension] && product[dimension][0]});
 			  });
 
 			  variations = variations.Item;