diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 9cbcfecd2..f44eee730 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -1295,4 +1295,7 @@
     <suppress files="src[\\/]test[\\/]java[\\/]stubs[\\/]javax[\\/]servlet[\\/]http[\\/]HttpSessionStub\.java" checks="."/>
     <suppress files="src[\\/]test[\\/]java[\\/]stubs[\\/]org[\\/]apache[\\/]jena[\\/]rdf[\\/]model[\\/]LiteralStub\.java" checks="."/>
     <suppress files="src[\\/]test[\\/]java[\\/]stubs[\\/]org[\\/]apache[\\/]jena[\\/]rdf[\\/]model[\\/]ModelMaker[\\/]ModelMakerStub\.java" checks="."/>
-</suppressions>
\ No newline at end of file
+    <suppress files="src[\/]main[\/]java[\/]edu[\/]cornell[\/]mannlib[\/]vitro[\/]webapp[\/]search[\/]controller[\/]ExtendedSearchController\.java" checks="."/>
+    <suppress files="src[\/]main[\/]java[\/]edu[\/]cornell[\/]mannlib[\/]vitro[\/]webapp[\/]edit[\/]n3editing[\/]configuration[\/]generators[\/]AddRubricToELENPHArticleGenerator\.java" checks="."/>
+    <suppress files="src[\/]main[\/]java[\/]edu[\/]cornell[\/]mannlib[\/]vitro[\/]webapp[\/]edit[\/]n3editing[\/]configuration[\/]generators[\/]CompilationGenerator\.java" checks="."/>
+</suppressions>
diff --git a/webapp/src/main/webapp/WEB-INF/resources/shortview_config.n3 b/webapp/src/main/webapp/WEB-INF/resources/shortview_config.n3
deleted file mode 100644
index 6442acf06..000000000
--- a/webapp/src/main/webapp/WEB-INF/resources/shortview_config.n3
+++ /dev/null
@@ -1,13 +0,0 @@
-# $This file is distributed under the terms of the license in LICENSE$
-
-#
-# Short View configuration
-#
-# This file allows a Vitro administrator to configure short view templates and data getters
-# for individuals of particular classes in particular contexts. This is a transitional
-# implementation, and should be replaced when the work on the Application and Display
-# Ontology is complete.
-#
-# Find out how to use this file at
-# https://wiki.lyrasis.org/display/VIVODOC112x/Creating+short+views+of+individuals
-#
diff --git a/webapp/src/main/webapp/favicon.ico b/webapp/src/main/webapp/favicon.ico
index 6e38bd98b..fe9367085 100644
Binary files a/webapp/src/main/webapp/favicon.ico and b/webapp/src/main/webapp/favicon.ico differ
diff --git a/webapp/src/main/webapp/robots.txt b/webapp/src/main/webapp/robots.txt
index 6b2a8a6a2..ed35ce7c4 100644
--- a/webapp/src/main/webapp/robots.txt
+++ b/webapp/src/main/webapp/robots.txt
@@ -1,18 +1,25 @@
 User-agent: *
-Disallow: /admin/
-Disallow: /help/
-Disallow: /images/
-Disallow: /js/
-Disallow: /quickedits/
-Disallow: /site_icons/
-Disallow: /src/
-Disallow: /templates/
-Disallow: /themes/
-Disallow: /WEB-INF/
-Disallow: /xsl/
-Disallow: /search/
-Disallow: /coauthors/
-Disallow: /pubsbyorg/
-Disallow: /fedsearch/
-Disallow: /comments.jsp
-Disallow: /dataservice/
+Disallow: /admin/             # Vitro
+Disallow: /help/              # Vitro
+Disallow: /images/            # Vitro
+Disallow: /js/                # Vitro
+Disallow: /quickedits/        # Vitro
+Disallow: /site_icons/        # Vitro
+Disallow: /src/               # Vitro
+Disallow: /templates/         # Vitro
+Disallow: /themes/            # Vitro
+Disallow: /xsl/               # Vitro
+Disallow: /search/            # Vitro
+Disallow: /coauthors/         # Vitro
+Disallow: /pubsbyorg/         # Vitro
+Disallow: /fedsearch/         # Vitro
+Disallow: /comments.jsp       # Vitro
+Disallow: /dataservice/       # Vitro
+Disallow: /listrdf/           # Vitro
+Disallow: /visualizationfm/   # VIVO addition
+Disallow: /visualization/     # VIVO addition
+Disallow: /vis/               # VIVO addition
+Disallow: /visualizationAjax/ # VIVO addition
+Disallow: /visualizationData/ # VIVO addition
+Disallow: /qrcode             # VIVO addition
+Disallow: /individual         # VIVO addition
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
deleted file mode 100644
index bf9882b19..000000000
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
+++ /dev/null
@@ -1,49 +0,0 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<#-- Template for browsing individuals in class groups for menupages -->
-
-<#import "lib-string.ftl" as str>
-<noscript>
-<p style="padding: 20px 20px 20px 20px;background-color:#f8ffb7">${i18n().browse_page_javascript_one} <a href="${urls.base}/browse" title="${i18n().index_page}">${i18n().index_page}</a> ${i18n().browse_page_javascript_two}</p>
-</noscript>
-
-<section id="noJavascriptContainer" class="hidden">
-<section id="browse-by" role="region">
-    <nav role="navigation">
-        <ul id="browse-classes">
-            <#list vClassGroup?sort_by("displayRank") as vClass>
-                <#------------------------------------------------------------
-                Need to replace vClassCamel with full URL that allows function
-                to degrade gracefully in absence of JavaScript. Something
-                similar to what Brian had setup with widget-browse.ftl
-                ------------------------------------------------------------->
-                <#assign vClassCamel = str.camelCase(vClass.name) />
-                <#-- Only display vClasses with individuals -->
-                <#if (vClass.entityCount > 0)>
-                    <li id="${vClassCamel}"><a href="#${vClassCamel}" title="${i18n().browse_all_in_class}" data-uri="${vClass.URI}">${vClass.name} <span class="count-classes">(${vClass.entityCount})</span></a></li>
-                </#if>
-            </#list>
-        </ul>
-        <nav id="alpha-browse-container" role="navigation">
-            <h3 class="selected-class"></h3>
-            <#assign alphabet = ["A", "B", "C", "D", "E", "F", "G" "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] />
-            <ul id="alpha-browse-individuals">
-                <li><a href="#" class="selected" data-alpha="all" title="${i18n().select_all}">${i18n().all}</a></li>
-                <#list alphabet as letter>
-                    <li><a href="#" data-alpha="${letter?lower_case}" title="${i18n().browse_all_starts_with(letter)}">${letter}</a></li>
-                </#list>
-            </ul>
-        </nav>
-    </nav>
-
-    <section id="individuals-in-class" role="region">
-        <ul role="list">
-
-            <#-- Will be populated dynamically via AJAX request -->
-        </ul>
-    </section>
-</section>
-</section>
-<script type="text/javascript">
-    $('section#noJavascriptContainer').removeClass('hidden');
-</script>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl
index 5606236dd..be693ca26 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl
@@ -2,10 +2,10 @@
 
 <#-- Default individual search view -->
 
-<#import "lib-properties.ftl" as p>
+<#import "lib-vivo-properties.ftl" as p>
 
-<a href="${individual.profileUrl}" title="${i18n().name}">${individual.name}</a>
+<a href="${individual.profileUrl}" title="${i18n().individual_name}">${individual.name}</a>
 
-<@p.mostSpecificTypes individual />
+<@p.displayTitle individual />
 
 <p class="snippet">${individual.snippet}</p>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl
deleted file mode 100644
index 711a2bafe..000000000
--- a/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<#-- Template for displaying search error message -->
-
-<#if title??>
-    <h2>${title?html}</h2>
-</#if>
-
-<p>
-${message?html}
-</p>
-<#include "search-help.ftl" >
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
deleted file mode 100644
index 5d8f0f244..000000000
--- a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
+++ /dev/null
@@ -1,120 +0,0 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<#-- Template for displaying paged search results -->
-
-<h2 class="searchResultsHeader">
-<#escape x as x?html>
-    ${i18n().search_results_for} '${querytext}'
-    <#if classGroupName?has_content>${i18n().limited_to_type} '${classGroupName}'</#if>
-    <#if typeName?has_content>${i18n().limited_to_type} '${typeName}'</#if>
-</#escape>
-<script type="text/javascript">
-	var url = window.location.toString();
-	if (url.indexOf("?") == -1){
-		var queryText = 'querytext=${querytext}';
-	} else {
-		var urlArray = url.split("?");
-		var queryText = urlArray[1];
-	}
-
-	var urlsBase = '${urls.base}';
-</script>
-
-	<img id="downloadIcon" src="images/download-icon.png" alt="${i18n().download_results}" title="${i18n().download_results}" />
-<#-- <span id="downloadResults" style="float:left"></span>  -->
-</h2>
-
-<span id="searchHelp"><a href="${urls.base}/searchHelp" title="${i18n().search_help}">${i18n().not_expected_results}</a></span>
-<div class="contentsBrowseGroup">
-
-    <#-- Refinement links -->
-    <#if classGroupLinks?has_content>
-        <div class="searchTOC">
-            <h4>${i18n().display_only}</h4>
-            <ul>
-            <#list classGroupLinks as link>
-                <li><a href="${link.url}" title="${i18n().class_group_link}">${link.text}</a><span>(${link.count})</span></li>
-            </#list>
-            </ul>
-        </div>
-    </#if>
-
-    <#if classLinks?has_content>
-        <div class="searchTOC">
-            <#if classGroupName?has_content>
-                <h4>${i18n().limit} ${classGroupName} ${i18n().to}</h4>
-            <#else>
-                <h4>${i18n().limit_to}</h4>
-            </#if>
-            <ul>
-            <#list classLinks as link>
-                <li><a href="${link.url}" title="${i18n().class_link}">${link.text}</a><span>(${link.count})</span></li>
-            </#list>
-            </ul>
-        </div>
-    </#if>
-
-    <#-- Search results -->
-    <ul class="searchhits">
-        <#list individuals as individual>
-            <li>
-            	<@shortView uri=individual.uri viewContext="search" />
-            </li>
-        </#list>
-    </ul>
-
-
-    <#-- Paging controls -->
-    <#if (pagingLinks?size > 0)>
-        <div class="searchpages">
-            ${i18n().pages}:
-            <#if prevPage??><a class="prev" href="${prevPage}" title="${i18n().previous}">${i18n().previous}</a></#if>
-            <#list pagingLinks as link>
-                <#if link.url??>
-                    <a href="${link.url}" title="${i18n().page_link}">${link.text}</a>
-                <#else>
-                    <span>${link.text}</span> <#-- no link if current page -->
-                </#if>
-            </#list>
-            <#if nextPage??><a class="next" href="${nextPage}" title="${i18n().next_capitalized}">${i18n().next_capitalized}</a></#if>
-        </div>
-    </#if>
-    <br />
-
-    <#-- VIVO OpenSocial Extension by UCSF -->
-    <#if openSocial??>
-        <#if openSocial.visible>
-        <h3>OpenSocial</h3>
-            <script type="text/javascript" language="javascript">
-                // find the 'Search' gadget(s).
-                var searchGadgets = my.findGadgetsAttachingTo("gadgets-search");
-                var keyword = '${querytext}';
-                // add params to these gadgets
-                if (keyword) {
-                    for (var i = 0; i < searchGadgets.length; i++) {
-                        var searchGadget = searchGadgets[i];
-                        searchGadget.additionalParams = searchGadget.additionalParams || {};
-                        searchGadget.additionalParams["keyword"] = keyword;
-                    }
-                }
-                else {  // remove these gadgets
-                    my.removeGadgets(searchGadgets);
-                }
-            </script>
-
-            <div id="gadgets-search" class="gadgets-gadget-parent" style="display:inline-block"></div>
-        </#if>
-    </#if>
-
-</div> <!-- end contentsBrowseGroup -->
-
-${stylesheets.add('<link rel="stylesheet" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />',
-  				  '<link rel="stylesheet" href="${urls.base}/css/search.css" />',
-                  '<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />')}
-
-${headScripts.add('<script src="//code.jquery.com/ui/1.10.3/jquery-ui.js"></script>',
-				  '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip.min.js"></script>',
-                  '<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>'
-                  )}
-
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/searchDownload.js"></script>')}