Index: lams_central/web/includes/javascript/popover-tag.js
===================================================================
diff -u -r3b38f0a90eb12eb72ebd7171062c77d3695302eb -rb8506f4514d358dea8c01475dd2d2acef0909843
--- lams_central/web/includes/javascript/popover-tag.js	(.../popover-tag.js)	(revision 3b38f0a90eb12eb72ebd7171062c77d3695302eb)
+++ lams_central/web/includes/javascript/popover-tag.js	(.../popover-tag.js)	(revision b8506f4514d358dea8c01475dd2d2acef0909843)
@@ -13,6 +13,10 @@
 			"tabindex"      : "0",
 			"role"          : "button"
 		})
+		.css({
+			'color' : 'black',
+			'text-decoration' : 'none'
+		})
 		.on('keypress', function(e){
 		    if (e.keyCode === 32 || e.keyCode == 13) {
 				// check for Space or Enter key and simulate a click
@@ -21,6 +25,7 @@
 		    }
 		})
 		.popover({
+			'container' : 'body',
 			'html'      : true,
 			'trigger'   : 'click',
 			// without this option the close button in popover title does not show up
Index: lams_central/web/qb/stats.jsp
===================================================================
diff -u -rb2b9056f147f07040dab6ab9c92d7b505776996f -rb8506f4514d358dea8c01475dd2d2acef0909843
--- lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision b2b9056f147f07040dab6ab9c92d7b505776996f)
+++ lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision b8506f4514d358dea8c01475dd2d2acef0909843)
@@ -314,7 +314,10 @@
 	<div class="panel panel-default">
 		<div class="panel-heading">
 			<fmt:message key="label.qb.stats.usage" />&nbsp;
-			<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="<fmt:message key="label.qb.stats.tooltip" />"></i>
+			<lams:Popover>
+          		<fmt:message key="label.qb.stats.tooltip" />
+          	</lams:Popover>
+
 		</div>
 		<div class="panel-body">
 			<c:choose>
@@ -341,15 +344,21 @@
 							</th>
 							<th>
 								<fmt:message key="label.qb.stats.usage.difficulty" />&nbsp;
-								<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="<fmt:message key="label.qb.difficulty.index.tooltip" />"></i>
+								<lams:Popover>
+					          		<fmt:message key="label.qb.difficulty.index.tooltip" />
+					          	</lams:Popover>
 							</th>
 							<th>
 								<fmt:message key="label.qb.stats.usage.discrimination" />&nbsp;
-								<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="<fmt:message key="label.qb.discrimination.index.tooltip" />"></i>
+								<lams:Popover>
+									<fmt:message key="label.qb.discrimination.index.tooltip" />
+					          	</lams:Popover>
 							</th>
 							<th>
 								<fmt:message key="label.qb.stats.usage.biserial" />&nbsp;
-							 	<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="<fmt:message key="label.qb.point.biserial.tooltip" />"></i>
+								<lams:Popover>
+									<fmt:message key="label.qb.point.biserial.tooltip" />
+					          	</lams:Popover>
 							</th>
 						</tr>
 						<c:forEach var="activityDTO" items="${stats.activities}">
Index: lams_tool_assessment/web/pages/monitoring/statisticpart.jsp
===================================================================
diff -u -r3b38f0a90eb12eb72ebd7171062c77d3695302eb -rb8506f4514d358dea8c01475dd2d2acef0909843
--- lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(.../statisticpart.jsp)	(revision 3b38f0a90eb12eb72ebd7171062c77d3695302eb)
+++ lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(.../statisticpart.jsp)	(revision b8506f4514d358dea8c01475dd2d2acef0909843)
@@ -308,10 +308,8 @@
 			    	<a class="collapsed" role="button" data-toggle="collapse" href="#qb-stats" aria-expanded="true" aria-controls="qb-stats">
 		          		<fmt:message key="label.qb.stats" />
 		          	</a>
-		          	
-		          	<lams:Popover titleKey="label.qb.stats">
+		          	<lams:Popover>
 		          		<fmt:message key="label.qb.stats.tooltip" />
-						<a href="/lams/" tabindex="0" target="_blank">Here is a link</a>
 		          	</lams:Popover>
 
 	      		</span>
@@ -331,35 +329,21 @@
 						</th>
 						<th scope="col" class="text-center">
 							<fmt:message key="label.qb.difficulty.index"/>&nbsp;
-							
-							<lams:Popover data-placement="bottom">
+							<lams:Popover>
 				          		<fmt:message key="label.qb.difficulty.index.tooltip" />
-								<a href="/lams/" tabindex="0" target="_blank">Here is a link</a>
 				          	</lams:Popover>
 							
 						</th>
 						<th scope="col" class="text-center">
 							<fmt:message key="label.qb.discrimination.index"/>&nbsp;
-							
-							<a id="discrimination-index-popover" class="lams-popover" data-placement="top"/></a>
-							<span id="discrimination-index-popover-content" class="lams-popover-content hidden">
-								<span class="lams-popover-title">
-									<fmt:message key="label.qb.discrimination.index"/>
-								</span>
-								<span class="lams-popover-body">
-									<fmt:message key="label.qb.discrimination.index.tooltip" />
-									<a href="/lams/" tabindex="0" target="_blank">Here is a link</a>
-								</span>
-							</span>
-														
-							
+							<lams:Popover>
+								<fmt:message key="label.qb.discrimination.index.tooltip" />
+				          	</lams:Popover>
 						</th>
 						<th scope="col" class="text-center">
 							<fmt:message key="label.qb.point.biserial"/>&nbsp;
-							
-							<lams:Popover titleKey="label.qb.difficulty.index" data-placement="left">
-								<fmt:message key="label.qb.difficulty.index.tooltip" />
-								<a href="/lams/" tabindex="0" target="_blank">Here is a link</a>
+							<lams:Popover>
+								<fmt:message key="label.qb.point.biserial.tooltip" />
 				          	</lams:Popover>
 	
 						</th>