diff --git a/apps/dashboard-app/src/main/js/src/assets/css/shrine.css b/apps/dashboard-app/src/main/js/src/assets/css/shrine.css
index b34fb77af..41afc181c 100644
--- a/apps/dashboard-app/src/main/js/src/assets/css/shrine.css
+++ b/apps/dashboard-app/src/main/js/src/assets/css/shrine.css
@@ -1,768 +1,774 @@
 @font-face {
     font-family: 'Nexa';
     src: url('../fnt/nexa/nexa-light-webfont.eot');
     src: url('../fnt/nexa/nexa-light-webfont.eot?#iefix') format('embedded-opentype'),
     url('../fnt/nexa/nexa-light-webfont.woff2') format('woff2'),
     url('../fnt/nexa/nexa-light-webfont.woff') format('woff'),
     url('../fnt/nexa/nexa-light-webfont.ttf') format('truetype'),
     url('../fnt/nexa/nexa-light-webfont.svg#nexa_lightregular') format('svg');
     font-weight: normal;
     font-style: normal;
 }
 
 
 
 
 @font-face {
     font-family: 'Nexa Bold';
     src: url('../fnt/nexa/nexa-bold-webfont.eot');
     src: url('../fnt/nexa/nexa-bold-webfont.eot?#iefix') format('embedded-opentype'),
     url('../fnt/nexa/nexa-bold-webfont.woff2') format('woff2'),
     url('../fnt/nexa/nexa-bold-webfont.woff') format('woff'),
     url('../fnt/nexa/nexa-bold-webfont.ttf') format('truetype'),
     url('../fnt/nexa/nexa-bold-webfont.svg#nexa_boldregular') format('svg');
     font-weight: normal;
     font-style: normal;
 
 }
 
 
 @font-face {
     font-family: 'Open Sans Regular';
     src: url('../fnt/open-sans/opensans-regular-webfont.eot');
     src: url('../fnt/open-sans/opensans-regular-webfont.eot?#iefix') format('embedded-opentype'),
     url('../fnt/open-sans/opensans-regular-webfont.woff2') format('woff2'),
     url('../fnt/open-sans/opensans-regular-webfont.woff') format('woff'),
     url('../fnt/open-sans/opensans-regular-webfont.ttf') format('truetype'),
     url('../fnt/open-sans/opensans-regular-webfont.svg#open_sansregular') format('svg');
     font-weight: normal;
     font-style: normal;
 
 }
 
 
 
 
 @font-face {
     font-family: 'Open Sans Semibold';
     src: url('../fnt/open-sans/opensans-semibold-webfont.eot');
     src: url('../fnt/open-sans/opensans-semibold-webfont.eot?#iefix') format('embedded-opentype'),
     url('../fnt/open-sans/opensans-semibold-webfont.woff2') format('woff2'),
     url('../fnt/open-sans/opensans-semibold-webfont.woff') format('woff'),
     url('../fnt/open-sans/opensans-semibold-webfont.ttf') format('truetype'),
     url('../fnt/open-sans/opensans-semibold-webfont.svg#open_sanssemibold') format('svg');
     font-weight: normal;
     font-style: normal;
 
 }
 
 @font-face {
     font-family: 'Roboto Bold';
     src: url('../fnt/roboto/roboto-bold-webfont.eot');
     src: url('../fnt/roboto/roboto-bold-webfont.eot?#iefix') format('embedded-opentype'),
     url('../fnt/roboto/roboto-bold-webfont.woff2') format('woff2'),
     url('../fnt/roboto/roboto-bold-webfont.woff') format('woff'),
     url('../fnt/roboto/roboto-bold-webfont.ttf') format('truetype'),
     url('../fnt/roboto/roboto-bold-webfont.svg#robotobold') format('svg');
     font-weight: normal;
     font-style: normal;
 
 }
 
 
 
 
 @font-face {
     font-family: 'Roboto Regular';
     src: url('../fnt/roboto/roboto-regular-webfont.eot');
     src: url('../fnt/roboto/roboto-regular-webfont.eot?#iefix') format('embedded-opentype'),
     url('../fnt/roboto/roboto-regular-webfont.woff2') format('woff2'),
     url('../fnt/roboto/roboto-regular-webfont.woff') format('woff'),
     url('../fnt/roboto/roboto-regular-webfont.ttf') format('truetype'),
     url('../fnt/roboto/roboto-regular-webfont.svg#robotoregular') format('svg');
     font-weight: normal;
     font-style: normal;
 
 }
 
 .main-app{
     background-image: url('../img/Background_Shrine.jpg');
     background-size: cover;
     background-color: transparent;
     background-attachment: fixed;
     width: 100%;
     height:100%;
     width: calc(100vw);
     height: calc(100vh);
     min-width: 100%;
     min-height: 100%;
 }
 
 .shrine-navbar {
     background-color: rgba(255, 255, 255, 0.62);
     border-color: transparent;
     font-family: "Nexa";
     color: #5d5d5d;
     min-height: 60px;
     width: 100%;
     height: 4.8em;
 }
 
 .shrine-brand {
     float: left;
     padding: 22px 15px;
     font-size: 30px;
     line-height: 30px;
     height: 30px;
 }
 
 .shrine-brand strong {
     font-family: "Nexa Bold";
     color: #2c5566;
 }
 
 .shrine-navbar .shrine-institution-logo {
     background-image: url('/static/logo.png');
     background-size: contain;
     background-color: transparent;
     background-color: rgba(255,255,255,0.1);
     background-repeat: no-repeat;
     background-position: right top;
     margin: 5px;
     width: 4em;
     height: 4em;
     max-height: 4em;
     max-width: 4em;
 }
 
 .shrine-button {
     cursor: pointer !important;
     background-color: transparent;
     border: none;
 }
 
 .shrine-button span {
     position: relative;
     bottom: 5px;
 
 }
 
 .shrine-btn-default {
     margin-right: 6px;
     border:none;
 }
 
 .shrine-btn-on {
     padding: 12px 12px;
     border-radius: 0;
     font-family: "Roboto Bold" !important;
     color: #FFFFFF !important;
     background:
     linear-gradient(rgba(4, 141, 190, .80), rgba(2, 89, 120, .80)),
     url('../img/bckg_diagonal_lines_no_border.png') !important;
 }
 
 .shrine-btn-off {
     padding: 6px 12px !important;
     border-radius: 4px !important;
     font-family: "Open Sans Semibold" !important;
     background-color: #8896A4 !important;
     color: #FFFFFF !important;
 }
 
 
 .shrine-on, .shrine-on a {
     font-family: "Roboto Bold" !important;
     color: #FFFFFF !important;
     background: linear-gradient(#048DBE, #025978) !important;
 }
 
 .shrine-off {
     font-family: "Roboto Regular" !important;
     color: #2C5566 !important;
     background-color: #ECEEEE !important;
 }
 
 
 .shrine-button.disabled, .shrine-button[disabled] {
     cursor: default !important;
     opacity: 0.2 !important;
 }
 
 .shrine-copy-bold {
     font-family: "Nexa Bold";
     color: #64818e;
 }
 
 .shrine-copy {
     font-family: "Nexa";
     color: #000000;
 }
 
 .row {
     margin-right: 0;
     margin-left: 0;
 }
 
 td.error, span.error {
     color: red;
 }
 
 td.error a, td.error a:hover, span.error a, span.error a:hover{
     color: inherit;
     text-decoration: underline !important;
     cursor: pointer;
 }
 
 td.ok, span.ok {
     color:green;
 }
 
 .form-group span {
     font-family: "Open Sans Semibold";
     color: #2c5566;
 }
 
 fieldset button {
     color: #2E5366;
 }
 
 fieldset button:hover, form a:hover {
     color: #008CBA;
     text-decoration: none;
     cursor: pointer;
 }
 
 form a {
     font-family: "Open Sans Regular";
     color: #647d8d;
     text-decoration: none;
 }
 
 footer img {
     margin-left: 10px;
     margin-top: 2px;
 }
 
 footer {
     background-color: rgba(50, 62, 74, 0.48);
     position: fixed;
     bottom: 0;
     left: 0;
     width: 100%;
     height: 83px;
     min-height: 83px;
     max-width: 100%;
 }
 
 table {
     background-image: url('../img/bckg_diagonal_lines_no_border.png');
     border: 1px solid #CCD8DF;
 
 }
 
 .table tr>td:first-child {
     width: 20%;
     min-width: 140px;
 }
 .table tr>td.thin-col {
     width: 6%;
     min-width: 35px;
 }
 
 .table-striped>tbody>tr:nth-of-type(odd) {
     background-color: #EFF6F9;
 }
 
 .table-striped>tbody>tr:nth-of-type(even) {
     background-color: #FFFFFF;
 }
 
 thead tr{
     border: 1px solid #CCD8DF;
 }
 
 td{
     border-right: 1px solid #CCD8DF;
     overflow: hidden;
     max-width: 450px;
     word-break: break-all;
 }
 
 
 
 thead tr td, thead tr td label, tfoot tr td span{
     font-family: "Open Sans Semibold";
     color: #003153;
 }
 
 td a, td a:hover{
     text-decoration: none !important;
     cursor: pointer;
     font-family: "Open Sans Semibold";
     color: #003153;
 }
 
 .shrine-panel{
     background-image: url('../img/bckg_diagonal_lines.png');
     background-size: 100% 100%;
     padding-right: 20px;
     padding-left: 20px;
     padding-top: 30px;
     padding-bottom: 30px;
 
 }
 
 /*!
  * Start Bootstrap - SB Admin 2 Bootstrap Admin Theme (http://startbootstrap.com)
  * Code licensed under the Apache License v2.0.
  * For details, see http://www.apache.org/licenses/LICENSE-2.0.
  */
 
 body {
     background-image: url('../img/Background_Shrine.jpg');
     background-repeat:no-repeat;
     background-size:100% 100%;
 }
 
 #wrapper {
     width: 100%;
     margin-bottom: 83px; /* clearance space for footer at bottom of long page */
 }
 
 .login-wrapper{
     margin-top: 51px;
     margin-right: 20px;
 }
 
 #page-wrapper {
     background-color: transparent;
     margin-top: 54px;
     margin-right: 20px;
 }
 
 .navbar-top-links li {
     display: inline-block;
 }
 
 .navbar-top-links li:last-child {
     margin-right: 15px;
 }
 
 .navbar-top-links li a {
     padding: 15px;
     min-height: 50px;
     font-family: "Open Sans Semibold";
     color: #2c5566;
 }
 
 .navbar-top-links .dropdown-menu li {
     font-family: "Open Sans Semibold";
     color: #2c5566;
     display: block;
 }
 
 .navbar-top-links .dropdown-menu li:last-child {
     margin-right: 0;
 }
 
 .navbar-top-links .dropdown-menu li a {
     padding: 3px 20px;
     min-height: 0;
 }
 
 .navbar-top-links .dropdown-menu li a div {
     white-space: normal;
 }
 
 .navbar-top-links .dropdown-messages,
 .navbar-top-links .dropdown-tasks,
 .navbar-top-links .dropdown-alerts {
     width: 310px;
     min-width: 0;
 }
 
 .navbar-top-links .dropdown-messages {
     margin-left: 5px;
 }
 
 .navbar-top-links .dropdown-tasks {
     margin-left: -59px;
 }
 
 .navbar-top-links .dropdown-alerts {
     margin-left: -123px;
 }
 
 .navbar-top-links{
     right: 0;
     left: auto;
 }
 
 .sidebar .sidebar-nav.navbar-collapse {
     padding-right: 0;
     padding-left: 0;
 }
 
 .sidebar .sidebar-search {
     padding: 15px;
 }
 
 .sidebar ul li {
     border-bottom: 1px solid #e7e7e7;
 }
 
 .sidebar ul li a.active {
     background-color: #eee;
 }
 
 .sidebar .arrow {
     float: right;
 }
 
 .sidebar .fa.arrow:before {
     content: "\f104";
 }
 
 .sidebar .active>a>.fa.arrow:before {
     content: "\f107";
 }
 
 .sidebar .nav-second-level li,
 .sidebar .nav-third-level li {
     border-bottom: 0!important;
 }
 
 .sidebar .nav-second-level li a {
     padding-left: 37px;
 }
 
 .sidebar .nav-third-level li a {
     padding-left: 52px;
 }
 
 @media(min-width:768px) {
     .sidebar {
         z-index: 1;
         margin-top: 51px;
     }
 
     .navbar-top-links .dropdown-messages,
     .navbar-top-links .dropdown-tasks,
     .navbar-top-links .dropdown-alerts {
         margin-left: auto;
     }
 }
 
 .btn-outline {
     color: inherit;
     background-color: transparent;
     transition: all .5s;
 }
 
 .btn-primary.btn-outline {
     color: #428bca;
 }
 
 .btn-success.btn-outline {
     color: #5cb85c;
 }
 
 .btn-info.btn-outline {
     color: #5bc0de;
 }
 
 .btn-warning.btn-outline {
     color: #f0ad4e;
 }
 
 .btn-danger.btn-outline {
     color: #d9534f;
 }
 
 .btn-primary.btn-outline:hover,
 .btn-success.btn-outline:hover,
 .btn-info.btn-outline:hover,
 .btn-warning.btn-outline:hover,
 .btn-danger.btn-outline:hover {
     color: #fff;
 }
 
 .chat {
     margin: 0;
     padding: 0;
     list-style: none;
 }
 
 .chat li {
     margin-bottom: 10px;
     padding-bottom: 5px;
     border-bottom: 1px dotted #999;
 }
 
 .chat li.left .chat-body {
     margin-left: 60px;
 }
 
 .chat li.right .chat-body {
     margin-right: 60px;
 }
 
 .chat li .chat-body p {
     margin: 0;
 }
 
 .panel .slidedown .glyphicon,
 .chat .glyphicon {
     margin-right: 5px;
 }
 
 .chat-panel .panel-body {
     height: 350px;
     overflow-y: scroll;
 }
 
 .login-panel {
     margin-top: 25%;
 }
 
 .flot-chart {
     display: block;
     height: 400px;
 }
 
 .flot-chart-content {
     width: 100%;
     height: 100%;
 }
 
 .dataTables_wrapper {
     position: relative;
     clear: both;
 }
 
 table.dataTable thead .sorting,
 table.dataTable thead .sorting_asc,
 table.dataTable thead .sorting_desc,
 table.dataTable thead .sorting_asc_disabled,
 table.dataTable thead .sorting_desc_disabled {
     background: 0 0;
 }
 
 table.dataTable thead .sorting_asc:after {
     content: "\f0de";
     float: right;
     font-family: fontawesome;
 }
 
 table.dataTable thead .sorting_desc:after {
     content: "\f0dd";
     float: right;
     font-family: fontawesome;
 }
 
 table.dataTable thead .sorting:after {
     content: "\f0dc";
     float: right;
     font-family: fontawesome;
     color: rgba(50,50,50,.5);
 }
 
 .btn-circle {
     width: 30px;
     height: 30px;
     padding: 6px 0;
     border-radius: 15px;
     text-align: center;
     font-size: 12px;
     line-height: 1.428571429;
 }
 
 .btn-circle.btn-lg {
     width: 50px;
     height: 50px;
     padding: 10px 16px;
     border-radius: 25px;
     font-size: 18px;
     line-height: 1.33;
 }
 
 .btn-circle.btn-xl {
     width: 70px;
     height: 70px;
     padding: 10px 16px;
     border-radius: 35px;
     font-size: 24px;
     line-height: 1.33;
 }
 
 .show-grid [class^=col-] {
     padding-top: 10px;
     padding-bottom: 10px;
     border: 1px solid #ddd;
     background-color: #eee!important;
 }
 
 .show-grid {
     margin: 15px 0;
 }
 
 .huge {
     font-size: 40px;
 }
 
 .panel-green {
     border-color: #5cb85c;
 }
 
 .panel-green .panel-heading {
     border-color: #5cb85c;
     color: #fff;
     background-color: #5cb85c;
 }
 
 .panel-green a {
     color: #5cb85c;
 }
 
 .panel-green a:hover {
     color: #3d8b3d;
 }
 
 .panel-red {
     border-color: #d9534f;
 }
 
 .panel-red .panel-heading {
     border-color: #d9534f;
     color: #fff;
     background-color: #d9534f;
 }
 
 .panel-red a {
     color: #d9534f;
 }
 
 .panel-red a:hover {
     color: #b52b27;
 }
 
 .panel-yellow {
     border-color: #f0ad4e;
 }
 
 .panel-yellow .panel-heading {
     border-color: #f0ad4e;
     color: #fff;
     background-color: #f0ad4e;
 }
 
 .panel-yellow a {
     color: #f0ad4e;
 }
 
 .panel-yellow a:hover {
     color: #df8a13;
 }
 
 .modal-content{
     border: none;
 }
 
 .shrine-modal{
     background-color: white;
     border: 1px solid #2c5566;
     font-family: "Open Sans Semibold";
     color: #2e5366;
     padding: 15px;
 }
 
 .shrine-modal form div.col-sm-12{
     border: 1px solid rgba(2, 89, 120, .80);
 }
 
 .shrine-modal input, .shrine-modal textarea{
     border-radius: 0px;
     border: 1px solid #2c5566;
 }
 
 .shrine-modal span{
     font-family: "Nexa Bold";
     color: #2e5366;
 }
 
 .shrine-modal span:hover{
     font-family: "Nexa Bold";
     color: #008CBA;
 }
 
 .shrine-modal button{
     background-color: white;
     border: none;
     font-family: "Nexa Bold";
     color: #2e5366;
 }
 
 .shrine-modal button span{
     position: relative;
     bottom: 6px;
 }
 
 .shrine-modal button:hover, .btn-success{
     font-family: "Nexa Bold";
     color: #008CBA;
     background-color: transparent;
     border: none;
 }
 
 .shrine-login{
     margin-top: 8%;
     margin-left: 1%;
 }
 
 .shrine-content{
     overflow: auto;
 }
 
 /*Fix for resizeable text area.*/
 textarea{
     resize: none;
 }
 
 
 @media (min-width: 768px) {
     .shrine-content {
         padding: 0;
     }
 }
 
 .shrine-calendar-input{
     margin-right: 1px;
     max-width:50%;
 }
 
 i.shrine-close{
     float:right;
     margin-top:-40px;
     margin-right:-40px;
     cursor:pointer;
     color: #fff;
     border: 2px solid #C8CED1;
     border-radius: 30px;
     background: #8896a4;
     font-size: 31px;
     font-weight: normal;
     display: inline-block;
     line-height: 0px;
     padding: 11px 3px;
     font-style:normal;
 }
 
 i.shrine-close:hover{
     background: #008cba;
 }
 
 .shrine-close:before {
     content: "×";
 }
 
+
+.ng-tpl{
+    overflow: hidden;
+}
+
+
diff --git a/apps/steward-app/src/main/js/src/app/dashboard/history/history.tpl.html b/apps/steward-app/src/main/js/src/app/dashboard/history/history.tpl.html
index 2af17c1d0..90cd7b0c0 100644
--- a/apps/steward-app/src/main/js/src/app/dashboard/history/history.tpl.html
+++ b/apps/steward-app/src/main/js/src/app/dashboard/history/history.tpl.html
@@ -1,6 +1,6 @@
-<div class="col-sm-12">
-    <div>
+<div class="col-sm-12 ng-tpl">
+    <div style="overflow: hidden">
         <history-table>
         </history-table>
     </div>
 </div>
\ No newline at end of file
diff --git a/apps/steward-app/src/main/js/src/app/dashboard/statistics/statistics.tpl.html b/apps/steward-app/src/main/js/src/app/dashboard/statistics/statistics.tpl.html
index 64a5c0c58..8450c87b2 100644
--- a/apps/steward-app/src/main/js/src/app/dashboard/statistics/statistics.tpl.html
+++ b/apps/steward-app/src/main/js/src/app/dashboard/statistics/statistics.tpl.html
@@ -1,63 +1,61 @@
-<div>
+<div class="ng-tpl">
     <div class="col-sm-12 shrine-modal" style="margin-bottom: 50px;">
             <fieldset>
                 <div class="col-sm-4">
                     <label>
                         Start Date:&nbsp;&nbsp;
                     </label>
                     <br/>
                     <input type="text" readonly class="shrine-calendar-input"
                            datepicker-popup="{{format}}"
                            max-date="endDate"
                            ng-model="startDate"
                            is-open="startOpened"
                            ng-required="true"
                            close-text="Close"/>
                     <button type="button"
                             class="shrine-button"
                             ng-click="openStart($event)">
                         <i class="glyphicon glyphicon-calendar"></i>
                     </button>
                 </div>
 
                 <div class="col-sm-4">
 
                     <label>
                         End Date:&nbsp;&nbsp;
                     </label>
                     <br/>
                     <input type="text" readonly class="shrine-calendar-input"
                            datepicker-popup="{{format}}"
                            ng-model="endDate"
                            min-date="startDate"
                            is-open="endOpened"
                            ng-required="true"
                            close-text="Close"/>
                     <button type="button"
                             class="shrine-button"
                                  ng-click="openEnd($event)">
                         <i class="glyphicon glyphicon-calendar"></i>
                     </button>
 
                 </div>
             <div class="col-sm-4">
                 <br/>
                 <button type="submit"
                         class="shrine-button shrine-submit"
                         ng-disabled="!validateRange()"
                         ng-click="addDateRange()">
                     <span>APPLY RANGE</span>
                     <i class="fa fa-chevron-right fa-2x"></i>
                 </button>
             </div>
         </fieldset>
     </div>
 
     <br/>
     <topic-status></topic-status>
     <br/>
     <br/>
     <query-counts></query-counts>
-
-
 </div>
diff --git a/apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail.tpl.html b/apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail.tpl.html
index 565d2643e..88bda8f3f 100644
--- a/apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail.tpl.html
+++ b/apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail.tpl.html
@@ -1,37 +1,37 @@
 
-<div class="col-sm-12 shrine-modal">
+<div class="col-sm-12 shrine-modal" style="width: 170%; margin-left: -37%;">
     <div class="col-sm-12">
         <i class="shrine-close"
            ng-click="cancel()"></i>
 
         <div class="btn-group" role="group" aria-label="...">
             <button type="button"
                     class="btn btn-default shrine-btn-default"
                     ng-click="tabState = 'description'"
                     ng-class="tabState !== 'history' ? 'shrine-btn-on' : 'shrine-btn-off'">
                 Description
             </button>
             <button type="button"
                     class="btn btn-default shrine-btn-default"
                     ng-click="tabState = 'history'"
                     ng-disabled="!canViewHistory()"
                     ng-class="tabState === 'history' ? 'shrine-btn-on' : 'shrine-btn-off'">
                 Query History
             </button>
         </div>
         <div ng-switch on="{{userRole == roles.ROLE1}}" ng-cloak>
             <!-- researcher -->
             <div ng-switch-when="true">
                 <role1-edit         ng-show="tabState == 'edit'"></role1-edit>
                 <role1-description  ng-show="tabState == 'description'"></role1-description>
             </div>
             <!-- steward -->
             <div ng-cloak ng-switch-when="false">
                 <role2-edit         ng-show="tabState == 'edit'"></role2-edit>
                 <role2-description  ng-show="tabState == 'description'"></role2-description>
             </div>
         </div>
         <query-history topic="topic" ng-show="tabState == 'history'"></query-history>
 
     </div>
 </div>
\ No newline at end of file
diff --git a/apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role2-edit.tpl.html b/apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role2-edit.tpl.html
index d62542085..3265f2eae 100644
--- a/apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role2-edit.tpl.html
+++ b/apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role2-edit.tpl.html
@@ -1,68 +1,68 @@
 
 <form name="form" role="form">
     <div class="col-sm-12">
         <br/>
         <div class="form-group">
             <label>Topic Id:</label> {{topic.id}}
         </div>
         <div class="form-group">
             <label>Date Created:</label> {{formatDate(topic.createDate)}}
         </div>
         <div class="form-group">
             <label>Last Updated:</label> {{formatDate(topic.changeDate)}}
         </div>
         <label class="pull-right">
             *<small>Required Field</small>
         </label>
         <div class="form-group">
             <label>Topic Name*</label>
             <input type="text"  ng-model="topic.name" name="topicname"
                    id="topicname" class="form-control" required
                    novalidate readonly>
         </div>
         <div class="form-group">
             <label>Please Describe Your Query's Intent*</label>
                         <textarea readonly
                                   ng-model="topic.description" name="topicdescription"
                                   id="topicdescription" class="form-control" required
                                   novalidate></textarea>
 
 
         </div>
         <div class="form-group" ng-switch
-             on="data.topicState === 'Pending'" ng-cloak>
+             on="topic.state === 'Pending'" ng-cloak>
             <label>Status:</label>
             <!-- ie 11 hack -->
             <select ng-model="data.topicState"
                     ng-switch-when="true">
                 <option value="Pending" ng-selected="true">
                     Pending
                 </option>
                 <option value="Approved">
                     Approved
                 </option>
                 <option value="Rejected">
                     Rejected
                 </option>
             </select>
             <select ng-model="data.topicState"
                     ng-switch-when="false" ng-cloak>
                 <option value="Approved" ng-selected="data.topicState === 'Approved'">
                     Approved
                 </option>
                 <option value="Rejected" ng-selected="data.topicState === 'Rejected'">
                     Rejected
                 </option>
             </select>
         </div>
         <div class="form-group text-center">
             <button type="submit"
                     class="pull-right shrine-button shrine-submit"
                     ng-disabled="data.topicState === 'Pending'"
                     ng-click="ok(topic.id)">
                 <span>UPDATE</span>
                 <i class="fa fa-chevron-right fa-2x"></i>
             </button>
         </div>
     </div>
 </form>
\ No newline at end of file
diff --git a/apps/steward-app/src/main/js/src/app/dashboard/topics/topics.tpl.html b/apps/steward-app/src/main/js/src/app/dashboard/topics/topics.tpl.html
index d57c0410f..1ad7eb80d 100644
--- a/apps/steward-app/src/main/js/src/app/dashboard/topics/topics.tpl.html
+++ b/apps/steward-app/src/main/js/src/app/dashboard/topics/topics.tpl.html
@@ -1,56 +1,56 @@
 <div>
         <div class="col-sm-12">
-            <div>
+            <div class="ng-tpl">
                 <div>
 
 
                     <div ng-switch on="{{userRole == roles.ROLE1}}" ng-cloak>
                         <!-- researcher -->
                         <div ng-switch-when="true">
 
                             <!-- TODO: update to ng-show from conditional if nothing to put here -->
                         </div>
                         <!-- steward -->
                         <div ng-cloak ng-switch-when="false">
                             <div class="btn-group" role="group" aria-label="...">
                                 <button type="button"
                                         class="btn btn-default shrine-btn-default"
                                         ng-click="setStateAndRefresh(states.STATE1)"
                                         ng-class="state === states.STATE1 ? 'shrine-btn-on' : 'shrine-btn-off'">
                                     {{states.STATE1.toUpperCase()}}
 
                                 </button>
                                 <button type="button"
                                         class="btn btn-default shrine-btn-default"
                                         ng-click="setStateAndRefresh(states.STATE2)"
                                         ng-class="state === states.STATE2 ? 'shrine-btn-on' : 'shrine-btn-off'">
                                     <i class="fa fa-check pull-left"></i>
                                     {{states.STATE2.toUpperCase()}}
                                 </button>
                                 <button type="button"
                                         class="btn btn-default shrine-btn-default"
                                         ng-click="setStateAndRefresh(states.STATE3)"
                                         ng-class="state === states.STATE3 ? 'shrine-btn-on' : 'shrine-btn-off'">
                                     <i class="fa fa-remove pull-left"></i>
                                     {{states.STATE3.toUpperCase()}}
                                 </button>
                             </div>
                         </div>
                     </div>
 
                     <div>
                         <p>
                             <topic-table sorted-by="changeDate" sort="sort">
                             </topic-table>
                         </p>
                     </div>
 
                 </div>
                 <!-- /.panel-heading -->
 
                 <!-- /.panel-body -->
             </div>
 
         </div>
     </div>
 
diff --git a/apps/steward-app/src/main/js/src/assets/css/shrine.css b/apps/steward-app/src/main/js/src/assets/css/shrine.css
index 9ae3c928b..92922421a 100644
--- a/apps/steward-app/src/main/js/src/assets/css/shrine.css
+++ b/apps/steward-app/src/main/js/src/assets/css/shrine.css
@@ -1,768 +1,772 @@
 @font-face {
     font-family: 'Nexa';
     src: url('../fnt/nexa/nexa-light-webfont.eot');
     src: url('../fnt/nexa/nexa-light-webfont.eot?#iefix') format('embedded-opentype'),
     url('../fnt/nexa/nexa-light-webfont.woff2') format('woff2'),
     url('../fnt/nexa/nexa-light-webfont.woff') format('woff'),
     url('../fnt/nexa/nexa-light-webfont.ttf') format('truetype'),
     url('../fnt/nexa/nexa-light-webfont.svg#nexa_lightregular') format('svg');
     font-weight: normal;
     font-style: normal;
 }
 
 
 
 
 @font-face {
     font-family: 'Nexa Bold';
     src: url('../fnt/nexa/nexa-bold-webfont.eot');
     src: url('../fnt/nexa/nexa-bold-webfont.eot?#iefix') format('embedded-opentype'),
     url('../fnt/nexa/nexa-bold-webfont.woff2') format('woff2'),
     url('../fnt/nexa/nexa-bold-webfont.woff') format('woff'),
     url('../fnt/nexa/nexa-bold-webfont.ttf') format('truetype'),
     url('../fnt/nexa/nexa-bold-webfont.svg#nexa_boldregular') format('svg');
     font-weight: normal;
     font-style: normal;
 
 }
 
 
 @font-face {
     font-family: 'Open Sans Regular';
     src: url('../fnt/open-sans/opensans-regular-webfont.eot');
     src: url('../fnt/open-sans/opensans-regular-webfont.eot?#iefix') format('embedded-opentype'),
     url('../fnt/open-sans/opensans-regular-webfont.woff2') format('woff2'),
     url('../fnt/open-sans/opensans-regular-webfont.woff') format('woff'),
     url('../fnt/open-sans/opensans-regular-webfont.ttf') format('truetype'),
     url('../fnt/open-sans/opensans-regular-webfont.svg#open_sansregular') format('svg');
     font-weight: normal;
     font-style: normal;
 
 }
 
 
 
 
 @font-face {
     font-family: 'Open Sans Semibold';
     src: url('../fnt/open-sans/opensans-semibold-webfont.eot');
     src: url('../fnt/open-sans/opensans-semibold-webfont.eot?#iefix') format('embedded-opentype'),
     url('../fnt/open-sans/opensans-semibold-webfont.woff2') format('woff2'),
     url('../fnt/open-sans/opensans-semibold-webfont.woff') format('woff'),
     url('../fnt/open-sans/opensans-semibold-webfont.ttf') format('truetype'),
     url('../fnt/open-sans/opensans-semibold-webfont.svg#open_sanssemibold') format('svg');
     font-weight: normal;
     font-style: normal;
 
 }
 
 @font-face {
     font-family: 'Roboto Bold';
     src: url('../fnt/roboto/roboto-bold-webfont.eot');
     src: url('../fnt/roboto/roboto-bold-webfont.eot?#iefix') format('embedded-opentype'),
     url('../fnt/roboto/roboto-bold-webfont.woff2') format('woff2'),
     url('../fnt/roboto/roboto-bold-webfont.woff') format('woff'),
     url('../fnt/roboto/roboto-bold-webfont.ttf') format('truetype'),
     url('../fnt/roboto/roboto-bold-webfont.svg#robotobold') format('svg');
     font-weight: normal;
     font-style: normal;
 
 }
 
 
 
 
 @font-face {
     font-family: 'Roboto Regular';
     src: url('../fnt/roboto/roboto-regular-webfont.eot');
     src: url('../fnt/roboto/roboto-regular-webfont.eot?#iefix') format('embedded-opentype'),
     url('../fnt/roboto/roboto-regular-webfont.woff2') format('woff2'),
     url('../fnt/roboto/roboto-regular-webfont.woff') format('woff'),
     url('../fnt/roboto/roboto-regular-webfont.ttf') format('truetype'),
     url('../fnt/roboto/roboto-regular-webfont.svg#robotoregular') format('svg');
     font-weight: normal;
     font-style: normal;
 
 }
 
 .main-app{
     background-image: url('../img/Background_Shrine.jpg');
     background-size: cover;
     background-color: transparent;
     background-attachment: fixed;
     width: 100%;
     height:100%;
     width: calc(100vw);
     height: calc(100vh);
     min-width: 100%;
     min-height: 100%;
 }
 
 .shrine-navbar {
     background-color: rgba(255, 255, 255, 0.62);
     border-color: transparent;
     font-family: "Nexa";
     color: #5d5d5d;
     min-height: 60px;
     width: 100%;
     height: 4.8em;
 }
 
 .shrine-brand {
     float: left;
     padding: 22px 15px;
     font-size: 30px;
     line-height: 30px;
     height: 30px;
 }
 
 .shrine-brand strong {
     font-family: "Nexa Bold";
     color: #2c5566;
 }
 
 .shrine-navbar .shrine-institution-logo {
     background-image: url('/static/logo.png');
     background-size: contain;
     background-color: transparent;
     background-color: rgba(255,255,255,0.1);
     background-repeat: no-repeat;
     background-position: right top;
     margin: 5px;
     width: 4em;
     height: 4em;
     max-height: 4em;
     max-width: 4em;
 }
 
 .shrine-button {
     cursor: pointer !important;
     background-color: transparent;
     border: none;
 }
 
 .shrine-button span {
     position: relative;
     bottom: 5px;
 
 }
 
 .shrine-btn-default {
     margin-right: 6px;
     border:none;
 }
 
 .shrine-btn-on {
     padding: 12px 12px;
     border-radius: 0;
     font-family: "Roboto Bold" !important;
     color: #FFFFFF !important;
     background:
     linear-gradient(rgba(4, 141, 190, .80), rgba(2, 89, 120, .80)),
     url('../img/bckg_diagonal_lines_no_border.png') !important;
 }
 
 .shrine-btn-off {
     padding: 6px 12px !important;
     border-radius: 4px !important;
     font-family: "Open Sans Semibold" !important;
     background-color: #8896A4 !important;
     color: #FFFFFF !important;
 }
 
 
 .shrine-on, .shrine-on a {
     font-family: "Roboto Bold" !important;
     color: #FFFFFF !important;
     background: linear-gradient(#048DBE, #025978) !important;
 }
 
 .shrine-off {
     font-family: "Roboto Regular" !important;
     color: #2C5566 !important;
     background-color: #ECEEEE !important;
 }
 
 
 .shrine-button.disabled, .shrine-button[disabled] {
     cursor: default !important;
     opacity: 0.2 !important;
 }
 
 .shrine-copy-bold {
     font-family: "Nexa Bold";
     color: #64818e;
 }
 
 .shrine-copy {
     font-family: "Nexa";
     color: #000000;
 }
 
 .row {
     margin-right: 0;
     margin-left: 0;
 }
 
 td.error, span.error {
     color: red;
 }
 
 td.error a, td.error a:hover, span.error a, span.error a:hover{
     color: inherit;
     text-decoration: underline !important;
     cursor: pointer;
 }
 
 td.ok, span.ok {
     color:green;
 }
 
 .form-group span {
     font-family: "Open Sans Semibold";
     color: #2c5566;
 }
 
 fieldset button {
     color: #2E5366;
 }
 
 fieldset button:hover, form a:hover {
     color: #008CBA;
     text-decoration: none;
     cursor: pointer;
 }
 
 form a {
     font-family: "Open Sans Regular";
     color: #647d8d;
     text-decoration: none;
 }
 
 footer img {
     margin-left: 10px;
     margin-top: 2px;
 }
 
 footer {
     background-color: rgba(50, 62, 74, 0.48);
     position: fixed;
     bottom: 0;
     left: 0;
     width: 100%;
     height: 83px;
     min-height: 83px;
     max-width: 100%;
 }
 
 table {
     background-image: url('../img/bckg_diagonal_lines_no_border.png');
     border: 1px solid #CCD8DF;
 
 }
 
 .table tr>td:first-child {
   width: 20%;
   min-width: 140px;
 }
 .table tr>td.thin-col {
   width: 6%;
   min-width: 35px;
 }
 
 .table-striped>tbody>tr:nth-of-type(odd) {
     background-color: #EFF6F9;
 }
 
 .table-striped>tbody>tr:nth-of-type(even) {
     background-color: #FFFFFF;
 }
 
 thead tr{
     border: 1px solid #CCD8DF;
 }
 
 td{
     border-right: 1px solid #CCD8DF;
     overflow: hidden;
     max-width: 450px;
     word-break: break-all;
 }
 
 
 
 thead tr td, thead tr td label, tfoot tr td span{
     font-family: "Open Sans Semibold";
     color: #003153;
 }
 
 td a, td a:hover{
     text-decoration: none !important;
     cursor: pointer;
     font-family: "Open Sans Semibold";
     color: #003153;
 }
 
 .shrine-panel{
     background-image: url('../img/bckg_diagonal_lines.png');
     background-size: 100% 100%;
     padding-right: 20px;
     padding-left: 20px;
     padding-top: 30px;
     padding-bottom: 30px;
 
 }
 
 /*!
  * Start Bootstrap - SB Admin 2 Bootstrap Admin Theme (http://startbootstrap.com)
  * Code licensed under the Apache License v2.0.
  * For details, see http://www.apache.org/licenses/LICENSE-2.0.
  */
 
 body {
     background-image: url('../img/Background_Shrine.jpg');
     background-repeat:no-repeat;
     background-size:100% 100%;
 }
 
 #wrapper {
     width: 100%;
     margin-bottom: 83px; /* clearance space for footer at bottom of long page */
 }
 
 .login-wrapper{
     margin-top: 51px;
     margin-right: 20px;
 }
 
 #page-wrapper {
     background-color: transparent;
     margin-top: 54px;
     margin-right: 20px;
 }
 
 .navbar-top-links li {
     display: inline-block;
 }
 
 .navbar-top-links li:last-child {
     margin-right: 15px;
 }
 
 .navbar-top-links li a {
     padding: 15px;
     min-height: 50px;
     font-family: "Open Sans Semibold";
     color: #2c5566;
 }
 
 .navbar-top-links .dropdown-menu li {
     font-family: "Open Sans Semibold";
     color: #2c5566;
     display: block;
 }
 
 .navbar-top-links .dropdown-menu li:last-child {
     margin-right: 0;
 }
 
 .navbar-top-links .dropdown-menu li a {
     padding: 3px 20px;
     min-height: 0;
 }
 
 .navbar-top-links .dropdown-menu li a div {
     white-space: normal;
 }
 
 .navbar-top-links .dropdown-messages,
 .navbar-top-links .dropdown-tasks,
 .navbar-top-links .dropdown-alerts {
     width: 310px;
     min-width: 0;
 }
 
 .navbar-top-links .dropdown-messages {
     margin-left: 5px;
 }
 
 .navbar-top-links .dropdown-tasks {
     margin-left: -59px;
 }
 
 .navbar-top-links .dropdown-alerts {
     margin-left: -123px;
 }
 
 .navbar-top-links{
     right: 0;
     left: auto;
 }
 
 .sidebar .sidebar-nav.navbar-collapse {
     padding-right: 0;
     padding-left: 0;
 }
 
 .sidebar .sidebar-search {
     padding: 15px;
 }
 
 .sidebar ul li {
     border-bottom: 1px solid #e7e7e7;
 }
 
 .sidebar ul li a.active {
     background-color: #eee;
 }
 
 .sidebar .arrow {
     float: right;
 }
 
 .sidebar .fa.arrow:before {
     content: "\f104";
 }
 
 .sidebar .active>a>.fa.arrow:before {
     content: "\f107";
 }
 
 .sidebar .nav-second-level li,
 .sidebar .nav-third-level li {
     border-bottom: 0!important;
 }
 
 .sidebar .nav-second-level li a {
     padding-left: 37px;
 }
 
 .sidebar .nav-third-level li a {
     padding-left: 52px;
 }
 
 @media(min-width:768px) {
     .sidebar {
         z-index: 1;
         margin-top: 51px;
     }
 
     .navbar-top-links .dropdown-messages,
     .navbar-top-links .dropdown-tasks,
     .navbar-top-links .dropdown-alerts {
         margin-left: auto;
     }
 }
 
 .btn-outline {
     color: inherit;
     background-color: transparent;
     transition: all .5s;
 }
 
 .btn-primary.btn-outline {
     color: #428bca;
 }
 
 .btn-success.btn-outline {
     color: #5cb85c;
 }
 
 .btn-info.btn-outline {
     color: #5bc0de;
 }
 
 .btn-warning.btn-outline {
     color: #f0ad4e;
 }
 
 .btn-danger.btn-outline {
     color: #d9534f;
 }
 
 .btn-primary.btn-outline:hover,
 .btn-success.btn-outline:hover,
 .btn-info.btn-outline:hover,
 .btn-warning.btn-outline:hover,
 .btn-danger.btn-outline:hover {
     color: #fff;
 }
 
 .chat {
     margin: 0;
     padding: 0;
     list-style: none;
 }
 
 .chat li {
     margin-bottom: 10px;
     padding-bottom: 5px;
     border-bottom: 1px dotted #999;
 }
 
 .chat li.left .chat-body {
     margin-left: 60px;
 }
 
 .chat li.right .chat-body {
     margin-right: 60px;
 }
 
 .chat li .chat-body p {
     margin: 0;
 }
 
 .panel .slidedown .glyphicon,
 .chat .glyphicon {
     margin-right: 5px;
 }
 
 .chat-panel .panel-body {
     height: 350px;
     overflow-y: scroll;
 }
 
 .login-panel {
     margin-top: 25%;
 }
 
 .flot-chart {
     display: block;
     height: 400px;
 }
 
 .flot-chart-content {
     width: 100%;
     height: 100%;
 }
 
 .dataTables_wrapper {
     position: relative;
     clear: both;
 }
 
 table.dataTable thead .sorting,
 table.dataTable thead .sorting_asc,
 table.dataTable thead .sorting_desc,
 table.dataTable thead .sorting_asc_disabled,
 table.dataTable thead .sorting_desc_disabled {
     background: 0 0;
 }
 
 table.dataTable thead .sorting_asc:after {
     content: "\f0de";
     float: right;
     font-family: fontawesome;
 }
 
 table.dataTable thead .sorting_desc:after {
     content: "\f0dd";
     float: right;
     font-family: fontawesome;
 }
 
 table.dataTable thead .sorting:after {
     content: "\f0dc";
     float: right;
     font-family: fontawesome;
     color: rgba(50,50,50,.5);
 }
 
 .btn-circle {
     width: 30px;
     height: 30px;
     padding: 6px 0;
     border-radius: 15px;
     text-align: center;
     font-size: 12px;
     line-height: 1.428571429;
 }
 
 .btn-circle.btn-lg {
     width: 50px;
     height: 50px;
     padding: 10px 16px;
     border-radius: 25px;
     font-size: 18px;
     line-height: 1.33;
 }
 
 .btn-circle.btn-xl {
     width: 70px;
     height: 70px;
     padding: 10px 16px;
     border-radius: 35px;
     font-size: 24px;
     line-height: 1.33;
 }
 
 .show-grid [class^=col-] {
     padding-top: 10px;
     padding-bottom: 10px;
     border: 1px solid #ddd;
     background-color: #eee!important;
 }
 
 .show-grid {
     margin: 15px 0;
 }
 
 .huge {
     font-size: 40px;
 }
 
 .panel-green {
     border-color: #5cb85c;
 }
 
 .panel-green .panel-heading {
     border-color: #5cb85c;
     color: #fff;
     background-color: #5cb85c;
 }
 
 .panel-green a {
     color: #5cb85c;
 }
 
 .panel-green a:hover {
     color: #3d8b3d;
 }
 
 .panel-red {
     border-color: #d9534f;
 }
 
 .panel-red .panel-heading {
     border-color: #d9534f;
     color: #fff;
     background-color: #d9534f;
 }
 
 .panel-red a {
     color: #d9534f;
 }
 
 .panel-red a:hover {
     color: #b52b27;
 }
 
 .panel-yellow {
     border-color: #f0ad4e;
 }
 
 .panel-yellow .panel-heading {
     border-color: #f0ad4e;
     color: #fff;
     background-color: #f0ad4e;
 }
 
 .panel-yellow a {
     color: #f0ad4e;
 }
 
 .panel-yellow a:hover {
     color: #df8a13;
 }
 
 .modal-content{
     border: none;
 }
 
 .shrine-modal{
     background-color: white;
     border: 1px solid #2c5566;
     font-family: "Open Sans Semibold";
     color: #2e5366;
     padding: 15px;
 }
 
 .shrine-modal form div.col-sm-12{
     border: 1px solid rgba(2, 89, 120, .80);
 }
 
 .shrine-modal input, .shrine-modal textarea{
     border-radius: 0px;
     border: 1px solid #2c5566;
 }
 
 .shrine-modal span{
     font-family: "Nexa Bold";
     color: #2e5366;
 }
 
 .shrine-modal span:hover{
     font-family: "Nexa Bold";
     color: #008CBA;
 }
 
 .shrine-modal button{
     background-color: white;
     border: none;
     font-family: "Nexa Bold";
     color: #2e5366;
 }
 
 .shrine-modal button span{
     position: relative;
     bottom: 6px;
 }
 
 .shrine-modal button:hover, .btn-success{
     font-family: "Nexa Bold";
     color: #008CBA;
     background-color: transparent;
     border: none;
 }
 
 .shrine-login{
     margin-top: 8%;
     margin-left: 1%;
 }
 
 .shrine-content{
     overflow: auto;
 }
 
 /*Fix for resizeable text area.*/
 textarea{
     resize: none;
 }
 
 
 @media (min-width: 768px) {
     .shrine-content {
         padding: 0;
     }
 }
 
 .shrine-calendar-input{
     margin-right: 1px;
     max-width:50%;
 }
 
 i.shrine-close{
     float:right;
     margin-top:-40px;
     margin-right:-40px;
     cursor:pointer;
     color: #fff;
     border: 2px solid #C8CED1;
     border-radius: 30px;
     background: #8896a4;
     font-size: 31px;
     font-weight: normal;
     display: inline-block;
     line-height: 0px;
     padding: 11px 3px;
     font-style:normal;
 }
 
 i.shrine-close:hover{
     background: #008cba;
 }
 
 .shrine-close:before {
     content: "×";
 }
 
+.ng-tpl{
+    overflow: hidden;
+}
+
diff --git a/shrine-webclient/src/main/html/js-i2b2/cells/SHRINE/EnhancedError.js b/shrine-webclient/src/main/html/js-i2b2/cells/SHRINE/EnhancedError.js
index 9944a7386..b8bb08089 100644
--- a/shrine-webclient/src/main/html/js-i2b2/cells/SHRINE/EnhancedError.js
+++ b/shrine-webclient/src/main/html/js-i2b2/cells/SHRINE/EnhancedError.js
@@ -1,290 +1,292 @@
 /**
  * Created by ben on 10/13/15.
  */
 var $hrine = window.$hrine = {};
 $hrine.EnhancedError =
 
 (function(){
 
     var EnhancedError = {},
         config        = config || {
             //@TODO:
         };
 
 
     /**
      *
      * @returns {{}}
      */
     function simulateI2b2Obj() {
 
         var self = {},
             errorObject = {
                 summary:     "SHRINE Failed to Start",
                 description: "The SHRINE software is not running at the queried" +
                 " site. This error must be corrected at the queried site.Check network status or contact your local SHRINE administrator. For faster assistance, expand this window and provide all text below this line to your local SHRINE administrator.",
                 details:     "There is a fatal syntax error in the remote site's" +
                 " shrine.conf or another .conf file. The remote site admin should check to make sure that there are no stray/missing quotes or brackets, and that URLs are entered correctly.",
                 codec:       ""
             };
 
         self.errorObject = errorObject;
 
 
         self.dispDIV = document.getElementById('infoQueryStatusText');
 
         self.dispDIV.innerHTML =
             '<div style="clear:both;"><div style="float:left; font-weight:bold">SHRINE Critical Error</div></div>';
 
         //which hospital
         self.dispDIV.innerHTML +=
             '<div style="clear:both;"><br/><div style="float:left; font-weight:bold; margin-left:20px;"> Error Summary: </div>';
 
         self.dispDIV.innerHTML += "<span title='" + errorObject.summary + "'><b><a class='query-error-anchor' href='#' style='color:#ff0000'>" +
             "<b><span color='#ff0000'>" + errorObject.summary + "</span></b></a></b></span>";
 
         return self;
     }
 
     /**
      *  Scope for error dialog.
      */
     EnhancedError.createErrorDialogue =  function (container, errorObjects) {
 
         var anchors, btnExpand, btnContract, errorData, i2b2Obj;
 
         //default error.
         if(!container || !errorObjects) {
             i2b2Obj = simulateI2b2Obj();
             container   = i2b2Obj.dispDIV;
             errorObjects  = [i2b2Obj.errorObject];
         }
 
         //this sets up the events.
         anchors     = container.getElementsByClassName('query-error-anchor');
 
         //something's wrong captain, abandon ship!
         if(!anchors.length|| !errorObjects.length) {
             return;
         }
 
         addAnchorEvents();
 
         function expandErrorDetailDiv (ev) {
             var errorDetailDiv          = $('errorDetailDiv');
             btnExpand.style.display     = 'none';
             btnContract.style.display   = 'inline';
             errorDetailDiv.innerHTML    = getExpandedHtml();
         }
 
 
         function retractErrorDetailDiv (ev) {
             var errorDetailDiv          = $('errorDetailDiv');
             btnExpand.style.display     = 'inline';
             btnContract.style.display   = 'none';
             errorDetailDiv.innerHTML    = getRetractedHtml();
         }
 
         function onClick(event) {
             event.preventDefault();
 
             errorData   = event.currentTarget.__errorData__;
             btnExpand   = document.getElementById('btnExpandErrorDetail');
             btnContract = document.getElementById('btnContractErrorDetail');
 
             // -- add event listeners for expand and contract as well --//
             btnExpand.addEventListener('click', expandErrorDetailDiv, false);
             btnContract.addEventListener('click', retractErrorDetailDiv, false);
 
             showErrorDetail(errorData);
         }
 
         /**
          *
          * @param errorData
          * @returns {string}
          */
         function getRetractedHtml () {
+
+            var wikiBaseUrl = (i2b2.hive.cfg.wikiBaseUrl || 'https://open.med.harvard.edu/wiki/display/SHRINE/');
             var retractedHtml = '<div><b>Summary:</b></div>'+
                 '<div>' + errorData.summary + '</div><br/>' +
                 '<div><b>Description:</b></div>'+
                 '<div>' + errorData.description + '</div><br/>' +
                 '<div><i>For information on troubleshooting and resolution, check' +
-                ' <a href="' + i2b2.hive.cfg.wikiBaseUrl + '/' + errorData.codec +'" target="_blank">the SHRINE Error' +
+                ' <a href="' + wikiBaseUrl + errorData.codec +'" target="_blank">the SHRINE Error' +
                 ' Codex</a>.</i></div>';
             return retractedHtml;
         }
 
         /**
          *
          * @param errorData
          * @returns {string}
          */
         function getExpandedHtml () {
             var expandedHtml  = getRetractedHtml() +
                 '<br/>' +
                 '<div><b><i>Copy the text below and paste it in an email to your site administrator for a faster response.</i></b></div>' +
                 '<br/>' +
                 '<div><b>Technical Details:</b></div><pre style="margin-top:0">' + errorData.details + '</pre><br/>' +
                 '<div><b>Codec:</b></div><pre style="margin-top:0">' + errorData.codec + '</pre><br/>' +
                 '<div><b>Stamp:</b></div><pre style="margin-top:0">' + errorData.stamp + '</pre><br/>' +
                 '<div><b>Stack Trace Name:</b></div><pre style="margin-top:0">' + errorData.exception.name + '</pre><br/>' +
                 '<div><b>Stack Trace Message:</b></div><pre style="margin-top:0">' + errorData.exception.message + '</pre><br/>' +
                 '<div><b>Stack Trace Details:</b></div><pre style="margin-top:0">' + errorData.exception.stackTrace + '</pre><br/>';
             return expandedHtml;
         }
 
         /**
          *
          * @param detailObj
          */
         function showErrorDetail(detailObj) {
 
             var handleCancel = function() {
                 this.cancel();
                 removeAllEvents();
                 retractErrorDetailDiv();
             }
 
             var dialogErrorDetail = new YAHOO.widget.SimpleDialog("dialogErrorDetail", {
                 width: "820px",
                 fixedcenter: true,
                 constraintoviewport: true,
                 modal: true,
                 zindex: 700,
                 buttons: [ {
                     text: "Done",
                     handler: handleCancel,
                     isDefault: true
                 }]
             });
 
             dialogErrorDetail._doClose = function (e) {
                 e.preventDefault();
                 this.cancel();
                 removeAllEvents();
                 retractErrorDetailDiv();
             }
 
             $('dialogErrorDetail').show();
             dialogErrorDetail.validate = function(){
                 return true;
             };
             dialogErrorDetail.render(document.body);
 
             // / display the dialoge
             dialogErrorDetail.center();
             dialogErrorDetail.show();
 
             $('errorDetailDiv').innerHTML = getRetractedHtml();
         }
 
 
         function addAnchorEvents () {
             var el, length = anchors.length;
 
             // -- will need to iterate over these once they are created and add event listeners.
             for(var i = 0; i < length; i ++) {
                 var el = anchors[i];
                 el.__errorData__ = errorObjects[i];
                 el.addEventListener('click', onClick, false);
             }
         }
 
         function removeAllEvents () {
             btnExpand.removeEventListener('click', expandErrorDetailDiv);
             btnContract.removeEventListener('click', retractErrorDetailDiv);
         }
     }
 
     /**
      * Parse problem node.
      * @param qriNode
      * @returns {{exception: {}}}
      */
     EnhancedError.parseProblem = function (qriNode) {
         var problem = {
             exception: {}
         };
 
         problem.codec 		= grabXmlNodeData(qriNode, 'descendant-or-self::query_status_type/problem/codec')
         problem.summary     = grabXmlNodeData(qriNode, 'descendant-or-self::query_status_type/problem/summary')
         problem.description = grabXmlNodeData(qriNode, 'descendant-or-self::query_status_type/problem/description')
 
         //unescape embedded html.
        problem.details = i2b2.h.XPath(qriNode, 'descendant-or-self::query_status_type/problem/details')[0]
             .innerHTML.unescapeHTML().replace(/(<([^>]+)>)/ig,"");
 
         problem.exception.name		= grabXmlNodeData(qriNode, 'descendant-or-self::query_status_type/problem/details/exception/name');
         problem.exception.message 	= grabXmlNodeData(qriNode, 'descendant-or-self::query_status_type/problem/details/exception/message');
         problem.exception.stackTrace = parseErrorException(qriNode);
         return problem;
     }
 
 
     /**
      * Replace all <line> <message> <exception> and <stacktrace> with <br/> tags.
      * @param node
      * @returns {*}
      */
     function parseErrorException(node) {
 
         //no exception, abandon ship!
         if(node.innerHTML.indexOf('<exception>') == -1){
             return '';
         }
 
         var content, startIdx, endIdx;
 
         //fish out the problem section.
         content = node.innerHTML.split('<problem>')
             .join()
             .split('</problem>')
             .join();
 
         //fish out the first stack trace.
         startIdx = content.indexOf('<stacktrace>') + 12;
         endIdx   = content.indexOf('</stacktrace>');
         content  = content.substring(startIdx, endIdx);
 
         //remove all line tags and replace with line break.
         content = content.split('<line>')
             .join('</br>')
             .split('</line>')
             .join()
 
             //remove all exception tags
             .split('<exception>')
             .join('<br/>')
             .split('</exception>')
             .join()
 
             //remove all stacktrace tags
             .split('<stacktrace>')
             .join('<br/>')
             .split('</stacktrace>')
             .join()
 
             //remove all message tags.
             .split('<message>')
             .join('<br/>')
             .split('</message>')
             .join();
 
         return content;
     }
 
     /**
      * Grab data for node, return empty string if none.
      * @param node
      * @param xPathString
      * @returns {string}
      */
     function grabXmlNodeData(node, xPathString){
         var nodeVal = i2b2.h.XPath(node, xPathString);
         return (nodeVal.length)? nodeVal[0].innerHTML : '';
     }
 
 
     return EnhancedError;
 })();
\ No newline at end of file