diff --git a/shrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.controller.js b/shrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.controller.js
index 8b70fb24d..0b125620f 100644
--- a/shrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.controller.js
+++ b/shrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.controller.js
@@ -1,207 +1,207 @@
 (function () {
 	'use strict';
 	// -- public -- //
 	i2b2.SHRINE.RequestTopic = requestTopic;
 	i2b2.SHRINE.TopicInfo = showTopicInfo;
 	i2b2.SHRINE.view.modal.topicInfoDialog = getTopicInfoDialog();
 
 	// -- events -- //
 	i2b2.events.afterLogin.subscribe(loginSuccessHandler);
 
 	// -- @todo: boostrap the Webclient plugin tabs here. -- //
 	function loginSuccessHandler(type, args) {
 		if (i2b2.hive.cfg.lstCells.SHRINE.serverLoaded) {
 			i2b2.PM.model.shrine_domain = true;
 		}
 
 		if (i2b2.h.isSHRINE()) {
 			loadTopics(type, args);
 			renderTopics();
 			bootstrap();
 		}
 	}
 
 	function loadTopics(type, args) {
 		var msg = i2b2.SHRINE.ajax.readApprovedEntries("SHRINE");
 		msg.parse();
 		if (msg.error) {
 			console.error("Could not get approved topic list from SHRINE");
 			console.dir(msg);
 			alert('Could not get approved topics list from SHRINE.');
 		}
 		else {
 			i2b2.SHRINE.model.topics = {};
 			var l = msg.model.length;
 			for (var i = 0; i < l; i++) {
 				var rec = msg.model[i];
 				if (rec.TopicID != undefined) {
 					i2b2.SHRINE.model.topics[rec.TopicID] = rec;
 				}
 			}
 		}
 	}
 
 
 	function renderTopics() {
 		var dropdown = $('queryTopicSelect');
 		while (dropdown.hasChildNodes()) { dropdown.removeChild(dropdown.firstChild); }
 		// create the "Select Topic" option
 		var sno = document.createElement('OPTION');
 		sno.setAttribute('value', null);
 		var snt = document.createTextNode(" ------ Select an Approved Query Topic ------ ");
 		sno.appendChild(snt);
 		dropdown.appendChild(sno);
 		// populate with topics
 		for (var i in i2b2.SHRINE.model.topics) {
 			var rec = i2b2.SHRINE.model.topics[i];
 			if (rec.TopicID != undefined && rec.approval == "Approved") {
 				// ONT options dropdown
 				var sno = document.createElement('OPTION');
 				sno.setAttribute('value', rec.TopicID);
 				var snt = document.createTextNode(rec.Name);
 				sno.appendChild(snt);
 				dropdown.appendChild(sno);
 			}
 		}
 
 		//<img src="js-i2b2/cells/CRC/assets/csv.png">
 
 		$$('#crcDlgResultOutputPRC input')[0].disabled = true;
 		$('crcDlgResultOutputPRS').hide();
 	}
 
 	/*
 	* Change this value in the config file [\i2b2\cells\SHRINE\cell_config_data.js]
 	*/
 	function requestTopic() {
 		window.open(i2b2.SHRINE.cfg.config.newTopicURL, 'RequestTopic', 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=800,height=600');
 	}
 
 
 	function showTopicInfo() {
 		var s = $('queryTopicSelect');
 		if (s.selectedIndex == null || s.selectedIndex == 0) {
 			return true;
 		}
 		var topicID = s.options[s.selectedIndex].value;
 		if (topicID == "") { return; }
 		i2b2.SHRINE.view.modal.topicInfoDialog.showInfo(topicID);
 	}
 
 
 	function getTopicInfoDialog() {
 		return {
 			showInfo: function (id) {
 				var thisRef = i2b2.SHRINE.view.modal.topicInfoDialog;
 				if (!thisRef.yuiDialog) {
 					thisRef.yuiDialog = new YAHOO.widget.SimpleDialog("SHRINE-info-panel", {
 						zindex: 700,
 						width: "400px",
 						fixedcenter: true,
 						constraintoviewport: true
 					});
 					thisRef.yuiDialog.render(document.body);
 					// show the form
 					thisRef.yuiDialog.show();
 				}
 				// show the form
 				$('SHRINE-info-panel').show();
 				thisRef.yuiDialog.show();
 				thisRef.yuiDialog.center();
 				// display the topic info
 				var rec = i2b2.SHRINE.model.topics[id];
 				if (undefined == rec) { thisRef.yuiDialog.hide(); }	// bad id == bail out here
 				$('SHRINE-info-title').innerHTML = rec.Name;
 				$('SHRINE-info-body').innerHTML = rec.Intent;
 			}
 		};
 	}
 
 	function bootstrap() {
 		overrideQueryPanelHTML(jQuery);
 		overrideI2B2(jQuery, i2b2, YAHOO);
 		loadShrineWrapper(jQuery, i2b2.SHRINE.cfg.config);
 	}
 
 	function loadShrineWrapper($, config) {
 		return $('#' + i2b2.SHRINE.plugin.viewName).load(config.wrapperHtmlFile, function (response, status, xhr) { });
 	}
 
 	function overrideI2B2($, i2b2, YAHOO) {
 		//-- plugin communication --//
 		i2b2.events.networkIdReceived = new YAHOO.util.CustomEvent("networkIdReceived", i2b2);
 		i2b2.events.afterQueryInit = new YAHOO.util.CustomEvent("afterQueryInit", i2b2);
 		i2b2.events.queryResultAvailable = new YAHOO.util.CustomEvent("queryResultAvailable", i2b2);
 		i2b2.events.queryResultUnavailable = new YAHOO.util.CustomEvent("queryResultUnvailable", i2b2);
 		i2b2.events.exportQueryResult = new YAHOO.util.CustomEvent("exportQueryResult", i2b2);
 
 		i2b2.events.queryResultAvailable.subscribe(function () {
 			jQuery('#crcStatusBox .TopTabs .opXML #shrineCSVExport')
 				.css({opacity: 1})
 				.click(function(e) {
 					e.stopPropagation();
 					i2b2.events.exportQueryResult.fire(); 
 				});
 		});
 		i2b2.events.queryResultUnavailable.subscribe(function () {
 			jQuery('#crcStatusBox .TopTabs .opXML #shrineCSVExport')
 				.css({opacity: 0.25})
 				.off('click');
 		});
 		var _queryRun = i2b2.CRC.ctrlr.QT._queryRun;
 		i2b2.CRC.ctrlr.QT._queryRun = function (name, options) {
 			i2b2.events.afterQueryInit.fire({ name: name, data: options });
 			return _queryRun.apply(i2b2.CRC.ctrlr.QT, [name, options]);
 		}
 		i2b2.CRC.view.status.showDisplay = function () {
 		}
 	}
 
 	function overrideQueryPanelHTML($) {
 		removeI2B2Tabs($);
 		removeI2B2Panels($);
 		removeI2B2PrintIcon($);
 		removeI2B2PrintQueryBox($);
 		addExportIcon($);
 		addShrineTab($);
 		addShrinePanel($);
 		jQuery('#crcStatusBox .TopTabs .opXML #shrineCSVExport')
 		.css({opacity: 0.25})
 	}
 
 	function removeI2B2Tabs($) {
 		$('#crcStatusBox .TopTabs').find('.tabBox').hide();
 	}
 
 	function removeI2B2Panels($) {
 		$('#crcStatusBox .StatusBox').children().hide();
 	}
 
 	function removeI2B2PrintIcon($) {
 		$('#crcStatusBox .TopTabs .opXML')
 			.children().first().remove();
 	}
 
 	function removeI2B2PrintQueryBox($) {
 		$("#printQueryBox").remove();
 	}
 
 	function addExportIcon($) {
 		$('#crcStatusBox .TopTabs .opXML').prepend(
 			'<a id="shrineCSVExport" style="cursor: pointer; text-decoration:underline; color: blue;">' +
 				'Export to CSV' +
 			'</a>');
 	}
 
 	function addShrineTab($) {
 		$('#crcStatusBox .TopTabs').append(
 			'<div class="tabBox query-viewer active" onClick="i2b2.SHRINE.plugin.navigateTo(\'query-viewer\')">' +
 			'<div>Query Viewer</div>' +
 			'</div>');
 	}
 
 	function addShrinePanel($) {
-		$('#crcStatusBox .StatusBox').append('<div id="shrinePlugin" class="shrinePluginContent" oncontextmenu="return false"></div>');
+		$('#crcStatusBox .StatusBox').append('<div id="shrinePlugin" class="shrinePluginContent" oncontextmenu="return false" style="padding: 0;"></div>');
 	}
 })();