diff --git a/youmap/static/youmap/youmap.css b/youmap/static/youmap/youmap.css
index 522e081e..137a1444 100644
--- a/youmap/static/youmap/youmap.css
+++ b/youmap/static/youmap/youmap.css
@@ -66,4 +66,7 @@ input:-moz-placeholder, :-moz-placeholder {
 }
 #reveal-container textarea {
     height: 100px;
+}
+#reveal-container select {
+    margin-bottom: 10px;
 }
\ No newline at end of file
diff --git a/youmap/templates/chickpea/map_form.html b/youmap/templates/chickpea/map_form.html
index 9cb5a67d..6e0efcad 100644
--- a/youmap/templates/chickpea/map_form.html
+++ b/youmap/templates/chickpea/map_form.html
@@ -1,20 +1,13 @@
+{% load youmap_tags %}
 <h3>Create your map now!</h3>
 <form action="{{ action_url }}" method="post" id="map_edit">
     {% for error in form.non_field_errors %}
         <small class="error">{{ error }}</small>
     {% endfor %}
     {% csrf_token %}
-    {{ form.name }}
-    {% for error in form.name.errors %}
-        <small class="error">{{ error|escape }}</small>
-    {% endfor %}
-    {{ form.description }}
-    {{ form.description.errors }}
-    <label>{{ form.licence.help_text }}</label>
-    {{ form.licence }}
-    {% for error in form.licence.errors %}
-        <small class="error">{{ error|escape }}</small>
-    {% endfor %}
+    {% foundation_field form.name %}
+    {% foundation_field form.description %}
+    {% foundation_field form.licence %}
     {{ form.zoom }}
     {{ form.center }}
     <input type="submit" class="button" />