diff --git a/webapp/web/css/individual/individual.css b/webapp/web/css/individual/individual.css
index 8f5e4764f..4e22cd6ad 100644
--- a/webapp/web/css/individual/individual.css
+++ b/webapp/web/css/individual/individual.css
@@ -32,7 +32,7 @@
 /* <------ INDIVIDUAL INTRO FOR ANY CLASS*/
 #individual-intro {
     margin-top: 15px;
-    margin-bottom: 20px;
+    margin-bottom: 0;
     position: relative;
     overflow: hidden;
 }
@@ -63,7 +63,7 @@ img#uriIcon {
     width: 166px;
     float: left;
     padding-right: 1.5em;
-    margin-bottom: 20px;
+    margin-bottom: 0;
 }
 #share-contact h3 {
     margin-top: 15px;
diff --git a/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl b/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl
index 894c9cea4..5811a727f 100644
--- a/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl
@@ -49,10 +49,18 @@
 <#assign nameForOtherGroup = "other"> <#-- used by both individual-propertyGroupMenu.ftl and individual-properties.ftl -->
 
 <#-- Property group menu -->
-<#include "individual-propertyGroupMenu.ftl">
+<#-- With release 1.6 the property group is no longer used. The include statement
+     remains in the event a particular VIVO site still wants to use it with the new
+     collapsible groups.
+     
+     <#include "individual-propertyGroupMenu.ftl">
+-->
 
 <#-- Ontology properties -->
 <#include "individual-properties.ftl">
+<script>
+    var individualLocalName = "${individual.localName}";
+</script>
 
 <#assign rdfUrl = individual.rdfUrl>
 
diff --git a/webapp/web/templates/freemarker/body/individual/individual.ftl b/webapp/web/templates/freemarker/body/individual/individual.ftl
index 62d979b8e..c76ed4da5 100644
--- a/webapp/web/templates/freemarker/body/individual/individual.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual.ftl
@@ -1,7 +1,27 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#-- Default individual profile page template -->
+<#-- Default VIVO individual profile page template (extends individual.ftl in vitro) -->
 
 <#include "individual-setup.ftl">
+<#import "lib-vivo-properties.ftl" as vp>
 
-<#include "individual-vitro.ftl">
\ No newline at end of file
+<#assign individualProductExtension>
+    <#-- Include for any class specific template additions -->
+    ${classSpecificExtension!}
+    <@vp.webpages propertyGroups editable />
+    <!--PREINDIVIDUAL OVERVIEW.FTL-->
+    <#include "individual-overview.ftl">
+        </section> <!-- #individual-info -->
+    </section> <!-- #individual-intro -->
+    <!--postindiviudal overiew tfl-->
+</#assign>
+
+<#include "individual-vitro.ftl">
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />',
+                  '<link rel="stylesheet" href="${urls.base}/css/individual/individual-property-groups.css" />')}
+
+${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>',
+                  '<script type="text/javascript" src="${urls.base}/js/amplify/amplify.store.min.js"></script>')}
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/individual/propertyGroupControls.js"></script>')}
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
index dd48a75ca..9f0a0e643 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
@@ -4,62 +4,81 @@
 
 <#import "lib-properties.ftl" as p>
 <#assign subjectUri = individual.controlPanelUrl()?split("=") >
+
+<#if ( propertyGroups.all?size > 1 ) >
+    <span id="toggleContainer">
+        <a id="propertyGroupsToggle" href="javascript:" title="expand all groups">expand all</a>
+    </span>
+<#else>
+    <p style="clear:both"><br /></p> 
+</#if>
 <#list propertyGroups.all as group>
     <#assign groupName = group.getName(nameForOtherGroup)>
     <#assign verbose = (verbosePropertySwitch.currentValue)!false>
+    <#if groupName?has_content>
+		<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
+    	<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
+    <#else>
+        <#assign groupName = "Properties">
+    	<#assign groupNameHtmlId = "properties" >
+    </#if>
     
-    <section class="property-group" role="region">
+    <section id="${groupNameHtmlId}" class="property-group" role="region">
         <nav class="scroll-up" role="navigation">
-            <a href="#branding" title="scroll up">
-                <img src="${urls.images}/individual/scroll-up.gif" alt="scroll to property group menus" />
-            </a>
+            <img src="${urls.images}/individual/expand-prop-group.png" groupName="${groupNameHtmlId}" alt="expand property group" title="expand this property group"/>
         </nav>
         
         <#-- Display the group heading --> 
-        <#if groupName?has_content>
-    		<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
-        	<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
             <h2 id="${groupNameHtmlId}">${groupName?capitalize}</h2>
-        <#else>
-            <h2 id="properties">Properties</h2>
-        </#if>
         
         <#-- List the properties in the group -->
-        <#list group.properties as property>
-            <article class="property" role="article">
-                <#-- Property display name -->
-                <#if property.localName == "authorInAuthorship" && editable  >
-                    <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
-                        <a id="managePubLink" class="manageLinks" href="${urls.base}/managePublications?subjectUri=${subjectUri[1]!}" title="manage publications" <#if verbose>style="padding-top:10px"</#if> >
-                            manage publications
-                        </a>
-                    </h3>
-                <#elseif property.localName == "hasResearcherRole" && editable  >
-                <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
-                    <a id="manageGrantLink" class="manageLinks" href="${urls.base}/manageGrants?subjectUri=${subjectUri[1]!}" title="manage grants & projects" <#if verbose>style="padding-top:10px"</#if> >
-                        manage grants & projects
-                    </a>
-                </h3>
-                <#elseif property.localName == "organizationForPosition" && editable  >
-                <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
-                    <a id="managePeopleLink" class="manageLinks" href="${urls.base}/managePeople?subjectUri=${subjectUri[1]!}" title="manage people" <#if verbose>style="padding-top:10px"</#if> >
-                        manage affiliated people
-                    </a>
-                </h3>
-                <#else>
-                    <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
-                </#if>
-                <#-- List the statements for each property -->
-                <ul class="property-list" role="list" id="${property.localName}List">
-                    <#-- data property -->
-                    <#if property.type == "data">
-                        <@p.dataPropertyList property editable />
-                    <#-- object property -->
+            <div id="${groupNameHtmlId}Group" >
+            <#list group.properties as property>
+                <article class="property" role="article">
+                    <#-- Property display name -->
+                    <#if property.localName == "authorInAuthorship" && editable  >
+                        <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
+                            <a id="managePubLink" class="manageLinks" href="${urls.base}/managePublications?subjectUri=${subjectUri[1]!}" title="manage publications" <#if verbose>style="padding-top:10px"</#if> >
+                                manage publications
+                            </a>
+                        </h3>
+                    <#elseif property.localName == "hasResearcherRole" && editable  >
+                        <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
+                            <a id="manageGrantLink" class="manageLinks" href="${urls.base}/manageGrants?subjectUri=${subjectUri[1]!}" title="manage grants & projects" <#if verbose>style="padding-top:10px"</#if> >
+                                manage grants & projects
+                            </a>
+                        </h3>
+                    <#elseif property.localName == "organizationForPosition" && editable  >
+                        <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
+                            <a id="managePeopleLink" class="manageLinks" href="${urls.base}/managePeople?subjectUri=${subjectUri[1]!}" title="manage people" <#if verbose>style="padding-top:10px"</#if> >
+                                manage affiliated people
+                            </a>
+                        </h3>
                     <#else>
-                        <@p.objectProperty property editable />
+                        <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
                     </#if>
-                </ul>
-            </article> <!-- end property -->
-        </#list>
+                    <#-- List the statements for each property -->
+                    <ul class="property-list" role="list" id="${property.localName}List">
+                        <#-- data property -->
+                        <#if property.type == "data">
+                            <@p.dataPropertyList property editable />
+                        <#-- object property -->
+                        <#else>
+                            <@p.objectProperty property editable />
+                        </#if>
+                    </ul>
+                </article> <!-- end property -->
+            </#list>
+        </div>
     </section> <!-- end property-group -->
 </#list>
+<script>
+var propGroupCount = ${propertyGroups.all?size};
+if ( propGroupCount == 1 ) {
+    $('section.property-group').find('div').show();
+    $('section.property-group').find("h2").addClass("expandedPropGroupH2");
+    $('section.property-group').children("nav").children("img").hide();
+//    var innerSrc = $('section.property-group').children("nav").children("img").attr("src");
+//    $('section.property-group').children("nav").children("img").attr("src",innerSrc.replace("expand-prop-group","collapse-prop-group"));
+}
+</script>
\ No newline at end of file