Index: lams_admin/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_admin/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_central/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_central/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_central/web/qb/authoring/addessay.jsp
===================================================================
diff -u -r9284ed16906938b99d2e25acea5403b6a7d0d5f7 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
+++ lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -222,7 +222,7 @@
 					</div>
 					
 					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" inPanel="false" />
 					</c:if>
 				</div>
 					
Index: lams_central/web/qb/authoring/addmarkhedging.jsp
===================================================================
diff -u -r9284ed16906938b99d2e25acea5403b6a7d0d5f7 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
+++ lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -192,7 +192,7 @@
 					</div>
 					
 					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" inPanel="false" />
 					</c:if>
 				</div>
 			</form:form>
Index: lams_central/web/qb/authoring/addmatchingpairs.jsp
===================================================================
diff -u -r9284ed16906938b99d2e25acea5403b6a7d0d5f7 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
+++ lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -171,7 +171,7 @@
 					</div>
 					
 					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" inPanel="false" />
 					</c:if>
 				</div>
 				
Index: lams_central/web/qb/authoring/addmultiplechoice.jsp
===================================================================
diff -u -r9284ed16906938b99d2e25acea5403b6a7d0d5f7 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
+++ lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -273,7 +273,7 @@
 					</div>
 					
 					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" inPanel="false"/>
 					</c:if>
 				</div><!-- settings tab ends -->
 			</form:form>
Index: lams_central/web/qb/authoring/addnumerical.jsp
===================================================================
diff -u -r9284ed16906938b99d2e25acea5403b6a7d0d5f7 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
+++ lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -224,7 +224,7 @@
 					</div>
 					
 					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" inPanel="false" />
 					</c:if>
 				</div>			
 				
Index: lams_central/web/qb/authoring/addordering.jsp
===================================================================
diff -u -r9284ed16906938b99d2e25acea5403b6a7d0d5f7 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
+++ lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -174,7 +174,7 @@
 					</div>	
 					
 					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" inPanel="false" />
 					</c:if>
 				</div>
 			</form:form>
Index: lams_central/web/qb/authoring/addshortanswer.jsp
===================================================================
diff -u -r9284ed16906938b99d2e25acea5403b6a7d0d5f7 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_central/web/qb/authoring/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
+++ lams_central/web/qb/authoring/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -183,7 +183,7 @@
 					</div>
 					
 					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" inPanel="false" />
 					</c:if>
 				</div>
 
Index: lams_central/web/qb/authoring/addtruefalse.jsp
===================================================================
diff -u -r9284ed16906938b99d2e25acea5403b6a7d0d5f7 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
+++ lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -183,7 +183,7 @@
 					</div>
 					
 					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" inPanel="false" />
 					</c:if>
 				</div>
 			</form:form>
Index: lams_gradebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_gradebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_gradebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_learning/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_learning/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_monitoring/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_doku/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r0441b6caf440e4a40163c2aa4ba1f4002051fc81 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
+++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_images/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_nb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_preview/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_task/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_zoom/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_www/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_www/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -3,8 +3,10 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -39,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -69,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_www/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rdbe381256743b49523ad8e294cbda8e42e19eb25
--- lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
@@ -17,6 +17,7 @@
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
 <%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -173,13 +174,35 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="outcome.authoring.title">
-	<div class="input-group">
-	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-	</div>
-	<div class="voffset10">
-		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-	</div>
-</lams:SimplePanel>
\ No newline at end of file
+<c:choose>
+	<c:when test="${inPanel}">
+		<lams:SimplePanel titleKey="outcome.authoring.title">
+			<div class="input-group">
+			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+			</div>
+			<div class="voffset10">
+				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+			</div>
+		</lams:SimplePanel>
+	</c:when>
+	<c:otherwise>
+		<div class="form-group row">
+		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
+		    	<fmt:message key="outcome.authoring.title" />
+		    </label>
+		    
+		    <div class="col-sm-9">
+		    	<div class="input-group">
+				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+				</div>
+				<div class="voffset10">
+					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+				</div>
+			</div>
+		</div>
+	</c:otherwise>
+</c:choose>
\ No newline at end of file