--- a/app/soc/templates/soc/organization/home.html	Sun Aug 02 22:39:47 2009 +0200
+++ b/app/soc/templates/soc/organization/home.html	Sun Aug 02 23:45:42 2009 +0200
@@ -38,19 +38,15 @@
 {% endif %}
 {% endblock %}
 {% block home_extras %}
-{% for list_number in list.lists %}
-<p>
-  {% include list.nextList %}
-</p>
-{% endfor %}
 <div id="org_home_extras">
   {% for list_number in list.lists %}
   <p>
     {% include list.nextList %}
   </p>
   {% endfor %}
- {% if gmaps_api_key %}
-   <div id="org_home_map"></div>
- {% endif %}
+
+  {% if gmaps_api_key and org_map_data %}
+    <div id="org_home_map"></div>
+  {% endif %}
 </div>
 {% endblock %}