diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 775b2ce7..0c96a979 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -343,6 +343,15 @@
     <url-pattern>/about</url-pattern>
   </servlet-mapping>
   
+  <servlet>
+    <servlet-name>HomePageController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.HomePageController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>HomePageController</servlet-name>
+    <url-pattern>/index.jsp</url-pattern>
+  </servlet-mapping>
+   
   <servlet>
     <servlet-name>FreemarkerTestController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TestController</servlet-class>
@@ -951,18 +960,6 @@
     <url-pattern>/TabEntitiesController</url-pattern>
   </servlet-mapping>
 
-  <!--  NOTICE: index.jsp is mapped to TabControler so that we 
-    		can have the urls that use to be in the system still work even 
-            though we no longer use index.jsp           -->
-  <servlet>
-    <servlet-name>TabController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.TabController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>TabController</servlet-name>
-    <url-pattern>/index.jsp</url-pattern>
-  </servlet-mapping>
-
   <!-- <servlet>
        <servlet-name>EntityPropertyListController</servlet-name>     
        <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityPropertyListController</servlet-class>
diff --git a/themes/vivo-basic/templates/page-home.ftl b/themes/vivo-basic/templates/page-home.ftl
new file mode 100644
index 00000000..b84b7f51
--- /dev/null
+++ b/themes/vivo-basic/templates/page-home.ftl
@@ -0,0 +1,59 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#include "doctype.html">
+
+<#include "head.ftl">
+
+<body>
+    <div id="wrap" class="container">
+        <div id="header">
+        
+            <#include "identity.ftl">
+            
+            <#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp -->
+            <div id="navAndSearch" class="block">
+                <#include "menu.ftl">  
+                <#include "search.ftl">                
+            </div> <!-- navAndSearch --> 
+            
+            <#include "breadcrumbs.ftl">         
+        </div> <!-- header --> 
+
+        <hr class="hidden" />
+
+        <div id="contentwrap">      
+            <div id="content">
+                <#-- UI team: the home page controller currently does not produce a ${body} string,
+                anticipating that you would put all the markup directly in page-home.ftl. If you want
+                it to work the way other pages do, with a separate template to produce the body,
+                <#-- ${body!}  -->             
+                <p>This is the home page of the VIVO vivo-basic theme.</p>
+            </div> <!-- content -->
+        </div> <!-- contentwrap -->
+    
+        <#include "footer.ftl">
+                                      
+    </div> <!-- wrap --> 
+    
+    <#include "scripts.ftl"> 
+</body>
+</html>
+
+<#-- 
+Three ways to add a stylesheet:
+
+A. In theme directory:
+${stylesheets.addFromTheme("/css/sample.css")}
+${stylesheets.add(themeDir + "/css/sample.css")}
+
+B. Any location
+${stylesheets.add("/edit/forms/css/sample.css)"}
+
+To add a script: 
+
+A. In theme directory:
+${scripts.addFromTheme("/css/sample.js")}
+
+B. Any location
+${scripts("/edit/forms/js/sample.js)"}
+-->
\ No newline at end of file
diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl
index 05b15d1d..e4c1bb14 100644
--- a/themes/wilma/templates/page.ftl
+++ b/themes/wilma/templates/page.ftl
@@ -69,7 +69,7 @@ ${headScripts.tags}
   </nav>
   <div id="wrapper-content">
 	
-    ${body}
+    ${body!}
  
   </div>
   <footer>
