diff --git a/src/AddressSearch.js b/src/AddressSearch.js
index eed611c28858e9452567f846bf1da9aa8c564a96..8ee9f4e156ed728fade956e818859debd1c7acfa 100644
--- a/src/AddressSearch.js
+++ b/src/AddressSearch.js
@@ -286,14 +286,16 @@ export default class AddressSearch extends React.Component {
         <div className="addressSearchSubTitle">
           We'll use this information to determine if BlocPower is available in your area.
         </div>
-        <Row className="addressSearch text-center">
-          <Col xs="1" className="addressSearchIcon">
-            <img src={location} width="15px" className="text-center" alt="" style={{ filter: "invert(100%)" }} />
-          </Col>
-          <Col className="addressSearchInput" style={{ paddingLeft: '0px' }}>
-            {addressData}
-          </Col>
-        </Row>
+        <div style={{height: "auto"}}>
+          <Row className="addressSearch text-center">
+            <Col xs="1" className="addressSearchIcon">
+              <img src={location} width="15px" className="text-center" alt="" style={{ filter: "invert(100%)" }} />
+            </Col>
+            <Col className="addressSearchInput" style={{ paddingLeft: '0px' }}>
+              {addressData}
+            </Col>
+          </Row>
+        </div>
         <Row className="addressSearchNote text-center">
           <Col xs="7" className="text-left">
             Having trouble entering your address? <br />
diff --git a/src/App.css b/src/App.css
index 617ddfe280856f8e3788619ebd7849661ec4f510..42eef8fb04b581266e6e2890ba1b4fd3cdcbdcc1 100644
--- a/src/App.css
+++ b/src/App.css
@@ -173,11 +173,6 @@
 .addressSearchNote {
   color: #999999;
   font-size: 0.9em;
-  margin-top: 250px;
-}
-
-.addressSearchInput {
-  height: 50px;
 }
 
 .addressSearchButton {
@@ -317,10 +312,6 @@
     padding: 0 10% 0 10%;
   }
 
-  .addressSearchNote {
-    margin-top: 250px;
-  }
-
   .title {
     font-size: 30px;
     margin-top: 25px;
diff --git a/src/BuildingTypes.js b/src/BuildingTypes.js
index dae415112d1238723a7a28f1f57ef5e9d53fd3dd..26a4749ce4d57380f83022bba38829978abf1c68 100644
--- a/src/BuildingTypes.js
+++ b/src/BuildingTypes.js
@@ -84,7 +84,7 @@ export default class BuildingTypes extends React.Component {
                 {
                   this.props.answerIds.map((answerId, id) => {
                     return (
-                      <Col xs="12" lg={{size: "4"}}>
+                      <Col xs="6" lg={{size: "4"}} className='add-margin-top'>
                           <div
                             className={this.state.answer === answerId ? "selectedButton" : "button"}
                             onClick={() => this.chooseAnswer(answerId)}
diff --git a/src/Fuels.js b/src/Fuels.js
index 41ec2aecfd9790d9bcbf56a92d506228733e8d2f..1d45e072fa8d42b13bd778c48a2c9a137f12b77c 100644
--- a/src/Fuels.js
+++ b/src/Fuels.js
@@ -92,7 +92,7 @@ export default class Fuels extends React.Component {
                 {
                   this.props.answerIds.map((answerId, id) => {
                     return (
-                      <Col xs={{size: "12"}} lg={{size: "2"}}>
+                      <Col xs={{size: "6"}} lg={{size: "2"}} className='add-margin-top'>
                         <div
                             className={this.state.answer === answerId ? "selectedButton" : "button"}
                             onClick={() => this.chooseFuel(answerId)}
diff --git a/src/HeatDistribution.js b/src/HeatDistribution.js
index caace3de551da63169d3439b8e2a4e29b7d18587..6a28c27b7d5264ff5078c93cf06553ca6def6c4b 100644
--- a/src/HeatDistribution.js
+++ b/src/HeatDistribution.js
@@ -81,7 +81,7 @@ export default class HeatDistribution extends React.Component {
               {
                 this.props.answerIds.map((answerId, id) => {
                   return (
-                    <Col xs="12" lg={{size: "2"}}>
+                    <Col xs="6" lg={{size: "2"}} className='add-margin-top'>
                         <div
                           className={this.state.answer === answerId ? "selectedButton" : "button"}
                           onClick={() => this.chooseAnswer(answerId)}
diff --git a/src/index.css b/src/index.css
index e882c2f7d455793dfab2bc6085187e14d3ebe57d..8822ab2d7cd0cd9e12385d455e96066c2f30f497 100644
--- a/src/index.css
+++ b/src/index.css
@@ -411,6 +411,10 @@ code {
 .addressSearchInputSection {
   margin-top: 30px;
   margin-bottom: 30px;
+  height: auto;
 }
 
 
+.add-margin-top{
+  margin-top: 30px;
+}