--- a/app/soc/templates/soc/site/home/public.html	Sat Sep 13 21:27:17 2008 +0000
+++ b/app/soc/templates/soc/site/home/public.html	Sat Sep 13 22:00:51 2008 +0000
@@ -14,6 +14,7 @@
 {% endcomment %}
 
 {% block scripts %}
+{% if site_settings.feed_url %}
     <script type="text/javascript" src="http://www.google.com/jsapi"></script>
     <script type="text/javascript" src="/soc/content/js/blog.js"></script>
     <script type="text/javascript">
@@ -22,14 +23,37 @@
 
     function initialize() {
       var blog = new BlogPreview(document.getElementById("blog"));
-      blog.show("http://google-opensource.blogspot.com/feeds/posts/default");
+      blog.show("{{ site_settings.feed_url }}");
     }
     google.setOnLoadCallback(initialize);
 
     </script>
+{% endif %}
+{% endblock %}
+
+{% block page_title %}
+{% if site_document %}
+{{ site_document.title }}
+{% else %}
+Google Open Source Programs
+{% endif %}
+{% endblock %}
+
+{% block header_title %}
+{% if site_document %}
+{{ site_document.title }}
+{% else %}
+Google Open Source Programs
+{% endif %}
 {% endblock %}
 
 {% block body %}
+    {% if site_document %}
+    {{ site_document.content|safe }}
+    {% else %}
 	{{ block.super }}
+    {% endif %}
+    {% if site_settings.feed_url %}
     <div id="blog"></div>
+    {% endif %}
 {% endblock %}
\ No newline at end of file