diff --git a/hapi-fhir-jpaserver-base/.classpath b/hapi-fhir-jpaserver-base/.classpath
index f9148a1a7ac..9ebe1a6b158 100644
--- a/hapi-fhir-jpaserver-base/.classpath
+++ b/hapi-fhir-jpaserver-base/.classpath
@@ -27,7 +27,7 @@
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.project.facet.core.xml
index 4f92af543f1..5c9bd7532ab 100644
--- a/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <installed facet="jst.utility" version="1.0"/>
-  <installed facet="java" version="1.7"/>
+  <installed facet="java" version="1.6"/>
 </faceted-project>
diff --git a/src/site/resources/hapi.css b/src/site/resources/hapi.css
index dd789e29468..84ffd8123b8 100644
--- a/src/site/resources/hapi.css
+++ b/src/site/resources/hapi.css
@@ -43,6 +43,11 @@
 
 */
 
+body {
+    padding-top: 40px;
+    padding-bottom: 10px;
+}
+
 pre {
   padding: 3px;
   margin: 0 0 10px;
diff --git a/src/site/site.xml b/src/site/site.xml
index 10760d677a9..1af3b531084 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -22,8 +22,8 @@
 		<logo name="Built with Maven 3" href="http://maven.apache.org" img="./images/maven-logo-mini.png" />
 	</poweredBy>
 
-	<publishDate position="top" format="yyyy-MM-dd" />
-	<version position="top" />
+	<publishDate position="bottom" format="yyyy-MM-dd" />
+	<version position="bottom" />
 
 	<!-- <version position="left" />  -->
 
@@ -50,26 +50,27 @@
 			<link rel="stylesheet" type="text/css" href="hapi.css" />
 		</head>
 		
-		<!-- 
+		<breadcrumbs>
+			<item name="HAPI FHIR" href="/" />
+		</breadcrumbs>
+		
 		<links>
-			<item name="GitHub Page" href="https://github.com/jamesagnew/hapi-fhir/" />
-			<item name="hl7.org" href="http://hl7.org/" />
-			<item name="University Health Network" href="http://www.uhn.ca/" />
+			<item name="Download" href="./download.html" />
+			<item name="GitHub Project" href="https://github.com/jamesagnew/hapi-fhir/" />
 		</links>
-		-->
 		
 		<menu name="HAPI FHIR" inherit="top">
-			<item name="Welcome" href="index.html" />
+			<item name="Home" href="index.html" />
 			<item name="Download" href="./download.html" />
 			<item name="Upgrade Guide" href="./doc_upgrading.html" />
 			<item name="Changelog" href="./changes-report.html" />
+			<item name="License" href="license.html" />
 		</menu>
-
-		<menu name="Test Servers" inherit="top">
-			<item name="Public Test Server" href="http://fhirtest.uhn.ca"/>
-			<item name="Vagrant (Private) Test Server" href="doc_vagrant.html"/>
+		
+		<menu name="Test Server" inherit="bottom">
+			<item name="Test Server" href="http://fhirtest.uhn.ca"/>
 		</menu>
-
+		
 		<menu name="Documentation" inherit="top">
 			<item name="Introduction" href="./doc_intro.html" >
 				<item name="DSTU2 Support (new)" href="./doc_dstu2.html" />			
@@ -113,12 +114,10 @@
 			<item name="Issue Tracker" href="https://github.com/jamesagnew/hapi-fhir/issues" />
 		</menu>
 
-		<menu name="Reports" inherit="bottom">
+		<menu name="Maven Reports" inherit="bottom">
 			<item name="Developers" href="team-list.html" />
 			<item name="Unit Test Report" href="surefire-report.html" />
 			<item name="FindBugs" href="findbugs.html" />
-			<item name="License" href="license.html" />
-			<item name="Source Code" href="https://github.com/jamesagnew/hapi-fhir" />
 		</menu>
 
 	</body>
@@ -139,11 +138,33 @@
 	
 	<custom>
 		<reflowSkin>
+			<pages>
+				<index project="hapi-fhir">
+					<!-- Override the title 
+					<titleTemplate>Reflow Maven Skin</titleTemplate>
+					-->
+					<!-- no breadcrumbs on the main index page -->
+					<breadcrumbs>false</breadcrumbs>
+					<!-- no ToC on the main index page -->
+					<toc>false</toc>
+					<!--
+					<markPageHeader>false</markPageHeader>
+					<sections>
+						<carousel />
+						<columns>2</columns>
+						<body />
+						<sidebar />
+					</sections>
+					-->
+				</index>
+			</pages>
 			<theme>bootswatch-united</theme>
 			<toc>sidebar</toc>
+			<topNav>Test Server|Documentation|JavaDocs|Get Help</topNav>
 			<bottomNav maxSpan="9" >
 				<column>HAPI FHIR|Test Servers</column>
 				<column>Get Help|Reports</column>
+				<column>Maven Reports</column>
 			</bottomNav>
 			<!-- 
 			<highlightJs>true</highlightJs>