diff --git a/ccm-cms-types-siteproxy/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SiteProxy.xml b/ccm-cms-types-siteproxy/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SiteProxy.xml
index f75ead6a2..3f004567b 100755
--- a/ccm-cms-types-siteproxy/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SiteProxy.xml
+++ b/ccm-cms-types-siteproxy/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SiteProxy.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
 
   <ctd:content-type label="Site Proxy"
-    description="A Proxy item for a page on an external site"
-    objectType="com.arsdigita.cms.contenttypes.SiteProxy"
-    classname="com.arsdigita.cms.contenttypes.SiteProxy">
+              description="A Proxy item for a page on an external site"
+               objectType="com.arsdigita.cms.contenttypes.SiteProxy"
+                classname="com.arsdigita.cms.contenttypes.SiteProxy">
 
     <ctd:authoring-kit
         createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
diff --git a/ccm-cms-types-siteproxy/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/siteproxy-item.jsp b/ccm-cms-types-siteproxy/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/siteproxy-item.jsp
index b27705eaa..1501efbda 100755
--- a/ccm-cms-types-siteproxy/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/siteproxy-item.jsp
+++ b/ccm-cms-types-siteproxy/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/siteproxy-item.jsp
@@ -1,11 +1,24 @@
+<%-- 
+    Document   : siteproxy-item2
+    Created on : 15.11.2009, 17:38:26
+    Author     : pb
+--%>
+
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
           xmlns:define="/WEB-INF/bebop-define.tld" 
           xmlns:show="/WEB-INF/bebop-show.tld"
           version="1.2">
 
+  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+
   <define:page name="SiteProxyItemPage" application="content" 
     title="CMS" cache="true">
 
+    <define:component name="categoryPath"
+      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
     <define:component name="itemXML"
       classname="com.arsdigita.cms.dispatcher.ContentPanel"/>
     <define:component name="siteProxyItemXML"
diff --git a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java
index ff9efa9d3..416f22da4 100755
--- a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java
+++ b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java
@@ -21,7 +21,7 @@ package com.arsdigita.cms.contenttypes;
 import org.apache.log4j.Logger;
 
 /**
- * The CMS initializer.
+ * The CMS SiteProxy initializer.
  *
  * @author Justin Ross &lt;jross@redhat.com&gt;
  * @version $Id: SiteProxyInitializer.java 757 2005-09-02 14:12:21Z sskracic $
@@ -30,6 +30,9 @@ public class SiteProxyInitializer extends ContentTypeInitializer {
 
     private static final Logger s_log = Logger.getLogger(SiteProxyInitializer.class);
 
+    /**
+     * SiteProxyInitialize Constructor
+     */
     public SiteProxyInitializer() {
         super("ccm-cms-types-siteproxy.pdl.mf",
               SiteProxy.BASE_DATA_OBJECT_TYPE);
diff --git a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyLoader.java b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyLoader.java
index 1c84a147d..0bd145c29 100755
--- a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyLoader.java
+++ b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyLoader.java
@@ -37,10 +37,6 @@ import java.io.InputStream;
  * @version $Id: SiteProxyLoader.java 1561 2007-04-16 15:37:21Z apevec $
  */
 public class SiteProxyLoader extends AbstractContentTypeLoader {
-    public final static String versionId =
-        "$Id: SiteProxyLoader.java 1561 2007-04-16 15:37:21Z apevec $" +
-        "$Author: apevec $" +
-        "$DateTime: 2004/08/17 23:15:09 $";
 
     private static final String[] TYPES = {
         "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SiteProxy.xml"
@@ -48,6 +44,10 @@ public class SiteProxyLoader extends AbstractContentTypeLoader {
 
     private ResourceParameter m_template;
 
+
+    /**
+     * SiteProxyLoader Constructor
+     */
     public SiteProxyLoader() {
         m_template = new ResourceParameter
             ("com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate",