diff --git a/themes/wilma/css/edit.css b/themes/wilma/css/edit.css
index c7984725..af8bfa94 100644
--- a/themes/wilma/css/edit.css
+++ b/themes/wilma/css/edit.css
@@ -1,337 +1,337 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
 /******************* styles copied from old global.css.jsp ********************************/
-
-.buttonForm {
-	margin-top       : 0;
-	margin-bottom    : 0;
-	margin-right     : 0;
-	margin-left      : 0.5em;
-	padding-bottom   : 0.5em;
-	color            : #444444;
-	font-family      : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	line-height      : 16px;
-	min-height       : 100px;
-	display          : inline;
-}
-	
+
+.buttonForm {
+    margin-top       : 0;
+    margin-bottom    : 0;
+    margin-right     : 0;
+    margin-left      : 0.5em;
+    padding-bottom   : 0.5em;
+    color            : #444444;
+    font-family      : Verdana, Geneva, Arial, Helvetica, sans-serif;
+    line-height      : 16px;
+    min-height       : 100px;
+    display          : inline;
+}
+    
 .editingForm {
-	margin-top       : 0;
-	margin-bottom    : 0;
-	margin-right     : 0;
-	margin-left      : 0;
-	padding-bottom   : 1em;
-	color            : #444444;
-	font-family      : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	line-height      : 16px;
-	background-color : #eee; /* cals+vivo themes were: #dddddd; */
-	min-height       : 100px;
-	font-size        : 0.9em;
+    margin-top       : 0;
+    margin-bottom    : 0;
+    margin-right     : 0;
+    margin-left      : 0;
+    padding-bottom   : 1em;
+    color            : #444444;
+    font-family      : Verdana, Geneva, Arial, Helvetica, sans-serif;
+    line-height      : 16px;
+    background-color : #eee; /* cals+vivo themes were: #dddddd; */
+    min-height       : 100px;
+    font-size        : 0.9em;
 }
 
 .editingForm table {
-	text-align   : left;
-	border-width : 1px;
-	border-style : solid;
-	border-color : black;
-	border-collapse:separate;
+    text-align   : left;
+    border-width : 1px;
+    border-style : solid;
+    border-color : black;
+    border-collapse:separate;
 }
 
-.editingForm td{
-	padding: 2px 2px 2px 2px;
-	font-size : 1em;
+.editingForm td{
+    padding: 2px 2px 2px 2px;
+    font-size : 1em;
 }
 
 td.verticalfieldlabel {
-	font-size   : 11px;
-	line-height : 13px;
+    font-size   : 11px;
+    line-height : 13px;
 }
 
 .editingForm .entryFormHead {
-	text-align      : center;
-	padding         : 0.2em;
-	background-color: #f8f8c8;
-	border-width    : 1px;
-	border-style    : solid;
-	border-color    : black;
+    text-align      : center;
+    padding         : 0.2em;
+    background-color: #f8f8c8;
+    border-width    : 1px;
+    border-style    : solid;
+    border-color    : black;
 }
 
 .editingForm .entryFormHead h2{
-	margin   : 0.1em;
-	padding  : 0em;
-	font-size: 1.4em;
-	color    : black;
+    margin   : 0.1em;
+    padding  : 0em;
+    font-size: 1.4em;
+    color    : black;
 }
 
 .editingForm .entryFormHead h3{
-	margin     : 0.1em;
-	padding    : 0em;
-	font-size  : 1.2em;
-	font-weight: 600; /* cals theme was: 650 */
-	color      : red;
+    margin     : 0.1em;
+    padding    : 0em;
+    font-size  : 1.2em;
+    font-weight: 600; /* cals theme was: 650 */
+    color      : red;
 }
 
 .editingForm .entryFormHead .entryFormHeadInstructions {
-	margin    : 0em;
-	padding   : 0em;
-	font-size : 0.8em;
+    margin    : 0em;
+    padding   : 0em;
+    font-size : 0.8em;
 }
 
 .editingForm .form-item {
-	background-color: #FAFAD2;
-	border-color    : #2E440C;
-	font-family     : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size       : 10px;
-	border-width    : 1px;
+    background-color: #FAFAD2;
+    border-color    : #2E440C;
+    font-family     : Verdana, Geneva, Arial, Helvetica, sans-serif;
+    font-size       : 10px;
+    border-width    : 1px;
 }
 
 .editingForm .form-button {
-	background-color: #ccf;
-	border-color    : #ccf;
-	font-family     : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size       : 1em;
-	border-width    : 1px;
-	margin-top      : 2px;
-	width           : auto;
-	overflow        : visible;
+    background-color: #ccf;
+    border-color    : #ccf;
+    font-family     : Verdana, Geneva, Arial, Helvetica, sans-serif;
+    font-size       : 1em;
+    border-width    : 1px;
+    margin-top      : 2px;
+    width           : auto;
+    overflow        : visible;
 }
 
 tr.form-row-even {
-	background-color : #e9f0ff;
-	border-color     : #eec; 
-	font-family      : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size        : 10px;
-	border-width     : 1px;
-	margin-top       : 2px;
+    background-color : #e9f0ff;
+    border-color     : #eec; 
+    font-family      : Verdana, Geneva, Arial, Helvetica, sans-serif;
+    font-size        : 10px;
+    border-width     : 1px;
+    margin-top       : 2px;
 }
 
 tr.form-row-odd {
-	background-color : #e9f9ff;
-	border-color     : #eec; 
-	font-family      : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size        : 10px;
-	border-width     : 1px;
-	margin-top       : 2px;
+    background-color : #e9f9ff;
+    border-color     : #eec; 
+    font-family      : Verdana, Geneva, Arial, Helvetica, sans-serif;
+    font-size        : 10px;
+    border-width     : 1px;
+    margin-top       : 2px;
 }
 
 .form-editingRow {
-	background-color: #ff9;
-	border-color    : #eec; 
-	font-family     : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size       : 10px;
-	border-width    : 1px;
-	margin-top      : 2px;
+    background-color: #ff9;
+    border-color    : #eec; 
+    font-family     : Verdana, Geneva, Arial, Helvetica, sans-serif;
+    font-size       : 10px;
+    border-width    : 1px;
+    margin-top      : 2px;
 }
 
 /* DWR apparently no longer used
 .form-subEditingRow {
-	background-color : #ffb;
-	border-color : #eec; 
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	border-width : 1px;
-	margin-top : 2px;
+    background-color : #ffb;
+    border-color : #eec; 
+    font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+    font-size: 10px;
+    border-width : 1px;
+    margin-top : 2px;
 } */
 
 table.form-background td {
-	padding-left    : 1em;
-	padding-right   : 1em;
+    padding-left    : 1em;
+    padding-right   : 1em;
 }
 
 table.form-background td form {
-	padding : 0.2em;
+    padding : 0.2em;
 }
 
 .form-background {
-	background-color : #C8D8F8;
-	border-color     : #CCCCFF;
-	font-family      : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size        : 10px;
-	border-width     : 1px;
-	margin-top       : 2px;
+    background-color : #C8D8F8;
+    border-color     : #CCCCFF;
+    font-family      : Verdana, Geneva, Arial, Helvetica, sans-serif;
+    font-size        : 10px;
+    border-width     : 1px;
+    margin-top       : 2px;
 }
 
 .form-background.vclass {
-	background-color : #E05550;
+    background-color : #E05550;
 }
 
 .form-background.property {
-	background-color : #A8F0A0;
+    background-color : #A8F0A0;
 }
 
 
 .form-table-head {
-	background-color: #ccf;
-	border-color    : #eec; 
-	font-family     : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size       : 10px;
-	border-width    : 1px;
-	margin-top      : 2px;
+    background-color: #ccf;
+    border-color    : #eec; 
+    font-family     : Verdana, Geneva, Arial, Helvetica, sans-serif;
+    font-size       : 10px;
+    border-width    : 1px;
+    margin-top      : 2px;
 }
 
 .navlinkblock {
-	color			: black; /*#4B0082;*/
-	font-family 	: Verdana,Arial, Helvetica, sans-serif;
-	font-size 		: 10px;
-	font-weight		: normal;
-	margin-top		: 1px;
-	margin-bottom	: 1px;
-	padding-top		: 1px;
-	padding-bottom	: 4px;
+    color           : black; /*#4B0082;*/
+    font-family     : Verdana,Arial, Helvetica, sans-serif;
+    font-size       : 10px;
+    font-weight     : normal;
+    margin-top      : 1px;
+    margin-bottom   : 1px;
+    padding-top     : 1px;
+    padding-bottom  : 4px;
 }
 
 td.editformcell {
-	font-size: 9px;
+    font-size: 9px;
 }
 
 td.editformcell select {
-	margin: 0;
+    margin: 0;
 }
 
 .header {
-	background-color: #B0C4DE;
-	color 			: black;
-	font-family		: Arial, Helvetica, sans-serif;
-	font-size		: 10pt;
-	font-style		: normal;
-	text-align		: left;
+    background-color: #B0C4DE;
+    color           : black;
+    font-family     : Arial, Helvetica, sans-serif;
+    font-size       : 10pt;
+    font-style      : normal;
+    text-align      : left;
 }
 .database_header {
-	background-color: #B0C4DE;
-	color 			: black;
-	font-family		: Arial, Helvetica, sans-serif;
-	font-size		: 10pt;
-	font-style		: normal;
-	text-align		: left;
+    background-color: #B0C4DE;
+    color           : black;
+    font-family     : Arial, Helvetica, sans-serif;
+    font-size       : 10pt;
+    font-style      : normal;
+    text-align      : left;
 }
 
 .database_upperleftcorner {
-	background-color: #B0C4DE;
-	color 			: black;
-	font-family		: Arial, Helvetica, sans-serif;
-	font-size		: 10pt;
-	font-style		: normal;
-	text-align		: left;
+    background-color: #B0C4DE;
+    color           : black;
+    font-family     : Arial, Helvetica, sans-serif;
+    font-size       : 10pt;
+    font-style      : normal;
+    text-align      : left;
 }
 
 .database_upperleftcenter {
-	background-color: #B0C4DE;
-	color 			: black;
-	font-family		: Arial, Helvetica, sans-serif;
-	font-size		: 10pt;
-	font-style		: normal;
-	text-align		: center;
+    background-color: #B0C4DE;
+    color           : black;
+    font-family     : Arial, Helvetica, sans-serif;
+    font-size       : 10pt;
+    font-style      : normal;
+    text-align      : center;
 }
 
 .rownumheader {
-	background-color: #B0C4DE;
-	color			: black;
-	font-family		: Arial, Helvetica, sans-serif;
-	font-size		: 10pt;
-	font-style		: normal;
-	text-align		: center;
+    background-color: #B0C4DE;
+    color           : black;
+    font-family     : Arial, Helvetica, sans-serif;
+    font-size       : 10pt;
+    font-style      : normal;
+    text-align      : center;
 }
 
 
 .headercenter {
-	background-color: #9370DB;
-	color 			:  black;
-	font-family		:  Arial, Helvetica, sans-serif;
-	font-size		:  10pt;
-	font-style		:  normal;
-	text-align		:  center;
+    background-color: #9370DB;
+    color           :  black;
+    font-family     :  Arial, Helvetica, sans-serif;
+    font-size       :  10pt;
+    font-style      :  normal;
+    text-align      :  center;
 }
 
 .postheader {
-	background-color: #E6E6FA;
-	color			: #777777;
-	font-family		: Arial, Helvetica, sans-serif;
-	font-size		: 10pt;
-	font-style		: normal;
-	text-align		: left;
+    background-color: #E6E6FA;
+    color           : #777777;
+    font-family     : Arial, Helvetica, sans-serif;
+    font-size       : 10pt;
+    font-style      : normal;
+    text-align      : left;
 }
 
 .database_postheader {
-	background-color: #E6E6FA;
-	color			: #777777;
-	font-family		: Arial, Helvetica, sans-serif;
-	font-size		: 10pt;
-	font-style		: normal;
-	text-align		: left;
+    background-color: #E6E6FA;
+    color           : #777777;
+    font-family     : Arial, Helvetica, sans-serif;
+    font-size       : 10pt;
+    font-style      : normal;
+    text-align      : left;
 }
 
 .postheadercenter {
-	background-color: #E6E6FA;
-	color			: #4682B4;
-	font-family		: Arial, Helvetica, sans-serif;
-	font-size		: 10pt;
-	font-style		: normal;
-	text-align		: center;
+    background-color: #E6E6FA;
+    color           : #4682B4;
+    font-family     : Arial, Helvetica, sans-serif;
+    font-size       : 10pt;
+    font-style      : normal;
+    text-align      : center;
 }
 
 .postheaderright {
-	background-color: #E6E6FA;
-	color			: #4682B4;
-	font-family		: Arial, Helvetica, sans-serif;
-	font-size		: 10pt;
-	font-style		: normal;
-	text-align		: right;
+    background-color: #E6E6FA;
+    color           : #4682B4;
+    font-family     : Arial, Helvetica, sans-serif;
+    font-size       : 10pt;
+    font-style      : normal;
+    text-align      : right;
 }
 
 .verticalfieldlabel {
-	background-color: #DEDEDF;
-	color			: black;
-	font-family		: Verdana, Arial, Helvetica, sans-serif;
-	font-size		: 8pt;
-	font-style		: normal;
-	text-align		: right;
-	vertical-align		: top;
+    background-color: #DEDEDF;
+    color           : black;
+    font-family     : Verdana, Arial, Helvetica, sans-serif;
+    font-size       : 8pt;
+    font-style      : normal;
+    text-align      : right;
+    vertical-align      : top;
 }
 
 .row, .rowvert {
-	background-color: #F0FFFF;
-	color			: black;
-	font-family		: Arial, Helvetica, sans-serif;
-	font-size		: 10pt;
-	font-style		: normal;
-	text-align		: left;
+    background-color: #F0FFFF;
+    color           : black;
+    font-family     : Arial, Helvetica, sans-serif;
+    font-size       : 10pt;
+    font-style      : normal;
+    text-align      : left;
 }
 
 .rowalternate {
-	background-color: #F8F8FF;
-	color			: black;
-	font-family		: Arial, Helvetica, sans-serif;
-	font-size		: 10pt;
-	font-style		: normal;
-	text-align		: left;
+    background-color: #F8F8FF;
+    color           : black;
+    font-family     : Arial, Helvetica, sans-serif;
+    font-size       : 10pt;
+    font-style      : normal;
+    text-align      : left;
 }
 
 .rowbold {
-	background-color: #FFFAFA;
-	color			: black;
-	font-family		: Arial, Helvetica, sans-serif;
-	font-size		: 10pt;
-	font-style		: normal;
-	font-weight	: bold;
-	text-align		: left;
+    background-color: #FFFAFA;
+    color           : black;
+    font-family     : Arial, Helvetica, sans-serif;
+    font-size       : 10pt;
+    font-style      : normal;
+    font-weight : bold;
+    text-align      : left;
 }
 
 .rownum {
-	background-color: #87CEFA;
-	color			: black;
-	font-family		: Arial, Helvetica, sans-serif;
-	font-size		: 10pt;
-	font-style		: normal;
-	text-align		: center;
+    background-color: #87CEFA;
+    color           : black;
+    font-family     : Arial, Helvetica, sans-serif;
+    font-size       : 10pt;
+    font-style      : normal;
+    text-align      : center;
 }
 
 span.entityRelationsSpan {
-	padding-top     : 4px;
-	margin          : 0 0 0 1em;
-	font-weight     : bold;
-	font-size       : 90%;
-	color           : #2E440C;
-	text-align      : center;
+    padding-top     : 4px;
+    margin          : 0 0 0 1em;
+    font-weight     : bold;
+    font-size       : 90%;
+    color           : #2E440C;
+    text-align      : center;
 }
 
 
diff --git a/themes/wilma/css/formedit.css b/themes/wilma/css/formedit.css
index 7ace681e..4c58b591 100644
--- a/themes/wilma/css/formedit.css
+++ b/themes/wilma/css/formedit.css
@@ -8,7 +8,7 @@
 **************************************************/
 
 form {
-	padding-bottom: 20px;
+    padding-bottom: 20px;
 }
 
 .form p {
@@ -16,29 +16,29 @@ form {
 }
 
 form textarea {
-	width: 60%;
+    width: 60%;
 }
 
 form a:link.cancel, form a:visited.cancel {
-	color: #f70;
-	border-color: #f70;
+    color: #f70;
+    border-color: #f70;
 }
 
 form a:hover.cancel {
-	color: #fff;
-	background: #f70;
+    color: #fff;
+    background: #f70;
 }
 
 form select option{
-	padding-right: 5px;
+    padding-right: 5px;
 }
 
 form dl {
-	margin-bottom: 20px;
+    margin-bottom: 20px;
 }
 
 form dl dt, form dl dd {
-	padding-top: 15px;
+    padding-top: 15px;
 }
 
 .validationError {
diff --git a/themes/wilma/templates/googleAnalytics.ftl b/themes/wilma/templates/googleAnalytics.ftl
index 6b0b4675..1000dbe9 100644
--- a/themes/wilma/templates/googleAnalytics.ftl
+++ b/themes/wilma/templates/googleAnalytics.ftl
@@ -5,20 +5,20 @@ Please see documentation at https://confluence.cornell.edu/display/ennsrd/Google
 
 <#--
 <script type="text/javascript">  
-	var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); 
+    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); 
 </script>  
 
 <script type="text/javascript">  
-	try { 
-		var pageTracker = _gat._getTracker("UA-5164622-5");
-		pageTracker._setDomainName("vivo.cornell.edu");
-		pageTracker._setAllowLinker(true);
-		pageTracker._trackPageview();
+    try { 
+        var pageTracker = _gat._getTracker("UA-5164622-5");
+        pageTracker._setDomainName("vivo.cornell.edu");
+        pageTracker._setAllowLinker(true);
+        pageTracker._trackPageview();
          
-		var rollupTracker = _gat._getTracker("UA-12531954-1");
-		rollupTracker._setDomainName("none"); 
-		rollupTracker._setAllowLinker(true);
-		rollupTracker._trackPageview(location.host+location.pathname);  
+        var rollupTracker = _gat._getTracker("UA-12531954-1");
+        rollupTracker._setDomainName("none"); 
+        rollupTracker._setAllowLinker(true);
+        rollupTracker._trackPageview(location.host+location.pathname);  
 } 
 
 catch(err) {}  
diff --git a/themes/wilma/templates/menu.ftl b/themes/wilma/templates/menu.ftl
index f086c18d..9954ba9e 100644
--- a/themes/wilma/templates/menu.ftl
+++ b/themes/wilma/templates/menu.ftl
@@ -12,11 +12,11 @@
 <#import "lib-list.ftl" as l>
 
     <nav>
-        <ul id="header-nav">	
+        <ul id="header-nav">    
             <#if loginName??>
                 <li><span class="pictos-arrow-10">U</span> ${loginName}</li>
-    			<li><a href="${urls.logout}">Log out</a></li>
-    	        <li><a href="${urls.siteAdmin}">Site Admin</a></li>
+                <li><a href="${urls.logout}">Log out</a></li>
+                <li><a href="${urls.siteAdmin}">Site Admin</a></li>
             <#else>
                 <li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
             </#if>
diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl
index 03ce8613..a1b9b697 100644
--- a/themes/wilma/templates/page-home.ftl
+++ b/themes/wilma/templates/page-home.ftl
@@ -41,7 +41,7 @@
 
             <nav>
                 <ul id="header-nav">
-                    	
+                        
                 <#if loginName??>
                     <li><span class="pictos-arrow-10">U</span> ${loginName}</li>
                     <li><a href="${urls.logout}">Log out</a></li>
@@ -132,7 +132,7 @@
                             <li><a href="#">Faculty Member<span class="count-individuals"> (18,080)</span></a></li>
                             <li><a class="selected"  href="#">Graduate Student<span class="count-individuals"> (2,550)</span></a></li>
                             <li><a href="#">Librarian <span class="count-individuals"> (1,280)</span></a></li>
-                            <li><a href="#">Non-Academic 	  	 <span class="count-individuals"> (280)</span></a></li>
+                            <li><a href="#">Non-Academic         <span class="count-individuals"> (280)</span></a></li>
                             <li><a href="#">Non-Faculty Academic <span class="count-individuals"> (2,380)</span></a></li>
                             <li><a href="#">Person<span class="count-individuals"> (2,480)</span></a></li>
                             <li><a href="#">Postdoc <span class="count-individuals"> (1,380)</span></a></li>
diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl
index ee936ecf..efa41623 100644
--- a/themes/wilma/templates/page.ftl
+++ b/themes/wilma/templates/page.ftl
@@ -26,8 +26,8 @@
         <![endif]-->
     </head>
     
-	<body>
-		<header id="branding">
+    <body>
+        <header id="branding">
             <h1 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2>
             <!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
             <#if siteTagline?has_content>
@@ -86,8 +86,11 @@
             </ul>
         </nav>
         
-        <div id="wrapper-content">
-            ${body}                         
+        <div id="wrapper-content"> 
+            <#-- mb863: using for now until we have controllers page.ftl to render the two templates commented below-->
+            <#--<#include "menupage/menupage.ftl">-->
+            <#--<#include "menupage/menupage--classgroup-people.ftl">-->
+            ${body}                       
         </div> <!-- #wrapper-content -->
         
         <footer>
@@ -114,7 +117,7 @@
         
         ${scripts.add("/js/jquery.js")}
         ${scripts.tags}
-        
+
         <#include "googleAnalytics.ftl">
     </body>
 </html>
\ No newline at end of file