diff --git a/js/templates/buyWizard.html b/js/templates/buyWizard.html
index 73e343eff..4fa2bd532 100644
--- a/js/templates/buyWizard.html
+++ b/js/templates/buyWizard.html
@@ -1,6 +1,6 @@
 <div class="modal-hero js-buyWizardHero custCol-text shadow-inner1-light"
      style="background-image: url(<%= ob.serverUrl %>get_image?hash=<%= ob.vendor_offer.listing.item.image_hashes[0] %><%= ob.imageExtension %>), url(imgs/defaultBanner.png);">
-  <div class="js-buyWizardMap buyWizardMap positionRelative hide" style="height: 262px">
+  <div class="js-buyWizardMap buyWizardMap positionRelative hide" style="height: 250px">
     <div class="js-mapSpinner txt-col1 ion-android-sync spinner spinner-slow icon-large icon-circle-background1 zIndex1 fullCentered" style="border: 1px solid #aaa;"></div>
     <div class="flexContainer mapWrap"></div>
   </div>
diff --git a/js/views/buyWizardVw.js b/js/views/buyWizardVw.js
index 9bd2808b0..fba5eedaf 100644
--- a/js/views/buyWizardVw.js
+++ b/js/views/buyWizardVw.js
@@ -398,15 +398,16 @@ module.exports = baseModal.extend({
     $currentIframe = this.$buyWizardMap.find('iframe');
     $currentIframe.addClass('blurMore');
 
-    if (address && address.street && address.city && address.state && address.postal_code) {
-      addressString = address.street + ", " + address.city + ", " + address.state + " " + address.postal_code + " " + address.displayCountry;
+    if (address) {
+      addressString = address.street + " " + address.city + " " + address.state + " " + address.postal_code + " " + address.displayCountry;
+      addressString = addressString.trim();
     } else {
       // if address is invalid, we'll create a dummy address for which google maps will show a map of the world
       addressString = "123 Street, City, State 12345 Country";
     }
 
     addressString = encodeURIComponent(addressString);
-    var $iFrame = $('<iframe class="js-iframe-pending positionTop" width="525" height="250" frameborder="0" style="border:0; margin-top: 0; height: 250px; clip: rect(0,0,0,0)" />');
+    var $iFrame = $('<iframe class="js-iframe-pending positionTop" width="525" height="250" frameborder="0" style="border:0; margin-top: 0; height: 250px; clip: rect(0,525px,250px,0)" />');
 
     if ($currentIframe.length) {
       this.$buyWizardMap.find('.js-mapSpinner').removeClass('hide');
@@ -463,6 +464,7 @@ module.exports = baseModal.extend({
       this.showMaps();
       if (this.userModel.get('shipping_addresses').length === 0){
         this.createNewAddress();
+        this.displayMap();
         $('.js-buyWizardAddressBack').show();
         $('.js-buyWizardNewAddressCancel').hide();
       }