diff --git a/app/assets/stylesheets/screen.css b/app/assets/stylesheets/screen.css
index 686beff..be61636 100644
--- a/app/assets/stylesheets/screen.css
+++ b/app/assets/stylesheets/screen.css
@@ -79,6 +79,7 @@ form input.error:focus, form textarea.error:focus {
 .table-cell {
   display: table-cell;
   height: 100%;
+  vertical-align: top;
 }
 
 .alert-message {
@@ -126,11 +127,15 @@ form input.error:focus, form textarea.error:focus {
   margin: 10px 5px;
 }
 
-#map {
-  margin-top: 40px;
+.map-container {
   width: auto;
 }
 
+#map {
+  height: 100%;
+  width: 100%;
+}
+
 #error, #notice, #warning {
   margin: auto;
   padding: 5px 10px;
diff --git a/app/views/main/index.html.haml b/app/views/main/index.html.haml
index 8dad2ef..d0c9986 100644
--- a/app/views/main/index.html.haml
+++ b/app/views/main/index.html.haml
@@ -18,5 +18,6 @@
       #feedback
         %a{:href => URI.escape("mailto:adoptahydrant@cityofboston.gov?subject=#{t("titles.main", :thing => t("defaults.thing").titleize)} #{t("links.feedback").titleize}")}
           = t("links.feedback")
-    .table-cell#map
-       
+    .table-cell.map-container
+      #map
+