diff --git a/images/OTJ8-concepts.png b/images/OTJ8-concepts.png
index 33686f9..bc27ba1 100644
--- a/images/OTJ8-concepts.png
+++ b/images/OTJ8-concepts.png
Binary files differ
diff --git a/pages/otj_java8.html b/pages/otj_java8.html
index 1d65093..005cd5e 100644
--- a/pages/otj_java8.html
+++ b/pages/otj_java8.html
@@ -37,10 +37,10 @@
   </div>
 </div>
 
-<div id="container" style="margin-top:50px;background-image:url(images/OTJ8-concepts.png);background-repeat:no-repeat;background-position:30px 20px;width:773px;height:687px;">
+<div id="container" style="margin-top:50px;background-image:url(images/OTJ8-concepts.png);background-repeat:no-repeat;background-position:30px 20px;width:790px;height:687px;">
 	<h1 style="position:relative; left:200px; top:0px;height:36px;">OT/J on Java 8 is …</h1>
 	<h2 style="position:relative; left:170px; top:0px;height:24px;">Composition:</h2>
-	<div style="position:relative; left:30px; top:10px; width:380px;height:300px;font-size:16px;">
+	<div style="position:relative; left:38px; top:15px; width:380px;height:300px;font-size:16px;">
 		The essence of object-oriented programming is to compose a system from a possibly large number of interacting classes and objects.
 		<p>
 		Since version 1.1, <b class="orange">Java</b> has not seen any enhancements for this task.
@@ -49,21 +49,21 @@
 		<a class="orange" href="http://wiki.eclipse.org/OTJ">OT/J</a> adds three closely related concepts:
 		</p>
 		<ul style="margin:0px;">
-		<li style="margin:3px;">Roles can be attached to a base object for <b>dynamic specialization</b>.</li>
-		<li style="margin:-5px 0px 0px;">Roles are grouped into a Team to yield <b>cohesive modules</b> for use-cases &amp; features.</li>
+		<li style="margin:3px;"><a href="http://wiki.eclipse.org/OTJ_Primer/Role_Playing">Roles</a> can be attached to a base object for <b>dynamic specialization</b>.</li>
+		<li style="margin:-5px 0px 0px;">Roles are grouped into a <a href="http://wiki.eclipse.org/OTJ_Primer/Role_Containment">Team</a> to yield <b>cohesive modules</b> for use-cases &amp; features.</li>
 		<li style="margin:-5px 0px 0px;">Teams support nested inheritance for <b>large-scale specialization</b>.</li></ul>
 	</div>
-	<h2 style="position:relative; left:100px; top:-425px;
+	<h2 style="position:relative; left:95px; top:-425px;
 		display:block;transform:rotate(-90deg);
 		-ms-transform:rotate(-90deg);
 		-webkit-transform:rotate(-90deg);">Algorithms:</h2>
-	<div style="position:relative; left:523px; top:-215px; width:245px;font-size:16px;">
+	<div style="position:relative; left:528px; top:-205px; width:245px;font-size:16px;">
 		<a class="orange" href="http://wiki.eclipse.org/OTJ">OT/J</a> is agnostic to how algorithms are encoded (programming in the small),<br/>
 		but you may leverage lambda expressions from <b class="orange">Java 8</b> in your OT/J programs for that touch
 		of <b>functional programming</b>.
 	</div>
-	<h2 style="position:relative; left:150px; top:-140px;">	Types:</h2>
-	<div style="position:relative; left:262px; top:-203px; width:480px;font-size:16px;">
+	<h2 style="position:relative; left:165px; top:-140px;">	Types:</h2>
+	<div style="position:relative; left:277px; top:-198px; width:480px;font-size:16px;">
 		A rich type system is key for attaching <b>semantics</b> to the elements of your program.
 		<ul>
 			<li style="margin-left:-12px;"><b class="orange">Java 8</b> features …<br/>