Index: lams_bb_integration/lib/bb-cms-admin.jar
===================================================================
diff -u -r7313b5c073ae563d642a7ef9a2acec81caa2a8ea -r0b039f5d3b81dd56af9fdf497c1ebe921e8e9b1d
Binary files differ
Index: lams_bb_integration/lib/bb-platform.jar
===================================================================
diff -u -r7313b5c073ae563d642a7ef9a2acec81caa2a8ea -r0b039f5d3b81dd56af9fdf497c1ebe921e8e9b1d
Binary files differ
Index: lams_bb_integration/lib/bb-taglibs.jar
===================================================================
diff -u -r7313b5c073ae563d642a7ef9a2acec81caa2a8ea -r0b039f5d3b81dd56af9fdf497c1ebe921e8e9b1d
Binary files differ
Index: lams_bb_integration/web/modules/create.jsp
===================================================================
diff -u -rdc03f6c07b7eec19f6ab1c0ebd7b1826fbea5560 -r0b039f5d3b81dd56af9fdf497c1ebe921e8e9b1d
--- lams_bb_integration/web/modules/create.jsp	(.../create.jsp)	(revision dc03f6c07b7eec19f6ab1c0ebd7b1826fbea5560)
+++ lams_bb_integration/web/modules/create.jsp	(.../create.jsp)	(revision 0b039f5d3b81dd56af9fdf497c1ebe921e8e9b1d)
@@ -66,8 +66,8 @@
                     <input id="title" type="text" name="title" value="" size="70">
                 </bbNG:dataElement>
                 
-                <bbNG:dataElement label="Description" labelFor="description">
-                    <textarea name="description" rows="12" cols="35"></textarea>
+                <bbNG:dataElement label="Description" labelFor="descriptiontext">
+                    <bbNG:textbox name="description" text="" isContentLinking="true"/>
                 </bbNG:dataElement>
             </bbNG:step> 
             
Index: lams_bb_integration/web/modules/learnermonitor.jsp
===================================================================
diff -u -re27f01d34eea709e255d542039faac9c4e46ac4d -r0b039f5d3b81dd56af9fdf497c1ebe921e8e9b1d
--- lams_bb_integration/web/modules/learnermonitor.jsp	(.../learnermonitor.jsp)	(revision e27f01d34eea709e255d542039faac9c4e46ac4d)
+++ lams_bb_integration/web/modules/learnermonitor.jsp	(.../learnermonitor.jsp)	(revision 0b039f5d3b81dd56af9fdf497c1ebe921e8e9b1d)
@@ -101,7 +101,7 @@
         ContentDbLoader courseDocumentLoader = (ContentDbLoader) bbPm.getLoader( ContentDbLoader.TYPE );
         Content courseDoc = (Content)courseDocumentLoader.loadById( contentId );
         title = courseDoc.getTitle();
-        description = courseDoc.getBody().getText();
+        description = courseDoc.getBody().getFormattedText();
         
         //get lineitemid from the storage (bbContentId -> lineitemid)
 	    PortalExtraInfo pei = PortalUtil.loadPortalExtraInfo(null, null, "LamsLineitemStorage");
@@ -161,9 +161,9 @@
     </bbNG:actionControlBar>
     
     <% if((description != "") && (description != null)) { %>
-	    <h4> 
+	    <div class="vtbegenerated"> 
 	    	<%=description%> 
-	    </h4>
+	    </div>
     <% } %>
     
     <% if(isDisplayDesignImage) { %>
Index: lams_bb_integration/web/modules/modify.jsp
===================================================================
diff -u -re27f01d34eea709e255d542039faac9c4e46ac4d -r0b039f5d3b81dd56af9fdf497c1ebe921e8e9b1d
--- lams_bb_integration/web/modules/modify.jsp	(.../modify.jsp)	(revision e27f01d34eea709e255d542039faac9c4e46ac4d)
+++ lams_bb_integration/web/modules/modify.jsp	(.../modify.jsp)	(revision 0b039f5d3b81dd56af9fdf497c1ebe921e8e9b1d)
@@ -52,8 +52,8 @@
     // Get the Item Attributes
     Calendar startDate = bbContent.getStartDate();
     Calendar endDate = bbContent.getEndDate();	
-    FormattedText desc = bbContent.getBody();
-    String description = desc.getText().replaceFirst(NOT_AVAILABLE, ""); //remove the NOT_AVAILABLE substring
+    FormattedText description = bbContent.getBody();
+    //String description = desc.getText().replaceFirst(NOT_AVAILABLE, ""); //remove the NOT_AVAILABLE substring
 
 %>
 
@@ -80,8 +80,8 @@
                     <input id="title" type="text" name="title" value="<%=bbContent.getTitle()%>">
                 </bbNG:dataElement>
         
-                <bbNG:dataElement label="Description" labelFor="description">
-                    <textarea name="description" rows="12" cols="35"><%=description%></textarea>
+                <bbNG:dataElement label="Description" labelFor="descriptiontext">
+                    <bbNG:textbox name="description" text="<%=description%>" isContentLinking="true"/>
                 </bbNG:dataElement>
                 
             </bbNG:step> 
Index: lams_bb_integration/web/modules/modify_proc.jsp
===================================================================
diff -u -rdc03f6c07b7eec19f6ab1c0ebd7b1826fbea5560 -r0b039f5d3b81dd56af9fdf497c1ebe921e8e9b1d
--- lams_bb_integration/web/modules/modify_proc.jsp	(.../modify_proc.jsp)	(revision dc03f6c07b7eec19f6ab1c0ebd7b1826fbea5560)
+++ lams_bb_integration/web/modules/modify_proc.jsp	(.../modify_proc.jsp)	(revision 0b039f5d3b81dd56af9fdf497c1ebe921e8e9b1d)
@@ -60,7 +60,7 @@
         // Get the form parameters and convert into correct data types
         // TODO: Use bb text area instead
         String strTitle = request.getParameter("title").trim();
-        String strDescription = request.getParameter("description").trim();
+        String strDescription = request.getParameter("descriptiontext").trim();
         FormattedText description = new FormattedText(strDescription, FormattedText.Type.HTML);
         
         String strIsAvailable = request.getParameter("isAvailable");
Index: lams_bb_integration/web/modules/start_lesson_proc.jsp
===================================================================
diff -u -re27f01d34eea709e255d542039faac9c4e46ac4d -r0b039f5d3b81dd56af9fdf497c1ebe921e8e9b1d
--- lams_bb_integration/web/modules/start_lesson_proc.jsp	(.../start_lesson_proc.jsp)	(revision e27f01d34eea709e255d542039faac9c4e46ac4d)
+++ lams_bb_integration/web/modules/start_lesson_proc.jsp	(.../start_lesson_proc.jsp)	(revision 0b039f5d3b81dd56af9fdf497c1ebe921e8e9b1d)
@@ -76,7 +76,7 @@
         // Get the form parameters and convert into correct data types
         // TODO: Use bb text area instead
         String strTitle = request.getParameter("title").trim();
-        String strDescription = request.getParameter("description").trim();
+        String strDescription = request.getParameter("descriptiontext").trim();
         FormattedText description = new FormattedText(strDescription, FormattedText.Type.HTML);
 
         String strSequenceID = request.getParameter("sequence_id").trim();