diff --git a/src/common-components/dropdown-question/dropdown-question.vue b/src/common-components/dropdown-question/dropdown-question.vue
index 1f303a995..7afdc0b38 100644
--- a/src/common-components/dropdown-question/dropdown-question.vue
+++ b/src/common-components/dropdown-question/dropdown-question.vue
@@ -73,18 +73,22 @@ export default {
 		}, 
 		labelText: {
 			get: function () {
-				var thisQuestionText = "";
+				const noBreakChar = "⁠";
+				var questionText = "";
 				if (this.disableAutoFill) {
+					var words = this.questionText.toString().split(/[ ]+/);
+					words.forEach(function (word) {
+						const position = 1;
+						word = [word.toString().slice(0, position), noBreakChar, word.toString().slice(position)].join('');
+						questionText += `${word} `;					
+					});	
 					
-					const noBreakChar = "⁠";
-					const position = 1;
-					thisQuestionText = [this.questionText.toString().slice(0, position), noBreakChar, this.questionText.toString().slice(position)].join('');
-					
+					questionText = questionText.trimEnd(); 
 				} else {
-					thisQuestionText = this.questionText.toString();
+					questionText = this.questionText.toString();
 				}
 
-				return thisQuestionText;
+				return questionText;
 			}
 		}
 	},
diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue
index 94ff8296c..062ceb683 100644
--- a/src/common-components/textbox-question/textbox-question.vue
+++ b/src/common-components/textbox-question/textbox-question.vue
@@ -91,18 +91,22 @@ export default {
 		},
 		labelText: {
 			get: function () {
-				var thisQuestionText = "";
+				const noBreakChar = "⁠";
+				var questionText = "";
 				if (this.disableAutoFill) {
+					var words = this.questionText.toString().split(/[ ]+/);
+					words.forEach(function (word) {
+						const position = 1;
+						word = [word.toString().slice(0, position), noBreakChar, word.toString().slice(position)].join('');
+						questionText += `${word} `;					
+					});	
 					
-					const noBreakChar = "⁠";
-					const position = 1;
-					thisQuestionText = [this.questionText.toString().slice(0, position), noBreakChar, this.questionText.toString().slice(position)].join('');
-					
+					questionText = questionText.trimEnd(); 
 				} else {
-					thisQuestionText = this.questionText.toString();
+					questionText = this.questionText.toString();
 				}
 
-				return thisQuestionText;
+				return questionText;
 			}
 		}
 	},
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 868ac02e0..4069b0c21 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -5,7 +5,7 @@
 		ref="theForm"
 		v-slot="{ meta }"
 		autocomplete="off" >
-		<div class="container-fluid shadow rounded-3 p-2 position-relative make-tall">
+		<div class="container-fluid shadow rounded-3 p-2 position-relative make-tall px-5">
 			<funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
 			<vehicleBanner ref="vehicleBanner" :displayGenericVehicleImage=false />
 			<funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" ref="funnelSubHeader" />		
@@ -224,8 +224,6 @@ export default {
 				);
 
 				// if the car entered is the same as the car found OR the glass options for the found car match the users damage selections
-				console.log(glassOptions.data);
-				console.log(store.getters.damage.glassToReplace);
 				if (carEntered.carId == carFound.carId || !compareGlassOptions(glassOptions.data, store.getters.damage.glassToReplace)) {
 					console.log("navigating to heritage funnel");
 					//navigateToHeritageFunnel();